[go: nahoru, domu]

Update D8 R8 to 8.6.10-dev

Version: 8.6.10-dev
This build IS NOT suitable for preview or public release.

Built here: go/r8-releases/raw/8.6.10-dev

BYPASS_INCLUSIVE_LANGUAGE_REASON=Mapping file include names from third party libraries

Change-Id: If95f3a0c365934457123a3c7926b2258859e5192
diff --git a/keepanno-annotations.jar b/keepanno-annotations.jar
index 72ec8c6..2b9912e 100644
--- a/keepanno-annotations.jar
+++ b/keepanno-annotations.jar
Binary files differ
diff --git a/r8.jar b/r8.jar
index a19820d..4f6fe28 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 8bb46b1..da54f29 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 8.6.8-dev
+# compiler_version: 8.6.10-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.2"}
-# pg_map_id: 8.6.8-dev
-# pg_map_hash: SHA-256 d2c3b6d5c1f7c6b3adb94e810f336c3f441a4c15c206809f36f24b5ad5ccd6bd
+# pg_map_id: 8.6.10-dev
+# pg_map_hash: SHA-256 153e4423112a56c5bd9981addceeebd15d0850be48c44d10dd356ac03a38cc02
 com.android.tools.r8.AndroidResourceConsumer -> com.android.tools.r8.AndroidResourceConsumer:
 # {"id":"sourceFile","fileName":"AndroidResourceConsumer.java"}
 com.android.tools.r8.AndroidResourceInput -> com.android.tools.r8.AndroidResourceInput:
@@ -159,7 +159,7 @@
     1:6:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.references.MethodReference,com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope,java.lang.String):36:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/AssertionsConfiguration$a;Ljava/lang/String;)V"}
     1:1:com.android.tools.r8.AssertionsConfiguration$Builder builder(com.android.tools.r8.utils.Reporter):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/AssertionsConfiguration$Builder;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/AssertionsConfiguration$Builder;"}
     1:1:com.android.tools.r8.references.MethodReference getAssertionHandler():61:61 -> getAssertionHandler
     1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformationScope getScope():65:65 -> getScope
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/AssertionsConfiguration$a;"}
@@ -202,7 +202,7 @@
 com.android.tools.r8.AssertionsConfiguration$Builder -> com.android.tools.r8.AssertionsConfiguration$Builder:
 # {"id":"sourceFile","fileName":"AssertionsConfiguration.java"}
     com.android.tools.r8.utils.Reporter reporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation transformation -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.references.MethodReference assertionHandler -> c
@@ -210,7 +210,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/AssertionsConfiguration$a;"}
     java.lang.String value -> e
     1:2:void <init>(com.android.tools.r8.utils.Reporter):90:91 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     1:14:com.android.tools.r8.AssertionsConfiguration build():181:194 -> build
     1:1:com.android.tools.r8.AssertionsConfiguration compileTimeDisableAllAssertions(com.android.tools.r8.AssertionsConfiguration$Builder):257:257 -> compileTimeDisableAllAssertions
     1:1:com.android.tools.r8.AssertionsConfiguration compileTimeEnableAllAssertions(com.android.tools.r8.AssertionsConfiguration$Builder):220:220 -> compileTimeEnableAllAssertions
@@ -245,30 +245,30 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     int minApiLevel -> d
     boolean androidPlatformBuild -> e
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.utils.AndroidApp app -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/utils/i;"}
     com.android.tools.r8.StringConsumer backportedMethodListConsumer -> h
     1:9:void <init>(boolean,boolean):84:92 -> <init>
     10:18:void <init>(com.android.tools.r8.utils.Reporter,int,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory):103:111 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;IZLcom/android/tools/r8/internal/Tk;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/StringConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;IZLcom/android/tools/r8/internal/Vk;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/StringConsumer;)V"}
     1:1:com.android.tools.r8.utils.AndroidApp getInputApp():81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/i;"}
     2:11:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):176:185 -> a
     12:12:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):178:178 -> a
     1:1:com.android.tools.r8.utils.Reporter getReporter():65:65 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder builder():123:123 -> builder
     2:2:void com.android.tools.r8.BackportedMethodListCommand$Builder.<init>():201:201 -> builder
     2:2:com.android.tools.r8.BackportedMethodListCommand$Builder builder():123 -> builder
     3:3:com.android.tools.r8.BackportedMethodListCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):127:127 -> builder
     1:1:com.android.tools.r8.StringConsumer getBackportedMethodListConsumer():77:77 -> getBackportedMethodListConsumer
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification getDesugaredLibraryConfiguration():73:73 -> getDesugaredLibraryConfiguration
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vk;"}
     1:1:int getMinApiLevel():69:69 -> getMinApiLevel
     1:1:boolean isAndroidPlatformBuild():61:61 -> isAndroidPlatformBuild
     1:1:boolean isPrintHelp():53:53 -> isPrintHelp
@@ -277,7 +277,7 @@
 com.android.tools.r8.BackportedMethodListCommand$Builder -> com.android.tools.r8.BackportedMethodListCommand$Builder:
 # {"id":"sourceFile","fileName":"BackportedMethodListCommand.java"}
     com.android.tools.r8.utils.Reporter reporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     int minApiLevel -> b
     java.util.List desugaredLibrarySpecificationResources -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -375,13 +375,13 @@
     1:1:com.android.tools.r8.utils.AndroidApp getInputApp():66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/i;"}
     com.android.tools.r8.utils.InternalOptions getInternalOptions() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:boolean isPrintHelp():57:57 -> isPrintHelp
     1:1:boolean isPrintVersion():61:61 -> isPrintVersion
 com.android.tools.r8.BaseCommand$Builder -> com.android.tools.r8.BaseCommand$Builder:
 # {"id":"sourceFile","fileName":"BaseCommand.java"}
     com.android.tools.r8.utils.Reporter reporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean printHelp -> b
     boolean printVersion -> c
     com.android.tools.r8.utils.AndroidApp$Builder app -> d
@@ -396,7 +396,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):127:127 -> <init>
     1:3:void lambda$build$0(com.android.tools.r8.utils.Box):144:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;)V"}
     4:4:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():156:156 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/i$a;"}
     5:5:void lambda$addClasspathFiles$4(java.nio.file.Path[]):220:220 -> a
@@ -436,7 +436,7 @@
     3:14:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):171:182 -> addProgramFiles
     1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):187:188 -> addProgramResourceProvider
     1:1:com.android.tools.r8.utils.Reporter getReporter():166:166 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     2:2:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):193:193 -> b
     3:7:void lambda$addLibraryFiles$3(java.util.Collection):207:211 -> b
     8:8:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):364:364 -> b
@@ -508,9 +508,9 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     int minApiLevel -> h
     com.android.tools.r8.utils.Reporter reporter -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     boolean includeClassesChecksum -> k
     boolean optimizeMultidexForLinearAlloc -> l
     java.util.function.BiPredicate dexClassChecksumFilter -> m
@@ -518,7 +518,7 @@
     java.util.List outputInspections -> o
     int threadCount -> p
     com.android.tools.r8.utils.DumpInputFlags dumpInputFlags -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym;"}
     com.android.tools.r8.MapIdProvider mapIdProvider -> r
     com.android.tools.r8.SourceFileProvider sourceFileProvider -> s
     boolean isAndroidPlatformBuild -> t
@@ -533,10 +533,10 @@
     14:14:void <init>(boolean,boolean):86 -> <init>
     15:22:void <init>(boolean,boolean):86:93 -> <init>
     23:45:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,java.util.function.BiPredicate,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean,java.util.List,java.util.List,com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.CancelCompilationChecker):118:140 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gB$g;ZZLjava/util/function/BiPredicate;Ljava/util/List;Ljava/util/List;ILcom/android/tools/r8/internal/wm;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;ZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iB$g;ZZLjava/util/function/BiPredicate;Ljava/util/List;Ljava/util/List;ILcom/android/tools/r8/internal/ym;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;ZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;)V"}
     1:1:boolean lambda$new$0(java.lang.String,java.lang.Long):0:0 -> a
     2:2:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):157:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm$a;)V"}
     3:3:boolean com.android.tools.r8.utils.ProgramConsumerUtils.isGeneratingClassFiles(com.android.tools.r8.ProgramConsumer):25:25 -> a
     3:3:com.android.tools.r8.dex.Marker$Backend com.android.tools.r8.utils.ProgramConsumerUtils.getBackend(com.android.tools.r8.ProgramConsumer):16 -> a
     3:3:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):158 -> a
@@ -548,39 +548,39 @@
     8:9:com.android.tools.r8.dex.Marker$Backend com.android.tools.r8.utils.ProgramConsumerUtils.getBackend(com.android.tools.r8.ProgramConsumer):19:20 -> a
     8:9:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):158 -> a
     10:11:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):158:159 -> a
-    12:12:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):415:415 -> a
+    12:12:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):427:427 -> a
     12:12:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):159 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):160:160 -> a
-    14:14:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinApi(int):420:420 -> a
+    14:14:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinApi(int):432:432 -> a
     14:14:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):160 -> a
     15:15:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):161:161 -> a
-    16:16:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setOptimizeMultidexForLinearAlloc(boolean):431:431 -> a
+    16:16:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setOptimizeMultidexForLinearAlloc(boolean):443:443 -> a
     16:16:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):161 -> a
     17:17:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):162:162 -> a
-    18:18:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setThreadCount(int):436:436 -> a
+    18:18:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setThreadCount(int):448:448 -> a
     18:18:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):162 -> a
     19:19:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):163:163 -> a
-    20:20:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugarState(com.android.tools.r8.utils.InternalOptions$DesugarState):441:441 -> a
+    20:20:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugarState(com.android.tools.r8.utils.InternalOptions$DesugarState):453:453 -> a
     20:20:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):163 -> a
     21:21:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):166:166 -> a
     22:22:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):165:165 -> a
-    23:23:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setArtProfileProviders(java.util.Collection):497:497 -> a
+    23:23:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setArtProfileProviders(java.util.Collection):509:509 -> a
     23:23:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):164 -> a
     24:24:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):167:167 -> a
-    25:25:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setStartupProfileProviders(java.util.Collection):503:503 -> a
+    25:25:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setStartupProfileProviders(java.util.Collection):515:515 -> a
     25:25:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):167 -> a
     26:26:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):168:168 -> a
-    27:27:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setAndroidPlatformBuild(boolean):513:513 -> a
+    27:27:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setAndroidPlatformBuild(boolean):525:525 -> a
     27:27:void dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):169 -> a
     1:1:java.util.List getArtProfilesForRewriting():242:242 -> c
     1:1:com.android.tools.r8.ClassConflictResolver getClassConflictResolver():250:250 -> d
     1:1:com.android.tools.r8.utils.InternalOptions$DesugarState getDesugarState():195:195 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$g;"}
     1:1:com.android.tools.r8.utils.DumpInputFlags getDumpInputFlags():258:258 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ym;"}
     1:1:com.android.tools.r8.utils.Reporter getReporter():262:262 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:boolean getAndroidPlatformBuild():238:238 -> getAndroidPlatformBuild
     1:1:java.util.List getAssertionsConfiguration():225:225 -> getAssertionsConfiguration
     1:1:com.android.tools.r8.CancelCompilationChecker getCancelCompilationChecker():254:254 -> getCancelCompilationChecker
@@ -601,7 +601,7 @@
 # {"id":"sourceFile","fileName":"BaseCompilerCommand.java"}
     boolean $assertionsDisabled -> A
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> desugarState
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     java.nio.file.Path outputPath -> h
@@ -619,7 +619,7 @@
     java.util.List outputInspections -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.DumpInputFlags dumpInputFlags -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym;"}
     com.android.tools.r8.MapIdProvider mapIdProvider -> t
     com.android.tools.r8.SourceFileProvider sourceFileProvider -> u
     boolean isAndroidPlatformBuild -> v
@@ -650,7 +650,7 @@
     111:111:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):319:319 -> <init>
     1:1:boolean lambda$new$0(java.lang.String,java.lang.Long):0:0 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):672:672 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Z)Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Z)Lcom/android/tools/r8/internal/Vk;"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification.empty():31:31 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):673 -> a
     4:5:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags.empty():44:45 -> a
@@ -720,7 +720,7 @@
     1:1:com.android.tools.r8.SourceFileProvider getSourceFileProvider():647:647 -> getSourceFileProvider
     1:1:com.android.tools.r8.ClassConflictResolver getClassConflictResolver():907:907 -> h
     1:1:com.android.tools.r8.utils.DumpInputFlags getDumpInputFlags():816:816 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ym;"}
     1:1:boolean isOptimizeMultidexForLinearAlloc():458:458 -> isOptimizeMultidexForLinearAlloc
     1:1:java.util.List getOutputInspections():891:891 -> j
     1:1:java.util.List getStartupProfileProviders():778:778 -> k
@@ -797,7 +797,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/BaseCompilerCommand$Builder;Lcom/android/tools/r8/l;Lcom/android/tools/r8/references/MethodReference;Ljava/lang/String;)V"}
     62:74:com.android.tools.r8.DiagnosticsLevel tryParseLevel(java.util.function.Consumer,java.lang.String,com.android.tools.r8.origin.Origin):211:223 -> a
     75:90:int tryParseMapDiagnostics(java.util.function.Consumer,com.android.tools.r8.utils.Reporter,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):240:255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Z40;Ljava/lang/String;[Ljava/lang/String;ILcom/android/tools/r8/origin/Origin;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/d50;Ljava/lang/String;[Ljava/lang/String;ILcom/android/tools/r8/origin/Origin;)I"}
     91:100:int tryParseMapDiagnostics(java.util.function.Consumer,com.android.tools.r8.utils.Reporter,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):251:260 -> a
     101:112:int tryParseDump(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):266:277 -> a
     113:113:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):302:302 -> a
@@ -893,7 +893,7 @@
 com.android.tools.r8.ClassFileConsumer$DirectoryConsumer -> com.android.tools.r8.ClassFileConsumer$DirectoryConsumer:
 # {"id":"sourceFile","fileName":"ClassFileConsumer.java"}
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/em;"}
     1:1:void <init>(java.nio.file.Path):174:174 -> <init>
     2:2:void <init>(java.nio.file.Path,boolean):178:178 -> <init>
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.ClassFileConsumer):182:182 -> <init>
@@ -985,33 +985,33 @@
     31:31:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):370 -> a
     32:33:com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createForD8ClassMerging(com.android.tools.r8.graph.AppView):59:60 -> a
     32:33:void lambda$finalizeApplication$14(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):383 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     34:34:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):65:65 -> a
     34:34:void lambda$finalizeApplication$14(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):384 -> a
     35:38:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     39:39:void lambda$main$2(java.lang.String[]):152:152 -> a
     40:41:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):157:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     42:60:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):172:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/y;"}
     61:61:java.lang.Boolean lambda$run$6(com.android.tools.r8.utils.InternalOptions):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Ljava/lang/Boolean;"}
     62:62:void lambda$run$8(java.lang.String):254:254 -> a
     63:63:void lambda$run$9(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):267:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/y;)V"}
     64:67:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):283:286 -> a
     64:67:com.android.tools.r8.graph.AppView lambda$readApp$5(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/gj0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/kj0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/y;"}
     68:68:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     68:68:void lambda$run$7(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):232 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fc;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hc;Lcom/android/tools/r8/graph/D2;)V"}
     69:69:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     69:69:void lambda$run$7(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):232 -> a
     70:70:void lambda$run$7(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):234:234 -> a
     71:94:void finalizeApplication(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):376:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     95:96:void lambda$finalizeApplication$15(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):389:390 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     97:97:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.runForD8(java.util.Collection,java.util.concurrent.ExecutorService):43:43 -> a
@@ -1022,7 +1022,7 @@
     99:99:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.runForD8(java.util.Collection,java.util.concurrent.ExecutorService):46:46 -> a
     99:99:void lambda$finalizeApplication$15(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):390 -> a
     100:109:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Timing):412:421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/dex/W;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/r4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/dex/W;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/r4;"}
     110:110:boolean com.android.tools.r8.graph.DexProgramClass.originatesFromDexResource():456:456 -> a
     110:110:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Timing):422 -> a
     111:121:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Timing):423:433 -> a
@@ -1045,11 +1045,11 @@
     148:148:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Timing):447:447 -> a
     149:149:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():260:260 -> a
     149:149:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Timing):448 -> a
-    150:150:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():629:629 -> a
+    150:150:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():628:628 -> a
     150:150:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/dex/c;)Lcom/android/tools/r8/graph/h;"}
-    151:151:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():629:629 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/dex/c;)Lcom/android/tools/r8/graph/h;"}
+    151:151:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():628:628 -> a
     151:151:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):186 -> a
     152:153:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):187:188 -> a
     154:154:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.dex.ApplicationReader.readMainDexClasses(com.android.tools.r8.graph.DexApplication):178:178 -> a
@@ -1064,14 +1064,14 @@
     157:158:com.android.tools.r8.graph.AppInfo com.android.tools.r8.graph.AppInfo.createInitialAppInfo(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy,com.android.tools.r8.shaking.MainDexInfo):42:43 -> a
     157:158:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):184 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):122:122 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     2:13:void run(java.lang.String[]):127:138 -> b
     14:14:void lambda$run$10(com.android.tools.r8.graph.AppView):273:273 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     15:15:void com.android.tools.r8.graph.AppView.setNamingLens(com.android.tools.r8.naming.NamingLens):831:831 -> b
     15:15:void lambda$run$10(com.android.tools.r8.graph.AppView):272 -> b
     16:16:void lambda$finalizeApplication$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):378:378 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     17:17:void lambda$finalizeApplication$16(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):394:394 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     1:1:void com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentation.run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):74:74 -> c
@@ -1153,13 +1153,13 @@
     66:70:void com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentation.run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):78 -> c
     66:70:void lambda$finalizeApplication$17(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):397 -> c
     71:74:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):162:165 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     75:75:void lambda$run$11(com.android.tools.r8.graph.AppView):279:279 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     76:76:void com.android.tools.r8.graph.AppView.setNamingLens(com.android.tools.r8.naming.NamingLens):831:831 -> c
     76:76:void lambda$run$11(com.android.tools.r8.graph.AppView):278 -> c
     1:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):195:237 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     44:110:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):229:295 -> d
     111:132:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):292:313 -> d
     133:164:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):312:343 -> d
@@ -1172,7 +1172,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     1:1:void reportSyntheticInformation(com.android.tools.r8.graph.AppView):349:349 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    2:2:com.android.tools.r8.SyntheticInfoConsumer com.android.tools.r8.utils.InternalOptions.getSyntheticInfoConsumer():604:604 -> e
+    2:2:com.android.tools.r8.SyntheticInfoConsumer com.android.tools.r8.utils.InternalOptions.getSyntheticInfoConsumer():603:603 -> e
     2:2:void reportSyntheticInformation(com.android.tools.r8.graph.AppView):349 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void reportSyntheticInformation(com.android.tools.r8.graph.AppView):350:350 -> e
@@ -1201,11 +1201,11 @@
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> C
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> D
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     java.lang.String synthesizedClassPrefix -> F
     boolean enableMainDexListCheck -> G
     com.android.tools.r8.com.google.common.collect.ImmutableList mainDexKeepRules -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.StringConsumer proguardMapConsumer -> I
     com.android.tools.r8.PartitionMapConsumer partitionMapConsumer -> J
     boolean enableMissingLibraryApiModeling -> K
@@ -1216,7 +1216,7 @@
     boolean intermediate -> z
     1:1:void <clinit>():73:73 -> <clinit>
     1:37:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,com.android.tools.r8.GlobalSyntheticsConsumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.SyntheticInfoConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.util.List,java.util.List,java.lang.String,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.StringConsumer,com.android.tools.r8.PartitionMapConsumer,boolean,boolean,boolean,java.util.List,java.util.List,com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.CancelCompilationChecker,com.android.tools.r8.graph.DexItemFactory):704:740 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gB$g;ZLcom/android/tools/r8/GlobalSyntheticsConsumer;ZZLjava/util/function/BiPredicate;Lcom/android/tools/r8/DesugarGraphConsumer;Lcom/android/tools/r8/SyntheticInfoConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/Tk;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ZLcom/android/tools/r8/internal/vu;ILcom/android/tools/r8/internal/wm;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/PartitionMapConsumer;ZZZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iB$g;ZLcom/android/tools/r8/GlobalSyntheticsConsumer;ZZLjava/util/function/BiPredicate;Lcom/android/tools/r8/DesugarGraphConsumer;Lcom/android/tools/r8/SyntheticInfoConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/Vk;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ZLcom/android/tools/r8/internal/xu;ILcom/android/tools/r8/internal/ym;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/PartitionMapConsumer;ZZZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/graph/B1;)V"}
     38:53:void <init>(boolean,boolean):744:759 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):633:633 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;)Lcom/android/tools/r8/D8Command$Builder;"}
@@ -1225,28 +1225,28 @@
     4:4:com.android.tools.r8.naming.ProguardMapStringConsumer com.android.tools.r8.naming.ProguardMapStringConsumer$Builder.build():65:65 -> a
     4:4:com.android.tools.r8.naming.MapConsumer lambda$getInternalOptions$0(com.android.tools.r8.StringConsumer):796 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():764:767 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():768 -> b
     6:12:com.android.tools.r8.utils.InternalOptions getInternalOptions():770:776 -> b
     13:22:com.android.tools.r8.utils.InternalOptions getInternalOptions():775:784 -> b
-    23:23:void com.android.tools.r8.utils.InternalOptions.setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):596:596 -> b
+    23:23:void com.android.tools.r8.utils.InternalOptions.setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):595:595 -> b
     23:23:com.android.tools.r8.utils.InternalOptions getInternalOptions():784 -> b
     24:24:com.android.tools.r8.utils.InternalOptions getInternalOptions():785:785 -> b
-    25:25:void com.android.tools.r8.utils.InternalOptions.setSyntheticInfoConsumer(com.android.tools.r8.SyntheticInfoConsumer):600:600 -> b
+    25:25:void com.android.tools.r8.utils.InternalOptions.setSyntheticInfoConsumer(com.android.tools.r8.SyntheticInfoConsumer):599:599 -> b
     25:25:com.android.tools.r8.utils.InternalOptions getInternalOptions():785 -> b
     26:62:com.android.tools.r8.utils.InternalOptions getInternalOptions():786:822 -> b
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     63:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():824 -> b
     64:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():825:832 -> b
     72:72:com.android.tools.r8.profile.art.ArtProfileOptions com.android.tools.r8.profile.art.ArtProfileOptions.setEnableNopCheckForTesting():123:123 -> b
     72:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():832 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:95:com.android.tools.r8.utils.InternalOptions getInternalOptions():836:858 -> b
-    96:96:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    96:96:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     96:96:com.android.tools.r8.utils.InternalOptions getInternalOptions():860 -> b
     97:101:com.android.tools.r8.utils.InternalOptions getInternalOptions():860:864 -> b
-    102:106:void com.android.tools.r8.utils.InternalOptions.configureAndroidPlatformBuild(boolean):357:361 -> b
+    102:106:void com.android.tools.r8.utils.InternalOptions.configureAndroidPlatformBuild(boolean):356:360 -> b
     102:106:com.android.tools.r8.utils.InternalOptions getInternalOptions():864 -> b
     107:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():866:866 -> b
     108:108:com.android.tools.r8.profile.art.ArtProfileOptions com.android.tools.r8.profile.art.ArtProfileOptions.setArtProfilesForRewriting(java.util.Collection):112:112 -> b
@@ -1260,17 +1260,17 @@
     113:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():872:878 -> b
     120:123:com.android.tools.r8.dump.DumpOptions dumpOptions():885:888 -> b
     120:123:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
-    124:124:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):426:426 -> b
+    124:124:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):438:438 -> b
     124:124:com.android.tools.r8.dump.DumpOptions dumpOptions():889 -> b
     124:124:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
     125:125:com.android.tools.r8.dump.DumpOptions dumpOptions():889:889 -> b
     125:125:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
-    126:126:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMainDexKeepRules(java.util.List):492:492 -> b
+    126:126:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMainDexKeepRules(java.util.List):504:504 -> b
     126:126:com.android.tools.r8.dump.DumpOptions dumpOptions():890 -> b
     126:126:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
     127:127:com.android.tools.r8.dump.DumpOptions dumpOptions():890:890 -> b
     127:127:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
-    128:128:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):508:508 -> b
+    128:128:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):520:520 -> b
     128:128:com.android.tools.r8.dump.DumpOptions dumpOptions():891 -> b
     128:128:com.android.tools.r8.utils.InternalOptions getInternalOptions():879 -> b
     129:129:com.android.tools.r8.dump.DumpOptions dumpOptions():892:892 -> b
@@ -1393,16 +1393,16 @@
 com.android.tools.r8.D8CommandParser -> com.android.tools.r8.q:
 # {"id":"sourceFile","fileName":"D8CommandParser.java"}
     java.util.Set OPTIONS_WITH_ONE_PARAMETER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kc0;"}
     1:22:void <clinit>():30:51 -> <clinit>
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> <clinit>
     23:23:void <clinit>():51 -> <clinit>
     24:24:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():28:28 -> <init>
     1:3:java.util.List getFlags():54:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     4:4:com.android.tools.r8.ParseFlagInfoImpl com.android.tools.r8.ParseFlagInfoImpl.getOutput():43:43 -> a
     4:4:java.util.List getFlags():57 -> a
     5:5:com.android.tools.r8.ParseFlagInfoImpl com.android.tools.r8.ParseFlagInfoImpl.flag1(java.lang.String,java.lang.String,java.lang.String[]):215:215 -> a
@@ -1520,7 +1520,7 @@
     java.util.Set descriptors -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):139:139 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():183:183 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):137 -> <init>
     3:8:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):137:142 -> <init>
@@ -1532,7 +1532,7 @@
 com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.p$a:
 # {"id":"sourceFile","fileName":"D8CommandParser.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     boolean empty -> b
     1:4:void <init>():116:119 -> <init>
     1:1:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider build():122:122 -> a
@@ -1673,7 +1673,7 @@
 com.android.tools.r8.DexFilePerClassFileConsumer$DirectoryConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer$DirectoryConsumer:
 # {"id":"sourceFile","fileName":"DexFilePerClassFileConsumer.java"}
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/em;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():235:235 -> <clinit>
     1:1:void <init>(java.nio.file.Path):247:247 -> <init>
@@ -1722,7 +1722,7 @@
 com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer -> com.android.tools.r8.DexIndexedConsumer$ArchiveConsumer:
 # {"id":"sourceFile","fileName":"DexIndexedConsumer.java"}
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> outputBuilder
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GV;"}
     1:1:void <init>(java.nio.file.Path):122:122 -> <init>
     2:2:void <init>(java.nio.file.Path,boolean):126:126 -> <init>
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer):130:130 -> <init>
@@ -1747,7 +1747,7 @@
     java.nio.file.Path directory -> c
     boolean preparedDirectory -> d
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/em;"}
     1:1:void <init>(java.nio.file.Path):224:224 -> <init>
     2:2:void <init>(java.nio.file.Path,boolean):228:228 -> <init>
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer):232:232 -> <init>
@@ -1831,7 +1831,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;)V"}
     2:2:void <init>(boolean):93:93 -> <init>
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():99:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:com.android.tools.r8.DexSegments$Command$Builder builder():59:59 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/y$a$a;"}
 com.android.tools.r8.DexSegments$Command$Builder -> com.android.tools.r8.y$a$a:
@@ -1891,7 +1891,7 @@
     10:13:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):248:251 -> a
     14:19:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):247:252 -> a
     20:29:void disassembleResource(com.android.tools.r8.Disassemble$DisassembleCommand,com.android.tools.r8.Disassemble$OutputWriter,com.android.tools.r8.ProgramResource,com.android.tools.r8.utils.InternalOptions):274:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/A$a;Lcom/android/tools/r8/C;Lcom/android/tools/r8/ProgramResource;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/A$a;Lcom/android/tools/r8/C;Lcom/android/tools/r8/ProgramResource;Lcom/android/tools/r8/internal/iB;)V"}
     30:30:boolean com.android.tools.r8.Disassemble$DisassembleCommand.useSmali():209:209 -> a
     30:30:void disassembleResource(com.android.tools.r8.Disassemble$DisassembleCommand,com.android.tools.r8.Disassemble$OutputWriter,com.android.tools.r8.ProgramResource,com.android.tools.r8.utils.InternalOptions):285 -> a
     31:36:void disassembleResource(com.android.tools.r8.Disassemble$DisassembleCommand,com.android.tools.r8.Disassemble$OutputWriter,com.android.tools.r8.ProgramResource,com.android.tools.r8.utils.InternalOptions):286:291 -> a
@@ -1936,7 +1936,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/nio/file/Path;Lcom/android/tools/r8/t0$a;Z)V"}
     6:10:void <init>(boolean,boolean):195:199 -> <init>
     1:3:com.android.tools.r8.utils.InternalOptions getInternalOptions():222:224 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder builder():124:124 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/A$a$a;"}
 com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.A$a$a:
@@ -1993,7 +1993,7 @@
 # {"id":"sourceFile","fileName":"ExtractMarker.java"}
     1:1:void <init>():42:42 -> <init>
     1:11:void extractForConsumer(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApp$Builder):92:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/utils/i$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/utils/i$a;)V"}
     12:12:void extractForConsumer(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApp$Builder):97:97 -> a
     13:13:void lambda$extractForConsumer$0(java.util.List,com.android.tools.r8.utils.AndroidApp$Builder):95:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/utils/i$a;)V"}
@@ -2006,15 +2006,15 @@
     19:20:void lambda$extractForConsumer$0(java.util.List,com.android.tools.r8.utils.AndroidApp$Builder):95 -> a
     21:21:void lambda$extractForConsumer$0(java.util.List,com.android.tools.r8.utils.AndroidApp$Builder):95:95 -> a
     22:22:void lambda$run$1(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,java.nio.file.Path,com.android.tools.r8.origin.Origin):117:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/Z40;Ljava/nio/file/Path;Lcom/android/tools/r8/origin/Origin;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/d50;Ljava/nio/file/Path;Lcom/android/tools/r8/origin/Origin;)V"}
     23:23:void lambda$run$1(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,java.nio.file.Path,com.android.tools.r8.origin.Origin):116:116 -> a
     24:24:void lambda$run$2(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,byte[],com.android.tools.r8.origin.Origin):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/Z40;[BLcom/android/tools/r8/origin/Origin;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/d50;[BLcom/android/tools/r8/origin/Origin;)V"}
     25:25:void lambda$run$2(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,byte[],com.android.tools.r8.origin.Origin):119:119 -> a
     26:34:void run(java.lang.String[]):133:141 -> a
     26:34:void lambda$main$4(java.lang.String[]):151 -> a
     1:1:void lambda$run$3(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,byte[],com.android.tools.r8.origin.Origin):126:126 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/Z40;[BLcom/android/tools/r8/origin/Origin;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/MarkerInfoConsumer;Lcom/android/tools/r8/internal/d50;[BLcom/android/tools/r8/origin/Origin;)V"}
     2:2:void lambda$run$3(com.android.tools.r8.MarkerInfoConsumer,com.android.tools.r8.utils.Reporter,byte[],com.android.tools.r8.origin.Origin):122:122 -> b
     1:1:void main(java.lang.String[]):151:151 -> main
     1:18:void run(com.android.tools.r8.ExtractMarkerCommand):111:128 -> run
@@ -2053,9 +2053,9 @@
     10:10:void parse(java.lang.String[],com.android.tools.r8.ExtractMarkerCommand$Builder):135:135 -> a
     11:11:void lambda$forEachEntry$0(java.util.function.BiConsumer,java.nio.file.Path):188:188 -> a
     12:12:void lambda$forEachEntry$1(java.util.function.BiConsumer,com.android.tools.r8.utils.Pair):189:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/IV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/MV;)V"}
     1:1:void lambda$forEachEntry$2(java.util.function.BiConsumer,com.android.tools.r8.utils.Pair):190:190 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/IV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/MV;)V"}
     1:1:com.android.tools.r8.ExtractMarkerCommand$Builder builder():115:115 -> builder
     2:2:com.android.tools.r8.ExtractMarkerCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):119:119 -> builder
     1:3:void forEachEntry(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer):188:190 -> forEachEntry
@@ -2100,7 +2100,7 @@
     1:1:void internalSetProgramConsumer(com.android.tools.r8.ProgramConsumer):63:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/b0;)V"}
     2:2:com.android.tools.r8.FeatureSplit$Builder builder(com.android.tools.r8.DiagnosticsHandler):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/FeatureSplit$Builder;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/FeatureSplit$Builder;"}
     1:1:com.android.tools.r8.AndroidResourceConsumer getAndroidResourceConsumer():83:83 -> getAndroidResourceConsumer
     1:1:com.android.tools.r8.AndroidResourceProvider getAndroidResourceProvider():79:79 -> getAndroidResourceProvider
     1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():71:71 -> getProgramConsumer
@@ -2117,7 +2117,7 @@
     com.android.tools.r8.AndroidResourceProvider androidResourceProvider -> c
     com.android.tools.r8.AndroidResourceConsumer androidResourceConsumer -> d
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):102:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):94:94 -> <init>
     1:1:com.android.tools.r8.FeatureSplit$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):125:125 -> addProgramResourceProvider
     1:1:com.android.tools.r8.FeatureSplit build():141:141 -> build
@@ -2129,27 +2129,27 @@
 com.android.tools.r8.GenerateMainDexList -> com.android.tools.r8.GenerateMainDexList:
 # {"id":"sourceFile","fileName":"GenerateMainDexList.java"}
     com.android.tools.r8.utils.Timing timing -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions):41:41 -> <init>
     3:3:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):150:150 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.InternalOptions):41 -> <init>
     4:8:void <init>(com.android.tools.r8.utils.InternalOptions):41:45 -> <init>
     1:4:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.SortingStringConsumer):51:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ac0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ec0;)V"}
     5:5:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):227:227 -> a
     5:5:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.SortingStringConsumer):56 -> a
     6:6:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.SortingStringConsumer):56:56 -> a
     7:7:void lambda$run$0(com.android.tools.r8.utils.SortingStringConsumer,com.android.tools.r8.graph.DexType):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ac0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ec0;Lcom/android/tools/r8/graph/I2;)V"}
     8:15:com.android.tools.r8.shaking.MainDexInfo traceMainDex(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):76:83 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/shaking/Y1;"}
-    16:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2333:2333 -> a
+    16:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2338:2338 -> a
     16:16:com.android.tools.r8.shaking.MainDexInfo traceMainDex(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84 -> a
     17:17:com.android.tools.r8.shaking.MainDexInfo traceMainDex(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):86:86 -> a
     18:18:void com.android.tools.r8.graph.AppView.setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):775:775 -> a
@@ -2163,15 +2163,15 @@
     30:32:void lambda$traceMainDex$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):107:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/I2;)V"}
     33:35:java.util.List runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):168:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)Ljava/util/List;"}
     36:36:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):74:74 -> a
     36:36:java.util.List runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):170 -> a
     37:38:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,java.util.List):185:186 -> a
     37:38:void lambda$run$3(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,java.util.List):162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/gB;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/iB;Ljava/util/List;)V"}
     1:2:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,java.util.List):185:186 -> b
     1:2:void lambda$runForTesting$4(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,java.util.List):174 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/gB;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/iB;Ljava/util/List;)V"}
     3:4:void lambda$runForTesting$4(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,java.util.List):176:177 -> b
     1:13:void main(java.lang.String[]):200:212 -> main
     1:3:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):138:140 -> run
@@ -2212,30 +2212,30 @@
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
 # {"id":"sourceFile","fileName":"GenerateMainDexListCommand.java"}
     java.util.List mainDexKeepRules -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.StringConsumer mainDexListConsumer -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QC;"}
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> g
     com.android.tools.r8.graph.DexItemFactory factory -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.Reporter reporter -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     java.lang.String USAGE_MESSAGE -> j
     boolean $assertionsDisabled -> k
     1:106:void <clinit>():27:132 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApp,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.utils.Reporter):201:206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/OC;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/QC;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/internal/d50;)V"}
     7:8:void <init>(boolean,boolean):210:211 -> <init>
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
     9:9:void <init>(boolean,boolean):212 -> <init>
     10:13:void <init>(boolean,boolean):212:215 -> <init>
     1:22:void parse(java.lang.String[],com.android.tools.r8.GenerateMainDexListCommand$Builder):168:189 -> a
     1:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():220:229 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder builder():146:146 -> builder
     2:2:com.android.tools.r8.GenerateMainDexListCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):150:150 -> builder
     1:1:com.android.tools.r8.utils.Reporter getReporter():164:164 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():160:160 -> getMainDexListConsumer
     1:2:com.android.tools.r8.GenerateMainDexListCommand$Builder parse(java.lang.String[]):154:155 -> parse
 com.android.tools.r8.GenerateMainDexListCommand$Builder -> com.android.tools.r8.GenerateMainDexListCommand$Builder:
@@ -2284,15 +2284,15 @@
     1:1:java.util.Set lambda$createAllApiStubs$5(java.util.Set,com.android.tools.r8.graph.LibraryClass):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/s4;)Ljava/util/Set;"}
     2:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):112:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     4:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):119:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     40:52:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):122:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     53:53:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):136 -> a
     54:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):136:137 -> a
-    56:56:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():657:657 -> a
+    56:56:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():656:656 -> a
     56:56:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):138 -> a
     57:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):138:148 -> a
     68:68:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):143:143 -> a
@@ -2300,13 +2300,13 @@
     69:69:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):141 -> a
     70:79:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):141:150 -> a
     80:93:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):160:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/y;"}
     94:94:com.android.tools.r8.graph.AppInfo lambda$readApp$1(com.android.tools.r8.graph.DirectMappedDexApplication):170:170 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3;)Lcom/android/tools/r8/graph/h;"}
     95:96:com.android.tools.r8.graph.AppInfo com.android.tools.r8.graph.AppInfo.createInitialAppInfo(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy,com.android.tools.r8.shaking.MainDexInfo):42:43 -> a
     95:96:com.android.tools.r8.graph.AppInfo lambda$readApp$1(com.android.tools.r8.graph.DirectMappedDexApplication):169 -> a
     97:97:void createGlobalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     98:98:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     98:98:void createGlobalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -2362,7 +2362,7 @@
     209:209:com.android.tools.r8.graph.DexProgramClass createSynthesizingContext(com.android.tools.r8.graph.DexItemFactory):269:269 -> a
     210:213:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):283:286 -> a
     210:213:com.android.tools.r8.graph.AppView lambda$readApp$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/gj0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/kj0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/y;"}
     214:223:void lambda$createAllApiStubs$6(java.util.Set,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.androidapi.ApiReferenceStubberEventConsumer,com.android.tools.r8.graph.DexLibraryClass):289:298 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/androidapi/a;Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/graph/V5;Lcom/android/tools/r8/internal/S2;Lcom/android/tools/r8/graph/q2;)V"}
     224:224:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
@@ -2384,7 +2384,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     245:245:void createAllApiStubs(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.SingletonImmutableSet,java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gc0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/kc0;Ljava/util/concurrent/ExecutorService;)V"}
     246:250:void createAllApiStubs(com.android.tools.r8.graph.AppView,java.util.Set,java.util.concurrent.ExecutorService):279:283 -> a
     246:250:void createAllApiStubs(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.SingletonImmutableSet,java.util.concurrent.ExecutorService):0 -> a
     251:251:com.android.tools.r8.graph.ThrowExceptionCode com.android.tools.r8.graph.ThrowExceptionCode.create(com.android.tools.r8.graph.DexType):37:37 -> a
@@ -2394,7 +2394,7 @@
     252:254:void createAllApiStubs(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.SingletonImmutableSet,java.util.concurrent.ExecutorService):0 -> a
     255:255:void createAllApiStubs(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.SingletonImmutableSet,java.util.concurrent.ExecutorService):0:0 -> a
     1:1:void lambda$createGlobalSynthetics$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):230:230 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     2:13:void run(java.lang.String[]):339:350 -> b
     1:6:void main(java.lang.String[]):360:365 -> main
     7:9:void main(java.lang.String[]):361:363 -> main
@@ -2422,7 +2422,7 @@
 # {"id":"sourceFile","fileName":"GlobalSyntheticsGeneratorCommand.java"}
     com.android.tools.r8.GlobalSyntheticsConsumer globalsConsumer -> a
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     int minApiLevel -> c
     boolean classfileDesugaringOnly -> d
     boolean printHelp -> e
@@ -2434,13 +2434,13 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.utils.Reporter,int,boolean):53:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/GlobalSyntheticsConsumer;Lcom/android/tools/r8/internal/Z40;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/GlobalSyntheticsConsumer;Lcom/android/tools/r8/internal/d50;IZ)V"}
     2:16:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.utils.Reporter,int,boolean):46:60 -> <init>
     17:17:void <init>(boolean,boolean):63:63 -> <init>
     18:44:void <init>(boolean,boolean):46:72 -> <init>
     1:9:com.android.tools.r8.utils.InternalOptions getInternalOptions():140:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
-    10:10:void com.android.tools.r8.utils.InternalOptions.setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):596:596 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
+    10:10:void com.android.tools.r8.utils.InternalOptions.setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):595:595 -> a
     10:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():148 -> a
     11:24:com.android.tools.r8.utils.InternalOptions getInternalOptions():150:163 -> a
     1:1:com.android.tools.r8.GlobalSyntheticsGeneratorCommand$Builder builder():132:132 -> builder
@@ -2459,7 +2459,7 @@
 # {"id":"sourceFile","fileName":"GlobalSyntheticsGeneratorCommand.java"}
     com.android.tools.r8.GlobalSyntheticsConsumer globalsConsumer -> a
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     int minApiLevel -> c
     boolean classfileDesugaringOnly -> d
     boolean printHelp -> e
@@ -2520,7 +2520,7 @@
 # {"id":"sourceFile","fileName":"GlobalSyntheticsGeneratorCommandParser.java"}
     java.lang.String USAGE_MESSAGE -> a
     java.util.Set OPTIONS_WITH_ONE_PARAMETER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:2:void <clinit>():26:27 -> <clinit>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object,java.lang.Object,java.lang.Object):109:109 -> <clinit>
     3:3:void <clinit>():54 -> <clinit>
@@ -2633,11 +2633,11 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>():40:40 -> <init>
     1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):80:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;ZLcom/android/tools/r8/D8Command;Lcom/android/tools/r8/R8Command;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;ZLcom/android/tools/r8/D8Command;Lcom/android/tools/r8/R8Command;)V"}
     3:33:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;ZLcom/android/tools/r8/D8Command;Lcom/android/tools/r8/R8Command;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;ZLcom/android/tools/r8/D8Command;Lcom/android/tools/r8/R8Command;Ljava/util/concurrent/ExecutorService;)V"}
     34:43:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
     44:62:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):128:146 -> a
     44:62:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109 -> a
     63:66:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):23:26 -> a
@@ -2653,7 +2653,7 @@
     69:69:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109 -> a
     70:72:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:152 -> a
     70:72:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109 -> a
-    73:73:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():657:657 -> a
+    73:73:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():656:656 -> a
     73:73:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152 -> a
     73:73:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109 -> a
     74:75:void com.android.tools.r8.jar.CfApplicationWriter.write(com.android.tools.r8.ClassFileConsumer):116:117 -> a
@@ -2668,7 +2668,7 @@
     90:98:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):155:163 -> a
     90:98:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109 -> a
     99:106:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):169:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/y;"}
     107:110:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):315:318 -> a
     107:110:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
     111:111:void com.android.tools.r8.graph.AppView.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):184:184 -> a
@@ -2689,28 +2689,28 @@
 # {"id":"sourceFile","fileName":"L8Command.java"}
     com.android.tools.r8.R8Command r8Command -> A
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.graph.DexItemFactory factory -> C
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     boolean $assertionsDisabled -> D
     com.android.tools.r8.D8Command d8Command -> z
     1:1:void <clinit>():39:39 -> <clinit>
     1:20:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.CancelCompilationChecker,com.android.tools.r8.graph.DexItemFactory):106:125 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/R8Command;Lcom/android/tools/r8/D8Command;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/Z40;ZLjava/util/function/BiPredicate;Lcom/android/tools/r8/internal/Tk;Ljava/util/List;Ljava/util/List;ILcom/android/tools/r8/internal/wm;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/R8Command;Lcom/android/tools/r8/D8Command;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/StringConsumer;ILcom/android/tools/r8/internal/d50;ZLjava/util/function/BiPredicate;Lcom/android/tools/r8/internal/Vk;Ljava/util/List;Ljava/util/List;ILcom/android/tools/r8/internal/ym;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/graph/B1;)V"}
     21:46:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.CancelCompilationChecker,com.android.tools.r8.graph.DexItemFactory):106:131 -> <init>
     47:51:void <init>(boolean,boolean):135:139 -> <init>
     1:32:com.android.tools.r8.utils.InternalOptions getInternalOptions():179:210 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     33:49:com.android.tools.r8.utils.InternalOptions getInternalOptions():208:224 -> b
     50:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():223:238 -> b
     66:69:com.android.tools.r8.dump.DumpOptions dumpOptions():493:496 -> b
     66:69:com.android.tools.r8.utils.InternalOptions getInternalOptions():239 -> b
-    70:70:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setProguardConfiguration(com.android.tools.r8.shaking.ProguardConfiguration):487:487 -> b
+    70:70:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setProguardConfiguration(com.android.tools.r8.shaking.ProguardConfiguration):499:499 -> b
     70:70:com.android.tools.r8.dump.DumpOptions dumpOptions():496 -> b
     70:70:com.android.tools.r8.utils.InternalOptions getInternalOptions():239 -> b
     71:71:com.android.tools.r8.dump.DumpOptions dumpOptions():498:498 -> b
     71:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():239 -> b
-    72:72:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):426:426 -> b
+    72:72:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):438:438 -> b
     72:72:com.android.tools.r8.dump.DumpOptions dumpOptions():498 -> b
     72:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():239 -> b
     73:73:com.android.tools.r8.dump.DumpOptions dumpOptions():498:498 -> b
@@ -2794,9 +2794,9 @@
 com.android.tools.r8.L8CommandParser -> com.android.tools.r8.X:
 # {"id":"sourceFile","fileName":"L8CommandParser.java"}
     java.util.Set OPTIONS_WITH_ONE_PARAMETER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kc0;"}
     1:14:void <clinit>():23:36 -> <clinit>
     15:15:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> <clinit>
     15:15:void <clinit>():36 -> <clinit>
@@ -2938,7 +2938,7 @@
     6:6:com.android.tools.r8.ParseFlagInfoImpl flag0(java.lang.String,java.lang.String[]):211:211 -> a
     6:6:com.android.tools.r8.ParseFlagInfoImpl getVersion(java.lang.String):109 -> a
     7:7:java.util.List getAssertionsFlags():131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     8:9:com.android.tools.r8.ParseFlagInfoImpl flag0a1(java.lang.String,java.lang.String,java.lang.String[]):236:237 -> a
     8:9:java.util.List getAssertionsFlags():132 -> a
     10:10:java.util.List getAssertionsFlags():132:132 -> a
@@ -3074,13 +3074,13 @@
 com.android.tools.r8.R8 -> com.android.tools.r8.R8:
 # {"id":"sourceFile","fileName":"R8.java"}
     com.android.tools.r8.utils.Timing timing -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():169:169 -> <clinit>
     1:6:void <init>(com.android.tools.r8.utils.InternalOptions):175:180 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     1:1:boolean lambda$run$6(com.android.tools.r8.graph.DexType):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     2:2:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker.builder():127:127 -> a
@@ -3109,19 +3109,19 @@
     51:62:void shrinkResources(java.util.Map,com.android.tools.r8.graph.AppView):970:981 -> a
     63:67:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):220:224 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
-    68:68:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    68:68:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     68:68:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):225 -> a
     69:69:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):226:226 -> a
-    70:70:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():657:657 -> a
+    70:70:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():656:656 -> a
     70:70:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):226 -> a
     71:76:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):226:231 -> a
     77:78:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):237:238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     79:79:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
     79:79:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):238 -> a
     80:80:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> a
     80:80:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     81:135:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):260:314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Ljava/util/concurrent/ExecutorService;)V"}
     136:155:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):314:333 -> a
@@ -3154,25 +3154,25 @@
     1319:1319:void lambda$run$3(com.android.tools.r8.utils.AndroidApp):300:300 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;)V"}
     1320:1320:void lambda$run$7(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):421:421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yr;)V"}
     1321:1321:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
     1321:1321:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$12(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):588 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/wr;)Lcom/android/tools/r8/shaking/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/yr;)Lcom/android/tools/r8/shaking/y;"}
     1322:1322:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$12(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):588:588 -> a
     1323:1323:void lambda$run$11(com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):580:580 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ir;)V"}
     1324:1324:void lambda$run$15(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):662:662 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Hr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Jr;)V"}
     1325:1325:void lambda$run$16(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):669:669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/wr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/yr;)V"}
     1326:1326:void lambda$run$17(java.lang.String):794:794 -> a
     1327:1327:boolean lambda$run$18(com.android.tools.r8.graph.DexProgramClass):800:800 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1328:1343:void writeKeepDeclarationsToConfigurationConsumer(java.util.List):896:911 -> a
     1344:1344:void writeKeepDeclarationsToConfigurationConsumer(java.util.List):910:910 -> a
     1345:1363:void writeResourcesToConsumer(com.android.tools.r8.utils.Reporter,com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult,java.util.Set,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.FeatureSplit):993:1011 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/nJ;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/AndroidResourceConsumer;Lcom/android/tools/r8/FeatureSplit;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/rJ;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/AndroidResourceConsumer;Lcom/android/tools/r8/FeatureSplit;)V"}
     1364:1364:void writeResourcesToConsumer(com.android.tools.r8.utils.Reporter,com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult,java.util.Set,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.FeatureSplit):1001:1001 -> a
     1365:1365:byte[] com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult.getResourceTableInProtoFormat(com.android.tools.r8.FeatureSplit):280:280 -> a
     1365:1365:void writeResourcesToConsumer(com.android.tools.r8.utils.Reporter,com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult,java.util.Set,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.FeatureSplit):1005 -> a
@@ -3213,7 +3213,7 @@
     1378:1378:void writeResourcesToConsumer(com.android.tools.r8.utils.Reporter,com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult,java.util.Set,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.FeatureSplit):1005 -> a
     1379:1399:void writeResourcesToConsumer(com.android.tools.r8.utils.Reporter,com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult,java.util.Set,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.FeatureSplit):997:1017 -> a
     1400:1404:void addResourcesToBuilder(com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder,com.android.tools.r8.utils.Reporter,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.FeatureSplit):1026:1030 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lJ;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/FeatureSplit;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pJ;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/FeatureSplit;)V"}
     1405:1405:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder.addXmlInput(java.nio.file.Path,byte[]):96:96 -> a
     1405:1405:void addResourcesToBuilder(com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder,com.android.tools.r8.utils.Reporter,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.FeatureSplit):1041 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -3242,10 +3242,10 @@
     1417:1417:void addResourcesToBuilder(com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder,com.android.tools.r8.utils.Reporter,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.FeatureSplit):1047:1047 -> a
     1418:1418:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):1054:1054 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
-    1419:1419:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isCheckAllApiReferencesAreSet():2079:2079 -> a
+    1419:1419:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isCheckAllApiReferencesAreSet():2085:2085 -> a
     1419:1419:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):1054 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1420:1420:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isCheckAllApiReferencesAreSet():2079:2079 -> a
+    1420:1420:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isCheckAllApiReferencesAreSet():2085:2085 -> a
     1420:1420:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):1054 -> a
     1421:1422:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):1058:1059 -> a
     1423:1423:void lambda$allReferencesAssignedApiLevel$20(com.android.tools.r8.graph.ProgramMember):1061:1061 -> a
@@ -3272,7 +3272,7 @@
     1451:1453:void lambda$performFinalMainDexTracing$21(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):1114:1116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/I2;)V"}
     1454:1458:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.util.List):1137:1141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/g;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)Lcom/android/tools/r8/graph/y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/g;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)Lcom/android/tools/r8/graph/y;"}
     1459:1461:void com.android.tools.r8.shaking.Enqueuer.setKeepDeclarations(java.util.List):640:642 -> a
     1459:1461:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.util.List):1141 -> a
     1462:1462:void com.android.tools.r8.shaking.Enqueuer.setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):646:646 -> a
@@ -3293,21 +3293,21 @@
     1485:1489:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.util.List):1167 -> a
     1490:1494:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.util.List):1168:1172 -> a
     1495:1495:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164:1164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/c10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/g10;)V"}
     1496:1496:java.util.Set com.android.tools.r8.shaking.AppInfoWithLiveness.getDeadProtoTypes():704:704 -> a
     1496:1496:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1497:1497:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164:1164 -> a
-    1498:1498:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1283:1283 -> a
+    1498:1498:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1289:1289 -> a
     1498:1498:void com.android.tools.r8.ir.analysis.proto.ProtoShrinker.setDeadProtoTypes(java.util.Set):87 -> a
     1498:1498:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164 -> a
     1499:1499:void com.android.tools.r8.ir.analysis.proto.ProtoShrinker.setDeadProtoTypes(java.util.Set):88:88 -> a
     1499:1499:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164 -> a
-    1500:1500:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1284:1284 -> a
+    1500:1500:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1290:1290 -> a
     1500:1500:void com.android.tools.r8.ir.analysis.proto.ProtoShrinker.setDeadProtoTypes(java.util.Set):87 -> a
     1500:1500:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1164 -> a
     1501:1501:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1188:1188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l4;Ljava/util/function/Supplier;Lcom/android/tools/r8/shaking/E4;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/M;ZLcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l4;Ljava/util/function/Supplier;Lcom/android/tools/r8/shaking/E4;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/M;ZLcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     1502:1502:com.android.tools.r8.shaking.GraphReporter com.android.tools.r8.shaking.Enqueuer.getGraphReporter():575:575 -> a
     1502:1502:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -3317,7 +3317,7 @@
     1505:1505:com.android.tools.r8.shaking.DiscardedChecker com.android.tools.r8.shaking.DiscardedChecker.createForMainDex(com.android.tools.r8.graph.AppView):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1505:1505:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1194 -> a
-    1506:1506:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
+    1506:1506:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
     1506:1506:com.android.tools.r8.shaking.DiscardedChecker com.android.tools.r8.shaking.DiscardedChecker.createForMainDex(com.android.tools.r8.graph.AppView):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1506:1506:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1194 -> a
@@ -3347,13 +3347,13 @@
     1543:1546:boolean verifyNoJarApplicationReaders(java.util.Collection):1230:1233 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)V"}
     1547:1547:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1255:1255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/R8Command;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/R8Command;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     1548:1548:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> a
     1548:1548:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1255 -> a
     1549:1549:void lambda$main$26(java.lang.String[]):1271:1271 -> a
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> b
     1:1:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     2:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):244:245 -> b
     4:4:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):255:255 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/c3;"}
@@ -3363,7 +3363,7 @@
     15:16:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):1079 -> b
     17:20:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):1079:1082 -> b
     21:21:void lambda$runEnqueuer$24(com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1170:1170 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ir;)V"}
     22:38:void run(java.lang.String[]):1241:1257 -> b
     39:40:void run(java.lang.String[]):1257:1258 -> b
     1:1:java.lang.Boolean lambda$run$10(com.android.tools.r8.graph.AppView):516:516 -> c
@@ -3408,21 +3408,21 @@
 # {"id":"sourceFile","fileName":"R8.java"}
     com.android.tools.r8.AndroidResourceInput androidResource -> a
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     1:3:void <init>(com.android.tools.r8.AndroidResourceInput,com.android.tools.r8.utils.Reporter):1279:1281 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/d50;)V"}
     1:1:com.android.tools.r8.origin.Origin getOrigin():1291:1291 -> getOrigin
     1:1:com.android.tools.r8.ResourcePath getPath():1286:1286 -> getPath
 com.android.tools.r8.R8$R8AndroidResourceWithData -> com.android.tools.r8.e0:
 # {"id":"sourceFile","fileName":"R8.java"}
     byte[] data -> c
     1:2:void <init>(com.android.tools.r8.AndroidResourceInput,com.android.tools.r8.utils.Reporter,byte[]):1318:1319 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/Z40;[B)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/d50;[B)V"}
     1:1:com.android.tools.r8.ByteDataView getByteDataView():1324:1324 -> getByteDataView
 com.android.tools.r8.R8$R8PassThroughAndroidResource -> com.android.tools.r8.f0:
 # {"id":"sourceFile","fileName":"R8.java"}
     1:1:void <init>(com.android.tools.r8.AndroidResourceInput,com.android.tools.r8.utils.Reporter):1298:1298 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/AndroidResourceInput;Lcom/android/tools/r8/internal/d50;)V"}
     1:3:com.android.tools.r8.ByteDataView getByteDataView():1304:1306 -> getByteDataView
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
 # {"id":"sourceFile","fileName":"R8Command.java"}
@@ -3442,9 +3442,9 @@
     java.util.function.Consumer syntheticProguardRulesConsumer -> M
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> N
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xo;"}
     java.lang.String synthesizedClassPrefix -> Q
     boolean enableMissingLibraryApiModeling -> R
     boolean enableStartupLayoutOptimization -> S
@@ -3453,10 +3453,10 @@
     com.android.tools.r8.ResourceShrinkerConfiguration resourceShrinkerConfiguration -> V
     boolean $assertionsDisabled -> W
     java.util.List mainDexKeepRules -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <clinit>():90:90 -> <clinit>
     1:47:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.PartitionMapConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean,boolean,boolean,java.util.List,java.util.List,com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.CancelCompilationChecker,com.android.tools.r8.AndroidResourceProvider,com.android.tools.r8.AndroidResourceConsumer,com.android.tools.r8.ResourceShrinkerConfiguration):1055:1101 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/shaking/Y2;Lcom/android/tools/r8/CompilationMode;ILcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gB$g;ZZZLjava/util/Optional;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/PartitionMapConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Ljava/util/function/Consumer;ZZLjava/util/function/BiPredicate;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/Tk;Lcom/android/tools/r8/internal/Uo;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ILcom/android/tools/r8/internal/wm;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;ZZZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/AndroidResourceConsumer;Lcom/android/tools/r8/ResourceShrinkerConfiguration;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/ProgramConsumer;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/shaking/Y2;Lcom/android/tools/r8/CompilationMode;ILcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iB$g;ZZZLjava/util/Optional;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/PartitionMapConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Ljava/util/function/Consumer;ZZLjava/util/function/BiPredicate;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/Vk;Lcom/android/tools/r8/internal/Xo;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ILcom/android/tools/r8/internal/ym;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;ZZZLjava/util/List;Ljava/util/List;Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/CancelCompilationChecker;Lcom/android/tools/r8/AndroidResourceProvider;Lcom/android/tools/r8/AndroidResourceConsumer;Lcom/android/tools/r8/ResourceShrinkerConfiguration;)V"}
     48:49:void <init>(boolean,boolean):1105:1106 -> <init>
     50:50:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
     50:50:void <init>(boolean,boolean):1106 -> <init>
@@ -3470,11 +3470,11 @@
     4:4:com.android.tools.r8.naming.ProguardMapStringConsumer com.android.tools.r8.naming.ProguardMapStringConsumer$Builder.build():65:65 -> a
     4:4:com.android.tools.r8.naming.MapConsumer lambda$getInternalOptions$0(com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer):1204 -> a
     5:5:com.android.tools.r8.naming.MapConsumer lambda$getInternalOptions$1(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.AndroidResourceConsumer):1211:1211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/AndroidResourceConsumer;)Lcom/android/tools/r8/naming/Q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/AndroidResourceConsumer;)Lcom/android/tools/r8/naming/Q;"}
     6:6:com.android.tools.r8.naming.ProguardMapStringConsumer com.android.tools.r8.naming.ProguardMapStringConsumer$Builder.build():65:65 -> a
     6:6:com.android.tools.r8.naming.MapConsumer lambda$getInternalOptions$1(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.AndroidResourceConsumer):1213 -> a
     1:9:com.android.tools.r8.utils.InternalOptions getInternalOptions():1152:1160 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     10:10:boolean com.android.tools.r8.shaking.ProguardConfiguration.isIgnoreWarnings():553:553 -> b
     10:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():1161 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -3496,10 +3496,10 @@
     101:103:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1333:1335 -> b
     101:103:com.android.tools.r8.utils.InternalOptions getInternalOptions():1230 -> b
     104:134:com.android.tools.r8.utils.InternalOptions getInternalOptions():1230:1260 -> b
-    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     135:135:com.android.tools.r8.utils.InternalOptions getInternalOptions():1265 -> b
     136:155:com.android.tools.r8.utils.InternalOptions getInternalOptions():1266:1285 -> b
-    156:156:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableStubbingOfClasses():2108:2108 -> b
+    156:156:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableStubbingOfClasses():2114:2114 -> b
     156:156:com.android.tools.r8.utils.InternalOptions getInternalOptions():1285 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     157:164:com.android.tools.r8.utils.InternalOptions getInternalOptions():1287:1294 -> b
@@ -3534,7 +3534,7 @@
     176:177:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):26 -> b
     176:177:com.android.tools.r8.utils.InternalOptions getInternalOptions():1293 -> b
     178:181:com.android.tools.r8.utils.InternalOptions getInternalOptions():1293:1296 -> b
-    182:186:void com.android.tools.r8.utils.InternalOptions.configureAndroidPlatformBuild(boolean):357:361 -> b
+    182:186:void com.android.tools.r8.utils.InternalOptions.configureAndroidPlatformBuild(boolean):356:360 -> b
     182:186:com.android.tools.r8.utils.InternalOptions getInternalOptions():1296 -> b
     187:187:com.android.tools.r8.utils.InternalOptions getInternalOptions():1298:1298 -> b
     188:188:com.android.tools.r8.profile.art.ArtProfileOptions com.android.tools.r8.profile.art.ArtProfileOptions.setArtProfilesForRewriting(java.util.Collection):112:112 -> b
@@ -3550,7 +3550,7 @@
     196:196:com.android.tools.r8.utils.InternalOptions getInternalOptions():1308:1308 -> b
     197:214:com.android.tools.r8.utils.InternalOptions getInternalOptions():1307:1324 -> b
     215:215:void lambda$dumpOptions$2(com.android.tools.r8.dump.DumpOptions$Builder):1391:1391 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm$a;)V"}
     216:216:boolean com.android.tools.r8.features.FeatureSplitConfiguration.isIsolatedSplitsEnabled():78:78 -> b
     216:216:void lambda$dumpOptions$2(com.android.tools.r8.dump.DumpOptions$Builder):1391 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -3569,26 +3569,26 @@
     1:1:java.util.List getParseFlagsInformation():1007:1007 -> getParseFlagsInformation
     1:1:boolean getProguardCompatibility():1147:1147 -> getProguardCompatibility
     1:3:com.android.tools.r8.dump.DumpOptions dumpOptions():1376:1378 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xm;"}
-    4:4:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIncludeDataResources(java.util.Optional):451:451 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zm;"}
+    4:4:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIncludeDataResources(java.util.Optional):463:463 -> i
     4:4:com.android.tools.r8.dump.DumpOptions dumpOptions():1379 -> i
     5:7:com.android.tools.r8.dump.DumpOptions dumpOptions():1380:1382 -> i
-    8:8:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setFeatureSplitConfiguration(com.android.tools.r8.features.FeatureSplitConfiguration):482:482 -> i
+    8:8:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setFeatureSplitConfiguration(com.android.tools.r8.features.FeatureSplitConfiguration):494:494 -> i
     8:8:com.android.tools.r8.dump.DumpOptions dumpOptions():1383 -> i
     9:9:com.android.tools.r8.dump.DumpOptions dumpOptions():1383:1383 -> i
-    10:10:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setAndroidResourceProvider(com.android.tools.r8.AndroidResourceProvider):577:577 -> i
+    10:10:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setAndroidResourceProvider(com.android.tools.r8.AndroidResourceProvider):589:589 -> i
     10:10:com.android.tools.r8.dump.DumpOptions dumpOptions():1384 -> i
     11:11:com.android.tools.r8.dump.DumpOptions dumpOptions():1384:1384 -> i
-    12:12:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setProguardConfiguration(com.android.tools.r8.shaking.ProguardConfiguration):487:487 -> i
+    12:12:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setProguardConfiguration(com.android.tools.r8.shaking.ProguardConfiguration):499:499 -> i
     12:12:com.android.tools.r8.dump.DumpOptions dumpOptions():1385 -> i
     13:13:com.android.tools.r8.dump.DumpOptions dumpOptions():1385:1385 -> i
-    14:14:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMainDexKeepRules(java.util.List):492:492 -> i
+    14:14:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMainDexKeepRules(java.util.List):504:504 -> i
     14:14:com.android.tools.r8.dump.DumpOptions dumpOptions():1386 -> i
     15:15:com.android.tools.r8.dump.DumpOptions dumpOptions():1386:1386 -> i
-    16:16:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):426:426 -> i
+    16:16:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):438:438 -> i
     16:16:com.android.tools.r8.dump.DumpOptions dumpOptions():1387 -> i
     17:17:com.android.tools.r8.dump.DumpOptions dumpOptions():1387:1387 -> i
-    18:18:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):508:508 -> i
+    18:18:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):520:520 -> i
     18:18:com.android.tools.r8.dump.DumpOptions dumpOptions():1388 -> i
     19:23:com.android.tools.r8.dump.DumpOptions dumpOptions():1388:1392 -> i
     1:1:java.lang.String getUsageMessage():931:931 -> j
@@ -3617,13 +3617,13 @@
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> O
     com.android.tools.r8.InputDependencyGraphConsumer inputDependencyGraphConsumer -> P
     com.android.tools.r8.features.FeatureSplitConfiguration$Builder featureSplitConfigurationBuilder -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/So;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vo;"}
     java.lang.String synthesizedClassPrefix -> R
     boolean enableMissingLibraryApiModeling -> S
     boolean enableExperimentalKeepAnnotations -> T
     boolean enableExperimentalVersionedKeepEdgeAnnotations -> U
     com.android.tools.r8.utils.SemanticVersion fakeCompilerVersion -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca0;"}
     com.android.tools.r8.AndroidResourceProvider androidResourceProvider -> W
     com.android.tools.r8.AndroidResourceConsumer androidResourceConsumer -> X
     com.android.tools.r8.ResourceShrinkerConfiguration resourceShrinkerConfiguration -> Y
@@ -3650,12 +3650,12 @@
     111:147:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):135:171 -> <init>
     1:1:com.android.tools.r8.R8Command$Builder setSynthesizedClassesPrefix(java.lang.String):187:187 -> a
     2:2:com.android.tools.r8.R8Command$Builder setFakeCompilerVersion(com.android.tools.r8.utils.SemanticVersion):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ya0;)Lcom/android/tools/r8/R8Command$Builder;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ca0;)Lcom/android/tools/r8/R8Command$Builder;"}
     3:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):233:234 -> a
     5:5:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):233:233 -> a
     6:7:void lambda$addProguardConfigurationFiles$4(java.util.List):268:269 -> a
     8:10:void amendWithRulesAndProvidersForInjarsAndMetaInf(com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParser):772:774 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/shaking/a3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/shaking/a3;)V"}
     11:11:java.util.List com.android.tools.r8.utils.AndroidApp$Builder.getProgramResourceProviders():1424:1424 -> a
     11:11:void amendWithRulesAndProvidersForInjarsAndMetaInf(com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParser):774 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -3679,7 +3679,7 @@
     44:48:void amendWithRulesAndProvidersForInjarsAndMetaInf(com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParser):821 -> a
     49:49:void amendWithRulesAndProvidersForInjarsAndMetaInf(com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParser):823:823 -> a
     50:54:com.android.tools.r8.utils.SemanticVersion lambda$amendWithRulesAndProvidersForInjarsAndMetaInf$6(com.android.tools.r8.utils.Reporter):792:796 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/internal/Ca0;"}
     55:66:com.android.tools.r8.utils.SemanticVersion lambda$amendWithRulesAndProvidersForInjarsAndMetaInf$6(com.android.tools.r8.utils.Reporter):793:804 -> a
     67:67:com.android.tools.r8.utils.SemanticVersion lambda$amendWithRulesAndProvidersForInjarsAndMetaInf$6(com.android.tools.r8.utils.Reporter):802:802 -> a
     68:73:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):831:836 -> a
@@ -3690,10 +3690,10 @@
     75:75:java.util.List com.android.tools.r8.utils.AndroidApp$Builder.getProgramResourceProviders():1425:1425 -> a
     75:75:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):836 -> a
     76:81:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):836:841 -> a
-    82:82:java.util.List com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.readExtractedKeepEdges(byte[]):128:128 -> a
+    82:82:java.util.List com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.readExtractedKeepEdges(byte[]):130:130 -> a
     82:82:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):841 -> a
     83:83:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):843:843 -> a
-    84:84:java.util.List com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.readKeepEdges(byte[]):124:124 -> a
+    84:84:java.util.List com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.readKeepEdges(byte[]):126:126 -> a
     84:84:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):843 -> a
     85:100:void extractKeepAnnotationRules(com.android.tools.r8.shaking.ProguardConfigurationParser):845:860 -> a
     101:101:com.android.tools.r8.utils.Reporter com.android.tools.r8.utils.AndroidApp$Builder.getReporter():936:936 -> a
@@ -3854,19 +3854,19 @@
 com.android.tools.r8.R8Command$ExtractEmbeddedRules -> com.android.tools.r8.j0:
 # {"id":"sourceFile","fileName":"R8Command.java"}
     java.util.function.Supplier compilerVersionSupplier -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf0;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     java.util.List proguardSources -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List r8Sources -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.SemanticVersion compilerVersion -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1395:1395 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.Reporter,java.util.function.Supplier):1404:1404 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/Uf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/Yf0;)V"}
     2:9:void <init>(com.android.tools.r8.utils.Reporter,java.util.function.Supplier):1399:1406 -> <init>
     1:3:void readProguardConfigurationSource(com.android.tools.r8.DataEntryResource,java.util.function.Consumer):1427:1429 -> a
     4:5:void readProguardConfigurationSource(com.android.tools.r8.DataEntryResource,java.util.function.Consumer):1427:1427 -> a
@@ -3890,10 +3890,10 @@
 com.android.tools.r8.R8Command$ResourceShrinkerMapStringConsumer -> com.android.tools.r8.k0:
 # {"id":"sourceFile","fileName":"R8Command.java"}
     com.android.tools.r8.utils.InternalOptions internal -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.lang.StringBuilder resultBuilder -> b
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):1346:1346 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:5:void <init>(com.android.tools.r8.utils.InternalOptions):1344:1347 -> <init>
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):1352:1352 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):1357:1358 -> finished
@@ -3904,16 +3904,16 @@
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.q0:
 # {"id":"sourceFile","fileName":"R8CommandParser.java"}
     java.util.Set OPTIONS_WITH_ONE_PARAMETER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:2:void <clinit>():39:40 -> <clinit>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object,java.lang.Object,java.lang.Object):109:109 -> <clinit>
     3:3:void <clinit>():65 -> <clinit>
     4:4:void <clinit>():65:65 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:4:java.util.List getFlags():70:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     5:5:com.android.tools.r8.ParseFlagInfoImpl com.android.tools.r8.ParseFlagInfoImpl.getClassfile():39:39 -> a
     5:5:java.util.List getFlags():74 -> a
     6:6:com.android.tools.r8.ParseFlagInfoImpl com.android.tools.r8.ParseFlagInfoImpl.flag0(java.lang.String,java.lang.String[]):211:211 -> a
@@ -4115,7 +4115,7 @@
     1:1:void <init>():98:98 -> <init>
     1:1:void run(com.android.tools.r8.ResourceShrinker$Command,com.android.tools.r8.ResourceShrinker$ReferenceChecker):481:481 -> run
     1:1:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ResourceShrinker$ReferenceChecker):487:487 -> runForTesting
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/ResourceShrinker$ReferenceChecker;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/ResourceShrinker$ReferenceChecker;)V"}
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):150:150 -> runForTesting
     2:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ResourceShrinker$ReferenceChecker):487 -> runForTesting
     3:5:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ResourceShrinker$ReferenceChecker):488:490 -> runForTesting
@@ -4131,7 +4131,7 @@
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp):104:104 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;)V"}
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():109:109 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
 com.android.tools.r8.ResourceShrinker$DexClassUsageVisitor -> com.android.tools.r8.r0:
 # {"id":"sourceFile","fileName":"ResourceShrinker.java"}
     com.android.tools.r8.graph.DexProgramClass classDef -> a
@@ -4421,11 +4421,11 @@
     1:1:java.lang.String getPreReleaseString():88:88 -> getPreReleaseString
     1:1:java.lang.String getVersionString():23:23 -> getVersionString
     1:1:boolean isDevelopmentVersion():108:108 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.da0:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.ha0:
 # {"id":"sourceFile","fileName":"SCC.java"}
     int currentTime -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap discoverTime -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.Set unassignedSet -> c
     java.util.Deque unassignedStack -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
@@ -4453,7 +4453,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"([BII)Z"}
     1:1:boolean isApiDatabaseEntry(java.lang.String):48:48 -> a
     2:45:com.android.tools.r8.androidapi.AndroidApiDataAccess create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):93:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/u2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/u2;"}
     46:47:com.android.tools.r8.androidapi.AndroidApiDataAccess create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):135:136 -> a
     48:58:com.android.tools.r8.androidapi.AndroidApiDataAccess create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):128:138 -> a
     59:61:int apiLevelHash(com.android.tools.r8.graph.DexReference):160:162 -> a
@@ -4596,7 +4596,7 @@
     11:11:com.android.tools.r8.androidapi.AndroidApiLevelCompute noAndroidApiLevelCompute():75:75 -> a
     11:11:com.android.tools.r8.androidapi.AndroidApiLevelCompute create(com.android.tools.r8.graph.AppView):71 -> a
     12:13:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):79:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/androidapi/f;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/androidapi/f;"}
     14:14:com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.main():27:27 -> a
     14:14:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):80 -> a
     15:15:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):82:82 -> a
@@ -4608,7 +4608,7 @@
     com.android.tools.r8.androidapi.ComputedApiLevel minApiLevel -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/f$a;"}
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):122:124 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> <init>
@@ -4656,7 +4656,7 @@
     5:5:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForLibraryReferenceIgnoringDesugaredLibrary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):107:107 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/androidapi/f;"}
     6:6:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/androidapi/f;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/androidapi/f;"}
 com.android.tools.r8.androidapi.AndroidApiLevelDatabase -> com.android.tools.r8.internal.z2:
 # {"id":"sourceFile","fileName":"AndroidApiLevelDatabase.java"}
     com.android.tools.r8.utils.AndroidApiLevel getFieldApiLevel(com.android.tools.r8.graph.DexField) -> a
@@ -4667,174 +4667,174 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/y2;"}
 com.android.tools.r8.androidapi.AndroidApiLevelDatabaseHelper -> com.android.tools.r8.internal.A2:
 # {"id":"sourceFile","fileName":"AndroidApiLevelDatabaseHelper.java"}
-    1:5:java.util.Set notModeledTypes():20:24 -> a
-    6:8:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):41:43 -> a
-    6:8:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
+    1:6:java.util.Set notModeledTypes():20:25 -> a
+    7:9:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):42:44 -> a
+    7:9:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/BiConsumer;)V"}
-    9:14:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):42:47 -> a
-    9:14:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    15:15:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):46:46 -> a
-    15:15:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    16:22:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):45:51 -> a
-    16:22:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    23:23:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):50:50 -> a
-    23:23:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    24:31:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):49:56 -> a
-    24:31:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    32:32:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):54:54 -> a
-    32:32:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    33:41:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):53:61 -> a
-    33:41:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    42:42:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):60:60 -> a
-    42:42:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    43:50:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):59:66 -> a
-    43:50:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    51:51:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):64:64 -> a
-    51:51:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    52:65:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):63:76 -> a
-    52:65:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    66:66:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):75:75 -> a
-    66:66:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    67:74:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):74:81 -> a
-    67:74:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    75:75:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):79:79 -> a
-    75:75:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    76:84:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):78:86 -> a
-    76:84:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    85:85:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer) -> a
-    85:85:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    86:93:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):84:91 -> a
-    86:93:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    94:94:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):89:89 -> a
-    94:94:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    95:104:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):88:97 -> a
-    95:104:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    105:105:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):95:95 -> a
-    105:105:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    106:115:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):94:103 -> a
-    106:115:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    116:116:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):101:101 -> a
-    116:116:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    117:125:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):100:108 -> a
-    117:125:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    126:126:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):107:107 -> a
-    126:126:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    127:133:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):106:112 -> a
-    127:133:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    134:134:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):111:111 -> a
-    134:134:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    135:142:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):110:117 -> a
-    135:142:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    143:143:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):115:115 -> a
-    143:143:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    144:151:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):114:121 -> a
-    144:151:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    152:152:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):120:120 -> a
-    152:152:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):30 -> a
-    153:156:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):129:132 -> a
-    153:156:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
-    157:157:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):130:130 -> a
-    157:157:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
-    158:158:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):129:129 -> a
-    158:158:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
-    159:179:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):139:159 -> a
-    159:179:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    180:180:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):158:158 -> a
-    180:180:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    181:186:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):157:162 -> a
-    181:186:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    187:191:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):161:165 -> a
-    187:191:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    192:196:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):164:168 -> a
-    192:196:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    197:197:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):167:167 -> a
-    197:197:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
-    198:202:void addWebkitCookieSyncManagerMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):176:180 -> a
-    198:202:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
-    203:203:void addWebkitCookieSyncManagerMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):179:179 -> a
-    203:203:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
-    204:224:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):186:206 -> a
-    204:224:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    225:230:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):205:210 -> a
-    225:230:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    231:237:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):209:215 -> a
-    231:237:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    238:238:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):214:214 -> a
-    238:238:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    239:246:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):213:220 -> a
-    239:246:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    247:247:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):219:219 -> a
-    247:247:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    248:255:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):218:225 -> a
-    248:255:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    256:256:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):224:224 -> a
-    256:256:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    257:267:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):223:233 -> a
-    257:267:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    268:268:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):231:231 -> a
-    268:268:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    269:269:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):229:229 -> a
-    269:269:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    270:284:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):228:242 -> a
-    270:284:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    285:285:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):241:241 -> a
-    285:285:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    286:286:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):239:239 -> a
-    286:286:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    287:296:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):238:247 -> a
-    287:296:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    297:304:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):246:253 -> a
-    297:304:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    305:305:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):251:251 -> a
-    305:305:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    306:317:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):250:261 -> a
-    306:317:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    318:318:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):259:259 -> a
-    318:318:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    319:329:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):258:268 -> a
-    319:329:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    330:330:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):266:266 -> a
-    330:330:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    331:344:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):265:278 -> a
-    331:344:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    345:345:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):276:276 -> a
-    345:345:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    346:355:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):275:284 -> a
-    346:355:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    356:356:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):283:283 -> a
-    356:356:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    357:365:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):282:290 -> a
-    357:365:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    366:366:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):288:288 -> a
-    366:366:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    367:376:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):287:296 -> a
-    367:376:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    377:377:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):295:295 -> a
-    377:377:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    378:386:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):294:302 -> a
-    378:386:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    387:387:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):300:300 -> a
-    387:387:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    388:397:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):299:308 -> a
-    388:397:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    398:398:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):307:307 -> a
-    398:398:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    399:409:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):306:316 -> a
-    399:409:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    410:410:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):314:314 -> a
-    410:410:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
-    411:411:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):313:313 -> a
-    411:411:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
+    10:15:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):43:48 -> a
+    10:15:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    16:16:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):47:47 -> a
+    16:16:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    17:23:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):46:52 -> a
+    17:23:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    24:24:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):51:51 -> a
+    24:24:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    25:32:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):50:57 -> a
+    25:32:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    33:33:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):55:55 -> a
+    33:33:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    34:42:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):54:62 -> a
+    34:42:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    43:43:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):61:61 -> a
+    43:43:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    44:51:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):60:67 -> a
+    44:51:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    52:52:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):65:65 -> a
+    52:52:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    53:66:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):64:77 -> a
+    53:66:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    67:67:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):76:76 -> a
+    67:67:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    68:75:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):75:82 -> a
+    68:75:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    76:76:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):80:80 -> a
+    76:76:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    77:85:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):79:87 -> a
+    77:85:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    86:86:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer) -> a
+    86:86:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    87:94:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):85:92 -> a
+    87:94:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    95:95:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):90:90 -> a
+    95:95:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    96:105:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):89:98 -> a
+    96:105:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    106:106:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):96:96 -> a
+    106:106:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    107:116:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):95:104 -> a
+    107:116:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    117:117:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):102:102 -> a
+    117:117:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    118:126:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):101:109 -> a
+    118:126:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    127:127:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):108:108 -> a
+    127:127:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    128:134:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):107:113 -> a
+    128:134:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    135:135:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):112:112 -> a
+    135:135:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    136:143:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):111:118 -> a
+    136:143:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    144:144:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):116:116 -> a
+    144:144:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    145:152:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):115:122 -> a
+    145:152:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    153:153:void addStringBuilderAndBufferMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):121:121 -> a
+    153:153:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):31 -> a
+    154:157:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):130:133 -> a
+    154:157:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
+    158:158:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):131:131 -> a
+    158:158:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
+    159:159:void addConcurrentKeySetViewMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):130:130 -> a
+    159:159:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):32 -> a
+    160:180:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):140:160 -> a
+    160:180:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    181:181:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):159:159 -> a
+    181:181:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    182:187:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):158:163 -> a
+    182:187:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    188:192:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):162:166 -> a
+    188:192:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    193:197:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):165:169 -> a
+    193:197:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    198:198:void addNfcMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):168:168 -> a
+    198:198:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):33 -> a
+    199:203:void addWebkitCookieSyncManagerMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):177:181 -> a
+    199:203:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
+    204:204:void addWebkitCookieSyncManagerMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):180:180 -> a
+    204:204:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):34 -> a
+    205:225:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):187:207 -> a
+    205:225:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    226:231:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):206:211 -> a
+    226:231:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    232:238:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):210:216 -> a
+    232:238:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    239:239:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):215:215 -> a
+    239:239:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    240:247:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):214:221 -> a
+    240:247:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    248:248:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):220:220 -> a
+    248:248:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    249:256:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):219:226 -> a
+    249:256:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    257:257:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):225:225 -> a
+    257:257:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    258:268:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):224:234 -> a
+    258:268:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    269:269:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):232:232 -> a
+    269:269:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    270:270:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):230:230 -> a
+    270:270:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    271:285:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):229:243 -> a
+    271:285:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    286:286:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):242:242 -> a
+    286:286:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    287:287:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):240:240 -> a
+    287:287:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    288:297:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):239:248 -> a
+    288:297:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    298:305:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):247:254 -> a
+    298:305:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    306:306:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):252:252 -> a
+    306:306:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    307:318:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):251:262 -> a
+    307:318:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    319:319:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):260:260 -> a
+    319:319:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    320:330:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):259:269 -> a
+    320:330:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    331:331:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):267:267 -> a
+    331:331:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    332:345:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):266:279 -> a
+    332:345:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    346:346:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):277:277 -> a
+    346:346:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    347:356:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):276:285 -> a
+    347:356:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    357:357:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):284:284 -> a
+    357:357:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    358:366:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):283:291 -> a
+    358:366:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    367:367:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):289:289 -> a
+    367:367:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    368:377:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):288:297 -> a
+    368:377:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    378:378:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):296:296 -> a
+    378:378:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    379:387:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):295:303 -> a
+    379:387:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    388:388:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):301:301 -> a
+    388:388:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    389:398:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):300:309 -> a
+    389:398:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    399:399:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):308:308 -> a
+    399:399:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    400:410:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):307:317 -> a
+    400:410:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    411:411:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):315:315 -> a
+    411:411:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
+    412:412:void addChronoTimeMethods(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):314:314 -> a
+    412:412:void visitAdditionalKnownApiReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):35 -> a
 com.android.tools.r8.androidapi.AndroidApiLevelHashingDatabaseImpl -> com.android.tools.r8.internal.B2:
 # {"id":"sourceFile","fileName":"AndroidApiLevelHashingDatabaseImpl.java"}
     java.util.List androidApiExtensionPackages -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Map lookupCache -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map constantPoolCache -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> e
     byte[] NON_EXISTING_DESCRIPTOR -> f
     com.android.tools.r8.androidapi.AndroidApiDataAccess dataAccess -> g
@@ -4842,7 +4842,7 @@
     boolean $assertionsDisabled -> h
     1:7:void <clinit>():30:36 -> <clinit>
     1:1:void <init>(java.util.List,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):157:157 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
     2:35:void <init>(java.util.List,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):135:168 -> <init>
     36:36:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> <init>
     36:36:void <init>(java.util.List,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):168 -> <init>
@@ -4850,7 +4850,7 @@
     53:53:void <init>(java.util.List,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DiagnosticsHandler):184:184 -> <init>
     1:1:byte[] getNonExistingDescriptor():41:41 -> a
     2:2:byte[] getUniqueDescriptorForReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.utils.ThrowingFunction):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/Ug0;)[B"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/Yg0;)[B"}
     3:3:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     3:3:byte[] getUniqueDescriptorForReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.utils.ThrowingFunction):47 -> a
     4:4:byte[] getUniqueDescriptorForReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.utils.ThrowingFunction):48:48 -> a
@@ -4877,7 +4877,7 @@
     57:57:void lambda$new$0(com.android.tools.r8.androidapi.AndroidApiForHashingReference):166:166 -> a
     58:58:void lambda$new$0(com.android.tools.r8.androidapi.AndroidApiForHashingReference):164:164 -> a
     59:62:void lambda$new$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.utils.InternalOptions,java.lang.String):174:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/internal/gB;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/internal/iB;Ljava/lang/String;)V"}
     63:63:void lambda$new$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.utils.InternalOptions,java.lang.String):175:175 -> a
     64:64:void lambda$new$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.utils.InternalOptions,java.lang.String):174:174 -> a
     65:65:com.android.tools.r8.utils.AndroidApiLevel getTypeApiLevel(com.android.tools.r8.graph.DexType):190:190 -> a
@@ -4957,14 +4957,14 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,java.util.List):34:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/androidapi/a$a;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/androidapi/a$a;Lcom/android/tools/r8/internal/xu;)V"}
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,java.util.List):28:40 -> <init>
     15:15:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,java.util.List):40 -> <init>
     16:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,java.util.List):40:41 -> <init>
     1:1:com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/androidapi/a$a;)Lcom/android/tools/r8/androidapi/c;"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2075:2075 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2081:2081 -> a
     2:2:com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:8:com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):46:51 -> a
@@ -5083,7 +5083,7 @@
     68:68:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
     68:68:void lambda$processClass$5(com.android.tools.r8.graph.DexProgramClass,java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/lang/Integer;Lcom/android/tools/r8/internal/r8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/lang/Integer;Lcom/android/tools/r8/internal/t8;)V"}
     69:70:void lambda$processClass$5(com.android.tools.r8.graph.DexProgramClass,java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):145:146 -> a
     71:75:void lambda$run$0(com.android.tools.r8.graph.DexLibraryClass):83:87 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;)V"}
@@ -5154,7 +5154,7 @@
     157:157:void mockMissingLibraryClass(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.androidapi.ApiReferenceStubberEventConsumer):224:224 -> a
     158:158:void mockMissingLibraryClass(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.androidapi.ApiReferenceStubberEventConsumer):219:219 -> a
     159:159:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$mockMissingLibraryClass$7():225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HO;"}
     160:160:void lambda$mockMissingLibraryClass$11(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):232:232 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/V5;Lcom/android/tools/r8/synthesis/V;)V"}
     161:161:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setSuperType(com.android.tools.r8.graph.DexType):112:112 -> a
@@ -5217,7 +5217,7 @@
     2:2:void acceptMockedLibraryClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexProgramClass):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:boolean isEmpty():55:55 -> isEmpty
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.g5:
 # {"id":"sourceFile","fileName":"AvailableApiExceptions.java"}
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
@@ -5225,352 +5225,352 @@
     1:3:void <init>(com.android.tools.r8.utils.InternalOptions):28:30 -> <init>
     1:3:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     4:5:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):39:40 -> <init>
     4:5:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     4:5:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     6:6:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     6:6:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147,"2":148,"3":149,"4":150,"5":151,"6":152},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147,"2":148,"3":149,"4":150,"5":151,"6":152},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     7:7:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     7:7:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":153,"2":154,"3":155,"4":156,"5":157,"6":158},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":153,"2":154,"3":155,"4":156,"5":157,"6":158},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     8:8:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     8:8:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":159,"2":160,"3":161,"4":162,"5":163,"6":164},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":159,"2":160,"3":161,"4":162,"5":163,"6":164},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     9:9:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     9:9:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167,"4":168,"5":169,"6":170},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167,"4":168,"5":169,"6":170},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     10:10:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":171,"2":172,"3":173,"4":174,"5":175,"6":176},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":171,"2":172,"3":173,"4":174,"5":175,"6":176},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     11:11:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     11:11:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179,"4":180,"5":181,"6":182},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179,"4":180,"5":181,"6":182},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     12:12:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     12:12:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":183,"2":184,"3":185,"4":186,"5":187,"6":188},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":183,"2":184,"3":185,"4":186,"5":187,"6":188},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     13:13:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     13:13:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":189,"2":190,"3":191,"4":192,"5":193,"6":194},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":189,"2":190,"3":191,"4":192,"5":193,"6":194},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     14:14:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     14:14:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":195,"2":196,"3":197,"4":198,"5":199,"6":200},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":195,"2":196,"3":197,"4":198,"5":199,"6":200},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     15:15:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     15:15:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":201,"2":202,"3":203,"4":204,"5":205,"6":206},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":201,"2":202,"3":203,"4":204,"5":205,"6":206},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     16:16:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     16:16:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":207,"2":208,"3":209,"4":210,"5":211,"6":212},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":207,"2":208,"3":209,"4":210,"5":211,"6":212},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     17:17:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     17:17:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":213,"2":214,"3":215,"4":216,"5":217,"6":218},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":213,"2":214,"3":215,"4":216,"5":217,"6":218},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     18:18:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     18:18:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":219,"2":220,"3":221,"4":222,"5":223,"6":224},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":219,"2":220,"3":221,"4":222,"5":223,"6":224},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     19:19:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     19:19:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":225,"2":226,"3":227,"4":228,"5":229,"6":230},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":225,"2":226,"3":227,"4":228,"5":229,"6":230},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     20:20:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     20:20:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":231,"2":232,"3":233,"4":234,"5":235,"6":236},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":231,"2":232,"3":233,"4":234,"5":235,"6":236},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     21:21:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     21:21:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237,"2":238,"3":239,"4":240,"5":241,"6":242},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237,"2":238,"3":239,"4":240,"5":241,"6":242},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     22:22:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     22:22:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245,"4":246,"5":247,"6":248},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245,"4":246,"5":247,"6":248},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     23:23:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     23:23:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":249,"2":250,"3":251,"4":252,"5":253,"6":254},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":249,"2":250,"3":251,"4":252,"5":253,"6":254},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     24:24:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     24:24:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":255,"2":256,"3":257,"4":258,"5":259,"6":260},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":255,"2":256,"3":257,"4":258,"5":259,"6":260},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     25:25:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     25:25:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":261,"2":262,"3":263,"4":264,"5":265,"6":266},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":261,"2":262,"3":263,"4":264,"5":265,"6":266},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     26:26:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     26:26:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":267,"2":268,"3":269,"4":270,"5":271,"6":272},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":267,"2":268,"3":269,"4":270,"5":271,"6":272},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     27:27:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     27:27:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":273,"2":274,"3":275,"4":276,"5":277,"6":278},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":273,"2":274,"3":275,"4":276,"5":277,"6":278},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     28:28:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     28:28:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":279,"2":280,"3":281,"4":282,"5":283,"6":284},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":279,"2":280,"3":281,"4":282,"5":283,"6":284},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     29:29:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     29:29:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":285,"2":286,"3":287,"4":288,"5":289,"6":290},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":285,"2":286,"3":287,"4":288,"5":289,"6":290},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     30:30:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     30:30:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":291,"2":292,"3":293,"4":294,"5":295,"6":296},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":291,"2":292,"3":293,"4":294,"5":295,"6":296},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     31:31:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     31:31:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":297,"2":298,"3":299,"4":300,"5":301,"6":302},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":297,"2":298,"3":299,"4":300,"5":301,"6":302},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     32:32:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     32:32:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":303,"2":304,"3":305,"4":306,"5":307,"6":308},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":303,"2":304,"3":305,"4":306,"5":307,"6":308},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     33:33:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     33:33:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":309,"2":310,"3":311,"4":312,"5":313,"6":314},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":309,"2":310,"3":311,"4":312,"5":313,"6":314},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     34:34:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     34:34:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":315,"2":316,"3":317,"4":318,"5":319,"6":320},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":315,"2":316,"3":317,"4":318,"5":319,"6":320},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     35:35:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     35:35:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":321,"2":322,"3":323,"4":324,"5":325,"6":326},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":321,"2":322,"3":323,"4":324,"5":325,"6":326},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     36:36:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     36:36:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":327,"2":328,"3":329,"4":330,"5":331,"6":332},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":327,"2":328,"3":329,"4":330,"5":331,"6":332},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     37:37:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     37:37:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":333,"2":334,"3":335,"4":336,"5":337,"6":338},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":333,"2":334,"3":335,"4":336,"5":337,"6":338},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     38:38:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     38:38:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":339,"2":340,"3":341,"4":342,"5":343,"6":344},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":339,"2":340,"3":341,"4":342,"5":343,"6":344},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     39:39:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     39:39:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":345,"2":346,"3":347,"4":348,"5":349,"6":350},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":345,"2":346,"3":347,"4":348,"5":349,"6":350},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     40:40:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     40:40:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":351,"2":352,"3":353,"4":354,"5":355,"6":356},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":351,"2":352,"3":353,"4":354,"5":355,"6":356},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     41:41:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     41:41:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":357,"2":358,"3":359,"4":360,"5":361,"6":362},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":357,"2":358,"3":359,"4":360,"5":361,"6":362},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     42:42:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     42:42:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":363,"2":364,"3":365,"4":366,"5":367,"6":368},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":363,"2":364,"3":365,"4":366,"5":367,"6":368},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     43:43:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     43:43:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":369,"2":370,"3":371,"4":372,"5":373,"6":374},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":369,"2":370,"3":371,"4":372,"5":373,"6":374},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     44:44:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     44:44:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":375,"2":376,"3":377,"4":378,"5":379,"6":380},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":375,"2":376,"3":377,"4":378,"5":379,"6":380},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     45:45:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     45:45:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":381,"2":382,"3":383,"4":384,"5":385,"6":386},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":381,"2":382,"3":383,"4":384,"5":385,"6":386},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     46:46:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     46:46:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":387,"2":388,"3":389,"4":390,"5":391,"6":392},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":387,"2":388,"3":389,"4":390,"5":391,"6":392},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     47:47:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     47:47:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":393,"2":394,"3":395,"4":396,"5":397,"6":398},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":393,"2":394,"3":395,"4":396,"5":397,"6":398},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     48:48:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     48:48:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":399,"2":400,"3":401,"4":402,"5":403,"6":404},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":399,"2":400,"3":401,"4":402,"5":403,"6":404},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     49:49:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     49:49:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":405,"2":406,"3":407,"4":408,"5":409,"6":410},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":405,"2":406,"3":407,"4":408,"5":409,"6":410},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     50:50:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     50:50:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413,"4":414,"5":415,"6":416},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413,"4":414,"5":415,"6":416},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     51:51:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     51:51:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":417,"2":418,"3":419,"4":420,"5":421,"6":422},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":417,"2":418,"3":419,"4":420,"5":421,"6":422},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     52:52:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     52:52:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":423,"2":424,"3":425,"4":426,"5":427,"6":428},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":423,"2":424,"3":425,"4":426,"5":427,"6":428},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     53:53:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     53:53:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":429,"2":430,"3":431,"4":432,"5":433,"6":434},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":429,"2":430,"3":431,"4":432,"5":433,"6":434},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     54:54:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     54:54:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":435,"2":436,"3":437,"4":438,"5":439,"6":440},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":435,"2":436,"3":437,"4":438,"5":439,"6":440},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     55:55:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     55:55:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":441,"2":442,"3":443,"4":444,"5":445,"6":446},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":441,"2":442,"3":443,"4":444,"5":445,"6":446},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     56:56:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     56:56:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":447,"2":448,"3":449,"4":450,"5":451,"6":452},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":447,"2":448,"3":449,"4":450,"5":451,"6":452},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     57:57:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     57:57:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":453,"2":454,"3":455,"4":456,"5":457,"6":458},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":453,"2":454,"3":455,"4":456,"5":457,"6":458},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     58:58:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     58:58:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":459,"2":460,"3":461,"4":462,"5":463,"6":464},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":459,"2":460,"3":461,"4":462,"5":463,"6":464},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     59:59:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     59:59:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":465,"2":466,"3":467,"4":468,"5":469,"6":470},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":465,"2":466,"3":467,"4":468,"5":469,"6":470},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     60:60:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     60:60:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":471,"2":472,"3":473,"4":474,"5":475,"6":476},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":471,"2":472,"3":473,"4":474,"5":475,"6":476},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     61:61:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     61:61:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":477,"2":478,"3":479,"4":480,"5":481,"6":482},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":477,"2":478,"3":479,"4":480,"5":481,"6":482},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     62:62:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     62:62:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":483,"2":484,"3":485,"4":486,"5":487,"6":488},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":483,"2":484,"3":485,"4":486,"5":487,"6":488},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     63:63:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     63:63:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":489,"2":490,"3":491,"4":492,"5":493,"6":494},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":489,"2":490,"3":491,"4":492,"5":493,"6":494},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     64:64:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     64:64:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":495,"2":496,"3":497,"4":498,"5":499,"6":500},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":495,"2":496,"3":497,"4":498,"5":499,"6":500},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     65:65:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     65:65:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":501,"2":502,"3":503,"4":504,"5":505,"6":506},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":501,"2":502,"3":503,"4":504,"5":505,"6":506},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     66:66:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     66:66:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":507,"2":508,"3":509,"4":510,"5":511,"6":512},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":507,"2":508,"3":509,"4":510,"5":511,"6":512},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     67:67:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     67:67:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":513,"2":514,"3":515,"4":516,"5":517,"6":518},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":513,"2":514,"3":515,"4":516,"5":517,"6":518},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     68:68:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     68:68:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":519,"2":520,"3":521,"4":522,"5":523,"6":524},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":519,"2":520,"3":521,"4":522,"5":523,"6":524},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     69:69:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     69:69:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527,"4":528,"5":529,"6":530},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527,"4":528,"5":529,"6":530},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     70:70:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     70:70:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":531,"2":532,"3":533,"4":534,"5":535,"6":536},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":531,"2":532,"3":533,"4":534,"5":535,"6":536},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     71:71:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     71:71:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":537,"2":538,"3":539,"4":540,"5":541,"6":542},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":537,"2":538,"3":539,"4":540,"5":541,"6":542},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     72:72:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     72:72:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":543,"2":544,"3":545,"4":546,"5":547,"6":548},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":543,"2":544,"3":545,"4":546,"5":547,"6":548},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     73:73:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     73:73:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":549,"2":550,"3":551,"4":552,"5":553,"6":554},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":549,"2":550,"3":551,"4":552,"5":553,"6":554},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     74:74:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     74:74:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558,"5":559,"6":560},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558,"5":559,"6":560},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     75:75:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     75:75:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":561,"2":562,"3":563,"4":564,"5":565,"6":566},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":561,"2":562,"3":563,"4":564,"5":565,"6":566},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     76:76:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     76:76:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":567,"2":568,"3":569,"4":570,"5":571,"6":572},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":567,"2":568,"3":569,"4":570,"5":571,"6":572},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     77:77:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     77:77:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":573,"2":574,"3":575,"4":576,"5":577,"6":578},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":573,"2":574,"3":575,"4":576,"5":577,"6":578},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     78:78:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     78:78:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":579,"2":580,"3":581,"4":582,"5":583,"6":584},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":579,"2":580,"3":581,"4":582,"5":583,"6":584},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     79:79:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     79:79:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":585,"2":586,"3":587,"4":588,"5":589,"6":590},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":585,"2":586,"3":587,"4":588,"5":589,"6":590},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     80:80:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     80:80:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":591,"2":592,"3":593,"4":594,"5":595,"6":596},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":591,"2":592,"3":593,"4":594,"5":595,"6":596},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     81:81:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     81:81:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":597,"2":598,"3":599,"4":600,"5":601,"6":602},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":597,"2":598,"3":599,"4":600,"5":601,"6":602},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     82:82:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     82:82:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":603,"2":604,"3":605,"4":606,"5":607,"6":608},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":603,"2":604,"3":605,"4":606,"5":607,"6":608},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     83:83:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     83:83:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":609,"2":610,"3":611,"4":612,"5":613,"6":614},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":609,"2":610,"3":611,"4":612,"5":613,"6":614},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     84:84:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     84:84:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":615,"2":616,"3":617,"4":618,"5":619,"6":620},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":615,"2":616,"3":617,"4":618,"5":619,"6":620},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     85:85:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     85:85:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":621,"2":622,"3":623,"4":624,"5":625,"6":626},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":621,"2":622,"3":623,"4":624,"5":625,"6":626},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     86:86:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     86:86:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":627,"2":628,"3":629,"4":630,"5":631,"6":632},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":627,"2":628,"3":629,"4":630,"5":631,"6":632},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     87:87:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     87:87:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":633,"2":634,"3":635,"4":636,"5":637,"6":638},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":633,"2":634,"3":635,"4":636,"5":637,"6":638},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     88:88:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     88:88:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":639,"2":640,"3":641,"4":642,"5":643,"6":644},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":639,"2":640,"3":641,"4":642,"5":643,"6":644},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     89:89:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     89:89:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":645,"2":646,"3":647,"4":648,"5":649,"6":650},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":645,"2":646,"3":647,"4":648,"5":649,"6":650},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     90:90:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     90:90:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":651,"2":652,"3":653,"4":654,"5":655,"6":656},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":651,"2":652,"3":653,"4":654,"5":655,"6":656},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     91:91:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     91:91:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"2":659,"3":661,"4":662,"5":663,"6":664},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"2":659,"3":661,"4":662,"5":663,"6":664},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     92:92:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     92:92:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":665,"2":666,"3":667,"4":668,"5":669,"6":670},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":665,"2":666,"3":667,"4":668,"5":669,"6":670},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     93:93:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     93:93:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":671,"2":672,"3":673,"4":674,"5":675,"6":676},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":671,"2":672,"3":673,"4":674,"5":675,"6":676},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     94:99:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):306:311 -> <init>
     94:99:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     94:99:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     100:100:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     100:100:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":683,"2":684,"3":685,"4":686,"5":687,"6":688},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":683,"2":684,"3":685,"4":686,"5":687,"6":688},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     101:104:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):315:318 -> <init>
     101:104:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     101:104:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     105:105:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     105:105:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":693,"2":694,"3":695,"4":696,"5":697,"6":698},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":693,"2":694,"3":695,"4":696,"5":697,"6":698},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     106:106:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     106:106:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":699,"2":700,"3":701,"4":702,"5":703,"6":704},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":699,"2":700,"3":701,"4":702,"5":703,"6":704},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     107:107:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     107:107:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":705,"2":706,"3":707,"4":708,"5":709,"6":710},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":705,"2":706,"3":707,"4":708,"5":709,"6":710},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     108:108:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):329:329 -> <init>
     108:108:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     108:108:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     109:109:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     109:109:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":713,"2":714,"3":715,"4":716,"5":717,"6":718},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":713,"2":714,"3":715,"4":716,"5":717,"6":718},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     110:110:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     110:110:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":719,"2":720,"3":721,"4":722,"5":723,"6":724},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":719,"2":720,"3":721,"4":722,"5":723,"6":724},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     111:111:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     111:111:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":725,"2":726,"3":727,"4":728,"5":729,"6":730},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":725,"2":726,"3":727,"4":728,"5":729,"6":730},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     112:112:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     112:112:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":731,"2":732,"3":733,"4":734,"5":735,"6":736},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":731,"2":732,"3":733,"4":734,"5":735,"6":736},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     113:113:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     113:113:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":737,"2":738,"3":739,"4":740,"5":741,"6":742},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":737,"2":738,"3":739,"4":740,"5":741,"6":742},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     114:114:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     114:114:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":743,"2":744,"3":745,"4":746,"5":747,"6":748},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":743,"2":744,"3":745,"4":746,"5":747,"6":748},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     115:118:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):349:352 -> <init>
     115:118:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     115:118:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     119:119:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     119:119:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":754,"2":755,"3":756,"4":757,"5":759,"6":760},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":754,"2":755,"3":756,"4":757,"5":759,"6":760},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     120:120:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     120:120:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":763,"2":764,"3":765,"4":766,"5":767,"6":768},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":763,"2":764,"3":765,"4":766,"5":767,"6":768},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     121:121:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     121:121:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":769,"2":770,"3":771,"4":772,"5":773,"6":774},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":769,"2":770,"3":771,"4":772,"5":773,"6":774},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     122:122:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     122:122:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":775,"2":776,"3":777,"4":778,"5":779,"6":780},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":775,"2":776,"3":777,"4":778,"5":779,"6":780},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     123:123:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     123:123:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":781,"2":782,"3":783,"4":784,"5":785,"6":786},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":781,"2":782,"3":783,"4":784,"5":785,"6":786},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     124:124:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     124:124:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":787,"2":788,"3":789,"4":790,"5":791,"6":792},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":787,"2":788,"3":789,"4":790,"5":791,"6":792},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     125:134:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):373:382 -> <init>
     125:134:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     125:134:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     135:135:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     135:135:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":803,"2":804,"3":805,"4":806,"5":807,"6":808},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":803,"2":804,"3":805,"4":806,"5":807,"6":808},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     136:139:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):387:390 -> <init>
     136:139:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     136:139:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     140:140:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     140:140:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":814,"2":815,"3":816,"4":817,"5":818,"6":819},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":814,"2":815,"3":816,"4":817,"5":818,"6":819},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     141:143:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):394:396 -> <init>
     141:143:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     141:143:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
     144:144:void <init>(com.android.tools.r8.utils.InternalOptions):0:0 -> <init>
     144:144:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":823,"2":824,"3":826,"4":827,"5":829,"6":830},"outline":"Lcom/android/tools/r8/internal/d5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":823,"2":824,"3":826,"4":827,"5":829,"6":830},"outline":"Lcom/android/tools/r8/internal/f5;a(Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)V"}
     145:145:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):401:401 -> <init>
     145:145:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     145:145:void com.android.tools.r8.internal.AvailableApiExceptions.<init>(com.android.tools.r8.internal.InternalOptions):0 -> <init>
@@ -6860,7 +6860,7 @@
     829:829:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
     830:830:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> <init>
     830:830:void <init>(com.android.tools.r8.utils.InternalOptions):30 -> <init>
-com.android.tools.r8.androidapi.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.d5:
+com.android.tools.r8.androidapi.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.f5:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:void com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String):0:5 -> a
@@ -6876,11 +6876,11 @@
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> M
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/androidapi/f$a;"}
     com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel max(com.android.tools.r8.androidapi.ComputedApiLevel):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/androidapi/f;"}
     com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:10:boolean isGreaterThan(com.android.tools.r8.androidapi.ComputedApiLevel):47:56 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Z"}
     1:1:boolean isEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):75:75 -> c
@@ -6888,7 +6888,7 @@
     1:3:boolean isGreaterThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):60:62 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Z"}
     com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel) -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean isEqualTo(java.lang.Object):16:16 -> isEqualTo
     boolean isUnknownApiLevel() -> k0
     boolean isKnownApiLevel() -> w
@@ -6913,11 +6913,11 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():179:179 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y2;"}
     2:2:com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):194:194 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:2:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):199:200 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/UU;"}
     3:3:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):194:194 -> e
     3:3:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):200 -> e
     4:4:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):202:202 -> e
@@ -6936,17 +6936,17 @@
     1:1:void <init>():88:88 -> <init>
     boolean isNotSetApiLevel() -> D
     1:1:com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel):105 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> b
     2:2:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):93 -> b
     3:3:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):92:92 -> b
     1:1:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):98:98 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> e
     2:2:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):99 -> e
     3:3:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):98:98 -> e
@@ -6959,17 +6959,17 @@
     1:1:void <init>():128:128 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isGreaterThan(com.android.tools.r8.utils.AndroidApiLevel):142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> b
     1:1:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):132 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> e
     1:1:com.android.tools.r8.utils.OptionalBool isLessThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):137 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/internal/UU;"}
     1:1:int hashCode():162:162 -> hashCode
     boolean isUnknownApiLevel() -> k0
     1:1:java.lang.String toString():152:152 -> toString
-com.android.tools.r8.androidapi.CovariantReturnTypeMethods -> com.android.tools.r8.internal.gh:
+com.android.tools.r8.androidapi.CovariantReturnTypeMethods -> com.android.tools.r8.internal.ih:
 # {"id":"sourceFile","fileName":"CovariantReturnTypeMethods.java"}
     1:2:void registerMethodsWithCovariantReturnType(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):20:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/Consumer;)V"}
@@ -7134,10 +7134,10 @@
     758:758:void registerMethodsWithCovariantReturnType(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):389:389 -> a
     759:759:void registerMethodsWithCovariantReturnType(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):387:387 -> a
     760:760:void registerMethodsWithCovariantReturnType(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):386:386 -> a
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.u6:
 # {"id":"sourceFile","fileName":"Bisect.java"}
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):78:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w6;Lcom/android/tools/r8/internal/s6$a;Ljava/nio/file/Path;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y6;Lcom/android/tools/r8/internal/u6$a;Ljava/nio/file/Path;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/graph/D2;"}
     5:13:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):184:192 -> a
     5:13:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):84 -> a
     14:14:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):191:191 -> a
@@ -7145,35 +7145,35 @@
     15:24:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):190:199 -> a
     15:24:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):84 -> a
     25:31:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):85:91 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.s6$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.u6$a:
 # {"id":"sourceFile","fileName":"Bisect.java"}
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/t6;"}
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.t6:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/v6;"}
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.v6:
 # {"id":"sourceFile","fileName":"BisectOptions.java"}
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v6;"}
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v6;"}
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v6;"}
     1:3:void <clinit>():31:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.y6:
 # {"id":"sourceFile","fileName":"BisectState.java"}
     java.lang.String signature -> a
     com.android.tools.r8.graph.DexApplication badApp -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/x0;"}
     java.util.List sortedGoodClasses -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Map indexMap -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.nio.file.Path stateFile -> e
     java.util.List runs -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.bisect.BisectState$Range nextRange -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w6;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):155:155 -> <init>
@@ -7184,7 +7184,7 @@
     20:20:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):168:168 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):160:160 -> <init>
     1:21:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):201:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v6;)V"}
     22:22:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
     23:29:com.android.tools.r8.graph.DexApplication bisect():240:246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/x0;"}
@@ -7258,7 +7258,7 @@
     9:11:void write():315 -> d
     12:17:void write():316:321 -> d
     18:18:void write():311:311 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.w6:
 # {"id":"sourceFile","fileName":"BisectState.java"}
     int start -> a
     int end -> b
@@ -7270,26 +7270,26 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/BufferedWriter;)V"}
     4:4:boolean isEmpty():53:53 -> a
     5:12:com.android.tools.r8.bisect.BisectState$Range add(com.android.tools.r8.bisect.BisectState$Range):61:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u6;)Lcom/android/tools/r8/internal/u6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w6;)Lcom/android/tools/r8/internal/w6;"}
     1:1:int size():57:57 -> b
     1:1:int size():57:57 -> c
     1:1:com.android.tools.r8.bisect.BisectState$Range split():84 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/w6;"}
     2:3:com.android.tools.r8.bisect.BisectState$Range split():84:85 -> c
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.x6:
 # {"id":"sourceFile","fileName":"BisectState.java"}
     boolean good -> a
     com.android.tools.r8.bisect.BisectState$Range range -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w6;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():116:116 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):120:123 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t6;Lcom/android/tools/r8/internal/u6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v6;Lcom/android/tools/r8/internal/w6;)V"}
     5:9:void <init>(java.lang.String):126:130 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.V8:
 # {"id":"sourceFile","fileName":"CfCodePrinter.java"}
     java.util.Set imports -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
@@ -7302,11 +7302,11 @@
     java.util.List sortedLabels -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     boolean pendingComma -> p
     java.lang.StringBuilder builder -> q
     java.util.Map knownTypeFields -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():85:85 -> <clinit>
     1:1:void <init>():101:101 -> <init>
@@ -7351,7 +7351,7 @@
     84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.cf.code.CfFrame.getLocals():136:136 -> a
     84:84:void print(com.android.tools.r8.cf.code.CfFrame):488 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9;)V"}
     85:85:void print(com.android.tools.r8.cf.code.CfFrame):488:488 -> a
     86:86:java.util.Deque com.android.tools.r8.cf.code.CfFrame.getStack():145:145 -> a
     86:86:void print(com.android.tools.r8.cf.code.CfFrame):489 -> a
@@ -7385,22 +7385,22 @@
     101:101:void print(com.android.tools.r8.cf.code.CfFrame):498:498 -> a
     102:102:java.lang.String longValue(long):188:188 -> a
     103:105:java.lang.String type(java.lang.String,java.util.List):194:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/vu;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/xu;)Ljava/lang/String;"}
     106:106:boolean lambda$type$0(java.lang.String):195:195 -> a
     107:109:java.lang.String r8Type(java.lang.String,java.util.List):229:231 -> a
     110:110:java.lang.String r8Type(java.lang.String,java.util.List):229:229 -> a
     111:111:java.lang.String numericType(com.android.tools.r8.ir.code.NumericType):255:255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Ljava/lang/String;"}
     112:112:java.lang.String irType(java.lang.String):235:235 -> a
     112:112:java.lang.String numericType(com.android.tools.r8.ir.code.NumericType):255 -> a
     113:113:java.lang.String numericType(com.android.tools.r8.ir.code.NumericType):255:255 -> a
     114:114:java.lang.String ifTypeKind(com.android.tools.r8.ir.code.IfType):263:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;)Ljava/lang/String;"}
     115:115:java.lang.String irType(java.lang.String):235:235 -> a
     115:115:java.lang.String ifTypeKind(com.android.tools.r8.ir.code.IfType):263 -> a
     116:116:java.lang.String ifTypeKind(com.android.tools.r8.ir.code.IfType):263:263 -> a
     117:117:java.lang.String monitorTypeKind(com.android.tools.r8.ir.code.MonitorType):267:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UO;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YO;)Ljava/lang/String;"}
     118:118:java.lang.String irType(java.lang.String):235:235 -> a
     118:118:java.lang.String monitorTypeKind(com.android.tools.r8.ir.code.MonitorType):267 -> a
     119:119:java.lang.String monitorTypeKind(com.android.tools.r8.ir.code.MonitorType):267:267 -> a
@@ -7420,53 +7420,53 @@
     143:143:void printNewInstruction(java.lang.String,java.lang.String[]):351 -> a
     144:145:void printNewInstruction(java.lang.String,java.lang.String[]):351:352 -> a
     146:146:void printNewVarInstruction(java.lang.String,com.android.tools.r8.ir.code.ValueType,int):356:356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/kl0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ol0;I)V"}
     147:147:void print(com.android.tools.r8.cf.code.CfStackInstruction):370:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ha;)V"}
     148:148:java.lang.String cfType(java.lang.String):239:239 -> a
     148:148:void print(com.android.tools.r8.cf.code.CfStackInstruction):372 -> a
     149:149:void print(com.android.tools.r8.cf.code.CfStackInstruction):372:372 -> a
     150:150:void print(com.android.tools.r8.cf.code.CfStackInstruction):370:370 -> a
     151:152:void print(com.android.tools.r8.cf.code.CfConstNumber):387:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d9;)V"}
     153:153:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfConstNumber.getType():60:60 -> a
     153:153:void print(com.android.tools.r8.cf.code.CfConstNumber):388 -> a
     154:154:void print(com.android.tools.r8.cf.code.CfConstNumber):388:388 -> a
     155:155:void print(com.android.tools.r8.cf.code.CfConstNumber):387:387 -> a
     156:156:void print(com.android.tools.r8.cf.code.CfConstClass):393:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X8;)V"}
     157:157:void print(com.android.tools.r8.cf.code.CfConstDynamic):399:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;)V"}
     158:158:void print(com.android.tools.r8.cf.code.CfReturn):409:409 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ya;)V"}
     159:159:void print(com.android.tools.r8.cf.code.CfMonitor):414:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U9;)V"}
     160:160:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):419:419 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8;)V"}
     161:161:java.lang.String cfType(java.lang.String):239:239 -> a
     161:161:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):421 -> a
     162:163:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):421:422 -> a
     164:164:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):419:419 -> a
     165:165:void print(com.android.tools.r8.cf.code.CfCmp):427:427 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U8;)V"}
     166:166:java.lang.String irType(java.lang.String):235:235 -> a
     166:166:void print(com.android.tools.r8.cf.code.CfCmp):428 -> a
     167:167:void print(com.android.tools.r8.cf.code.CfCmp):428:428 -> a
     168:168:void print(com.android.tools.r8.cf.code.CfCmp):427:427 -> a
     169:169:void print(com.android.tools.r8.cf.code.CfLogicalBinop):433:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T9;)V"}
     170:170:java.lang.String cfType(java.lang.String):239:239 -> a
     170:170:void print(com.android.tools.r8.cf.code.CfLogicalBinop):435 -> a
     171:172:void print(com.android.tools.r8.cf.code.CfLogicalBinop):435:436 -> a
     173:173:void print(com.android.tools.r8.cf.code.CfLogicalBinop):433:433 -> a
     174:174:void print(com.android.tools.r8.cf.code.CfNeg):441:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X9;)V"}
     175:175:com.android.tools.r8.ir.code.NumericType com.android.tools.r8.cf.code.CfNeg.getType():37:37 -> a
     175:175:void print(com.android.tools.r8.cf.code.CfNeg):441 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     176:176:void print(com.android.tools.r8.cf.code.CfNeg):441:441 -> a
     177:177:void print(com.android.tools.r8.cf.code.CfNumberConversion):446:446 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/da;)V"}
     178:178:com.android.tools.r8.ir.code.NumericType com.android.tools.r8.cf.code.CfNumberConversion.getFromType():59:59 -> a
     178:178:void print(com.android.tools.r8.cf.code.CfNumberConversion):448 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7476,55 +7476,55 @@
     181:181:void print(com.android.tools.r8.cf.code.CfNumberConversion):449:449 -> a
     182:182:void print(com.android.tools.r8.cf.code.CfNumberConversion):446:446 -> a
     183:183:void print(com.android.tools.r8.cf.code.CfConstString):454:454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e9;)V"}
     184:184:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):459:459 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)V"}
     185:185:void print(com.android.tools.r8.cf.code.CfArrayLoad):464:464 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B8;)V"}
     186:186:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     186:186:void print(com.android.tools.r8.cf.code.CfArrayLoad):464 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     187:187:void print(com.android.tools.r8.cf.code.CfArrayLoad):464:464 -> a
     188:188:void print(com.android.tools.r8.cf.code.CfArrayStore):469:469 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D8;)V"}
     189:189:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     189:189:void print(com.android.tools.r8.cf.code.CfArrayStore):469 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     190:190:void print(com.android.tools.r8.cf.code.CfArrayStore):469:469 -> a
     191:193:void print(com.android.tools.r8.cf.code.CfInvoke):476:478 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;)V"}
     194:194:void print(com.android.tools.r8.cf.code.CfInvoke):474:474 -> a
     195:195:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):483:483 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;)V"}
     196:196:void print(com.android.tools.r8.cf.code.CfInstanceOf):561:561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A9;)V"}
     197:197:void print(com.android.tools.r8.cf.code.CfCheckCast):566:566 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M8;)V"}
     198:212:void print(com.android.tools.r8.cf.code.CfFieldInstruction):591:605 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;)V"}
     213:213:void print(com.android.tools.r8.cf.code.CfFieldInstruction):596:596 -> a
     214:223:void print(com.android.tools.r8.cf.code.CfFieldInstruction):593:602 -> a
     224:224:void print(com.android.tools.r8.cf.code.CfFieldInstruction):599:599 -> a
     225:225:void print(com.android.tools.r8.cf.code.CfNew):611:611 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y9;)V"}
     226:226:void print(com.android.tools.r8.cf.code.CfNewArray):616:616 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z9;)V"}
     227:227:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():53:53 -> a
     227:227:void print(com.android.tools.r8.cf.code.CfNewArray):616 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     228:228:void print(com.android.tools.r8.cf.code.CfNewArray):616:616 -> a
     229:229:void print(com.android.tools.r8.cf.code.CfMultiANewArray):621:621 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V9;)V"}
     230:230:void print(com.android.tools.r8.cf.code.CfPosition):638:638 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka;)V"}
     231:231:void print(com.android.tools.r8.cf.code.CfGoto):642:642 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r9;)V"}
     232:232:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfGoto.getTarget():68:68 -> a
     232:232:void print(com.android.tools.r8.cf.code.CfGoto):642 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     233:233:void print(com.android.tools.r8.cf.code.CfGoto):642:642 -> a
     234:234:void print(com.android.tools.r8.cf.code.CfIf):647:647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t9;)V"}
     235:235:com.android.tools.r8.ir.code.IfType com.android.tools.r8.cf.code.CfConditionalJumpInstruction.getKind():38:38 -> a
     235:235:void print(com.android.tools.r8.cf.code.CfIf):648 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7535,7 +7535,7 @@
     238:238:void printNewJumpInstruction(java.lang.String,com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):360:360 -> a
     238:238:void print(com.android.tools.r8.cf.code.CfIf):647 -> a
     239:239:void print(com.android.tools.r8.cf.code.CfIfCmp):653:653 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v9;)V"}
     240:240:com.android.tools.r8.ir.code.IfType com.android.tools.r8.cf.code.CfConditionalJumpInstruction.getKind():38:38 -> a
     240:240:void print(com.android.tools.r8.cf.code.CfIfCmp):654 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7546,9 +7546,9 @@
     243:243:void printNewJumpInstruction(java.lang.String,com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):360:360 -> a
     243:243:void print(com.android.tools.r8.cf.code.CfIfCmp):653 -> a
     244:244:void print(com.android.tools.r8.cf.code.CfSwitch):659:659 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)V"}
     245:245:void print(com.android.tools.r8.cf.code.CfLoad):664:664 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R9;)V"}
     246:246:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfLoad.getType():109:109 -> a
     246:246:void print(com.android.tools.r8.cf.code.CfLoad):664 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7556,7 +7556,7 @@
     247:247:void print(com.android.tools.r8.cf.code.CfLoad):664 -> a
     248:248:void print(com.android.tools.r8.cf.code.CfLoad):664:664 -> a
     249:249:void print(com.android.tools.r8.cf.code.CfStore):669:669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ta;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Va;)V"}
     250:250:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfStore.getType():107:107 -> a
     250:250:void print(com.android.tools.r8.cf.code.CfStore):669 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7564,7 +7564,7 @@
     251:251:void print(com.android.tools.r8.cf.code.CfStore):669 -> a
     252:252:void print(com.android.tools.r8.cf.code.CfStore):669:669 -> a
     253:253:void print(com.android.tools.r8.cf.code.CfIinc):674:674 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w9;)V"}
     254:254:int com.android.tools.r8.cf.code.CfIinc.getLocalIndex():85:85 -> a
     254:254:void print(com.android.tools.r8.cf.code.CfIinc):676 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7574,41 +7574,41 @@
     257:257:void print(com.android.tools.r8.cf.code.CfIinc):677:677 -> a
     258:258:void print(com.android.tools.r8.cf.code.CfIinc):674:674 -> a
     259:259:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):682:682 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z8;)V"}
     260:260:void print(com.android.tools.r8.cf.code.CfConstMethodType):687:687 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a9;)V"}
     1:1:java.lang.String quote(java.lang.String):184:184 -> b
     2:2:java.lang.String valueType(com.android.tools.r8.ir.code.ValueType):251:251 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)Ljava/lang/String;"}
     3:3:java.lang.String irType(java.lang.String):235:235 -> b
     3:3:java.lang.String valueType(com.android.tools.r8.ir.code.ValueType):251 -> b
     4:4:java.lang.String valueType(com.android.tools.r8.ir.code.ValueType):251:251 -> b
     5:5:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):259:259 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)Ljava/lang/String;"}
     6:6:java.lang.String irType(java.lang.String):235:235 -> b
     6:6:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):259 -> b
     7:7:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):259:259 -> b
     8:11:void ensureComma():343:346 -> b
     8:11:void print(com.android.tools.r8.cf.code.CfLabel):631 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     12:12:void print(com.android.tools.r8.cf.code.CfLabel):632:632 -> b
     13:14:java.lang.String getCfFrameLocals(com.android.tools.r8.cf.code.CfFrame):504:505 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9;)Ljava/lang/String;"}
     15:15:java.lang.String int2ObjectAVLTreeMapType():205:205 -> b
     15:15:java.lang.String getCfFrameLocals(com.android.tools.r8.cf.code.CfFrame):507 -> b
     16:16:java.lang.String getCfFrameLocals(com.android.tools.r8.cf.code.CfFrame):513:513 -> b
     17:24:java.lang.String frameTypeType(com.android.tools.r8.cf.code.frame.FrameType):525:532 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)Ljava/lang/String;"}
     25:25:java.lang.String cfType(java.lang.String):239:239 -> b
     25:25:java.lang.String frameTypeType(com.android.tools.r8.cf.code.frame.FrameType):532 -> b
     26:47:java.lang.String frameTypeType(com.android.tools.r8.cf.code.frame.FrameType):532:553 -> b
     48:48:java.lang.String frameTypeType(com.android.tools.r8.cf.code.frame.FrameType):552:552 -> b
     1:1:java.lang.String labelName(com.android.tools.r8.cf.code.CfLabel):247:247 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)Ljava/lang/String;"}
     2:8:java.lang.String dexType(com.android.tools.r8.graph.DexType):304:310 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/String;"}
     9:9:java.lang.String getCfFrameStack(com.android.tools.r8.cf.code.CfFrame):520:520 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9;)Ljava/lang/String;"}
     10:10:java.lang.String arrayDequeType():217:217 -> c
     10:10:java.lang.String getCfFrameStack(com.android.tools.r8.cf.code.CfFrame):521 -> c
     11:11:java.lang.String arraysType():221:221 -> c
@@ -7629,16 +7629,16 @@
     1:2:java.util.List getImportsSorted():108:109 -> k
     1:1:java.util.List getMethods():114:114 -> l
     1:1:java.util.Set getSynthesizedTypes():691:691 -> m
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.ta:
 # {"id":"sourceFile","fileName":"CfPrinter.java"}
     java.lang.String indent -> a
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.List localsAtLabel -> d
     java.lang.StringBuilder builder -> e
     com.android.tools.r8.utils.RetracerForCodePrinting retracer -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P90;"}
     int nextInstructionIndex -> g
     int instructionIndexSpace -> h
     boolean $assertionsDisabled -> i
@@ -7646,7 +7646,7 @@
     1:1:void <init>():121:121 -> <init>
     2:16:void <init>():114:128 -> <init>
     17:17:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):137:137 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)V"}
     18:55:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):114:151 -> <init>
     56:56:void appendMethod(com.android.tools.r8.graph.DexMethod):798:798 -> <init>
     56:56:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):151 -> <init>
@@ -7657,7 +7657,7 @@
     1:1:int com.android.tools.r8.cf.code.CfLogicalBinop.getAsmOpcode():106:106 -> a
     1:1:void print(com.android.tools.r8.cf.code.CfLogicalBinop):377 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T9;)V"}
     2:2:int com.android.tools.r8.cf.code.CfLogicalBinop.getAsmOpcode():106:106 -> a
     2:2:void print(com.android.tools.r8.cf.code.CfLogicalBinop):377 -> a
     3:3:java.lang.String opcodeName(int):802:802 -> a
@@ -7667,7 +7667,7 @@
     6:6:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfStore.getType():107:107 -> a
     6:6:void print(com.android.tools.r8.cf.code.CfStore):649 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ta;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Va;)V"}
     7:7:void print(com.android.tools.r8.cf.code.CfStore):649:649 -> a
     8:8:int com.android.tools.r8.cf.code.CfStore.getLocalIndex():111:111 -> a
     8:8:void print(com.android.tools.r8.cf.code.CfStore):649 -> a
@@ -7676,7 +7676,7 @@
     11:11:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfLoad.getType():109:109 -> a
     11:11:void print(com.android.tools.r8.cf.code.CfLoad):645 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R9;)V"}
     12:12:void print(com.android.tools.r8.cf.code.CfLoad):645:645 -> a
     13:13:int com.android.tools.r8.cf.code.CfLoad.getLocalIndex():113:113 -> a
     13:13:void print(com.android.tools.r8.cf.code.CfLoad):645 -> a
@@ -7691,11 +7691,11 @@
     40:41:java.util.List getSortedLocalVariables(com.android.tools.r8.graph.CfCode):237:238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;)Ljava/util/ArrayList;"}
     42:45:void print(com.android.tools.r8.cf.code.CfRecordFieldValues):265:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ua;)V"}
     46:47:void print(java.lang.String):259:260 -> a
     46:47:void print(com.android.tools.r8.cf.code.CfRecordFieldValues):268 -> a
     48:77:void print(com.android.tools.r8.cf.code.CfStackInstruction):276:305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ha;)V"}
     78:78:void print(com.android.tools.r8.cf.code.CfStackInstruction):302:302 -> a
     79:80:void print(java.lang.String):259:260 -> a
     79:80:void print(com.android.tools.r8.cf.code.CfStackInstruction):302 -> a
@@ -7724,15 +7724,15 @@
     103:104:void print(java.lang.String):259:260 -> a
     103:104:void print(com.android.tools.r8.cf.code.CfStackInstruction):278 -> a
     105:121:void print(com.android.tools.r8.cf.code.CfConstNumber):318:334 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d9;)V"}
     122:122:void print(com.android.tools.r8.cf.code.CfConstNumber):331:331 -> a
     123:123:void print(com.android.tools.r8.cf.code.CfConstNumber):328:328 -> a
     124:124:void print(com.android.tools.r8.cf.code.CfConstNumber):325:325 -> a
     125:125:void print(com.android.tools.r8.cf.code.CfConstNumber):322:322 -> a
     126:128:void print(com.android.tools.r8.cf.code.CfConstClass):339:341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X8;)V"}
     129:130:void print(com.android.tools.r8.cf.code.CfConstDynamic):345:346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;)V"}
     131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():114:114 -> a
     131:131:void print(com.android.tools.r8.cf.code.CfConstDynamic):347 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7742,66 +7742,66 @@
     132:132:void print(com.android.tools.r8.cf.code.CfConstDynamic):347 -> a
     133:133:void print(com.android.tools.r8.cf.code.CfConstDynamic):347:347 -> a
     134:134:void print(com.android.tools.r8.cf.code.CfReturn):361:361 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ya;)V"}
     135:136:void print(java.lang.String):259:260 -> a
     135:136:void print(com.android.tools.r8.cf.code.CfReturn):361 -> a
     137:137:void print(com.android.tools.r8.cf.code.CfMonitor):365:365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U9;)V"}
     138:139:void print(java.lang.String):259:260 -> a
     138:139:void print(com.android.tools.r8.cf.code.CfMonitor):365 -> a
     140:140:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):369:369 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8;)V"}
     141:141:java.lang.String opcodeName(int):802:802 -> a
     141:141:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):369 -> a
     142:143:void print(java.lang.String):259:260 -> a
     142:143:void print(com.android.tools.r8.cf.code.CfArithmeticBinop):369 -> a
     144:144:void print(com.android.tools.r8.cf.code.CfCmp):373:373 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U8;)V"}
     145:145:java.lang.String opcodeName(int):802:802 -> a
     145:145:void print(com.android.tools.r8.cf.code.CfCmp):373 -> a
     146:147:void print(java.lang.String):259:260 -> a
     146:147:void print(com.android.tools.r8.cf.code.CfCmp):373 -> a
     148:148:void print(com.android.tools.r8.cf.code.CfNeg):381:381 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X9;)V"}
     149:149:java.lang.String opcodeName(int):802:802 -> a
     149:149:void print(com.android.tools.r8.cf.code.CfNeg):381 -> a
     150:151:void print(java.lang.String):259:260 -> a
     150:151:void print(com.android.tools.r8.cf.code.CfNeg):381 -> a
     152:152:void print(com.android.tools.r8.cf.code.CfNumberConversion):385:385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/da;)V"}
     153:153:java.lang.String opcodeName(int):802:802 -> a
     153:153:void print(com.android.tools.r8.cf.code.CfNumberConversion):385 -> a
     154:155:void print(java.lang.String):259:260 -> a
     154:155:void print(com.android.tools.r8.cf.code.CfNumberConversion):385 -> a
     156:157:void print(com.android.tools.r8.cf.code.CfConstString):389:390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e9;)V"}
     158:159:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):394:395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)V"}
     160:160:com.android.tools.r8.graph.DexReference com.android.tools.r8.cf.code.CfDexItemBasedConstString.getItem():57:57 -> a
     160:160:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):395 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     161:161:void print(com.android.tools.r8.cf.code.CfDexItemBasedConstString):395:395 -> a
     162:163:void print(com.android.tools.r8.cf.code.CfArrayLoad):399:400 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B8;)V"}
     164:164:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     164:164:void print(com.android.tools.r8.cf.code.CfArrayLoad):400 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     165:165:void print(com.android.tools.r8.cf.code.CfArrayLoad):400:400 -> a
     166:167:void print(com.android.tools.r8.cf.code.CfArrayStore):404:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D8;)V"}
     168:168:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     168:168:void print(com.android.tools.r8.cf.code.CfArrayStore):405 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     169:169:void print(com.android.tools.r8.cf.code.CfArrayStore):405:405 -> a
     170:171:void print(com.android.tools.r8.cf.code.CfInvoke):409:410 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;)V"}
     172:172:java.lang.String opcodeName(int):802:802 -> a
     172:172:void print(com.android.tools.r8.cf.code.CfInvoke):410 -> a
     173:174:void print(com.android.tools.r8.cf.code.CfInvoke):410:411 -> a
     175:175:void appendMethod(com.android.tools.r8.graph.DexMethod):798:798 -> a
     175:175:void print(com.android.tools.r8.cf.code.CfInvoke):411 -> a
     176:176:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):415:415 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;)V"}
     177:177:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.cf.code.CfInvokeDynamic.getCallSite():151:151 -> a
     177:177:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):416 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7815,7 +7815,7 @@
     198:198:void appendMethod(com.android.tools.r8.graph.DexMethod):798:798 -> a
     198:198:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):432 -> a
     199:200:void print(com.android.tools.r8.cf.code.CfFrame):436:437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9;)V"}
     201:201:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.cf.code.CfFrame.getLocals():136:136 -> a
     201:201:void print(com.android.tools.r8.cf.code.CfFrame):438 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7830,9 +7830,9 @@
     211:211:void print(com.android.tools.r8.cf.code.CfFrame):450 -> a
     212:218:void print(com.android.tools.r8.cf.code.CfFrame):450:456 -> a
     219:221:void lambda$print$3(int,int,com.android.tools.r8.cf.code.frame.FrameType):442:444 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Sq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Uq;)V"}
     222:227:void print(com.android.tools.r8.cf.code.frame.FrameType):460:465 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)V"}
     228:228:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces.getInitializedTypeWithInterfaces():54:54 -> a
     228:228:void print(com.android.tools.r8.cf.code.frame.FrameType):466 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7844,11 +7844,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     233:238:void print(com.android.tools.r8.cf.code.frame.FrameType):469:474 -> a
     239:241:void print(com.android.tools.r8.cf.code.CfInstanceOf):479:481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A9;)V"}
     242:244:void print(com.android.tools.r8.cf.code.CfCheckCast):485:487 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M8;)V"}
     245:260:void print(com.android.tools.r8.cf.code.CfFieldInstruction):507:522 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;)V"}
     261:261:void print(com.android.tools.r8.cf.code.CfFieldInstruction):513:513 -> a
     262:271:void print(com.android.tools.r8.cf.code.CfFieldInstruction):510:519 -> a
     272:280:void print(com.android.tools.r8.cf.code.CfFieldInstruction):516:524 -> a
@@ -7858,9 +7858,9 @@
     284:284:void appendDescriptor(com.android.tools.r8.graph.DexType):768:768 -> a
     284:284:void print(com.android.tools.r8.cf.code.CfFieldInstruction):526 -> a
     285:287:void print(com.android.tools.r8.cf.code.CfNew):530:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y9;)V"}
     288:288:void print(com.android.tools.r8.cf.code.CfNewArray):536:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z9;)V"}
     289:289:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():53:53 -> a
     289:289:void print(com.android.tools.r8.cf.code.CfNewArray):537 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7874,7 +7874,7 @@
     305:305:void print(com.android.tools.r8.cf.code.CfNewArray):549 -> a
     306:306:void print(com.android.tools.r8.cf.code.CfNewArray):549:549 -> a
     307:308:void print(com.android.tools.r8.cf.code.CfMultiANewArray):561:562 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V9;)V"}
     309:309:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():57:57 -> a
     309:309:void print(com.android.tools.r8.cf.code.CfMultiANewArray):563 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7883,17 +7883,17 @@
     312:312:void print(com.android.tools.r8.cf.code.CfMultiANewArray):564 -> a
     313:313:void print(com.android.tools.r8.cf.code.CfMultiANewArray):564:564 -> a
     314:318:void print(com.android.tools.r8.cf.code.CfPosition):587:591 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka;)V"}
     319:319:void appendComment(java.lang.String):764:764 -> a
     319:319:void print(com.android.tools.r8.cf.code.CfPosition):591 -> a
     320:321:void print(com.android.tools.r8.cf.code.CfGoto):596:597 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r9;)V"}
     322:322:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfGoto.getTarget():68:68 -> a
     322:322:void print(com.android.tools.r8.cf.code.CfGoto):597 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     323:323:void print(com.android.tools.r8.cf.code.CfGoto):597:597 -> a
     324:324:void print(com.android.tools.r8.cf.code.CfIf):605:605 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t9;)V"}
     325:325:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfConditionalJumpInstruction.getType():47:47 -> a
     325:325:void print(com.android.tools.r8.cf.code.CfIf):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7910,7 +7910,7 @@
     337:337:void print(com.android.tools.r8.cf.code.CfIf):611 -> a
     338:338:void print(com.android.tools.r8.cf.code.CfIf):611:611 -> a
     339:340:void print(com.android.tools.r8.cf.code.CfIfCmp):615:616 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v9;)V"}
     341:341:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.cf.code.CfConditionalJumpInstruction.getType():47:47 -> a
     341:341:void print(com.android.tools.r8.cf.code.CfIfCmp):617 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7924,7 +7924,7 @@
     347:347:void print(com.android.tools.r8.cf.code.CfIfCmp):620 -> a
     348:348:void print(com.android.tools.r8.cf.code.CfIfCmp):620:620 -> a
     349:352:void print(com.android.tools.r8.cf.code.CfSwitch):624:627 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)V"}
     353:353:java.util.List com.android.tools.r8.cf.code.CfSwitch.getSwitchTargets():101:101 -> a
     353:353:void print(com.android.tools.r8.cf.code.CfSwitch):628 -> a
     354:365:void print(com.android.tools.r8.cf.code.CfSwitch):629:640 -> a
@@ -7932,7 +7932,7 @@
     366:366:void print(com.android.tools.r8.cf.code.CfSwitch):641 -> a
     367:367:void print(com.android.tools.r8.cf.code.CfSwitch):641:641 -> a
     368:370:void print(com.android.tools.r8.cf.code.CfIinc):653:655 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w9;)V"}
     371:371:int com.android.tools.r8.cf.code.CfIinc.getLocalIndex():85:85 -> a
     371:371:void print(com.android.tools.r8.cf.code.CfIinc):656 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -7941,30 +7941,30 @@
     374:374:void print(com.android.tools.r8.cf.code.CfIinc):658 -> a
     375:375:void print(com.android.tools.r8.cf.code.CfIinc):658:658 -> a
     376:388:char typePrefix(com.android.tools.r8.ir.code.ValueType):667:679 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)C"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)C"}
     389:407:char typePrefix(com.android.tools.r8.ir.code.MemberType):684:702 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)C"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)C"}
     408:410:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):725:727 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z8;)V"}
     411:411:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.cf.code.CfConstMethodHandle.getHandle():38:38 -> a
     411:411:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     412:412:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):727:727 -> a
     413:415:void print(com.android.tools.r8.cf.code.CfConstMethodType):731:733 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a9;)V"}
     416:416:com.android.tools.r8.graph.DexProto com.android.tools.r8.cf.code.CfConstMethodType.getType():38:38 -> a
     416:416:void print(com.android.tools.r8.cf.code.CfConstMethodType):733 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     417:417:void print(com.android.tools.r8.cf.code.CfConstMethodType):733:733 -> a
     418:418:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):742:742 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)Ljava/lang/String;"}
     419:421:void indent():758:760 -> a
     422:426:void appendClass(com.android.tools.r8.graph.DexType):785:789 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:13:int lambda$getSortedLocalVariables$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):241:253 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G$a;Lcom/android/tools/r8/graph/G$a;)I"}
     14:24:void print(com.android.tools.r8.cf.code.CfLabel):572:582 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     25:25:void print(com.android.tools.r8.cf.code.CfLabel):580:580 -> b
     26:26:void appendComment(java.lang.String):764:764 -> b
     26:26:void print(com.android.tools.r8.cf.code.CfLabel):578 -> b
@@ -7994,7 +7994,7 @@
     2:3:void print(java.lang.String):259:260 -> h
     2:3:void print(com.android.tools.r8.cf.code.CfArrayLength):568 -> h
     1:1:java.lang.String toString():807:807 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.sa:
 # {"id":"sourceFile","fileName":"CfPrinter.java"}
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> b
@@ -8012,14 +8012,14 @@
     7:7:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] com.android.tools.r8.cf.code.CfStackInstruction$Opcode.values():32:32 -> <clinit>
     7:7:void <clinit>():276 -> <clinit>
     8:8:void <clinit>():276:276 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.wa:
 # {"id":"sourceFile","fileName":"CfRegisterAllocator.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.cf.TypeVerificationHelper typeHelper -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xj0;"}
     java.util.Map liveAtEntrySets -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map lazyTypeInfoAtBlockEntry -> e
@@ -8039,12 +8039,12 @@
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/tj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/xj0;)V"}
     2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):93:123 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap com.android.tools.r8.ir.code.BasicBlock.getLocalsAtEntry():121:121 -> a
     1:1:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):417 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     2:12:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):417:427 -> a
     13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     13:13:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):433 -> a
@@ -8071,7 +8071,7 @@
     27:27:com.android.tools.r8.graph.ProgramMethod getProgramMethod():128:128 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     28:29:int getRegisterForValue(com.android.tools.r8.ir.code.Value):142:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)I"}
     30:30:int com.android.tools.r8.cf.FixedLocalValue.getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     30:30:int getRegisterForValue(com.android.tools.r8.ir.code.Value):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -8091,7 +8091,7 @@
     36:36:int getRegisterForValue(com.android.tools.r8.ir.code.Value):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:37:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):151:151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
     38:59:int getNextFreeRegister(boolean):277:298 -> a
     60:60:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):366:366 -> a
     60:60:void assignRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):350 -> a
@@ -8135,9 +8135,9 @@
     80:80:void assignRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):353 -> a
     81:81:void assignRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):354:354 -> a
     82:82:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry getTypesAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):380:380 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/ta;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/va;"}
     83:83:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):546:546 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;ILjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;ILjava/util/List;)V"}
     84:84:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> a
     84:84:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):546 -> a
     85:91:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):547:553 -> a
@@ -8215,7 +8215,7 @@
     185:191:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):579:585 -> a
     192:197:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):584:589 -> a
     198:202:void updateFirstRegisterMapByJoiningTheSecond(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):596:600 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/nz;)V"}
     203:203:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():317:317 -> a
     203:203:void updateFirstRegisterMapByJoiningTheSecond(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):600 -> a
     204:205:void updateFirstRegisterMapByJoiningTheSecond(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):600:601 -> a
@@ -8225,7 +8225,7 @@
     214:223:void updateFirstStackByJoiningTheSecond(java.util.List,java.util.List):614:623 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;)V"}
     1:1:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):138:138 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
     2:7:void computeNeedsRegister():180:185 -> b
     2:7:void allocateRegisters():166 -> b
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():191:191 -> b
@@ -8392,12 +8392,12 @@
     104:109:void allocateRegisters():168 -> b
     110:111:void allocateRegisters():173:174 -> b
     112:113:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):383:384 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/ta;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/va;"}
     114:114:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):93:93 -> b
     114:114:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):384 -> b
     115:124:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):385:394 -> b
     125:129:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):400:404 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     130:130:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():317:317 -> b
     130:130:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):404 -> b
     131:131:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):404:404 -> b
@@ -8408,15 +8408,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y;"}
     1:1:int registersUsed():133:133 -> d
     1:1:com.android.tools.r8.utils.InternalOptions options():156:156 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.ta:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.va:
 # {"id":"sourceFile","fileName":"CfRegisterAllocator.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.List stack -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):72:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Ljava/util/ArrayList;)V"}
     1:3:java.lang.String toString():79:81 -> toString
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> toString
     4:4:java.lang.String toString():81 -> toString
@@ -8426,53 +8426,53 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> toString
     6:6:java.lang.String toString():81 -> toString
     7:15:java.lang.String toString():81:89 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.bb:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.db:
 # {"id":"sourceFile","fileName":"CfVersion.java"}
     int version -> b
     com.android.tools.r8.cf.CfVersion V1_1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_2 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_4 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_5 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_6 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_7 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V1_8 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V9 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V11 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V15 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V23 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion V24 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.cf.CfVersion[] versions -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/db;"}
     boolean $assertionsDisabled -> p
     1:45:void <clinit>():15:59 -> <clinit>
     1:2:void <init>(int):86:87 -> <init>
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():15:15 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:com.android.tools.r8.cf.CfVersion fromRaw(int):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/db;"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):111:111 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:java.lang.Iterable all():115:115 -> a
     4:4:boolean lambda$rangeInclusive$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):123:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/bb;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/db;)Z"}
     1:1:int major():95:95 -> b
     2:2:boolean lambda$rangeInclusive$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):124:124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/bb;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/db;)Z"}
     1:1:int minor():99:99 -> c
     2:2:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):119:119 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/bb;)Ljava/lang/Iterable;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/db;)Ljava/lang/Iterable;"}
     3:3:boolean isPreview():107:107 -> c
     3:3:java.lang.Iterable rangeInclusive(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):120 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -8489,36 +8489,36 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():135:135 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:java.lang.String toString():150:150 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Yp:
 # {"id":"sourceFile","fileName":"FixedLocalValue.java"}
     com.android.tools.r8.ir.code.Phi phi -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     1:1:boolean isConstant():40:40 -> b0
     1:1:boolean needsRegister():35:35 -> m0
     1:1:java.lang.String toString():45:45 -> toString
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tW;"}
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.nL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xW;"}
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.rL:
 # {"id":"sourceFile","fileName":"LoadStoreHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.cf.TypeVerificationHelper typesHelper -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xj0;"}
     java.util.Map clonableConstants -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.ListIterator blockIterator -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M5;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):40:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/tj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/xj0;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):37:43 -> <init>
     1:4:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):114:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ua;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wa;)V"}
     5:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     5:5:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):117 -> a
     6:6:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):117:117 -> a
@@ -8570,7 +8570,7 @@
     49:53:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):136 -> a
     54:54:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):139:139 -> a
     55:55:void loadInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Lw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Nw;)V"}
     56:56:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     56:56:void loadInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):153 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -8640,7 +8640,7 @@
     91:93:void loadInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):163 -> a
     94:96:void loadInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):165:167 -> a
     97:99:void storeOrPopOutValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):172:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/DB;Lcom/android/tools/r8/internal/J5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/FB;Lcom/android/tools/r8/internal/L5;)V"}
     100:100:com.android.tools.r8.ir.code.StackValue createStackValue(com.android.tools.r8.graph.DexType,int):147:147 -> a
     100:100:void popOutType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):230 -> a
     100:100:void storeOrPopOutValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):176 -> a
@@ -8652,9 +8652,9 @@
     108:110:void popOutType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):230 -> a
     108:110:void storeOrPopOutValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):176 -> a
     111:127:com.android.tools.r8.ir.code.Instruction load(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):278:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     1:5:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):181:185 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Lw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Nw;)V"}
     6:6:boolean canRemoveConstInstruction(com.android.tools.r8.ir.code.ConstInstruction,com.android.tools.r8.ir.code.BasicBlock):92:92 -> b
     6:6:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):185 -> b
     7:14:boolean hasLocalInfoOrUsersOutsideThisBlock(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock):47:54 -> b
@@ -8717,34 +8717,34 @@
     105:105:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):217:217 -> b
     106:107:void splitAfterStoredOutValue(com.android.tools.r8.ir.code.InstructionListIterator):225:226 -> b
     106:107:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):218 -> b
-com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.lL:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.pL:
 # {"id":"sourceFile","fileName":"LoadStoreHelper.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():64 -> <clinit>
     2:2:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.mL:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.qL:
 # {"id":"sourceFile","fileName":"LoadStoreHelper.java"}
     com.android.tools.r8.ir.code.Phi phi -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW;"}
     com.android.tools.r8.ir.code.Value operand -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:3:void <init>(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):252:254 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/internal/Xk0;)V"}
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.tj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/internal/bl0;)V"}
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.xj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo INT -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo FLOAT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo LONG -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo DOUBLE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj0;"}
     com.android.tools.r8.graph.AppView appView -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Map types -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map newInstanceInfos -> h
@@ -8753,13 +8753,13 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):116:116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):111:124 -> <init>
     1:17:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):128:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/tj0;"}
     18:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140:145 -> a
     24:27:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):149:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/graph/I2;"}
     28:33:com.android.tools.r8.graph.DexType join(java.util.Set):181:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/graph/I2;"}
     34:34:com.android.tools.r8.ir.analysis.type.TypeElement toTypeElement(com.android.tools.r8.graph.DexType):220:220 -> a
@@ -8770,7 +8770,7 @@
     38:47:com.android.tools.r8.graph.DexType join(java.util.Set):188:197 -> a
     48:48:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     49:58:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):206:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sj0;Lcom/android/tools/r8/internal/sj0;)Lcom/android/tools/r8/internal/sj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wj0;Lcom/android/tools/r8/internal/wj0;)Lcom/android/tools/r8/internal/wj0;"}
     59:59:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object,java.lang.Object):100:100 -> a
     59:59:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):216 -> a
     60:60:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):216:216 -> a
@@ -8780,21 +8780,21 @@
     127:129:java.util.Map computeVerificationTypes():291 -> a
     130:146:java.util.Map computeVerificationTypes():293:309 -> a
     147:152:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):322:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):156:174 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/sj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/wj0;"}
     20:20:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):172:172 -> b
     21:21:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):170:170 -> b
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):168:168 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):166:166 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):164:164 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.oj0:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.sj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():162 -> <clinit>
     2:2:void <clinit>():162:162 -> <clinit>
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.pj0:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.tj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     com.android.tools.r8.graph.DexType type -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -8805,20 +8805,20 @@
     1:1:com.android.tools.r8.graph.DexType getDexType():52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.qj0:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.uj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rQ;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():61:61 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.NewInstance):64:66 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rQ;)V"}
     1:1:com.android.tools.r8.graph.DexType getDexType():71:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.graph.DexType getDexType():71:71 -> toString
     1:1:java.lang.String toString():76 -> toString
     2:2:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.rj0:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.vj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     com.android.tools.r8.graph.DexType type -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -8833,32 +8833,32 @@
     1:1:com.android.tools.r8.graph.DexType getDexType():93:93 -> toString
     1:1:java.lang.String toString():98 -> toString
     2:2:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.sj0:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.wj0:
 # {"id":"sourceFile","fileName":"TypeVerificationHelper.java"}
     com.android.tools.r8.graph.DexType getDexType() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.z8:
 # {"id":"sourceFile","fileName":"CfArithmeticBinop.java"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.ir.code.NumericType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:5:void <init>(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):41:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x8$a;Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8$a;Lcom/android/tools/r8/internal/BS;)V"}
     1:1:int getCompareToId():50:50 -> A
     1:1:int getAsmOpcode():120:120 -> U
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():65:65 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:1:com.android.tools.r8.ir.code.NumericType getType():69:69 -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BS;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:com.android.tools.r8.cf.code.CfArithmeticBinop fromAsm(int):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/x8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/z8;"}
     4:4:com.android.tools.r8.cf.code.CfArithmeticBinop fromAsm(int):113:113 -> a
     5:5:com.android.tools.r8.cf.code.CfArithmeticBinop fromAsm(int):111:111 -> a
     6:6:com.android.tools.r8.cf.code.CfArithmeticBinop fromAsm(int):109:109 -> a
@@ -8881,21 +8881,21 @@
     23:23:com.android.tools.r8.cf.code.CfArithmeticBinop fromAsm(int):75:75 -> a
     24:24:int getAsmOpcodeTypeOffset(com.android.tools.r8.ir.code.NumericType):142:142 -> a
     24:24:int getAsmOpcode(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x8$a;Lcom/android/tools/r8/internal/xS;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z8$a;Lcom/android/tools/r8/internal/BS;)I"}
     25:37:int getAsmOpcode(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):125:137 -> a
     38:38:void print(com.android.tools.r8.cf.CfPrinter):156:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     39:39:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     40:60:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):186:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     61:61:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203:203 -> a
     62:62:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):200:200 -> a
     63:63:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):197:197 -> a
     64:64:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):194:194 -> a
     65:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:191 -> a
     66:67:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):214:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     68:68:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):160:160 -> a
     68:68:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):215 -> a
     69:70:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):215:216 -> a
@@ -8906,7 +8906,7 @@
     74:74:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):217 -> a
     1:1:int bytecodeSizeUpperBound():175:175 -> x
     1:1:boolean canThrow():180:180 -> y
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.y8:
 # {"id":"sourceFile","fileName":"CfArithmeticBinop.java"}
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfArithmeticBinop$Opcode -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
@@ -8916,62 +8916,62 @@
     3:3:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode.values():30:30 -> <clinit>
     3:3:void <clinit>():125 -> <clinit>
     4:4:void <clinit>():125:125 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.x8$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.z8$a:
 # {"id":"sourceFile","fileName":"CfArithmeticBinop.java"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Mul -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Div -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Rem -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/z8$a;"}
     1:5:void <clinit>():31:35 -> <clinit>
     6:6:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(java.lang.String,int):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.A8:
 # {"id":"sourceFile","fileName":"CfArrayLength.java"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():26:26 -> <init>
     1:1:int getCompareToId():49:49 -> A
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     9:9:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78:78 -> a
     11:15:void com.android.tools.r8.ir.conversion.IRBuilder.addArrayLength(int,int):1153:1157 -> a
     11:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):77 -> a
     16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():44:44 -> x
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.B8:
 # {"id":"sourceFile","fileName":"CfArrayLoad.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.MemberType):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     1:1:int getCompareToId():35:35 -> A
     1:19:int getLoadType():39:57 -> V
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     2:2:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     3:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):82:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     7:7:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86:88 -> a
@@ -8989,10 +8989,10 @@
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93:93 -> a
     18:24:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):100:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     25:25:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):103:103 -> a
     26:26:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     27:27:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     27:27:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):109 -> a
     28:30:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):109:111 -> a
@@ -9011,16 +9011,16 @@
     51:51:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):122:122 -> a
-com.android.tools.r8.cf.code.CfArrayLoadOrStore -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.cf.code.CfArrayLoadOrStore -> com.android.tools.r8.internal.C8:
 # {"id":"sourceFile","fileName":"CfArrayLoadOrStore.java"}
     com.android.tools.r8.ir.code.MemberType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.MemberType):19:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     1:1:com.android.tools.r8.ir.code.MemberType getType():58:58 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sN;"}
     1:19:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):35:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     20:20:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):51:51 -> a
@@ -9032,30 +9032,30 @@
     26:26:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):39:39 -> a
     27:27:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):37:37 -> a
     28:28:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     29:29:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:int bytecodeSizeUpperBound():26:26 -> x
     1:1:boolean canThrow():31:31 -> y
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.D8:
 # {"id":"sourceFile","fileName":"CfArrayStore.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.MemberType):28:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     1:1:int getCompareToId():33:33 -> A
     1:19:int getStoreType():47:65 -> V
     1:1:com.android.tools.r8.cf.code.CfArrayStore asArrayStore():43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D8;"}
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     3:3:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):90:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     7:7:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93:93 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     10:10:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):102 -> a
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):102:102 -> a
@@ -9064,7 +9064,7 @@
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.MemberType):151:151 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):102 -> a
     19:21:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):102:104 -> a
-com.android.tools.r8.cf.code.CfAssignability -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.cf.code.CfAssignability -> com.android.tools.r8.internal.H8:
 # {"id":"sourceFile","fileName":"CfAssignability.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -9075,7 +9075,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:5:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):32:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;Lcom/android/tools/r8/internal/Sq;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;Lcom/android/tools/r8/internal/Uq;)Z"}
     6:6:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType):43:43 -> a
     6:6:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):36 -> a
     7:7:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
@@ -9108,13 +9108,13 @@
     42:42:boolean internalIsClassTypeAssignableToClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):123:123 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     43:43:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.ValueType):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ol0;)Z"}
     44:60:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):150:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ry;Lcom/android/tools/r8/internal/ry;)Lcom/android/tools/r8/internal/C8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ty;Lcom/android/tools/r8/internal/ty;)Lcom/android/tools/r8/internal/E8;"}
     61:65:com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult reportFailedAssignabilityResult(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,int):175:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ry;Lcom/android/tools/r8/internal/ry;Lcom/android/tools/r8/internal/Sq;Lcom/android/tools/r8/internal/Sq;I)Lcom/android/tools/r8/internal/D8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ty;Lcom/android/tools/r8/internal/ty;Lcom/android/tools/r8/internal/Uq;Lcom/android/tools/r8/internal/Uq;I)Lcom/android/tools/r8/internal/F8;"}
     66:94:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque):191:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Deque;Ljava/util/Deque;)Lcom/android/tools/r8/internal/C8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Deque;Ljava/util/Deque;)Lcom/android/tools/r8/internal/E8;"}
     1:2:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):87:88 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     3:7:boolean hasIntVerificationType(com.android.tools.r8.graph.DexType):136:140 -> b
@@ -9135,23 +9135,23 @@
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayElementType(com.android.tools.r8.graph.DexItemFactory):524:524 -> b
     34:34:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):110 -> b
     35:45:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):109:119 -> b
-com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult -> com.android.tools.r8.internal.E8:
 # {"id":"sourceFile","fileName":"CfAssignability.java"}
     1:1:void <init>():222:222 -> <init>
     1:1:com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult asFailed():233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F8;"}
     1:1:boolean isFailed():0:0 -> b
-com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult -> com.android.tools.r8.internal.F8:
 # {"id":"sourceFile","fileName":"CfAssignability.java"}
     java.lang.String message -> a
     1:2:void <init>(java.lang.String):249:250 -> <init>
     1:1:com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult asFailed():264:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F8;"}
     1:1:java.lang.String getMessage():254:254 -> c
-com.android.tools.r8.cf.code.CfAssignability$SuccessfulAssignabilityResult -> com.android.tools.r8.internal.E8:
+com.android.tools.r8.cf.code.CfAssignability$SuccessfulAssignabilityResult -> com.android.tools.r8.internal.G8:
 # {"id":"sourceFile","fileName":"CfAssignability.java"}
     1:1:void <init>():237:237 -> <init>
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.M8:
 # {"id":"sourceFile","fileName":"CfCheckCast.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -9165,12 +9165,12 @@
     1:1:boolean isCheckCast():142:142 -> C
     1:1:boolean isTypeInstruction():55:55 -> T
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     2:2:boolean ignoreCompatRules():45:45 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):65 -> a
     3:3:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):65:65 -> a
     4:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     5:5:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):76 -> a
     6:6:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):81:81 -> a
@@ -9178,73 +9178,73 @@
     7:7:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):81 -> a
     8:9:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):95:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     10:10:void print(com.android.tools.r8.cf.CfPrinter):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     11:11:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     12:12:boolean ignoreCompatRules():45:45 -> a
     12:12:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):112 -> a
     13:13:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):112:112 -> a
     14:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     16:16:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):124 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:125 -> a
     18:18:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Ja;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/La;)V"}
     19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addCheckCast(int,com.android.tools.r8.graph.DexType):1172:1172 -> a
     19:19:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:21:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):136:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfCheckCast asCheckCast():147:147 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M8;"}
     1:1:com.android.tools.r8.graph.DexType getType():60:60 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():50:50 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():101:101 -> x
     1:1:boolean canThrow():117:117 -> y
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.U8:
 # {"id":"sourceFile","fileName":"CfCmp.java"}
     com.android.tools.r8.ir.code.Cmp$Bias bias -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gd;"}
     com.android.tools.r8.ir.code.NumericType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:8:void <init>(com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.NumericType):35:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ed;Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gd;Lcom/android/tools/r8/internal/BS;)V"}
     1:1:int getCompareToId():47:47 -> A
     1:9:int getAsmOpcode():87:95 -> U
     10:10:int getAsmOpcode():91:91 -> U
     1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():62:62 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gd;"}
     1:1:com.android.tools.r8.ir.code.NumericType getType():66:66 -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BS;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):59:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:com.android.tools.r8.cf.code.CfCmp fromAsm(int):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/S8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/U8;"}
     4:4:com.android.tools.r8.cf.code.CfCmp fromAsm(int):80:80 -> a
     5:5:com.android.tools.r8.cf.code.CfCmp fromAsm(int):78:78 -> a
     6:6:com.android.tools.r8.cf.code.CfCmp fromAsm(int):76:76 -> a
     7:7:com.android.tools.r8.cf.code.CfCmp fromAsm(int):74:74 -> a
     8:8:com.android.tools.r8.cf.code.CfCmp fromAsm(int):72:72 -> a
     9:9:void print(com.android.tools.r8.cf.CfPrinter):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     10:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     11:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     14:14:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127:127 -> a
     16:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):134:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):160:160 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):135 -> a
     19:20:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):135:136 -> a
@@ -9252,29 +9252,29 @@
     21:21:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):136 -> a
     22:22:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):137:137 -> a
     1:1:int bytecodeSizeUpperBound():120:120 -> x
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.R8:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.T8:
 # {"id":"sourceFile","fileName":"CfCmp.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():87 -> <clinit>
     2:2:void <clinit>():87:87 -> <clinit>
-com.android.tools.r8.cf.code.CfConditionalJumpInstruction -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.cf.code.CfConditionalJumpInstruction -> com.android.tools.r8.internal.W8:
 # {"id":"sourceFile","fileName":"CfConditionalJumpInstruction.java"}
     com.android.tools.r8.ir.code.IfType kind -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.ValueType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.cf.code.CfLabel target -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     1:4:void <init>(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):16:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/internal/M9;)V"}
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():43:43 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:boolean isConditionalJump():29:29 -> D
     1:1:boolean isJumpWithNormalTarget():34:34 -> O
     1:1:boolean hasFallthrough():52:52 -> U
     1:1:int bytecodeSizeUpperBound():24:24 -> x
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.X8:
 # {"id":"sourceFile","fileName":"CfConstClass.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -9288,7 +9288,7 @@
     1:1:int getCompareToId():63:63 -> A
     1:1:boolean isTypeInstruction():84:84 -> T
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69 -> a
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
@@ -9296,15 +9296,15 @@
     4:4:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74 -> a
     5:5:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     6:6:void <init>(com.android.tools.r8.graph.DexType):36:36 -> a
     6:6:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):94 -> a
     7:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     8:8:void print(com.android.tools.r8.cf.CfPrinter):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     9:15:java.lang.String getInternalName(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):128:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/String;"}
     16:16:java.lang.String getInternalName(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):132:132 -> a
     17:17:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):141:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
@@ -9312,32 +9312,32 @@
     18:18:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):141 -> a
     19:19:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):141:141 -> a
     20:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     21:21:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     21:21:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146 -> a
     22:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:146 -> a
     23:23:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfConstClass asConstClass():54:54 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X8;"}
     1:1:com.android.tools.r8.graph.DexType getType():89:89 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():79:79 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():114:114 -> x
     1:1:boolean canThrow():124:124 -> y
-com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.Y8:
 # {"id":"sourceFile","fileName":"CfConstDynamic.java"}
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ug;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():41:41 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference):45:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ug;)V"}
     1:1:int getCompareToId():88:88 -> A
     1:1:boolean isTypeInstruction():109:109 -> T
     1:1:com.android.tools.r8.cf.code.CfConstDynamic fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/og;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/W8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qg;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/Y8;"}
     2:2:int com.android.tools.r8.org.objectweb.asm.ConstantDynamic.getBootstrapMethodArgumentCount():109:109 -> a
     2:2:com.android.tools.r8.cf.code.CfConstDynamic fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):80 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -9345,13 +9345,13 @@
     3:3:com.android.tools.r8.cf.code.CfConstDynamic fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):80 -> a
     4:6:com.android.tools.r8.cf.code.CfConstDynamic fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):80:82 -> a
     7:7:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     8:8:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):99:99 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     9:9:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     10:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     11:11:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference.getBootstrapMethod():106:106 -> a
     11:11:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -9378,7 +9378,7 @@
     31:33:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):148 -> a
     34:36:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):149:151 -> a
     37:37:void print(com.android.tools.r8.cf.CfPrinter):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     38:38:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):180:180 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference.getType():102:102 -> a
@@ -9394,21 +9394,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:47:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):183:183 -> a
     48:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):188:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     49:49:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):195:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfConstDynamic asConstDynamic():51:51 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y8;"}
     1:1:com.android.tools.r8.graph.DexType getType():114:114 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference.getType():102:102 -> getType
     2:2:com.android.tools.r8.graph.DexType getType():114 -> getType
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():104:104 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():164:164 -> x
     1:1:boolean canThrow():174:174 -> y
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.Z8:
 # {"id":"sourceFile","fileName":"CfConstMethodHandle.java"}
     com.android.tools.r8.graph.DexMethodHandle handle -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y2;"}
@@ -9416,29 +9416,29 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y2;)V"}
     1:1:int getCompareToId():43:43 -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     5:5:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):123:123 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:71 -> a
     7:7:void print(com.android.tools.r8.cf.CfPrinter):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     9:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):99:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     11:11:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100:100 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):99:99 -> a
     14:14:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():77:77 -> x
     1:1:boolean canThrow():94:94 -> y
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.a9:
 # {"id":"sourceFile","fileName":"CfConstMethodType.java"}
     com.android.tools.r8.graph.DexProto type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
@@ -9447,60 +9447,60 @@
     1:1:int getCompareToId():43:43 -> A
     1:1:com.android.tools.r8.graph.DexProto getType():38:38 -> a
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:69 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getType(java.lang.String):177:177 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69:69 -> a
     6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     8:8:void print(com.android.tools.r8.cf.CfPrinter):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     12:12:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98:98 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:97 -> a
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():75:75 -> x
     1:1:boolean canThrow():92:92 -> y
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.b9:
 # {"id":"sourceFile","fileName":"CfConstNull.java"}
     1:1:void <init>():26:26 -> <init>
     1:1:int getCompareToId():49:49 -> A
     1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     6:6:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):70 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):70:70 -> a
     8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1226:1226 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):70 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():44:44 -> x
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.b9:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.d9:
 # {"id":"sourceFile","fileName":"CfConstNumber.java"}
     long value -> c
     com.android.tools.r8.ir.code.ValueType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:4:void <init>(long,com.android.tools.r8.ir.code.ValueType):37:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/kl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/ol0;)V"}
     1:1:int getCompareToId():45:45 -> A
     1:2:double getDoubleValue():83:84 -> U
     1:2:float getFloatValue():78:79 -> V
@@ -9508,17 +9508,17 @@
     1:2:long getLongValue():73:74 -> X
     1:1:long getRawValue():64:64 -> Y
     1:1:com.android.tools.r8.ir.code.ValueType getType():60:60 -> Z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):34:34 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56 -> a
     5:57:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):98:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     58:65:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):138:145 -> a
     66:66:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):140:140 -> a
     67:67:boolean isNegativeZeroDouble(double):213:213 -> a
@@ -9533,14 +9533,14 @@
     85:85:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):117:117 -> a
     86:94:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):101:109 -> a
     95:95:void print(com.android.tools.r8.cf.CfPrinter):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     96:96:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     97:97:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
     97:97:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227 -> a
     98:98:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):227:227 -> a
     99:99:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):234:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     100:100:boolean com.android.tools.r8.ir.code.ValueType.isPrimitive():43:43 -> a
     100:100:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -9556,13 +9556,13 @@
     57:57:int bytecodeSizeUpperBound():190 -> x
     58:58:int bytecodeSizeUpperBound():176:176 -> x
     59:59:int bytecodeSizeUpperBound():159:159 -> x
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.c9:
 # {"id":"sourceFile","fileName":"CfConstNumber.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():98 -> <clinit>
     2:2:void <clinit>():98:98 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.c9:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.e9:
 # {"id":"sourceFile","fileName":"CfConstString.java"}
     com.android.tools.r8.graph.DexString string -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -9572,64 +9572,64 @@
     1:1:com.android.tools.r8.graph.DexString getString():50:50 -> U
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):177:177 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):41 -> a
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     5:5:void print(com.android.tools.r8.cf.CfPrinter):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     6:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     8:8:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:101 -> a
     10:12:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1264 -> a
     10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100 -> a
     13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfConstString asConstString():59:59 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e9;"}
     1:1:int bytecodeSizeUpperBound():84:84 -> x
     1:1:boolean canThrow():95:95 -> y
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.i9:
 # {"id":"sourceFile","fileName":"CfDexItemBasedConstString.java"}
     com.android.tools.r8.graph.DexReference item -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F2;"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):35:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     1:1:int getCompareToId():42:42 -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):109:110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     7:7:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):110 -> a
     8:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):110:111 -> a
     10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):117:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     12:12:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:118 -> a
     14:17:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1269:1272 -> a
     14:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):117 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():92:92 -> x
     1:1:boolean canThrow():103:103 -> y
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.j9:
 # {"id":"sourceFile","fileName":"CfFieldInstruction.java"}
     com.android.tools.r8.graph.DexField field -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -9645,66 +9645,66 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     int getOpcode() -> V
     com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     1:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):30:32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:com.android.tools.r8.cf.code.CfFieldInstruction create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     5:5:com.android.tools.r8.cf.code.CfFieldInstruction create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):55:55 -> a
     6:6:com.android.tools.r8.cf.code.CfFieldInstruction create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):53:53 -> a
     7:7:com.android.tools.r8.cf.code.CfFieldInstruction create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):51:51 -> a
     8:8:com.android.tools.r8.cf.code.CfFieldInstruction create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):49:49 -> a
     9:9:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     10:10:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):84:84 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     11:11:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     11:11:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):84 -> a
     12:17:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):110:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     18:18:void print(com.android.tools.r8.cf.CfPrinter):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction():91:91 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
     1:1:com.android.tools.r8.graph.DexField getField():62:62 -> getField
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     1:1:int bytecodeSizeUpperBound():120:120 -> x
     1:1:boolean canThrow():130:130 -> y
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.k9:
 # {"id":"sourceFile","fileName":"CfFrame.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap locals -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ty;"}
     java.util.Deque stack -> d
     java.util.Deque EMPTY_STACK -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ou;"}
     boolean $assertionsDisabled -> f
     1:4:void <clinit>():46:49 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):89:90 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     3:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,java.util.Deque):101:103 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;Ljava/util/ArrayDeque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;Ljava/util/ArrayDeque;)V"}
     6:10:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,java.util.Deque):107:111 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ry;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ty;Ljava/util/Deque;)V"}
     1:1:int getCompareToId():63:63 -> A
     1:1:boolean isFrame():53:53 -> H
     1:1:com.android.tools.r8.cf.code.CfFrame$Builder builder():115:115 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i9$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k9$a;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap getLocals():136:136 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ty;"}
     1:2:java.util.ArrayDeque getMutableStack():149:150 -> W
     1:1:java.util.Deque getStack():145:145 -> X
     1:1:com.android.tools.r8.cf.code.CfFrame mutableCopy():124:124 -> Y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k9;"}
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):130:131 -> Y
     2:3:com.android.tools.r8.cf.code.CfFrame mutableCopy():124 -> Y
     4:4:com.android.tools.r8.cf.code.CfFrame mutableCopy():124:124 -> Y
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):77:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:int computeStackCount():200:200 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):187 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:11:java.lang.Object[] computeStackTypes(int,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):213:220 -> a
     4:11:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):188 -> a
     12:21:int computeLocalsCount():226:235 -> a
@@ -9756,13 +9756,13 @@
     58:58:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):272 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:59:void print(com.android.tools.r8.cf.CfPrinter):295:295 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     60:60:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):300:300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     61:61:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):310:310 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     62:62:com.android.tools.r8.cf.code.frame.PreciseFrameType getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):315:315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/jX;"}
     63:63:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isUninitializedThis():0:0 -> a
     63:63:com.android.tools.r8.cf.code.frame.PreciseFrameType getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):315 -> a
     64:64:com.android.tools.r8.cf.code.frame.PreciseFrameType getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):315:315 -> a
@@ -9776,7 +9776,7 @@
     69:69:com.android.tools.r8.cf.code.frame.PreciseFrameType getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):319 -> a
     70:71:com.android.tools.r8.cf.code.frame.PreciseFrameType getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):320:321 -> a
     72:98:com.android.tools.r8.cf.code.CfFrame mapReferenceTypes(java.util.function.Function):328:354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/i9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/k9;"}
     99:99:com.android.tools.r8.cf.code.frame.FrameType com.android.tools.r8.cf.code.CfFrame$Builder.getLocal(int):408:408 -> a
     99:99:com.android.tools.r8.cf.code.CfFrame mapReferenceTypes(java.util.function.Function):354 -> a
     100:100:boolean com.android.tools.r8.cf.code.CfFrame$Builder.hasLocal(int):404:404 -> a
@@ -9803,14 +9803,14 @@
     14:24:boolean com.android.tools.r8.com.google.common.collect.Iterables.elementsEqual(java.lang.Iterable,java.lang.Iterable):238 -> equals
     14:24:boolean equals(java.lang.Object):163 -> equals
     1:1:com.android.tools.r8.cf.code.CfFrame asFrame():58:58 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k9;"}
     1:3:int hashCode():169:171 -> hashCode
     1:1:java.lang.String toString():290:290 -> toString
     1:1:int bytecodeSizeUpperBound():196:196 -> x
-com.android.tools.r8.cf.code.CfFrame$Builder -> com.android.tools.r8.internal.i9$a:
+com.android.tools.r8.cf.code.CfFrame$Builder -> com.android.tools.r8.internal.k9$a:
 # {"id":"sourceFile","fileName":"CfFrame.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap locals -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ty;"}
     java.util.Deque stack -> b
     boolean hasIncompleteUninitializedNew -> c
     boolean seenStore -> d
@@ -9820,7 +9820,7 @@
     1:3:com.android.tools.r8.cf.code.CfFrame$Builder allocateStack(int):375:377 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     4:5:com.android.tools.r8.cf.code.CfFrame$Builder appendLocal(com.android.tools.r8.cf.code.frame.FrameType):384:385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/internal/i9$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)Lcom/android/tools/r8/internal/k9$a;"}
     6:6:com.android.tools.r8.cf.code.CfFrame$Builder internalStore(int,com.android.tools.r8.cf.code.frame.FrameType):434:434 -> a
     6:6:com.android.tools.r8.cf.code.CfFrame$Builder appendLocal(com.android.tools.r8.cf.code.frame.FrameType):386 -> a
     7:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap ensureMutableLocals():451:454 -> a
@@ -9829,11 +9829,11 @@
     11:11:com.android.tools.r8.cf.code.CfFrame$Builder internalStore(int,com.android.tools.r8.cf.code.frame.FrameType):436:436 -> a
     11:11:com.android.tools.r8.cf.code.CfFrame$Builder appendLocal(com.android.tools.r8.cf.code.frame.FrameType):386 -> a
     12:12:com.android.tools.r8.cf.code.CfFrame$Builder apply(java.util.function.Consumer):390:390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/i9$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/k9$a;"}
     13:14:com.android.tools.r8.cf.code.CfFrame$Builder push(com.android.tools.r8.cf.code.frame.PreciseFrameType):413:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/i9$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/k9$a;"}
     15:15:com.android.tools.r8.cf.code.CfFrame$Builder store(int,com.android.tools.r8.cf.code.frame.FrameType):429:429 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/internal/i9$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Uq;)Lcom/android/tools/r8/internal/k9$a;"}
     16:16:com.android.tools.r8.cf.code.CfFrame$Builder internalStore(int,com.android.tools.r8.cf.code.frame.FrameType):434:434 -> a
     16:16:com.android.tools.r8.cf.code.CfFrame$Builder store(int,com.android.tools.r8.cf.code.frame.FrameType):430 -> a
     17:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap ensureMutableLocals():451:454 -> a
@@ -9842,26 +9842,26 @@
     21:21:com.android.tools.r8.cf.code.CfFrame$Builder internalStore(int,com.android.tools.r8.cf.code.frame.FrameType):436:436 -> a
     21:21:com.android.tools.r8.cf.code.CfFrame$Builder store(int,com.android.tools.r8.cf.code.frame.FrameType):430 -> a
     22:22:com.android.tools.r8.cf.code.CfFrame build():441:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k9;"}
     1:2:void ensureMutableStack():458:459 -> b
-com.android.tools.r8.cf.code.CfFrameUtils -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.cf.code.CfFrameUtils -> com.android.tools.r8.internal.m9:
 # {"id":"sourceFile","fileName":"CfFrameUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:18:void storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):16:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Sq;Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Uq;Lcom/android/tools/r8/internal/Ix;)V"}
     19:27:boolean verifyLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):38:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ry;)V"}
-com.android.tools.r8.cf.code.CfFrameVerifier -> com.android.tools.r8.internal.m9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ty;)V"}
+com.android.tools.r8.cf.code.CfFrameVerifier -> com.android.tools.r8.internal.o9:
 # {"id":"sourceFile","fileName":"CfFrameVerifier.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.CfCode code -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig config -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u8;"}
     com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer eventConsumer -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q9;"}
     com.android.tools.r8.graph.DexItemFactory factory -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.ProgramMethod method -> f
@@ -9872,17 +9872,17 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer,com.android.tools.r8.graph.ProgramMethod):51:51 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/o9;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/q9;Lcom/android/tools/r8/graph/C5;)V"}
     2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer,com.android.tools.r8.graph.ProgramMethod):43:58 -> <init>
     18:21:java.util.Set com.android.tools.r8.graph.CfCode.getTryCatchRangeLabels():283:286 -> <init>
     18:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer,com.android.tools.r8.graph.ProgramMethod):58 -> <init>
     22:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer,com.android.tools.r8.graph.ProgramMethod):58:58 -> <init>
     1:1:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():904:904 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():910:910 -> a
     2:2:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():66 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():904 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():910 -> a
     3:3:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():66 -> a
     4:11:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():66:73 -> a
     12:21:com.android.tools.r8.utils.TraversalContinuation buildLabelToFrameMap():171:180 -> a
@@ -10104,7 +10104,7 @@
     213:213:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():159 -> a
     214:214:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus run():148:148 -> a
     215:215:com.android.tools.r8.utils.TraversalContinuation lambda$run$0(com.android.tools.r8.cf.code.CfInstruction,java.util.Map,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Ljava/util/Map;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Ljava/util/Map;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     216:216:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     216:216:com.android.tools.r8.utils.TraversalContinuation lambda$run$0(com.android.tools.r8.cf.code.CfInstruction,java.util.Map,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):133 -> a
     217:218:com.android.tools.r8.utils.TraversalContinuation lambda$run$0(com.android.tools.r8.cf.code.CfInstruction,java.util.Map,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):133:134 -> a
@@ -10116,7 +10116,7 @@
     224:224:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     224:224:com.android.tools.r8.utils.TraversalContinuation lambda$run$0(com.android.tools.r8.cf.code.CfInstruction,java.util.Map,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):136 -> a
     225:225:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus fail(com.android.tools.r8.utils.TraversalContinuation):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;)V"}
     226:226:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     226:226:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus fail(com.android.tools.r8.utils.TraversalContinuation):213 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10124,28 +10124,28 @@
     229:229:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus fail(com.android.tools.r8.graph.CfCodeDiagnostics):218:218 -> a
     229:229:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus fail(com.android.tools.r8.utils.TraversalContinuation):214 -> a
     230:236:void updateActiveCatchHandlers(com.android.tools.r8.cf.code.CfLabel):223:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     237:237:boolean lambda$updateActiveCatchHandlers$1(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfTryCatch):229:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/Ya;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/ab;)Z"}
     238:253:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch,java.util.Map):251:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;Ljava/util/Map;)Lcom/android/tools/r8/graph/H;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;Ljava/util/Map;)Lcom/android/tools/r8/graph/H;"}
     254:264:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch,java.util.Map):265:275 -> a
     265:265:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch,java.util.Map):272:272 -> a
     266:280:boolean isFinalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):374:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Z"}
 com.android.tools.r8.cf.code.CfFrameVerifier$Builder -> R8$$REMOVED$$CLASS$$0:
 # {"id":"sourceFile","fileName":"CfFrameVerifier.java"}
 com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus -> R8$$REMOVED$$CLASS$$1:
 # {"id":"sourceFile","fileName":"CfFrameVerifier.java"}
-com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.n9:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:boolean com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus.isInvalidOrNotPresent():414:414 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Z"}
-com.android.tools.r8.cf.code.CfFrameVerifierDefaultAnalysisConfig -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.cf.code.CfFrameVerifierDefaultAnalysisConfig -> com.android.tools.r8.internal.p9:
 # {"id":"sourceFile","fileName":"CfFrameVerifierDefaultAnalysisConfig.java"}
     com.android.tools.r8.cf.code.CfAssignability assignability -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H8;"}
     com.android.tools.r8.graph.CfCode code -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G;"}
     com.android.tools.r8.graph.ProgramMethod method -> c
@@ -10163,24 +10163,24 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:int getMaxLocals():41:41 -> d
     1:1:com.android.tools.r8.cf.code.CfAssignability getAssignability():31:31 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F8;"}
-com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer -> com.android.tools.r8.internal.o9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H8;"}
+com.android.tools.r8.cf.code.CfFrameVerifierEventConsumer -> com.android.tools.r8.internal.q9:
 # {"id":"sourceFile","fileName":"CfFrameVerifierEventConsumer.java"}
     void acceptError(com.android.tools.r8.graph.CfCodeDiagnostics) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H;)V"}
     1:1:void acceptInstructionState(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)V"}
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.p9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)V"}
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.r9:
 # {"id":"sourceFile","fileName":"CfGoto.java"}
     com.android.tools.r8.cf.code.CfLabel target -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):31:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     1:1:int getCompareToId():37:37 -> A
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():68:68 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10189,28 +10189,28 @@
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     7:7:void print(com.android.tools.r8.cf.CfPrinter):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():95:95 -> x
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.t9:
 # {"id":"sourceFile","fileName":"CfIf.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/internal/M9;)V"}
     1:1:int getCompareToId():38:38 -> A
     1:15:int getOpcode():66:80 -> V
     16:16:int getOpcode():78:78 -> V
     17:17:int getOpcode():68:68 -> V
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):44:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10219,15 +10219,15 @@
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     8:9:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     10:10:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalTargets$0(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.TraversalContinuation$Continue):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/Jh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/Oh0;"}
     11:11:void print(com.android.tools.r8.cf.CfPrinter):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     12:12:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     13:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     15:15:int com.android.tools.r8.ir.conversion.CfSourceCode.getCurrentInstructionIndex():571:571 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106 -> a
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107:107 -> a
@@ -10264,23 +10264,23 @@
     27:32:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,int,int,int):1449 -> a
     27:32:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107 -> a
     33:33:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.q9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.s9:
 # {"id":"sourceFile","fileName":"CfIf.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():66:66 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.v9:
 # {"id":"sourceFile","fileName":"CfIfCmp.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/internal/M9;)V"}
     1:1:int getCompareToId():38:38 -> A
     1:15:int getOpcode():66:80 -> V
     16:16:int getOpcode():78:78 -> V
     17:17:int getOpcode():68:68 -> V
     1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):44:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10289,15 +10289,15 @@
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     8:9:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     10:10:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalTargets$0(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.TraversalContinuation$Continue):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/Jh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/Oh0;"}
     11:11:void print(com.android.tools.r8.cf.CfPrinter):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     12:12:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     13:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     16:16:int com.android.tools.r8.ir.conversion.CfSourceCode.getCurrentInstructionIndex():571:571 -> a
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):109:109 -> a
@@ -10334,12 +10334,12 @@
     31:36:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1420 -> a
     31:36:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):109 -> a
     37:37:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.s9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.u9:
 # {"id":"sourceFile","fileName":"CfIfCmp.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():66:66 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.w9:
 # {"id":"sourceFile","fileName":"CfIinc.java"}
     int var -> c
     int increment -> d
@@ -10350,22 +10350,22 @@
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     6:6:void print(com.android.tools.r8.cf.CfPrinter):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     7:7:int getLocalIndex():85:85 -> a
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):101:101 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):100:100 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     11:11:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.read(int):209:209 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10373,7 +10373,7 @@
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
     13:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94:95 -> a
     1:1:int bytecodeSizeUpperBound():76:76 -> x
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.x9:
 # {"id":"sourceFile","fileName":"CfInitClass.java"}
     com.android.tools.r8.graph.DexType clazz -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -10381,7 +10381,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:int getCompareToId():49:49 -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55 -> a
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):60:60 -> a
@@ -10389,11 +10389,11 @@
     4:4:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):60 -> a
     5:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):81:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     11:11:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102:102 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     13:13:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
     14:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:113 -> a
@@ -10403,11 +10403,11 @@
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addInitClass(int,com.android.tools.r8.graph.DexType):1853 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113 -> a
     19:19:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     20:20:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfInitClass):351:351 -> a
     20:20:void print(com.android.tools.r8.cf.CfPrinter):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     21:21:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfInitClass):352:352 -> a
     21:21:void print(com.android.tools.r8.cf.CfPrinter):96 -> a
     22:22:com.android.tools.r8.graph.DexType getClassValue():40:40 -> a
@@ -10418,7 +10418,7 @@
     23:23:void print(com.android.tools.r8.cf.CfPrinter):96 -> a
     1:1:int bytecodeSizeUpperBound():91:91 -> x
     1:1:boolean canThrow():107:107 -> y
-com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.y9:
 # {"id":"sourceFile","fileName":"CfInstanceFieldRead.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):28:28 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexField):24 -> <init>
@@ -10427,17 +10427,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     1:1:int getOpcode():33:33 -> V
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):59:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):64:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):65 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):65:65 -> a
     7:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):73:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
-com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.x9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
+com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.z9:
 # {"id":"sourceFile","fileName":"CfInstanceFieldWrite.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):31:31 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexField):27 -> <init>
@@ -10446,22 +10446,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     1:1:int getOpcode():41:41 -> V
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     3:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):67:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     6:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):77:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):78:78 -> a
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     12:14:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(com.android.tools.r8.cf.code.frame.PreciseFrameType):88:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/ro;"}
     15:15:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(com.android.tools.r8.cf.code.frame.PreciseFrameType):86:86 -> a
     1:1:com.android.tools.r8.cf.code.CfInstanceFieldWrite asInstanceFieldPut():56:56 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x9;"}
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.y9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z9;"}
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.A9:
 # {"id":"sourceFile","fileName":"CfInstanceOf.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -10470,9 +10470,9 @@
     1:1:int getCompareToId():59:59 -> A
     1:1:boolean isTypeInstruction():44:44 -> T
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):65 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> a
@@ -10480,13 +10480,13 @@
     5:5:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70 -> a
     6:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):94:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     8:8:void print(com.android.tools.r8.cf.CfPrinter):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):111:111 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):121:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     13:13:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123:123 -> a
@@ -10496,23 +10496,23 @@
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1488 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122 -> a
     19:22:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):130:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.graph.DexType getType():49:49 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf():80:80 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A9;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():39:39 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():100:100 -> x
     1:1:boolean canThrow():116:116 -> y
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.B9:
 # {"id":"sourceFile","fileName":"CfInstruction.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     int getCompareToId() -> A
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():116:116 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:boolean isCheckCast():424:424 -> C
     1:1:boolean isConditionalJump():382:382 -> D
     1:1:boolean isFieldGet():0:0 -> E
@@ -10532,80 +10532,80 @@
     1:1:boolean isThrow():0:0 -> S
     1:1:boolean isTypeInstruction():352:352 -> T
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     void print(com.android.tools.r8.cf.CfPrinter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     2:2:void forEachNormalTarget(java.util.function.Consumer,com.android.tools.r8.cf.code.CfInstruction):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/B9;)V"}
     3:4:com.android.tools.r8.utils.TraversalContinuation lambda$forEachNormalTarget$0(java.util.function.Consumer,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):123:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/z9;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/B9;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     5:7:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):135:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     8:8:boolean isLabel():0:0 -> a
     8:8:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):140 -> a
     9:9:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):140:140 -> a
     10:10:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     10:10:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):141 -> a
     11:11:com.android.tools.r8.cf.code.CfArrayStore asArrayStore():149:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D8;"}
     1:1:com.android.tools.r8.cf.code.CfCheckCast asCheckCast():428:428 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M8;"}
     1:1:com.android.tools.r8.cf.code.CfConstClass asConstClass():436:436 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X8;"}
     1:1:com.android.tools.r8.cf.code.CfConstDynamic asConstDynamic():192:192 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y8;"}
     1:1:com.android.tools.r8.cf.code.CfConstString asConstString():184:184 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e9;"}
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction():200:200 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
     1:1:com.android.tools.r8.cf.code.CfFrame asFrame():292:292 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k9;"}
     1:1:com.android.tools.r8.cf.code.CfInstanceFieldWrite asInstanceFieldPut():232:232 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z9;"}
     1:1:com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf():324:324 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A9;"}
     1:1:com.android.tools.r8.cf.code.CfInvoke asInvoke():252:252 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I9;"}
     1:1:com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic():260:260 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H9;"}
-    1:1:com.android.tools.r8.cf.code.CfJumpInstruction asJump():392:392 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J9;"}
+    1:1:com.android.tools.r8.cf.code.CfJumpInstruction asJump():392:392 -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L9;"}
     1:1:com.android.tools.r8.cf.code.CfLabel asLabel():284:284 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:com.android.tools.r8.cf.code.CfLoad asLoad():308:308 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R9;"}
     1:1:boolean instructionTypeCanThrow():410:410 -> o
     1:1:com.android.tools.r8.cf.code.CfInstruction asCfInstruction():154:154 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B9;"}
     1:1:com.android.tools.r8.dex.code.DexInstruction asDexInstruction():164:164 -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.cf.code.CfNew asNew():176:176 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y9;"}
     1:1:com.android.tools.r8.cf.code.CfPosition asPosition():300:300 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ia;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ka;"}
     1:1:com.android.tools.r8.cf.code.CfRecordFieldValues asRecordFieldValues():168:168 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ua;"}
     1:3:java.lang.String toString():95:97 -> toString
     1:1:com.android.tools.r8.cf.code.CfStaticFieldWrite asStaticFieldPut():240:240 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ra;"}
-    1:1:com.android.tools.r8.cf.code.CfStore asStore():316:316 -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ta;"}
+    1:1:com.android.tools.r8.cf.code.CfStore asStore():316:316 -> v
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Va;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():348:348 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():74:74 -> x
     1:1:boolean canThrow():0:0 -> y
     1:1:boolean emitsIR():0:0 -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.I9:
 # {"id":"sourceFile","fileName":"CfInvoke.java"}
     com.android.tools.r8.graph.DexMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -10628,13 +10628,13 @@
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):67:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     5:5:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73 -> a
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     7:7:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.AppView.codeLens():657:657 -> a
     7:7:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.ir.code.InvokeType.fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):55 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10651,13 +10651,13 @@
     30:35:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):125:130 -> a
     36:36:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):129:129 -> a
     37:37:void print(com.android.tools.r8.cf.CfPrinter):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     38:52:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):147:161 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     53:59:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):149:155 -> a
     60:66:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):152:158 -> a
     67:117:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):208:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     118:161:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):211:254 -> a
     162:165:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245:248 -> a
     166:222:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217:273 -> a
@@ -10665,7 +10665,7 @@
     231:231:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):278:278 -> a
     232:232:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):277:277 -> a
     233:233:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     234:234:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():64:64 -> a
     234:234:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10673,10 +10673,10 @@
     1:3:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):173:175 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:com.android.tools.r8.cf.code.CfInvoke asInvoke():90:90 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I9;"}
     1:1:int bytecodeSizeUpperBound():136:136 -> x
     1:1:boolean canThrow():200:200 -> y
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.J9:
 # {"id":"sourceFile","fileName":"CfInvokeDynamic.java"}
     com.android.tools.r8.graph.DexCallSite callSite -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D0;"}
@@ -10686,11 +10686,11 @@
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():151:151 -> U
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D0;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:14:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):86:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     15:15:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):95:95 -> a
     16:48:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexItemFactory):109:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/graph/B1;)Ljava/lang/Object;"}
@@ -10700,11 +10700,11 @@
     55:61:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexItemFactory):111:117 -> a
     62:84:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexItemFactory):115:137 -> a
     85:85:void print(com.android.tools.r8.cf.CfPrinter):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     86:86:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):157:157 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     87:89:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):167:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     90:92:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):193:195 -> a
     90:92:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
     93:100:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169:176 -> a
@@ -10717,7 +10717,7 @@
     112:112:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):178 -> a
     113:113:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):178:178 -> a
     114:114:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     115:115:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():118:118 -> a
     115:115:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):188 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10731,10 +10731,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     122:126:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):189:193 -> a
     1:1:com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic():56:56 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J9;"}
     1:1:int bytecodeSizeUpperBound():104:104 -> x
     1:1:boolean canThrow():162:162 -> y
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.K9:
 # {"id":"sourceFile","fileName":"CfJsrRet.java"}
     int local -> c
     1:2:void <init>(int):34:35 -> <init>
@@ -10742,24 +10742,24 @@
     1:1:int getCompareToId():40 -> A
     1:1:com.android.tools.r8.errors.CompilationError error():28:28 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     2:2:com.android.tools.r8.errors.CompilationError error():28:28 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:com.android.tools.r8.errors.CompilationError error():28:28 -> a
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     4:4:com.android.tools.r8.errors.CompilationError error():28:28 -> a
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     6:6:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):38:38 -> a
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):85 -> a
     7:7:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfJsrRet):737:737 -> a
     7:7:void print(com.android.tools.r8.cf.CfPrinter):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     8:8:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfJsrRet):738:738 -> a
     8:8:void print(com.android.tools.r8.cf.CfPrinter):75 -> a
     9:9:int getLocal():89:89 -> a
@@ -10770,23 +10770,23 @@
     10:10:void print(com.android.tools.r8.cf.CfPrinter):75 -> a
     1:1:com.android.tools.r8.errors.CompilationError error():28:28 -> x
     1:1:int bytecodeSizeUpperBound():70 -> x
-com.android.tools.r8.cf.code.CfJumpInstruction -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.cf.code.CfJumpInstruction -> com.android.tools.r8.internal.L9:
 # {"id":"sourceFile","fileName":"CfJumpInstruction.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean isJump():11:11 -> N
     1:1:boolean hasFallthrough():24:24 -> U
     1:1:com.android.tools.r8.cf.code.CfJumpInstruction asJump():16:16 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J9;"}
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.K9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L9;"}
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.M9:
 # {"id":"sourceFile","fileName":"CfLabel.java"}
     com.android.tools.r8.org.objectweb.asm.Label label -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     1:3:void <init>():25:27 -> <init>
     1:1:int getCompareToId():38:38 -> A
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():30:33 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/II;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10795,30 +10795,30 @@
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):50:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     5:5:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfLabel asLabel():54:54 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:int bytecodeSizeUpperBound():83:83 -> x
     1:1:boolean emitsIR():93:93 -> z
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.R9:
 # {"id":"sourceFile","fileName":"CfLoad.java"}
     int var -> c
     com.android.tools.r8.ir.code.ValueType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):35:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;I)V"}
     1:1:int getCompareToId():42:42 -> A
     1:13:int getLoadType():57:69 -> U
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
@@ -10827,16 +10827,16 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     6:6:void print(com.android.tools.r8.cf.CfPrinter):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     7:7:int getLocalIndex():113:113 -> a
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):135:135 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):132:132 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     11:11:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.read(int):209:209 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -10848,7 +10848,7 @@
     15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):120 -> a
     16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.FrameType):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/Uq;)Lcom/android/tools/r8/internal/l9;"}
     17:18:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(com.android.tools.r8.cf.code.frame.FrameType):142:143 -> a
     17:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.FrameType):138 -> a
     19:19:int getLocalIndex():113:113 -> a
@@ -10865,37 +10865,37 @@
     27:27:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(com.android.tools.r8.cf.code.frame.FrameType):149 -> a
     27:27:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.FrameType):138 -> a
     1:1:com.android.tools.r8.cf.code.CfLoad asLoad():75:75 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R9;"}
     1:1:int bytecodeSizeUpperBound():100:100 -> x
     1:1:boolean emitsIR():125:125 -> z
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.Q9:
 # {"id":"sourceFile","fileName":"CfLoad.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():57 -> <clinit>
     2:2:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.T9:
 # {"id":"sourceFile","fileName":"CfLogicalBinop.java"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.ir.code.NumericType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:6:void <init>(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):42:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q9;Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;Lcom/android/tools/r8/internal/BS;)V"}
     1:1:int getAsmOpcode():106:106 -> A
     1:1:int getCompareToId():52 -> A
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():71:71 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:com.android.tools.r8.ir.code.NumericType getType():67:67 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BS;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:com.android.tools.r8.cf.code.CfLogicalBinop fromAsm(int):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/R9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/T9;"}
     4:4:com.android.tools.r8.cf.code.CfLogicalBinop fromAsm(int):99:99 -> a
     5:5:com.android.tools.r8.cf.code.CfLogicalBinop fromAsm(int):97:97 -> a
     6:6:com.android.tools.r8.cf.code.CfLogicalBinop fromAsm(int):95:95 -> a
@@ -10910,10 +10910,10 @@
     15:15:com.android.tools.r8.cf.code.CfLogicalBinop fromAsm(int):77:77 -> a
     16:16:int getAsmOpcode():106:106 -> a
     16:16:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     17:17:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):144:144 -> a
     18:32:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):110:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q9;Lcom/android/tools/r8/internal/xS;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;Lcom/android/tools/r8/internal/BS;)I"}
     33:33:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):122:122 -> a
     34:34:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):120:120 -> a
     35:35:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):118:118 -> a
@@ -10921,9 +10921,9 @@
     37:37:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):114:114 -> a
     38:38:int getAsmOpcode(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):112:112 -> a
     39:39:void print(com.android.tools.r8.cf.CfPrinter):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     40:63:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     64:64:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):174:174 -> a
     65:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):171:171 -> a
     66:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):168:168 -> a
@@ -10931,7 +10931,7 @@
     68:68:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):162:162 -> a
     69:69:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):159:159 -> a
     70:82:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):185:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     83:83:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):160:160 -> a
     83:83:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):197 -> a
     84:84:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):198:198 -> a
@@ -10941,45 +10941,45 @@
     87:87:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):306:306 -> a
     87:87:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):199 -> a
     1:1:int bytecodeSizeUpperBound():149:149 -> x
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.S9:
 # {"id":"sourceFile","fileName":"CfLogicalBinop.java"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shr -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Ushr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Or -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Xor -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S9;"}
     1:6:void <clinit>():31:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.U9:
 # {"id":"sourceFile","fileName":"CfMonitor.java"}
     com.android.tools.r8.ir.code.MonitorType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YO;"}
     1:2:void <init>(com.android.tools.r8.ir.code.MonitorType):31:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YO;)V"}
     1:1:int getAsmOpcode():75:75 -> A
     1:1:int getCompareToId():41 -> A
     1:1:com.android.tools.r8.ir.code.MonitorType getType():36:36 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YO;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:int getAsmOpcode():75:75 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     6:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):90:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     8:8:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91 -> a
     9:9:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
@@ -10988,10 +10988,10 @@
     10:11:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1300:1301 -> a
     10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91 -> a
     12:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():71:71 -> x
     1:1:boolean canThrow():85:85 -> y
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.V9:
 # {"id":"sourceFile","fileName":"CfMultiANewArray.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -11007,22 +11007,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:com.android.tools.r8.graph.DexType getType():57:57 -> a
     2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     3:4:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):96:97 -> a
     5:5:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):82:82 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     8:8:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     8:8:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):82 -> a
     9:9:void print(com.android.tools.r8.cf.CfPrinter):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     10:10:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     11:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     14:16:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):193:195 -> a
     14:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126:126 -> a
@@ -11031,84 +11031,84 @@
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126:126 -> a
     20:20:void com.android.tools.r8.ir.conversion.IRBuilder.addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1657:1657 -> a
     20:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     21:21:void com.android.tools.r8.ir.conversion.IRBuilder.addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1657 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     22:22:void com.android.tools.r8.ir.conversion.IRBuilder.addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1657 -> a
     22:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126 -> a
     23:29:void com.android.tools.r8.ir.conversion.IRBuilder.addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1657:1663 -> a
     23:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126 -> a
     30:34:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):133:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.graph.DexType getType():57:57 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():47:47 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():102:102 -> x
     1:1:boolean canThrow():118:118 -> y
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.X9:
 # {"id":"sourceFile","fileName":"CfNeg.java"}
     com.android.tools.r8.ir.code.NumericType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)V"}
     1:1:int getCompareToId():42:42 -> A
     1:14:int getAsmOpcode():81:94 -> U
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:com.android.tools.r8.cf.code.CfNeg fromAsm(int):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/V9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/X9;"}
     6:6:com.android.tools.r8.cf.code.CfNeg fromAsm(int):107:107 -> a
     7:7:com.android.tools.r8.cf.code.CfNeg fromAsm(int):105:105 -> a
     8:8:com.android.tools.r8.cf.code.CfNeg fromAsm(int):103:103 -> a
     9:9:com.android.tools.r8.cf.code.CfNeg fromAsm(int):101:101 -> a
     10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):115:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     12:12:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116:116 -> a
     14:14:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):123:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):160:160 -> a
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):123 -> a
     16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):123:123 -> a
     17:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):306:306 -> a
     17:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):123 -> a
     1:1:int bytecodeSizeUpperBound():72:72 -> x
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.W9:
 # {"id":"sourceFile","fileName":"CfNeg.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():81 -> <clinit>
     2:2:void <clinit>():81:81 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.Y9:
 # {"id":"sourceFile","fileName":"CfNew.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.cf.code.CfLabel label -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfLabel):39:41 -> <init>
     1:3:void <init>(com.android.tools.r8.graph.DexType):36 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     4:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfLabel):39:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/M9;)V"}
     1:1:int getCompareToId():87:87 -> A
     1:1:boolean isTypeInstruction():72:72 -> T
     1:4:com.android.tools.r8.cf.code.CfLabel getLabel():49:52 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:boolean hasLabel():45:45 -> V
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):93 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):98:98 -> a
@@ -11116,13 +11116,13 @@
     5:5:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):98 -> a
     6:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     8:8:void print(com.android.tools.r8.cf.CfPrinter):123:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     11:11:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139:139 -> a
@@ -11132,19 +11132,19 @@
     16:16:void com.android.tools.r8.ir.conversion.IRBuilder.addNewInstance(int,com.android.tools.r8.graph.DexType):1811 -> a
     16:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139 -> a
     17:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     18:18:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):146 -> a
     19:19:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):146:146 -> a
     1:1:com.android.tools.r8.graph.DexType getType():77:77 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfNew asNew():57:57 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y9;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():67:67 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():118:118 -> x
     1:1:boolean canThrow():134:134 -> y
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.Z9:
 # {"id":"sourceFile","fileName":"CfNewArray.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -11156,9 +11156,9 @@
     1:1:boolean isTypeInstruction():48:48 -> T
     1:19:int getPrimitiveTypeCode():78:96 -> U
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
@@ -11166,7 +11166,7 @@
     5:5:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74 -> a
     6:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):130:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     8:9:java.lang.String getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):105:106 -> a
     8:9:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):135 -> a
     10:10:com.android.tools.r8.graph.DexType getType():53:53 -> a
@@ -11183,11 +11183,11 @@
     19:21:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):135 -> a
     22:22:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):133:133 -> a
     23:23:void print(com.android.tools.r8.cf.CfPrinter):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     24:25:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):152:153 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     26:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     28:28:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     28:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):165 -> a
     29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):166:166 -> a
@@ -11205,14 +11205,14 @@
     38:38:void com.android.tools.r8.ir.conversion.IRBuilder.addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1795 -> a
     38:38:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):166 -> a
     39:40:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):173:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.graph.DexType getType():53:53 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():43:43 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():141:141 -> x
     1:1:boolean canThrow():159:159 -> y
-com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.aa:
 # {"id":"sourceFile","fileName":"CfNewUnboxedEnum.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -11222,9 +11222,9 @@
     1:1:int getCompareToId():63:63 -> A
     1:1:boolean isTypeInstruction():48:48 -> T
     1:1:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     2:2:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     3:3:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
@@ -11232,14 +11232,14 @@
     5:5:void com.android.tools.r8.graph.DexType.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74 -> a
     6:6:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):104:104 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     8:8:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):135:135 -> a
     8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     10:10:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114:114 -> a
@@ -11249,11 +11249,11 @@
     15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1819 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
     16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     17:17:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfNewUnboxedEnum):555:555 -> a
     17:17:void print(com.android.tools.r8.cf.CfPrinter):98 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     18:18:void com.android.tools.r8.cf.CfPrinter.print(com.android.tools.r8.cf.code.CfNewUnboxedEnum):556:556 -> a
     18:18:void print(com.android.tools.r8.cf.CfPrinter):98 -> a
     19:19:com.android.tools.r8.graph.DexType getType():53:53 -> a
@@ -11265,27 +11265,27 @@
     1:1:com.android.tools.r8.graph.DexType getType():53:53 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction():43:43 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Za;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
     1:1:int bytecodeSizeUpperBound():93:93 -> x
     1:1:boolean canThrow():109:109 -> y
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.ba:
 # {"id":"sourceFile","fileName":"CfNop.java"}
     1:1:void <init>():25:25 -> <init>
     1:1:int getCompareToId():29:29 -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):41:41 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addNop():1352:1352 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     7:8:void com.android.tools.r8.ir.conversion.IRBuilder.addNop():1352:1353 -> a
     7:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):69 -> a
     9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
@@ -11293,31 +11293,31 @@
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):69 -> a
     1:1:int bytecodeSizeUpperBound():59:59 -> x
     1:1:boolean emitsIR():74:74 -> z
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.da:
 # {"id":"sourceFile","fileName":"CfNumberConversion.java"}
     com.android.tools.r8.ir.code.NumericType from -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType to -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType):33:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/BS;)V"}
     1:1:int getCompareToId():44:44 -> A
     1:53:int getAsmOpcode():91:143 -> U
     54:101:int getAsmOpcode():93:140 -> U
     102:110:int getAsmOpcode():121:129 -> U
     111:119:int getAsmOpcode():110:118 -> U
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ba;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/da;"}
     6:6:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):178:178 -> a
     7:7:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):176:176 -> a
     8:8:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):174:174 -> a
@@ -11334,39 +11334,39 @@
     19:19:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):152:152 -> a
     20:20:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):150:150 -> a
     21:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):186:187 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     23:23:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
     23:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):187 -> a
     24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):187:187 -> a
     25:25:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):194:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     26:26:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):160:160 -> a
     26:26:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):194 -> a
     27:27:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):194:194 -> a
     28:28:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):306:306 -> a
     28:28:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):194 -> a
     1:1:int bytecodeSizeUpperBound():82:82 -> x
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.ca:
 # {"id":"sourceFile","fileName":"CfNumberConversion.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():93 -> <clinit>
     2:2:void <clinit>():93:93 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.ka:
 # {"id":"sourceFile","fileName":"CfPosition.java"}
     com.android.tools.r8.cf.code.CfLabel label -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.ir.code.Position position -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):30:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/TW;)V"}
     1:1:int getCompareToId():37:37 -> A
     1:1:com.android.tools.r8.ir.code.Position getPosition():82:82 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:int lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfPosition):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka;)I"}
     3:4:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):47:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O;Lcom/android/tools/r8/utils/structural/A;)V"}
     5:5:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):46:46 -> a
@@ -11380,11 +11380,11 @@
     8:8:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     8:8:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53 -> a
     9:9:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     10:10:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     12:12:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.conversion.CfSourceCode.getCanonicalPosition(com.android.tools.r8.ir.code.Position):892:892 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -11395,14 +11395,14 @@
     15:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107 -> a
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:108 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$internalAcceptCompareTo$1(com.android.tools.r8.cf.code.CfPosition):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka;)Lcom/android/tools/r8/internal/M9;"}
     1:1:com.android.tools.r8.cf.code.CfPosition asPosition():101:101 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ia;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ka;"}
     1:1:int bytecodeSizeUpperBound():73:73 -> x
     1:1:boolean emitsIR():91:91 -> z
-com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.ua:
 # {"id":"sourceFile","fileName":"CfRecordFieldValues.java"}
     com.android.tools.r8.graph.DexField[] fields -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/l1;"}
@@ -11412,21 +11412,21 @@
     1:1:com.android.tools.r8.graph.DexField[] getFields():72:72 -> U
       # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/graph/l1;"}
     1:1:com.android.tools.r8.graph.DexField[] lambda$specify$0(com.android.tools.r8.cf.code.CfRecordFieldValues):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sa;)[Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ua;)[Lcom/android/tools/r8/graph/l1;"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     6:6:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):93:93 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     7:7:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):93 -> a
     8:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     15:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.wrap(int[],int):152:153 -> a
     15:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.wrap(int[]):166 -> a
     15:16:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106 -> a
@@ -11441,91 +11441,91 @@
     21:21:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107:107 -> a
     22:22:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104:104 -> a
     23:27:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):112:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfRecordFieldValues asRecordFieldValues():63:63 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ua;"}
     1:1:int bytecodeSizeUpperBound():58:58 -> x
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.ya:
 # {"id":"sourceFile","fileName":"CfReturn.java"}
     com.android.tools.r8.ir.code.ValueType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):34:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)V"}
     1:1:int getCompareToId():44:44 -> A
     1:13:int getOpcode():59:71 -> V
     1:1:com.android.tools.r8.ir.code.ValueType getType():39:39 -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     7:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):125:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     11:11:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     11:11:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:int bytecodeSizeUpperBound():77:77 -> x
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.va:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.xa:
 # {"id":"sourceFile","fileName":"CfReturn.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():59 -> <clinit>
     2:2:void <clinit>():59:59 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.xa:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.za:
 # {"id":"sourceFile","fileName":"CfReturnVoid.java"}
     1:1:void <init>():27:27 -> <init>
     1:1:int getCompareToId():39:39 -> A
     1:1:boolean isReturn():79:79 -> R
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     7:7:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     7:7:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:int bytecodeSizeUpperBound():69:69 -> x
-com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.Aa:
 # {"id":"sourceFile","fileName":"CfSafeCheckCast.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Ja;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/La;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1176:1176 -> a
     2:2:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):28:28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     4:4:com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.Fa:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.Ha:
 # {"id":"sourceFile","fileName":"CfStackInstruction.java"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
     1:2:void <init>(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):81:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fa$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ha$a;)V"}
     1:1:int getCompareToId():87:87 -> A
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():126:126 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ha$a;"}
     1:1:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Fa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ha;"}
     2:2:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):71:71 -> a
     3:3:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):69:69 -> a
     4:4:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):67:67 -> a
@@ -11536,15 +11536,15 @@
     9:9:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):57:57 -> a
     10:10:com.android.tools.r8.cf.code.CfStackInstruction fromAsm(int):55:55 -> a
     11:11:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     12:12:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):99:99 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     13:13:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     14:14:void print(com.android.tools.r8.cf.CfPrinter):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     15:137:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     138:157:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):205:224 -> a
     158:173:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):220:235 -> a
     174:174:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> a
@@ -11641,29 +11641,29 @@
     246:246:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> a
     246:246:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):375 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     247:247:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> a
     247:247:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):375 -> a
     248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
     248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):381 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     249:249:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
     249:249:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):381 -> a
     250:250:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
     250:250:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$15(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):449 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
     251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$15(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):449 -> a
     252:252:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):261:261 -> a
     252:252:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$14(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):448 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     253:255:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):262:264 -> a
     253:255:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$14(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):448 -> a
     256:256:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):263:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ja;Lcom/android/tools/r8/internal/Ja;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/La;Lcom/android/tools/r8/internal/La;)V"}
     257:257:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> a
     257:257:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):263 -> a
     258:258:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> a
@@ -11682,11 +11682,11 @@
     266:266:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):274:274 -> a
     266:266:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$12(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):444 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     267:270:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):275:278 -> a
     267:270:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$12(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):444 -> a
     271:271:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ja;Lcom/android/tools/r8/internal/Ja;Lcom/android/tools/r8/internal/Ja;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/La;Lcom/android/tools/r8/internal/La;Lcom/android/tools/r8/internal/La;)V"}
     272:272:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> a
     272:272:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):280 -> a
     273:273:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> a
@@ -11710,11 +11710,11 @@
     284:284:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):289:289 -> a
     284:284:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$11(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):442 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     285:289:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):290:294 -> a
     285:289:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$11(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):442 -> a
     290:393:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):356:459 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     394:394:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):455:455 -> a
     395:395:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):438:438 -> a
     396:396:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):415:415 -> a
@@ -11727,23 +11727,23 @@
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> b
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$3(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):395 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> b
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$3(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):395 -> b
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):261:261 -> b
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$2(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):394 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     4:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):262:264 -> b
     4:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$2(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):394 -> b
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):274:274 -> b
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$7(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):419 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     8:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):275:278 -> b
     8:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$7(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):419 -> b
     12:12:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299:299 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ja;Lcom/android/tools/r8/internal/Ja;Lcom/android/tools/r8/internal/Ja;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/La;Lcom/android/tools/r8/internal/La;Lcom/android/tools/r8/internal/La;)V"}
     13:13:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> b
     13:13:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> b
     14:14:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.ir.conversion.CfState$Slot):165:165 -> b
@@ -11770,75 +11770,75 @@
     27:27:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> b
     27:27:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):314 -> b
     28:28:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$10(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):421:421 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     29:29:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$13(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):440:440 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> c
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$17(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):456 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> c
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$17(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):456 -> c
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> c
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$9(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):422 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> c
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$9(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):422 -> c
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$16(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):446:446 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):261:261 -> d
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$5(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):405 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     2:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):262:264 -> d
     2:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$5(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):405 -> d
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$4(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):392:392 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> e
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$6(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):406 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):244:244 -> e
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$6(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):406 -> e
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$8(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):417:417 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     1:1:int bytecodeSizeUpperBound():117:117 -> x
     1:1:boolean emitsIR():351:351 -> z
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.Ea:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.Ga:
 # {"id":"sourceFile","fileName":"CfStackInstruction.java"}
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] com.android.tools.r8.cf.code.CfStackInstruction$Opcode.values():32:32 -> <clinit>
     1:1:void <clinit>():131 -> <clinit>
     2:2:void <clinit>():131:131 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.Fa$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.Ha$a:
 # {"id":"sourceFile","fileName":"CfStackInstruction.java"}
     int opcode -> b
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Pop -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Pop2 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode DupX1 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode DupX2 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X1 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ha$a;"}
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Fa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ha$a;"}
     1:9:void <clinit>():33:41 -> <clinit>
     10:10:void <clinit>():32:32 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):45:46 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
-com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.Sa:
 # {"id":"sourceFile","fileName":"CfStaticFieldRead.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):27:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
@@ -11848,17 +11848,17 @@
     1:1:boolean isFieldGet():42:42 -> E
     1:1:int getOpcode():37:37 -> V
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     4:4:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.push(com.android.tools.r8.graph.DexType):169:169 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):58 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):58:58 -> a
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
-com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.Ra:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
+com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.Ta:
 # {"id":"sourceFile","fileName":"CfStaticFieldWrite.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):27:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
@@ -11868,28 +11868,28 @@
     1:1:boolean isFieldPut():42:42 -> G
     1:1:int getOpcode():37:37 -> V
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/h9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j9;"}
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Ljava/util/ListIterator;)V"}
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.cf.code.CfStaticFieldWrite asStaticFieldPut():52:52 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ra;"}
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.Ta:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ta;"}
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.Va:
 # {"id":"sourceFile","fileName":"CfStore.java"}
     int var -> c
     com.android.tools.r8.ir.code.ValueType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):33:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;I)V"}
     1:1:int getCompareToId():40:40 -> A
     1:13:int getStoreType():55:67 -> U
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
@@ -11898,16 +11898,16 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):51 -> a
     5:5:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     6:6:void print(com.android.tools.r8.cf.CfPrinter):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     7:7:int getLocalIndex():111:111 -> a
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):130:130 -> a
     9:9:int getLocalIndex():111:111 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):138:138 -> a
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):331:331 -> a
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):138 -> a
@@ -11928,7 +11928,7 @@
     23:23:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):335:335 -> a
     23:23:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):138 -> a
     24:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     26:26:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.write(int,com.android.tools.r8.ir.conversion.CfState$Slot):217:217 -> a
     26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):117 -> a
     27:28:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState.write(int,com.android.tools.r8.ir.conversion.CfState$SlotType):221:222 -> a
@@ -11938,7 +11938,7 @@
     30:30:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):117 -> a
     31:34:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):129:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     35:35:boolean com.android.tools.r8.ir.code.ValueType.isPrimitive():43:43 -> a
     35:35:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -11946,16 +11946,16 @@
     38:38:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):173:173 -> a
     38:38:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):133 -> a
     1:1:com.android.tools.r8.cf.code.CfStore asStore():73:73 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ta;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Va;"}
     1:1:int bytecodeSizeUpperBound():98:98 -> x
     1:1:boolean emitsIR():122:122 -> z
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.Ua:
 # {"id":"sourceFile","fileName":"CfStore.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():55 -> <clinit>
     2:2:void <clinit>():55:55 -> <clinit>
-com.android.tools.r8.cf.code.CfSubtypingAssignability -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.cf.code.CfSubtypingAssignability -> com.android.tools.r8.internal.Wa:
 # {"id":"sourceFile","fileName":"CfSubtypingAssignability.java"}
     boolean allowAnyAssignmentToInterfaceTypes -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView,boolean):23:24 -> <init>
@@ -11965,33 +11965,33 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;I)V"}
     1:9:boolean internalIsClassTypeAssignableToClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):30:38 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.Ya:
 # {"id":"sourceFile","fileName":"CfSwitch.java"}
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ya$a;"}
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     int[] keys -> e
     java.util.List targets -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():33:33 -> <clinit>
     1:7:void <init>(com.android.tools.r8.cf.code.CfSwitch$Kind,com.android.tools.r8.cf.code.CfLabel,int[],java.util.List):42:48 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wa$a;Lcom/android/tools/r8/internal/K9;[ILjava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya$a;Lcom/android/tools/r8/internal/M9;[ILjava/util/ArrayList;)V"}
     1:1:int getCompareToId():63:63 -> A
     1:1:boolean isJumpWithNormalTarget():116:116 -> O
     1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():93:93 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:java.util.List getKeys():97:97 -> W
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():89:89 -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ya$a;"}
     1:1:java.util.List getSwitchTargets():101:101 -> Y
     1:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     3:3:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalTargets$0(java.util.function.BiFunction,com.android.tools.r8.utils.TraversalContinuation$Continue):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Jh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/Oh0;"}
     4:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     6:6:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):74:74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O;Lcom/android/tools/r8/utils/structural/A;)V"}
     7:7:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):46:46 -> a
@@ -11999,7 +11999,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):74:76 -> a
     11:11:int[] lambda$internalAcceptCompareTo$1(com.android.tools.r8.cf.code.CfSwitch):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wa;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)[I"}
     12:12:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     13:13:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
@@ -12011,47 +12011,47 @@
     17:17:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     17:17:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):83 -> a
     18:29:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):130:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     30:30:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):136:136 -> a
     31:31:void print(com.android.tools.r8.cf.CfPrinter):162:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     32:37:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):167:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     38:38:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:9:int bytecodeSizeUpperBound():148:156 -> x
     10:10:int bytecodeSizeUpperBound():150:150 -> x
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.Xa:
 # {"id":"sourceFile","fileName":"CfSwitch.java"}
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] com.android.tools.r8.cf.code.CfSwitch$Kind.values():35:35 -> <clinit>
     1:1:void <clinit>():134 -> <clinit>
     2:2:void <clinit>():134:134 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.Wa$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.Ya$a:
 # {"id":"sourceFile","fileName":"CfSwitch.java"}
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ya$a;"}
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ya$a;"}
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Wa$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ya$a;"}
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.Za:
 # {"id":"sourceFile","fileName":"CfThrow.java"}
     1:1:void <init>():28:28 -> <init>
     1:1:int getCompareToId():40:40 -> A
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Iv;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     4:4:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ta;)V"}
     5:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Ca;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/Ea;)V"}
     7:7:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):96 -> a
     8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> a
@@ -12065,32 +12065,32 @@
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1991:1991 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):96 -> a
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     16:16:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     16:16:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:int bytecodeSizeUpperBound():80:80 -> x
     1:1:boolean canThrow():90:90 -> y
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.ab:
 # {"id":"sourceFile","fileName":"CfTryCatch.java"}
     com.android.tools.r8.cf.code.CfLabel start -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.cf.code.CfLabel end -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     java.util.List guards -> c
     java.util.List targets -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():20:20 -> <clinit>
     1:6:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,java.util.List,java.util.List):26:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/K9;Ljava/util/List;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/M9;Ljava/util/List;Ljava/util/List;)V"}
     7:8:boolean verifyAllNonNull(java.util.List):60:61 -> <init>
     7:8:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,java.util.List,java.util.List):31 -> <init>
     1:1:void forEachTarget(java.util.function.Consumer):44:44 -> a
     2:2:java.util.List getTargets():56:56 -> a
     3:3:int acceptCompareTo(com.android.tools.r8.cf.code.CfTryCatch,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     4:4:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$0(com.android.tools.r8.cf.code.CfTryCatch):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;)Lcom/android/tools/r8/internal/M9;"}
     5:5:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):84:84 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O;Lcom/android/tools/r8/utils/structural/A;)V"}
     6:6:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):46:46 -> a
@@ -12104,25 +12104,25 @@
     13:13:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):91:91 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;)Lcom/android/tools/r8/internal/M9;"}
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):86:86 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;)Ljava/util/Collection;"}
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):87:87 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya;)Ljava/util/Collection;"}
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.Za:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab;)Ljava/util/Collection;"}
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.bb:
 # {"id":"sourceFile","fileName":"CfTypeInstruction.java"}
     com.android.tools.r8.cf.code.CfInstruction withType(com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/B9;"}
     com.android.tools.r8.graph.DexType getType() -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.cf.code.frame.BaseFrameType -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.cf.code.frame.BaseFrameType -> com.android.tools.r8.internal.A5:
 # {"id":"sourceFile","fileName":"BaseFrameType.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():274:274 -> <init>
     1:1:boolean isUninitializedNew():0:0 -> A
     1:1:com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew():221:221 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rj0;"}
     1:1:boolean isSinglePrimitive():128:128 -> C
     1:1:boolean isInitializedNonNullReferenceTypeWithInterfaces():0:0 -> D
     1:1:boolean isWidePrimitive():190:190 -> E
@@ -12133,166 +12133,166 @@
     3:3:boolean isPrecise():96 -> F
     4:4:boolean isPrecise():96:96 -> F
     1:1:com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized():231:231 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oj0;"}
     1:1:boolean isInitializedReferenceType():0:0 -> H
     1:1:com.android.tools.r8.cf.code.frame.NullFrameType asNullType():80:80 -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UR;"}
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():236:236 -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:boolean isInitialized():0:0 -> a
     2:2:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):90:90 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     3:3:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):256:256 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.frame.PrimitiveFrameType asPrimitive():113:113 -> asPrimitive
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QX;"}
     1:1:boolean isSingle():118:118 -> b
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces asInitializedNonNullReferenceTypeWithoutInterfaces():164:164 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rv;"}
     1:1:boolean isTwoWord():0:0 -> d
     1:1:boolean isNullType():0:0 -> e
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType asWidePrimitive():195:195 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:boolean isOneWord():0:0 -> g
     1:1:boolean isWidePrimitiveLow():200:200 -> h
     1:1:com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType():143:143 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sv;"}
     1:1:boolean isPrimitive():108:108 -> isPrimitive
     1:1:boolean isUninitializedThis():0:0 -> j
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():261:261 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():102:102 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     2:2:boolean isOneWord():0:0 -> l
     2:2:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():102 -> l
     3:3:boolean isTwoWord():0:0 -> l
     3:3:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():102 -> l
     4:4:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():102:102 -> l
     1:1:com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType asSinglePrimitive():133:133 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ac0;"}
     1:1:boolean isInitializedNonNullReferenceTypeWithoutInterfaces():0:0 -> n
     1:1:boolean isWide():0:0 -> o
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameType asInitializedNonNullReferenceType():153:153 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces asInitializedNonNullReferenceTypeWithInterfaces():175:175 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ov;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
     1:1:boolean isInitializedNonNullReferenceType():148:148 -> s
     1:1:boolean isWidePrimitiveHigh():205:205 -> t
     1:1:com.android.tools.r8.cf.code.frame.UninitializedThis asUninitializedThis():246:246 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tj0;"}
     1:1:boolean isUninitialized():226:226 -> v
     1:1:com.android.tools.r8.cf.code.frame.WideFrameType asWide():185:185 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/im0;"}
     1:1:int getWidth():210:210 -> x
     2:2:boolean isSingle():118:118 -> x
     2:2:int getWidth():210 -> x
     3:3:int getWidth():210:210 -> x
     1:1:boolean isObject():0:0 -> y
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():123:123 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.BooleanFrameType -> com.android.tools.r8.internal.I6:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.BooleanFrameType -> com.android.tools.r8.internal.K6:
 # {"id":"sourceFile","fileName":"BooleanFrameType.java"}
     com.android.tools.r8.cf.code.frame.BooleanFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K6;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.ByteFrameType -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.cf.code.frame.ByteFrameType -> com.android.tools.r8.internal.H7:
 # {"id":"sourceFile","fileName":"ByteFrameType.java"}
     com.android.tools.r8.cf.code.frame.ByteFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H7;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:boolean hasIntVerificationType():36:36 -> K
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.CharFrameType -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.cf.code.frame.CharFrameType -> com.android.tools.r8.internal.ib:
 # {"id":"sourceFile","fileName":"CharFrameType.java"}
     com.android.tools.r8.cf.code.frame.CharFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ib;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:boolean hasIntVerificationType():36:36 -> K
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.DoubleFrameType -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.cf.code.frame.DoubleFrameType -> com.android.tools.r8.internal.pm:
 # {"id":"sourceFile","fileName":"DoubleFrameType.java"}
     com.android.tools.r8.cf.code.frame.DoubleFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pm;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getHighType():13:13 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getLowType():13:13 -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():61:61 -> getTypeName
     1:1:boolean isWidePrimitiveLow():0:0 -> h
     1:1:boolean isWidePrimitiveHigh():0:0 -> t
-com.android.tools.r8.cf.code.frame.DoubleHighFrameType -> com.android.tools.r8.internal.om:
+com.android.tools.r8.cf.code.frame.DoubleHighFrameType -> com.android.tools.r8.internal.qm:
 # {"id":"sourceFile","fileName":"DoubleHighFrameType.java"}
     com.android.tools.r8.cf.code.frame.DoubleHighFrameType SINGLETON -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/om;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qm;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():51:51 -> getTypeName
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.cf.code.frame.FloatFrameType -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.cf.code.frame.FloatFrameType -> com.android.tools.r8.internal.rq:
 # {"id":"sourceFile","fileName":"FloatFrameType.java"}
     com.android.tools.r8.cf.code.frame.FloatFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rq;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.FrameType -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.cf.code.frame.FrameType -> com.android.tools.r8.internal.Uq:
 # {"id":"sourceFile","fileName":"FrameType.java"}
     int $r8$clinit -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <clinit>():20:20 -> <clinit>
     boolean isUninitializedNew() -> A
     com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew() -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rj0;"}
     boolean isSinglePrimitive() -> C
     boolean isInitializedNonNullReferenceTypeWithInterfaces() -> D
     boolean isWidePrimitive() -> E
     boolean isPrecise() -> F
     com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized() -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oj0;"}
     boolean isInitializedReferenceType() -> H
     com.android.tools.r8.cf.code.frame.NullFrameType asNullType() -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UR;"}
     com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     boolean isInitialized() -> a
     1:1:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Mv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Ov;"}
     2:3:com.android.tools.r8.cf.code.frame.PrimitiveFrameType primitive(com.android.tools.r8.graph.DexType):103:104 -> a
     2:3:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):64 -> a
     4:4:char com.android.tools.r8.graph.DexString.getFirstByteAsChar():58:58 -> a
@@ -12307,7 +12307,7 @@
     7:8:com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType initializedReference(com.android.tools.r8.graph.DexType):77:78 -> a
     7:8:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):66 -> a
     9:9:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/MX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/QX;"}
     10:24:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):114:128 -> a
     25:25:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):126:126 -> a
     26:26:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):124:124 -> a
@@ -12316,59 +12316,59 @@
     29:29:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):118:118 -> a
     30:30:com.android.tools.r8.cf.code.frame.PrimitiveFrameType internalPrimitive(char):116:116 -> a
     31:31:com.android.tools.r8.cf.code.frame.UninitializedNew uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/K9;)Lcom/android/tools/r8/internal/Nj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/M9;)Lcom/android/tools/r8/internal/Rj0;"}
     32:48:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):155:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Mv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Ov;"}
     49:49:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):169:169 -> a
     50:50:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
     51:51:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):165:165 -> a
     52:52:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):163:163 -> a
     53:53:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):158:158 -> a
     54:54:com.android.tools.r8.cf.code.frame.FrameType map(java.util.function.Function):282:282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Sq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Uq;"}
     com.android.tools.r8.cf.code.frame.PrimitiveFrameType asPrimitive() -> asPrimitive
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QX;"}
     boolean isSingle() -> b
     1:3:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces initializedNonNullReference(com.android.tools.r8.graph.DexType):87:89 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Pv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Rv;"}
     com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces asInitializedNonNullReferenceTypeWithoutInterfaces() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rv;"}
     boolean isTwoWord() -> d
     boolean isNullType() -> e
     com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType asWidePrimitive() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     boolean isOneWord() -> g
     boolean isWidePrimitiveLow() -> h
     com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sv;"}
     boolean isPrimitive() -> isPrimitive
     boolean isUninitializedThis() -> j
     com.android.tools.r8.graph.DexType getUninitializedNewType() -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise() -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType asSinglePrimitive() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ac0;"}
     boolean isInitializedNonNullReferenceTypeWithoutInterfaces() -> n
     boolean isWide() -> o
     com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameType asInitializedNonNullReferenceType() -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
     com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces asInitializedNonNullReferenceTypeWithInterfaces() -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ov;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
     1:1:com.android.tools.r8.cf.code.frame.UninitializedThis uninitializedThis():139:139 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     boolean isInitializedNonNullReferenceType() -> s
     boolean isWidePrimitiveHigh() -> t
     com.android.tools.r8.cf.code.frame.UninitializedThis asUninitializedThis() -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tj0;"}
     boolean isUninitialized() -> v
     com.android.tools.r8.cf.code.frame.WideFrameType asWide() -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/im0;"}
     int getWidth() -> x
     boolean isObject() -> y
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.FrameType$1 -> com.android.tools.r8.internal.Rq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.FrameType$1 -> com.android.tools.r8.internal.Tq:
 # {"id":"sourceFile","fileName":"FrameType.java"}
     boolean $assertionsDisabled -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
@@ -12376,52 +12376,52 @@
     1:1:void <clinit>():156 -> <clinit>
     2:2:void <clinit>():156:156 -> <clinit>
     3:3:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.cf.code.frame.InitializedFrameType -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.cf.code.frame.InitializedFrameType -> com.android.tools.r8.internal.Ov:
 # {"id":"sourceFile","fileName":"InitializedFrameType.java"}
-com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameType -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameType -> com.android.tools.r8.internal.Pv:
 # {"id":"sourceFile","fileName":"InitializedNonNullReferenceFrameType.java"}
     1:1:void <init>():13:13 -> <init>
     1:1:boolean isPrecise():48:48 -> F
     1:1:boolean isInitializedReferenceType():23:23 -> H
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getInitializedTypeWithInterfaces(com.android.tools.r8.graph.AppView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     1:1:boolean isInitialized():18:18 -> a
     2:2:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType():13:13 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sv;"}
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():53:53 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameType asInitializedNonNullReferenceType():38:38 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
     1:1:boolean isInitializedNonNullReferenceType():33:33 -> s
     1:1:boolean isObject():43:43 -> y
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():58:58 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces -> com.android.tools.r8.internal.Ov:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces -> com.android.tools.r8.internal.Qv:
 # {"id":"sourceFile","fileName":"InitializedNonNullReferenceFrameTypeWithInterfaces.java"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.graph.DexType initializedTypeCache -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():16:16 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):22:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;)V"}
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):24 -> <init>
     5:6:void <init>(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):24:25 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getInitializedTypeWithInterfaces():54:54 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K30;"}
     1:4:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):41:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     5:5:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getInitializedTypeWithInterfaces():54:54 -> a
     5:5:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getInitializedTypeWithInterfaces(com.android.tools.r8.graph.AppView):50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     6:6:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     7:7:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     8:8:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isNullType():0:0 -> a
     8:8:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):66 -> a
     9:9:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
@@ -12443,9 +12443,9 @@
     1:6:boolean equals(java.lang.Object):89:94 -> equals
     1:1:int hashCode():99:99 -> hashCode
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces asInitializedNonNullReferenceTypeWithInterfaces():36:36 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ov;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
     1:1:java.lang.String toString():104:104 -> toString
-com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces -> com.android.tools.r8.internal.Rv:
 # {"id":"sourceFile","fileName":"InitializedNonNullReferenceFrameTypeWithoutInterfaces.java"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -12459,13 +12459,13 @@
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getInitializedTypeWithInterfaces(com.android.tools.r8.graph.AppView):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     3:17:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):58:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     18:18:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):64:64 -> a
     19:27:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):62:70 -> a
     28:28:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     29:29:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isNullType():0:0 -> a
     29:29:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):79 -> a
     30:30:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
@@ -12484,63 +12484,63 @@
     41:42:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):93 -> a
     43:43:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):83:83 -> a
     1:1:com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces asInitializedNonNullReferenceTypeWithoutInterfaces():37:37 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rv;"}
     1:6:boolean equals(java.lang.Object):102:107 -> equals
     1:1:int hashCode():112:112 -> hashCode
     1:1:java.lang.String toString():117:117 -> toString
-com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType -> com.android.tools.r8.internal.Sv:
 # {"id":"sourceFile","fileName":"InitializedReferenceFrameType.java"}
-com.android.tools.r8.cf.code.frame.IntFrameType -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.cf.code.frame.IntFrameType -> com.android.tools.r8.internal.Wz:
 # {"id":"sourceFile","fileName":"IntFrameType.java"}
     com.android.tools.r8.cf.code.frame.IntFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wz;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:boolean hasIntVerificationType():36:36 -> K
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.LongFrameType -> com.android.tools.r8.internal.HL:
+com.android.tools.r8.cf.code.frame.LongFrameType -> com.android.tools.r8.internal.LL:
 # {"id":"sourceFile","fileName":"LongFrameType.java"}
     com.android.tools.r8.cf.code.frame.LongFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LL;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getHighType():13:13 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getLowType():13:13 -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():61:61 -> getTypeName
     1:1:boolean isWidePrimitiveLow():0:0 -> h
     1:1:boolean isWidePrimitiveHigh():0:0 -> t
-com.android.tools.r8.cf.code.frame.LongHighFrameType -> com.android.tools.r8.internal.IL:
+com.android.tools.r8.cf.code.frame.LongHighFrameType -> com.android.tools.r8.internal.ML:
 # {"id":"sourceFile","fileName":"LongHighFrameType.java"}
     com.android.tools.r8.cf.code.frame.LongHighFrameType SINGLETON -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ML;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():51:51 -> getTypeName
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.cf.code.frame.NullFrameType -> com.android.tools.r8.internal.QR:
+com.android.tools.r8.cf.code.frame.NullFrameType -> com.android.tools.r8.internal.UR:
 # {"id":"sourceFile","fileName":"NullFrameType.java"}
     com.android.tools.r8.cf.code.frame.NullFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UR;"}
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:boolean isPrecise():53:53 -> F
     1:1:com.android.tools.r8.cf.code.frame.NullFrameType asNullType():43:43 -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UR;"}
     1:1:com.android.tools.r8.graph.DexType getInitializedType():72:72 -> a
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
@@ -12548,70 +12548,70 @@
     2:2:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     3:3:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     4:4:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     5:5:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
     5:5:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):91 -> a
     6:9:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):91:94 -> a
     10:10:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):92:92 -> a
     1:1:com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType():15:15 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sv;"}
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():58:58 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     1:1:java.lang.String toString():100:100 -> toString
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():63:63 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.OneWord -> com.android.tools.r8.internal.IU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.OneWord -> com.android.tools.r8.internal.MU:
 # {"id":"sourceFile","fileName":"OneWord.java"}
     com.android.tools.r8.cf.code.frame.OneWord SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MU;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String toString():42:42 -> toString
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():26:26 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.PreciseFrameType -> com.android.tools.r8.internal.fX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.PreciseFrameType -> com.android.tools.r8.internal.jX:
 # {"id":"sourceFile","fileName":"PreciseFrameType.java"}
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:com.android.tools.r8.cf.code.frame.FrameType map(java.util.function.Function):10:10 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Sq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Uq;"}
     2:4:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):15:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/jX;"}
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithoutInterfaces.getInitializedType():46:46 -> a
     5:5:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):17 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:14:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):18:26 -> a
     15:15:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> a
     15:15:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):26 -> a
-com.android.tools.r8.cf.code.frame.PreciseFrameType$1 -> com.android.tools.r8.internal.eX:
+com.android.tools.r8.cf.code.frame.PreciseFrameType$1 -> com.android.tools.r8.internal.iX:
 # {"id":"sourceFile","fileName":"PreciseFrameType.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
-com.android.tools.r8.cf.code.frame.PrimitiveFrameType -> com.android.tools.r8.internal.MX:
+com.android.tools.r8.cf.code.frame.PrimitiveFrameType -> com.android.tools.r8.internal.QX:
 # {"id":"sourceFile","fileName":"PrimitiveFrameType.java"}
     java.lang.String getTypeName() -> getTypeName
-com.android.tools.r8.cf.code.frame.ShortFrameType -> com.android.tools.r8.internal.db0:
+com.android.tools.r8.cf.code.frame.ShortFrameType -> com.android.tools.r8.internal.hb0:
 # {"id":"sourceFile","fileName":"ShortFrameType.java"}
     com.android.tools.r8.cf.code.frame.ShortFrameType SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hb0;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:boolean hasIntVerificationType():36:36 -> K
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.SingleFrameType -> com.android.tools.r8.internal.Tb0:
+com.android.tools.r8.cf.code.frame.SingleFrameType -> com.android.tools.r8.internal.Xb0:
 # {"id":"sourceFile","fileName":"SingleFrameType.java"}
     com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType -> com.android.tools.r8.internal.Wb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType -> com.android.tools.r8.internal.ac0:
 # {"id":"sourceFile","fileName":"SinglePrimitiveFrameType.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean isSinglePrimitive():49:49 -> C
@@ -12619,136 +12619,136 @@
     1:1:boolean hasIntVerificationType():0:0 -> K
     1:1:boolean isInitialized():19:19 -> a
     2:7:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):63:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     1:1:com.android.tools.r8.cf.code.frame.PrimitiveFrameType asPrimitive():39:39 -> asPrimitive
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QX;"}
     1:1:boolean isPrimitive():34:34 -> isPrimitive
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():29:29 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     1:1:com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType asSinglePrimitive():54:54 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ac0;"}
     1:1:java.lang.String toString():73:73 -> toString
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():44:44 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.SingletonFrameType -> com.android.tools.r8.internal.dc0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.SingletonFrameType -> com.android.tools.r8.internal.hc0:
 # {"id":"sourceFile","fileName":"SingletonFrameType.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean equals(java.lang.Object):11:11 -> equals
     1:1:int hashCode():16:16 -> hashCode
-com.android.tools.r8.cf.code.frame.TwoWord -> com.android.tools.r8.internal.Yh0:
+com.android.tools.r8.cf.code.frame.TwoWord -> com.android.tools.r8.internal.ci0:
 # {"id":"sourceFile","fileName":"TwoWord.java"}
     com.android.tools.r8.cf.code.frame.TwoWord SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ci0;"}
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.cf.code.frame.WideFrameType join(com.android.tools.r8.cf.code.frame.WideFrameType):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/em0;)Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/im0;)Lcom/android/tools/r8/internal/im0;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     1:1:java.lang.String toString():50:50 -> toString
     1:1:com.android.tools.r8.cf.code.frame.WideFrameType asWide():29:29 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/im0;"}
     1:1:int getWidth():34:34 -> x
-com.android.tools.r8.cf.code.frame.UninitializedFrameType -> com.android.tools.r8.internal.Kj0:
+com.android.tools.r8.cf.code.frame.UninitializedFrameType -> com.android.tools.r8.internal.Oj0:
 # {"id":"sourceFile","fileName":"UninitializedFrameType.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean isPrecise():17:17 -> F
     1:1:com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized():37:37 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oj0;"}
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():22:22 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     1:1:boolean isUninitialized():32:32 -> v
     1:1:boolean isObject():12:12 -> y
     1:1:com.android.tools.r8.cf.code.frame.SingleFrameType asSingle():27:27 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tb0;"}
-com.android.tools.r8.cf.code.frame.UninitializedNew -> com.android.tools.r8.internal.Nj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+com.android.tools.r8.cf.code.frame.UninitializedNew -> com.android.tools.r8.internal.Rj0:
 # {"id":"sourceFile","fileName":"UninitializedNew.java"}
     com.android.tools.r8.cf.code.CfLabel label -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.graph.DexType type -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):21:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/M9;)V"}
     1:1:com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew():54:54 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rj0;"}
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():39:39 -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     3:3:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     1:5:boolean equals(java.lang.Object):69:73 -> equals
     1:1:int hashCode():78:78 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():44:44 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.cf.code.frame.UninitializedThis -> com.android.tools.r8.internal.Pj0:
+com.android.tools.r8.cf.code.frame.UninitializedThis -> com.android.tools.r8.internal.Tj0:
 # {"id":"sourceFile","fileName":"UninitializedThis.java"}
     com.android.tools.r8.cf.code.frame.UninitializedThis SINGLETON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tj0;"}
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):23:23 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/r0;)Ljava/lang/Object;"}
     3:3:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.frame.SingleFrameType):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tb0;)Lcom/android/tools/r8/internal/Tb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb0;)Lcom/android/tools/r8/internal/Xb0;"}
     1:1:boolean equals(java.lang.Object):52:52 -> equals
     1:1:int hashCode():57:57 -> hashCode
     1:1:java.lang.String toString():62:62 -> toString
     1:1:com.android.tools.r8.cf.code.frame.UninitializedThis asUninitializedThis():38:38 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pj0;"}
-com.android.tools.r8.cf.code.frame.WideFrameType -> com.android.tools.r8.internal.em0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tj0;"}
+com.android.tools.r8.cf.code.frame.WideFrameType -> com.android.tools.r8.internal.im0:
 # {"id":"sourceFile","fileName":"WideFrameType.java"}
     com.android.tools.r8.cf.code.frame.WideFrameType join(com.android.tools.r8.cf.code.frame.WideFrameType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/em0;)Lcom/android/tools/r8/internal/em0;"}
-com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType -> com.android.tools.r8.internal.fm0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/im0;)Lcom/android/tools/r8/internal/im0;"}
+com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType -> com.android.tools.r8.internal.jm0:
 # {"id":"sourceFile","fileName":"WidePrimitiveFrameType.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean isWidePrimitive():51:51 -> E
     1:1:boolean isPrecise():21:21 -> F
     com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getHighType() -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType getLowType() -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:boolean isInitialized():16:16 -> a
     2:2:com.android.tools.r8.cf.code.frame.WideFrameType join(com.android.tools.r8.cf.code.frame.WideFrameType):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/em0;)Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/im0;)Lcom/android/tools/r8/internal/im0;"}
     1:1:com.android.tools.r8.cf.code.frame.PrimitiveFrameType asPrimitive():36:36 -> asPrimitive
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QX;"}
     1:1:com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType asWidePrimitive():56:56 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jm0;"}
     1:1:boolean isPrimitive():31:31 -> isPrimitive
     1:1:com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise():26:26 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jX;"}
     1:1:boolean isWide():41:41 -> o
     1:1:java.lang.String toString():71:71 -> toString
     1:1:com.android.tools.r8.cf.code.frame.WideFrameType asWide():46:46 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/im0;"}
     1:1:int getWidth():61:61 -> x
-com.android.tools.r8.classmerging.ClassMergerGraphLens -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.classmerging.ClassMergerGraphLens -> com.android.tools.r8.internal.Hc:
 # {"id":"sourceFile","fileName":"ClassMergerGraphLens.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):25:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z5;Ljava/util/Map;Lcom/android/tools/r8/internal/V5;Lcom/android/tools/r8/internal/Z5;)V"}
-com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase -> com.android.tools.r8.internal.Ec:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/b6;Ljava/util/Map;Lcom/android/tools/r8/internal/X5;Lcom/android/tools/r8/internal/b6;)V"}
+com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase -> com.android.tools.r8.internal.Gc:
 # {"id":"sourceFile","fileName":"ClassMergerGraphLens.java"}
     1:1:void <init>():28:28 -> <init>
     com.android.tools.r8.classmerging.ClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.MergedClasses) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/Fc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wN;)Lcom/android/tools/r8/internal/Hc;"}
     void commitPendingUpdates() -> a
     void fixupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     void fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.classmerging.ClassMergerSharedData -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.classmerging.ClassMergerSharedData -> com.android.tools.r8.internal.Ic:
 # {"id":"sourceFile","fileName":"ClassMergerSharedData.java"}
     java.util.List extraUnusedArgumentTypes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView):19:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     5:5:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.ofInstance(java.lang.Object):288:288 -> <init>
@@ -12766,26 +12766,26 @@
     13:13:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.ofInstance(java.lang.Object):288:288 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.AppView):27 -> <init>
     14:15:void <init>(com.android.tools.r8.graph.AppView):27:28 -> <init>
-com.android.tools.r8.classmerging.ClassMergerTreeFixer -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.classmerging.ClassMergerTreeFixer -> com.android.tools.r8.internal.Kc:
 # {"id":"sourceFile","fileName":"ClassMergerTreeFixer.java"}
     com.android.tools.r8.classmerging.ClassMergerSharedData classMergerSharedData -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ic;"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase lensBuilder -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ec;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gc;"}
     com.android.tools.r8.graph.classmerging.MergedClasses mergedClasses -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wN;"}
     java.util.Map originalSuperTypes -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet keptSignatures -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureBiMap reservedInterfaceSignatures -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ol;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():46:46 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase,com.android.tools.r8.graph.classmerging.MergedClasses):69:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Ec;Lcom/android/tools/r8/internal/sN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/wN;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase,com.android.tools.r8.graph.classmerging.MergedClasses):57:57 -> <init>
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.classmerging.ClassMergerGraphLens$BuilderBase,com.android.tools.r8.graph.classmerging.MergedClasses):59 -> <init>
@@ -12793,8 +12793,8 @@
     1:1:boolean lambda$fixupDirectMethod$6(com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):0:0 -> a
     1:1:boolean com.android.tools.r8.internal.ClassMergerTreeFixer.lambda$fixupDirectMethod$6(com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/w2;)Z"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":327,"2":328,"3":329},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":327,"2":328,"3":329},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     324:324:boolean lambda$fixupDirectMethod$6(com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):323:323 -> a
     324:324:boolean com.android.tools.r8.internal.ClassMergerTreeFixer.lambda$fixupDirectMethod$6(com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):0 -> a
     325:325:boolean com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.containsValue(java.lang.Object):45:45 -> a
@@ -12812,16 +12812,16 @@
     329:329:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     329:329:boolean lambda$fixupDirectMethod$6(com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):323 -> a
     void traverseProgramClassesDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
     330:341:com.android.tools.r8.classmerging.ClassMergerGraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Fc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Hc;"}
     342:345:java.util.List getRoots():103:106 -> a
     342:345:com.android.tools.r8.classmerging.ClassMergerGraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):91 -> a
     346:353:com.android.tools.r8.classmerging.ClassMergerGraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):91:98 -> a
     354:354:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.DexProgramClass):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)V"}
     355:355:com.android.tools.r8.utils.collections.DexMethodSignatureBiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):161:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;)Lcom/android/tools/r8/internal/Ol;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/internal/Ql;"}
     356:359:com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap createLocallyReservedMethodSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap) -> a
     356:359:com.android.tools.r8.utils.collections.DexMethodSignatureBiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):164 -> a
     360:360:com.android.tools.r8.graph.DexMethodSignature lookupReservedVirtualName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):381:381 -> a
@@ -12965,7 +12965,7 @@
     463:467:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):301:305 -> a
     463:467:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     468:468:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexEncodedMethod):107:107 -> a
     468:468:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):305 -> a
     468:468:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
@@ -13034,7 +13034,7 @@
     508:520:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
     521:521:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):0:0 -> a
     521:521:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":528,"2":529,"3":530},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":528,"2":529,"3":530},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     522:522:boolean com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.containsValue(java.lang.Object):45:45 -> a
     522:522:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):344 -> a
     522:522:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
@@ -13042,7 +13042,7 @@
     523:523:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
     524:524:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):0:0 -> a
     524:524:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":531,"2":532,"3":533},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":531,"2":532,"3":533},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     525:525:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.put(java.lang.Object,java.lang.Object):148:148 -> a
     525:525:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):345 -> a
     525:525:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.internal.DexMethodSignatureBiMap,com.android.tools.r8.internal.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):0 -> a
@@ -13068,7 +13068,7 @@
     533:533:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     533:533:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):345 -> a
     534:534:boolean lambda$fixupDirectMethod$7(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):337:337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/w2;)Z"}
     535:535:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethod):103:103 -> a
     535:535:boolean lambda$fixupDirectMethod$7(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):337 -> a
     536:536:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> a
@@ -13105,7 +13105,7 @@
     548:548:boolean com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.containsValue(java.lang.Object):45:45 -> a
     548:548:boolean lambda$fixupDirectMethod$7(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexMethod):340 -> a
     549:549:boolean lambda$fixupVirtualMethod$8(com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexMethodSignature):416:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/graph/B2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/B2;)Z"}
     550:550:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> a
     550:550:boolean lambda$fixupVirtualMethod$8(com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexMethodSignature):416 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -13169,7 +13169,7 @@
     609:609:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):494:494 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.classmerging.ClassMergerGraphLens lambda$run$0():78:78 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hc;"}
     2:4:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):135:137 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.EnclosingMethodAttribute.getEnclosingType():68:68 -> b
@@ -13232,7 +13232,7 @@
     40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):0 -> b
     41:41:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> b
     41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":283,"2":284,"3":285},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":283,"2":284,"3":285},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     254:254:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):213:213 -> b
     254:254:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.internal.ClassMergerTreeFixer.fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):0 -> b
     255:255:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> b
@@ -13299,7 +13299,7 @@
     285:285:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> b
     285:285:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):210 -> b
     286:289:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):404:407 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     290:290:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.get(java.lang.Object):80:80 -> b
     290:290:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap):407 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -13352,7 +13352,7 @@
     9:9:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):208:208 -> c
     9:9:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):156 -> c
     10:10:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):243:243 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     1:5:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):113:117 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):43:43 -> d
@@ -13360,27 +13360,27 @@
     7:7:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):117:117 -> d
     8:8:void preprocess():128:128 -> d
     9:9:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):171:171 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap,com.android.tools.r8.graph.DexEncodedMethod):177:177 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
-com.android.tools.r8.classmerging.ClassMergerTreeFixer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Hc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+com.android.tools.r8.classmerging.ClassMergerTreeFixer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Jc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.graph.DexMethodSignature$MethodBased com.android.tools.r8.internal.ClassMergerTreeFixer$$ExternalSyntheticOutline0.m(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.classmerging.MergeGroup -> com.android.tools.r8.internal.qN:
+com.android.tools.r8.classmerging.MergeGroup -> com.android.tools.r8.internal.uN:
 # {"id":"sourceFile","fileName":"MergeGroup.java"}
     1:1:void <init>():6:6 -> <init>
     int size() -> size
-com.android.tools.r8.classmerging.Policy -> com.android.tools.r8.internal.GW:
+com.android.tools.r8.classmerging.Policy -> com.android.tools.r8.internal.KW:
 # {"id":"sourceFile","fileName":"Policy.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy():47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vP;"}
     2:3:java.util.Collection removeTrivialGroups(java.util.Collection):75:76 -> a
     4:7:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):82:85 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZILjava/util/Collection;)V"}
@@ -13391,11 +13391,11 @@
     9:9:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):87 -> a
     10:18:boolean recordRemovedClassesForDebugging(boolean,int,java.util.Collection):90:98 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing():55:55 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wP;"}
     1:1:com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy():39:39 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qb0;"}
     1:1:com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing asVerticalClassMergerPolicy():63:63 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kl0;"}
     1:1:void clear():26:26 -> e
     java.lang.String getName() -> f
     1:1:boolean isIdentityForInterfaceGroups():0:0 -> g
@@ -13404,25 +13404,25 @@
     1:1:boolean isSingleClassPolicy():35:35 -> j
     1:1:boolean isVerticalClassMergerPolicy():59:59 -> k
     1:1:boolean shouldSkipPolicy():67:67 -> l
-com.android.tools.r8.classmerging.PolicyExecutor -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.classmerging.PolicyExecutor -> com.android.tools.r8.internal.LW:
 # {"id":"sourceFile","fileName":"PolicyExecutor.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     java.util.LinkedList apply(com.android.tools.r8.classmerging.Policy,java.util.LinkedList,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
     1:23:java.util.Collection run(java.util.Collection,java.util.Collection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):35:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/AbstractList;Ljava/util/Collection;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/AbstractList;Ljava/util/Collection;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Ljava/util/LinkedList;"}
     24:24:boolean lambda$run$0(com.android.tools.r8.classmerging.MergeGroup):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qN;)Z"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass -> com.android.tools.r8.internal.Zf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uN;)Z"}
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass -> com.android.tools.r8.internal.bg:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Configuration_descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Configuration_fieldAccessorTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor descriptor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     1:77:void <clinit>():5648:5724 -> <clinit>
     1:77:void com.android.tools.r8.internal.ConfigurationOuterClass.<clinit>():0 -> <clinit>
       # {"id":"com.android.tools.r8.synthesized"}
@@ -13432,7 +13432,7 @@
     78:78:void com.android.tools.r8.internal.ConfigurationOuterClass.<clinit>():0 -> <clinit>
     79:79:void <clinit>():0:0 -> <clinit>
     79:79:void com.android.tools.r8.internal.ConfigurationOuterClass.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5809,"2":5810,"3":5811},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5809,"2":5810,"3":5811},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     5807:5808:void <clinit>():5728:5729 -> <clinit>
     5807:5808:void com.android.tools.r8.internal.ConfigurationOuterClass.<clinit>():0 -> <clinit>
     5809:5809:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -13440,14 +13440,14 @@
     5810:5810:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
     5810:5810:void <clinit>():5728 -> <clinit>
     5811:5811:void <clinit>():5728:5728 -> <clinit>
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Ef:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.Object com.android.tools.r8.internal.ConfigurationOuterClass$$ExternalSyntheticOutline0.m(com.android.tools.r8.internal.Descriptors$Descriptor[],int):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration -> com.android.tools.r8.internal.ag:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
     int navigation_ -> A
     int sdkVersion_ -> B
@@ -13456,9 +13456,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> E
     com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration DEFAULT_INSTANCE -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ag;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jf;"}
     int mcc_ -> e
     int mnc_ -> f
     java.lang.Object locale_ -> g
@@ -13484,14 +13484,14 @@
     int navHidden_ -> z
     1:9:void <clinit>():5601:5609 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):447:447 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/If;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kf;)V"}
     2741:2741:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):3187:3187 -> <init>
     2742:2742:void <init>():449:449 -> <init>
     5480:5480:void <init>():3187:3187 -> <init>
     5481:5497:void <init>():450:466 -> <init>
     1:5:boolean isInitialized():3190:3194 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):3201:3202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):3202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -13593,7 +13593,7 @@
     106:108:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):3277:3279 -> a
     109:109:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):3597:3597 -> a
     109:109:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):440 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration getDefaultInstanceForType():5630:5630 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():440 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -13610,7 +13610,7 @@
     8:8:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76980},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76980},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     3305:3308:int getSerializedSize():3296:3299 -> c
     3305:3308:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     3309:3309:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$LayoutDirection.getNumber():717:717 -> c
@@ -13623,7 +13623,7 @@
     3311:3311:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     3312:3312:int getSerializedSize():0:0 -> c
     3312:3312:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76981},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76981},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     6615:6615:int getSerializedSize():3303:3303 -> c
     6615:6615:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     6616:6616:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13631,7 +13631,7 @@
     6616:6616:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     6617:6617:int getSerializedSize():0:0 -> c
     6617:6617:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76982},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76982},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     9924:9924:int getSerializedSize():3307:3307 -> c
     9924:9924:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     9925:9925:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13639,7 +13639,7 @@
     9925:9925:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     9926:9926:int getSerializedSize():0:0 -> c
     9926:9926:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76983},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76983},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     13237:13237:int getSerializedSize():3311:3311 -> c
     13237:13237:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     13238:13238:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13647,7 +13647,7 @@
     13238:13238:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     13239:13239:int getSerializedSize():0:0 -> c
     13239:13239:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76984},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76984},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     16554:16554:int getSerializedSize():3315:3315 -> c
     16554:16554:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     16555:16555:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13655,7 +13655,7 @@
     16555:16555:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     16556:16556:int getSerializedSize():0:0 -> c
     16556:16556:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76985},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76985},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     19875:19875:int getSerializedSize():3319:3319 -> c
     19875:19875:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     19876:19876:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13663,7 +13663,7 @@
     19876:19876:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     19877:19877:int getSerializedSize():0:0 -> c
     19877:19877:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76986},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76986},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     23200:23200:int getSerializedSize():3323:3323 -> c
     23200:23200:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     23201:23201:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutSize.getNumber():850:850 -> c
@@ -13676,7 +13676,7 @@
     23203:23203:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     23204:23204:int getSerializedSize():0:0 -> c
     23204:23204:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76987},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76987},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     26531:26531:int getSerializedSize():3327:3327 -> c
     26531:26531:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     26532:26532:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutLong.getNumber():969:969 -> c
@@ -13689,7 +13689,7 @@
     26534:26534:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     26535:26535:int getSerializedSize():0:0 -> c
     26535:26535:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76988},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76988},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     29866:29866:int getSerializedSize():3331:3331 -> c
     29866:29866:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     29867:29867:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenRound.getNumber():1086:1086 -> c
@@ -13702,7 +13702,7 @@
     29869:29869:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     29870:29870:int getSerializedSize():0:0 -> c
     29870:29870:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76989},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76989},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     33205:33205:int getSerializedSize():3335:3335 -> c
     33205:33205:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     33206:33206:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$WideColorGamut.getNumber():1203:1203 -> c
@@ -13715,7 +13715,7 @@
     33208:33208:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     33209:33209:int getSerializedSize():0:0 -> c
     33209:33209:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76990},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76990},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     36548:36548:int getSerializedSize():3339:3339 -> c
     36548:36548:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     36549:36549:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Hdr.getNumber():1320:1320 -> c
@@ -13728,7 +13728,7 @@
     36551:36551:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     36552:36552:int getSerializedSize():0:0 -> c
     36552:36552:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76991},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76991},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     39895:39895:int getSerializedSize():3343:3343 -> c
     39895:39895:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     39896:39896:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Orientation.getNumber():1445:1445 -> c
@@ -13741,7 +13741,7 @@
     39898:39898:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     39899:39899:int getSerializedSize():0:0 -> c
     39899:39899:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76992},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76992},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     43246:43246:int getSerializedSize():3347:3347 -> c
     43246:43246:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     43247:43247:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeType.getNumber():1603:1603 -> c
@@ -13754,7 +13754,7 @@
     43249:43249:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     43250:43250:int getSerializedSize():0:0 -> c
     43250:43250:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76993},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76993},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     46601:46601:int getSerializedSize():3351:3351 -> c
     46601:46601:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     46602:46602:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeNight.getNumber():1725:1725 -> c
@@ -13767,7 +13767,7 @@
     46604:46604:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     46605:46605:int getSerializedSize():0:0 -> c
     46605:46605:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76994},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76994},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     49960:49960:int getSerializedSize():3355:3355 -> c
     49960:49960:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     49961:49961:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13775,7 +13775,7 @@
     49961:49961:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     49962:49962:int getSerializedSize():0:0 -> c
     49962:49962:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76995},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76995},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     53321:53321:int getSerializedSize():3359:3359 -> c
     53321:53321:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     53322:53322:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Touchscreen.getNumber():1850:1850 -> c
@@ -13788,7 +13788,7 @@
     53324:53324:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     53325:53325:int getSerializedSize():0:0 -> c
     53325:53325:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76996},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76996},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     56688:56688:int getSerializedSize():3363:3363 -> c
     56688:56688:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     56689:56689:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$KeysHidden.getNumber():1976:1976 -> c
@@ -13801,7 +13801,7 @@
     56691:56691:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     56692:56692:int getSerializedSize():0:0 -> c
     56692:56692:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76997},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76997},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     60059:60059:int getSerializedSize():3367:3367 -> c
     60059:60059:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     60060:60060:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Keyboard.getNumber():2102:2102 -> c
@@ -13814,7 +13814,7 @@
     60062:60062:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     60063:60063:int getSerializedSize():0:0 -> c
     60063:60063:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76998},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76998},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     63434:63434:int getSerializedSize():3371:3371 -> c
     63434:63434:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     63435:63435:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$NavHidden.getNumber():2220:2220 -> c
@@ -13827,7 +13827,7 @@
     63437:63437:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     63438:63438:int getSerializedSize():0:0 -> c
     63438:63438:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76999},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76999},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     66813:66813:int getSerializedSize():3375:3375 -> c
     66813:66813:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     66814:66814:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Navigation.getNumber():2353:2353 -> c
@@ -13840,7 +13840,7 @@
     66816:66816:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     66817:66817:int getSerializedSize():0:0 -> c
     66817:66817:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77000},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77000},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     70196:70196:int getSerializedSize():3379:3379 -> c
     70196:70196:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     70197:70197:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13848,7 +13848,7 @@
     70197:70197:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     70198:70198:int getSerializedSize():0:0 -> c
     70198:70198:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77001},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77001},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     73581:73584:int getSerializedSize():3383:3386 -> c
     73581:73584:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     73585:73585:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$GrammaticalGender.getNumber():2480:2480 -> c
@@ -13861,7 +13861,7 @@
     73587:73587:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     73588:73588:int getSerializedSize():0:0 -> c
     73588:73588:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77002},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77002},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     76978:76979:int getSerializedSize():3390:3391 -> c
     76978:76979:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.getSerializedSize():0 -> c
     76980:76980:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -13911,9 +13911,9 @@
     77002:77002:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeEnumSize(int,int):613:613 -> c
     77002:77002:int getSerializedSize():3388 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():440:440 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():479:479 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):3400:3403 -> equals
     5:5:int getMcc():2571:2571 -> equals
     5:5:boolean equals(java.lang.Object):3405 -> equals
@@ -13977,7 +13977,7 @@
     2:2:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getMcc():2571:2571 -> hashCode
     4:4:int hashCode():3454 -> hashCode
     4:4:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.hashCode():0 -> hashCode
@@ -14035,39 +14035,39 @@
     71:73:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration.hashCode():0 -> hashCode
     74:74:int hashCode():3452:3452 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():673:674 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder toBuilder():3590:3591 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/If;"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Df:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kf;"}
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Ff:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline0.m(int,int,int,int,int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline1 -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline1 -> com.android.tools.r8.internal.Gf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline1.m(com.android.tools.r8.internal.Descriptors$Descriptor,int,int,int,int):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;IIII)I"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline2 -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline2 -> com.android.tools.r8.internal.Hf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline2.m(int,int,int):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline3 -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline3 -> com.android.tools.r8.internal.If:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$$ExternalSyntheticOutline3.m(int,int,int):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$1 -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$1 -> com.android.tools.r8.internal.Jf:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
     1:1:void <init>():5609:5609 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5615:5615 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5609 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):485:487 -> a
     2:4:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5615 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5609 -> a
@@ -14179,7 +14179,7 @@
     236:236:void com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):661:661 -> a
     236:236:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5615 -> a
     236:236:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5609 -> a
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder -> com.android.tools.r8.internal.If:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder -> com.android.tools.r8.internal.Kf:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
     int navHidden_ -> A
     int navigation_ -> B
@@ -14215,16 +14215,16 @@
     1520:1520:void maybeForceBuilderInitialization():3637:3637 -> <init>
     1520:1520:void <init>():3627 -> <init>
     1521:3396:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):3632:5507 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     3397:3397:void maybeForceBuilderInitialization():3637:3637 -> <init>
     3397:3397:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):3633 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3608:3608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():3620:3621 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3781 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3781 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3608 -> a
@@ -14233,10 +14233,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5591:5591 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration.getDefaultInstance():5605:5605 -> a
     10:10:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeFrom(com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration):3794 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yf;)Lcom/android/tools/r8/internal/If;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ag;)Lcom/android/tools/r8/internal/Kf;"}
     11:11:int com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration.getMcc():2571:2571 -> a
     11:11:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeFrom(com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration):3795 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -14333,14 +14333,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5585 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3608:3608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():3620:3621 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3759 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3759 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3608 -> b
@@ -14353,9 +14353,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration build():3711:3713 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():3608 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3892:3898 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/If;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Kf;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3894 -> c
     9:15:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3894:3900 -> c
@@ -14365,331 +14365,331 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5585 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3608 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():3701:3701 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration build():3711:3713 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():3608 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():3608:3608 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():3620:3621 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:28:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration buildPartial():3720:3747 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ag;"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$GrammaticalGender -> R8$$REMOVED$$CLASS$$2:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$GrammaticalGender$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$GrammaticalGender$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Lf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$GrammaticalGender$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Hdr -> R8$$REMOVED$$CLASS$$3:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Hdr$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Hdr$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Mf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$Hdr$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Keyboard -> R8$$REMOVED$$CLASS$$4:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Keyboard$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Keyboard$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Nf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$Keyboard$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$KeysHidden -> R8$$REMOVED$$CLASS$$5:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$KeysHidden$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$KeysHidden$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Of:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$KeysHidden$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$LayoutDirection -> R8$$REMOVED$$CLASS$$6:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$LayoutDirection$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$LayoutDirection$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Pf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$LayoutDirection$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$NavHidden -> R8$$REMOVED$$CLASS$$7:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$NavHidden$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$NavHidden$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Qf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$NavHidden$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Navigation -> R8$$REMOVED$$CLASS$$8:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Navigation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Navigation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Rf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$Navigation$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Orientation -> R8$$REMOVED$$CLASS$$9:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Orientation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Orientation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Sf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$Orientation$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutLong -> R8$$REMOVED$$CLASS$$10:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutLong$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutLong$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Tf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$ScreenLayoutLong$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutSize -> R8$$REMOVED$$CLASS$$11:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutSize$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenLayoutSize$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Uf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$ScreenLayoutSize$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenRound -> R8$$REMOVED$$CLASS$$12:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenRound$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$ScreenRound$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Vf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$ScreenRound$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Touchscreen -> R8$$REMOVED$$CLASS$$13:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Touchscreen$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$Touchscreen$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Wf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$Touchscreen$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeNight -> R8$$REMOVED$$CLASS$$14:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeNight$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeNight$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Xf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$UiModeNight$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeType -> R8$$REMOVED$$CLASS$$15:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$UiModeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Yf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$UiModeType$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$WideColorGamut -> R8$$REMOVED$$CLASS$$16:
 # {"id":"sourceFile","fileName":"ConfigurationOuterClass.java"}
-com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$WideColorGamut$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration$WideColorGamut$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Zf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.ConfigurationOuterClass$Configuration$WideColorGamut$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources -> com.android.tools.r8.internal.L80:
+com.android.tools.r8.com.android.aapt.Resources -> com.android.tools.r8.internal.P80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_OverlayableItem_descriptor -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Array_Element_descriptor -> A0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_OverlayableItem_fieldAccessorTable -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Array_Element_fieldAccessorTable -> B0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StagedId_descriptor -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Plural_descriptor -> C0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StagedId_fieldAccessorTable -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Plural_fieldAccessorTable -> D0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_EntryId_descriptor -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Plural_Entry_descriptor -> E0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_EntryId_fieldAccessorTable -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Plural_Entry_fieldAccessorTable -> F0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Entry_descriptor -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_XmlNode_descriptor -> G0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Entry_fieldAccessorTable -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_XmlNode_fieldAccessorTable -> H0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_ConfigValue_descriptor -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_XmlElement_descriptor -> I0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_ConfigValue_fieldAccessorTable -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_XmlElement_fieldAccessorTable -> J0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Value_descriptor -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_XmlNamespace_descriptor -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Value_fieldAccessorTable -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_XmlNamespace_fieldAccessorTable -> L0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Item_descriptor -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_XmlAttribute_descriptor -> M0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Item_fieldAccessorTable -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_XmlAttribute_fieldAccessorTable -> N0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_CompoundValue_descriptor -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_MacroBody_descriptor -> O0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_CompoundValue_fieldAccessorTable -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_MacroBody_fieldAccessorTable -> P0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Boolean_descriptor -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_NamespaceAlias_descriptor -> Q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Boolean_fieldAccessorTable -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_NamespaceAlias_fieldAccessorTable -> R0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Reference_descriptor -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StyleString_descriptor -> S0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Reference_fieldAccessorTable -> T
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StyleString_fieldAccessorTable -> T0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Id_descriptor -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StyleString_Span_descriptor -> U0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Id_fieldAccessorTable -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StyleString_Span_fieldAccessorTable -> V0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_String_descriptor -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_UntranslatableSection_descriptor -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_String_fieldAccessorTable -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_UntranslatableSection_fieldAccessorTable -> X0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_RawString_descriptor -> Y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor descriptor -> Y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_RawString_fieldAccessorTable -> Z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StringPool_descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StyledString_descriptor -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StringPool_fieldAccessorTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StyledString_fieldAccessorTable -> b0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_SourcePosition_descriptor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_StyledString_Span_descriptor -> c0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_SourcePosition_fieldAccessorTable -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_StyledString_Span_fieldAccessorTable -> d0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Source_descriptor -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_FileReference_descriptor -> e0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Source_fieldAccessorTable -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_FileReference_fieldAccessorTable -> f0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_ToolFingerprint_descriptor -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Primitive_descriptor -> g0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_ToolFingerprint_fieldAccessorTable -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Primitive_fieldAccessorTable -> h0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_DynamicRefTable_descriptor -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Primitive_NullType_descriptor -> i0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_DynamicRefTable_fieldAccessorTable -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Primitive_NullType_fieldAccessorTable -> j0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_ResourceTable_descriptor -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Primitive_EmptyType_descriptor -> k0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_ResourceTable_fieldAccessorTable -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Primitive_EmptyType_fieldAccessorTable -> l0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_PackageId_descriptor -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Attribute_descriptor -> m0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_PackageId_fieldAccessorTable -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Attribute_fieldAccessorTable -> n0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Package_descriptor -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Attribute_Symbol_descriptor -> o0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Package_fieldAccessorTable -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Attribute_Symbol_fieldAccessorTable -> p0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_TypeId_descriptor -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Style_descriptor -> q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_TypeId_fieldAccessorTable -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Style_fieldAccessorTable -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Type_descriptor -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Style_Entry_descriptor -> s0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Type_fieldAccessorTable -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Style_Entry_fieldAccessorTable -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Visibility_descriptor -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Styleable_descriptor -> u0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Visibility_fieldAccessorTable -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Styleable_fieldAccessorTable -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_AllowNew_descriptor -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Styleable_Entry_descriptor -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_AllowNew_fieldAccessorTable -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Styleable_Entry_fieldAccessorTable -> x0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Overlayable_descriptor -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_aapt_pb_Array_descriptor -> y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Overlayable_fieldAccessorTable -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_aapt_pb_Array_fieldAccessorTable -> z0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     1:154:void <clinit>():56733:56886 -> <clinit>
     1:154:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
       # {"id":"com.android.tools.r8.synthesized"}
@@ -14701,7 +14701,7 @@
     156:156:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     157:157:void <clinit>():0:0 -> <clinit>
     157:157:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567015,"2":2567016,"3":2567017},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567015,"2":2567016,"3":2567017},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     57046:57047:void <clinit>():56889:56890 -> <clinit>
     57046:57047:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     57048:57048:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14710,7 +14710,7 @@
     57048:57048:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     57049:57049:void <clinit>():0:0 -> <clinit>
     57049:57049:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567018,"2":2567019,"3":2567020},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567018,"2":2567019,"3":2567020},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     113944:113945:void <clinit>():56895:56896 -> <clinit>
     113944:113945:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     113946:113946:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14719,7 +14719,7 @@
     113946:113946:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     113947:113947:void <clinit>():0:0 -> <clinit>
     113947:113947:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567021,"2":2567022,"3":2567023},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567021,"2":2567022,"3":2567023},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     170848:170849:void <clinit>():56901:56902 -> <clinit>
     170848:170849:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     170850:170850:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14728,7 +14728,7 @@
     170850:170850:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     170851:170851:void <clinit>():0:0 -> <clinit>
     170851:170851:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567024,"2":2567025,"3":2567026},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567024,"2":2567025,"3":2567026},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     227758:227759:void <clinit>():56907:56908 -> <clinit>
     227758:227759:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     227760:227760:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14737,7 +14737,7 @@
     227760:227760:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     227761:227761:void <clinit>():0:0 -> <clinit>
     227761:227761:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567027,"2":2567028,"3":2567029},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567027,"2":2567028,"3":2567029},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     284674:284675:void <clinit>():56913:56914 -> <clinit>
     284674:284675:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     284676:284676:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14746,7 +14746,7 @@
     284676:284676:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     284677:284677:void <clinit>():0:0 -> <clinit>
     284677:284677:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567030,"2":2567031,"3":2567032},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567030,"2":2567031,"3":2567032},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     341596:341597:void <clinit>():56919:56920 -> <clinit>
     341596:341597:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     341598:341598:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14755,7 +14755,7 @@
     341598:341598:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     341599:341599:void <clinit>():0:0 -> <clinit>
     341599:341599:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567033,"2":2567034,"3":2567035},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567033,"2":2567034,"3":2567035},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     398524:398525:void <clinit>():56925:56926 -> <clinit>
     398524:398525:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     398526:398526:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14773,7 +14773,7 @@
     398530:398530:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     398531:398531:void <clinit>():0:0 -> <clinit>
     398531:398531:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567036,"2":2567037,"3":2567038},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567036,"2":2567037,"3":2567038},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     455468:455469:void <clinit>():56937:56938 -> <clinit>
     455468:455469:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     455470:455470:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14782,7 +14782,7 @@
     455470:455470:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     455471:455471:void <clinit>():0:0 -> <clinit>
     455471:455471:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567039,"2":2567040,"3":2567041},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567039,"2":2567040,"3":2567041},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     512414:512415:void <clinit>():56943:56944 -> <clinit>
     512414:512415:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     512416:512416:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14791,7 +14791,7 @@
     512416:512416:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     512417:512417:void <clinit>():0:0 -> <clinit>
     512417:512417:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567042,"2":2567043,"3":2567044},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567042,"2":2567043,"3":2567044},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     569366:569367:void <clinit>():56949:56950 -> <clinit>
     569366:569367:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     569368:569368:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14800,7 +14800,7 @@
     569368:569368:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     569369:569369:void <clinit>():0:0 -> <clinit>
     569369:569369:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567045,"2":2567046,"3":2567047},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567045,"2":2567046,"3":2567047},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     626324:626325:void <clinit>():56955:56956 -> <clinit>
     626324:626325:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     626326:626326:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14809,7 +14809,7 @@
     626326:626326:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     626327:626327:void <clinit>():0:0 -> <clinit>
     626327:626327:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567048,"2":2567049,"3":2567050},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567048,"2":2567049,"3":2567050},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     683288:683289:void <clinit>():56961:56962 -> <clinit>
     683288:683289:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     683290:683290:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14818,7 +14818,7 @@
     683290:683290:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     683291:683291:void <clinit>():0:0 -> <clinit>
     683291:683291:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567051,"2":2567052,"3":2567053},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567051,"2":2567052,"3":2567053},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     740258:740259:void <clinit>():56967:56968 -> <clinit>
     740258:740259:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     740260:740260:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14827,7 +14827,7 @@
     740260:740260:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     740261:740261:void <clinit>():0:0 -> <clinit>
     740261:740261:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567054,"2":2567055,"3":2567056},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567054,"2":2567055,"3":2567056},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     797234:797235:void <clinit>():56973:56974 -> <clinit>
     797234:797235:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     797236:797236:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14836,7 +14836,7 @@
     797236:797236:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     797237:797237:void <clinit>():0:0 -> <clinit>
     797237:797237:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567057,"2":2567058,"3":2567059},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567057,"2":2567058,"3":2567059},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     854216:854217:void <clinit>():56979:56980 -> <clinit>
     854216:854217:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     854218:854218:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14854,7 +14854,7 @@
     854222:854222:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     854223:854223:void <clinit>():0:0 -> <clinit>
     854223:854223:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567060,"2":2567061,"3":2567062},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567060,"2":2567061,"3":2567062},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     911214:911215:void <clinit>():56991:56992 -> <clinit>
     911214:911215:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     911216:911216:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14863,7 +14863,7 @@
     911216:911216:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     911217:911217:void <clinit>():0:0 -> <clinit>
     911217:911217:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567063,"2":2567064,"3":2567065},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567063,"2":2567064,"3":2567065},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     968214:968215:void <clinit>():56997:56998 -> <clinit>
     968214:968215:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     968216:968216:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14872,7 +14872,7 @@
     968216:968216:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     968217:968217:void <clinit>():0:0 -> <clinit>
     968217:968217:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567066,"2":2567067,"3":2567068},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567066,"2":2567067,"3":2567068},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1025220:1025221:void <clinit>():57003:57004 -> <clinit>
     1025220:1025221:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1025222:1025222:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14881,7 +14881,7 @@
     1025222:1025222:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1025223:1025223:void <clinit>():0:0 -> <clinit>
     1025223:1025223:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567069,"2":2567070,"3":2567071},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567069,"2":2567070,"3":2567071},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1082232:1082233:void <clinit>():57009:57010 -> <clinit>
     1082232:1082233:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1082234:1082234:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14890,7 +14890,7 @@
     1082234:1082234:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1082235:1082235:void <clinit>():0:0 -> <clinit>
     1082235:1082235:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567072,"2":2567073,"3":2567074},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567072,"2":2567073,"3":2567074},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1139250:1139251:void <clinit>():57015:57016 -> <clinit>
     1139250:1139251:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1139252:1139252:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14899,7 +14899,7 @@
     1139252:1139252:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1139253:1139253:void <clinit>():0:0 -> <clinit>
     1139253:1139253:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567075,"2":2567076,"3":2567077},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567075,"2":2567076,"3":2567077},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1196274:1196275:void <clinit>():57021:57022 -> <clinit>
     1196274:1196275:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1196276:1196276:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14917,7 +14917,7 @@
     1196280:1196280:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1196281:1196281:void <clinit>():0:0 -> <clinit>
     1196281:1196281:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567078,"2":2567079,"3":2567080},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567078,"2":2567079,"3":2567080},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1253314:1253315:void <clinit>():57033:57034 -> <clinit>
     1253314:1253315:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1253316:1253316:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14926,7 +14926,7 @@
     1253316:1253316:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1253317:1253317:void <clinit>():0:0 -> <clinit>
     1253317:1253317:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567081,"2":2567082,"3":2567083},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567081,"2":2567082,"3":2567083},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1310356:1310357:void <clinit>():57039:57040 -> <clinit>
     1310356:1310357:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1310358:1310358:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14935,7 +14935,7 @@
     1310358:1310358:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1310359:1310359:void <clinit>():0:0 -> <clinit>
     1310359:1310359:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567084,"2":2567085,"3":2567086},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567084,"2":2567085,"3":2567086},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1367404:1367405:void <clinit>():57045:57046 -> <clinit>
     1367404:1367405:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1367406:1367406:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -14944,7 +14944,7 @@
     1367406:1367406:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1367407:1367407:void <clinit>():0:0 -> <clinit>
     1367407:1367407:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567087,"2":2567088,"3":2567089},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567087,"2":2567088,"3":2567089},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1424458:1424459:void <clinit>():57051:57052 -> <clinit>
     1424458:1424459:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1424460:1424460:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14953,7 +14953,7 @@
     1424460:1424460:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1424461:1424461:void <clinit>():0:0 -> <clinit>
     1424461:1424461:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567090,"2":2567091,"3":2567092},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567090,"2":2567091,"3":2567092},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1481518:1481519:void <clinit>():57057:57058 -> <clinit>
     1481518:1481519:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1481520:1481520:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14962,7 +14962,7 @@
     1481520:1481520:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1481521:1481521:void <clinit>():0:0 -> <clinit>
     1481521:1481521:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567093,"2":2567094,"3":2567095},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567093,"2":2567094,"3":2567095},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1538584:1538585:void <clinit>():57063:57064 -> <clinit>
     1538584:1538585:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1538586:1538586:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -14980,7 +14980,7 @@
     1538590:1538590:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1538591:1538591:void <clinit>():0:0 -> <clinit>
     1538591:1538591:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567096,"2":2567097,"3":2567098},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567096,"2":2567097,"3":2567098},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1595666:1595667:void <clinit>():57075:57076 -> <clinit>
     1595666:1595667:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1595668:1595668:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -14989,7 +14989,7 @@
     1595668:1595668:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1595669:1595669:void <clinit>():0:0 -> <clinit>
     1595669:1595669:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567099,"2":2567100,"3":2567101},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567099,"2":2567100,"3":2567101},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1652750:1652751:void <clinit>():57081:57082 -> <clinit>
     1652750:1652751:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1652752:1652752:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -14998,7 +14998,7 @@
     1652752:1652752:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1652753:1652753:void <clinit>():0:0 -> <clinit>
     1652753:1652753:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567102,"2":2567103,"3":2567104},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567102,"2":2567103,"3":2567104},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1709840:1709841:void <clinit>():57087:57088 -> <clinit>
     1709840:1709841:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1709842:1709842:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getDescriptor():56728:56728 -> <clinit>
@@ -15010,7 +15010,7 @@
     1709843:1709843:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1709844:1709844:void <clinit>():0:0 -> <clinit>
     1709844:1709844:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567105,"2":2567106,"3":2567107},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567105,"2":2567106,"3":2567107},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1766937:1766938:void <clinit>():57093:57094 -> <clinit>
     1766937:1766938:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1766939:1766939:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -15019,7 +15019,7 @@
     1766939:1766939:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1766940:1766940:void <clinit>():0:0 -> <clinit>
     1766940:1766940:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567108,"2":2567109,"3":2567110},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567108,"2":2567109,"3":2567110},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1824039:1824040:void <clinit>():57099:57100 -> <clinit>
     1824039:1824040:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1824041:1824041:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15028,7 +15028,7 @@
     1824041:1824041:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1824042:1824042:void <clinit>():0:0 -> <clinit>
     1824042:1824042:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567111,"2":2567112,"3":2567113},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567111,"2":2567112,"3":2567113},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1881147:1881148:void <clinit>():57105:57106 -> <clinit>
     1881147:1881148:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1881149:1881149:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -15037,7 +15037,7 @@
     1881149:1881149:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1881150:1881150:void <clinit>():0:0 -> <clinit>
     1881150:1881150:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567114,"2":2567115,"3":2567116},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567114,"2":2567115,"3":2567116},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1938261:1938262:void <clinit>():57111:57112 -> <clinit>
     1938261:1938262:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1938263:1938263:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15055,7 +15055,7 @@
     1938267:1938267:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1938268:1938268:void <clinit>():0:0 -> <clinit>
     1938268:1938268:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567117,"2":2567118,"3":2567119},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567117,"2":2567118,"3":2567119},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1995391:1995392:void <clinit>():57123:57124 -> <clinit>
     1995391:1995392:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1995393:1995393:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15064,7 +15064,7 @@
     1995393:1995393:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     1995394:1995394:void <clinit>():0:0 -> <clinit>
     1995394:1995394:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567120,"2":2567121,"3":2567122},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567120,"2":2567121,"3":2567122},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2052523:2052524:void <clinit>():57129:57130 -> <clinit>
     2052523:2052524:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2052525:2052525:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -15073,7 +15073,7 @@
     2052525:2052525:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2052526:2052526:void <clinit>():0:0 -> <clinit>
     2052526:2052526:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567123,"2":2567124,"3":2567125},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567123,"2":2567124,"3":2567125},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2109661:2109662:void <clinit>():57135:57136 -> <clinit>
     2109661:2109662:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2109663:2109663:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15082,7 +15082,7 @@
     2109663:2109663:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2109664:2109664:void <clinit>():0:0 -> <clinit>
     2109664:2109664:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567126,"2":2567127,"3":2567128},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567126,"2":2567127,"3":2567128},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2166805:2166806:void <clinit>():57141:57142 -> <clinit>
     2166805:2166806:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2166807:2166807:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15091,7 +15091,7 @@
     2166807:2166807:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2166808:2166808:void <clinit>():0:0 -> <clinit>
     2166808:2166808:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567129,"2":2567130,"3":2567131},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567129,"2":2567130,"3":2567131},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2223955:2223956:void <clinit>():57147:57148 -> <clinit>
     2223955:2223956:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2223957:2223957:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15100,7 +15100,7 @@
     2223957:2223957:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2223958:2223958:void <clinit>():0:0 -> <clinit>
     2223958:2223958:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567132,"2":2567133,"3":2567134},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567132,"2":2567133,"3":2567134},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2281111:2281112:void <clinit>():57153:57154 -> <clinit>
     2281111:2281112:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2281113:2281113:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15109,7 +15109,7 @@
     2281113:2281113:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2281114:2281114:void <clinit>():0:0 -> <clinit>
     2281114:2281114:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567135,"2":2567136,"3":2567137},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567135,"2":2567136,"3":2567137},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2338273:2338274:void <clinit>():57159:57160 -> <clinit>
     2338273:2338274:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2338275:2338275:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15127,7 +15127,7 @@
     2338279:2338279:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2338280:2338280:void <clinit>():0:0 -> <clinit>
     2338280:2338280:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567138,"2":2567139,"3":2567140},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567138,"2":2567139,"3":2567140},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2395451:2395452:void <clinit>():57171:57172 -> <clinit>
     2395451:2395452:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2395453:2395453:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15136,7 +15136,7 @@
     2395453:2395453:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2395454:2395454:void <clinit>():0:0 -> <clinit>
     2395454:2395454:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567141,"2":2567142,"3":2567143},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567141,"2":2567142,"3":2567143},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2452631:2452632:void <clinit>():57177:57178 -> <clinit>
     2452631:2452632:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2452633:2452633:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -15145,7 +15145,7 @@
     2452633:2452633:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2452634:2452634:void <clinit>():0:0 -> <clinit>
     2452634:2452634:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567144,"2":2567145,"3":2567146},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567144,"2":2567145,"3":2567146},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2509817:2509818:void <clinit>():57183:57184 -> <clinit>
     2509817:2509818:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2509819:2509819:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15154,7 +15154,7 @@
     2509819:2509819:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2509820:2509820:void <clinit>():0:0 -> <clinit>
     2509820:2509820:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567147,"2":2567148,"3":2567149},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2567147,"2":2567148,"3":2567149},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     2567009:2567014:void <clinit>():57189:57194 -> <clinit>
     2567009:2567014:void com.android.tools.r8.internal.Resources.<clinit>():0 -> <clinit>
     2567015:2567015:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -15382,28 +15382,28 @@
     2567148:2567148:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
     2567148:2567148:void <clinit>():57189 -> <clinit>
     2567149:2567149:void <clinit>():57189:57189 -> <clinit>
-com.android.tools.r8.com.android.aapt.Resources$AllowNew -> com.android.tools.r8.internal.I50:
+com.android.tools.r8.com.android.aapt.Resources$AllowNew -> com.android.tools.r8.internal.M50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$AllowNew DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M50;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K50;"}
     1:9:void <clinit>():11740:11748 -> <clinit>
     1:172:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):10963:11134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L50;)V"}
     173:342:void <init>():10965:11134 -> <init>
     343:343:void <init>():10966:10966 -> <init>
     1:5:boolean isInitialized():11137:11141 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):11148:11154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):11301:11301 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10956 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$AllowNew getDefaultInstanceForType():11769:11769 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():10956 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -15412,9 +15412,9 @@
     8:8:int getSerializedSize():11165 -> c
     9:13:int getSerializedSize():11167:11171 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():10956:10956 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():10979:10979 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):11180:11183 -> equals
     5:5:boolean hasSource():11062:11062 -> equals
     5:5:boolean equals(java.lang.Object):11185 -> equals
@@ -15442,24 +15442,24 @@
     9:16:int hashCode():11208 -> hashCode
     17:19:int hashCode():11208:11210 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11045:11046 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():11074:11074 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():11074 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder toBuilder():11294:11295 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H50;"}
-com.android.tools.r8.com.android.aapt.Resources$AllowNew$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.F50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L50;"}
+com.android.tools.r8.com.android.aapt.Resources$AllowNew$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.J50:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.Resources$AllowNew$$ExternalSyntheticOutline0.m(int,int,int,int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources$AllowNew$1 -> com.android.tools.r8.internal.G50:
+com.android.tools.r8.com.android.aapt.Resources$AllowNew$1 -> com.android.tools.r8.internal.K50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():11748:11748 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$AllowNew parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11754:11754 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11748 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$AllowNew.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10985:10987 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$AllowNew parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11754 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11748 -> a
@@ -15506,10 +15506,10 @@
     52:52:void com.android.tools.r8.com.android.aapt.Resources$AllowNew.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11033:11033 -> a
     52:52:com.android.tools.r8.com.android.aapt.Resources$AllowNew parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11754 -> a
     52:52:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11748 -> a
-com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder -> com.android.tools.r8.internal.H50:
+com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder -> com.android.tools.r8.internal.L50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -15518,16 +15518,16 @@
     3:3:void maybeForceBuilderInitialization():11341:11341 -> <init>
     3:3:void <init>():11331 -> <init>
     4:294:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):11336:11626 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     295:295:void maybeForceBuilderInitialization():11341:11341 -> <init>
     295:295:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):11337 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11312:11312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11324:11325 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11421 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11421 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11312 -> a
@@ -15536,10 +15536,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11730:11730 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$AllowNew com.android.tools.r8.com.android.aapt.Resources$AllowNew.getDefaultInstance():11744:11744 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$AllowNew):11434 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I50;)Lcom/android/tools/r8/internal/H50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M50;)Lcom/android/tools/r8/internal/L50;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$AllowNew.hasSource():11062:11062 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$AllowNew):11435 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -15563,14 +15563,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11724 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11312 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11312:11312 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11324:11325 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11399 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11312 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11399 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):11312 -> b
@@ -15584,11 +15584,11 @@
     1:8:com.android.tools.r8.com.android.aapt.Resources$AllowNew buildPartial():11380:11387 -> build
     1:8:com.android.tools.r8.com.android.aapt.Resources$AllowNew build():11371 -> build
     1:8:com.android.tools.r8.com.google.protobuf.MessageLite build():11312 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     9:10:com.android.tools.r8.com.android.aapt.Resources$AllowNew build():11372:11373 -> build
     9:10:com.android.tools.r8.com.google.protobuf.MessageLite build():11312 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11459:11465 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/L50;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11461 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11461:11467 -> c
@@ -15598,9 +15598,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$AllowNew$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11724 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11312 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():11361:11361 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:8:com.android.tools.r8.com.android.aapt.Resources$AllowNew buildPartial():11380:11387 -> h
     1:8:com.android.tools.r8.com.android.aapt.Resources$AllowNew build():11371 -> h
     1:8:com.android.tools.r8.com.google.protobuf.Message build():11312 -> h
@@ -15611,28 +15611,28 @@
     1:8:com.android.tools.r8.com.google.protobuf.Message buildPartial():11312 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11324:11325 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Array -> com.android.tools.r8.internal.P50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Array -> com.android.tools.r8.internal.T50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.util.List element_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$Array DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T50;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O50;"}
     1:9:void <clinit>():43451:43459 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):41496:41496 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P50;)V"}
     1280:1280:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):42775:42775 -> <init>
     1281:1281:void <init>():41498:41498 -> <init>
     2558:2558:void <init>():42775:42775 -> <init>
     2559:2559:void <init>():41499:41499 -> <init>
     1:5:boolean isInitialized():42778:42782 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):42789:42792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Array$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42929:42929 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):41489 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Array getDefaultInstanceForType():43480:43480 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():41489 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -15644,15 +15644,15 @@
     8:8:int com.android.tools.r8.internal.Resources$Array.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.Resources$Array.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":42816},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":42816},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     42814:42815:int getSerializedSize():42805:42806 -> c
     42814:42815:int com.android.tools.r8.internal.Resources$Array.getSerializedSize():0 -> c
     42816:42816:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     42816:42816:int getSerializedSize():42803 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():41489:41489 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():41512:41512 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):42815:42818 -> equals
     5:5:java.util.List getElementList():42726:42726 -> equals
     5:5:boolean equals(java.lang.Object):42820 -> equals
@@ -15675,22 +15675,22 @@
     6:6:int hashCode():42835 -> hashCode
     7:10:int hashCode():42835:42838 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():41572:41573 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Builder toBuilder():42922:42923 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L50;"}
-com.android.tools.r8.com.android.aapt.Resources$Array$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.J50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P50;"}
+com.android.tools.r8.com.android.aapt.Resources$Array$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.N50:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:int com.android.tools.r8.internal.Resources$Array$$ExternalSyntheticOutline0.m(com.android.tools.r8.internal.MessageLite,int,int):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BN;II)I"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.Resources$Array$1 -> com.android.tools.r8.internal.K50:
+com.android.tools.r8.com.android.aapt.Resources$Array$1 -> com.android.tools.r8.internal.O50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():43459:43459 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Array parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43465:43465 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43459 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Array.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41518:41520 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Array parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43465 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43459 -> a
@@ -15737,28 +15737,28 @@
     45:47:void com.android.tools.r8.com.android.aapt.Resources$Array.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41558:41560 -> a
     45:47:com.android.tools.r8.com.android.aapt.Resources$Array parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43465 -> a
     45:47:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43459 -> a
-com.android.tools.r8.com.android.aapt.Resources$Array$Builder -> com.android.tools.r8.internal.L50:
+com.android.tools.r8.com.android.aapt.Resources$Array$Builder -> com.android.tools.r8.internal.P50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.util.List element_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 elementBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():42957 -> <init>
     2:2:void <init>():43122:43122 -> <init>
     3:3:void maybeForceBuilderInitialization():42968:42968 -> <init>
     3:3:void <init>():42958 -> <init>
     4:163:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42963:43122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     164:164:void maybeForceBuilderInitialization():42968:42968 -> <init>
     164:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42964 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42939:42939 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42951:42952 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Array$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):43051 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42939 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Array$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):43051 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42939 -> a
@@ -15767,10 +15767,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43441:43441 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42939 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$Array.getDefaultInstance():43455:43455 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Array):43064 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P50;)Lcom/android/tools/r8/internal/L50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T50;)Lcom/android/tools/r8/internal/P50;"}
     11:15:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Array):43065:43069 -> a
     16:18:void ensureElementIsMutable():43124:43126 -> a
     16:18:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Array):43071 -> a
@@ -15794,14 +15794,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43435 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42939 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42939:42939 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42951:42952 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Array$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):43029 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42939 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Array$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):43029 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42939 -> b
@@ -15814,9 +15814,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Array build():42997:42999 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():42939 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43108:43114 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/L50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/P50;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43110 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Array$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43110:43116 -> c
@@ -15826,42 +15826,42 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43435 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42939 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():42987:42987 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Array build():42997:42999 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():42939 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():42939:42939 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42951:42952 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:12:com.android.tools.r8.com.android.aapt.Resources$Array buildPartial():43006:43017 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P50;"}
-com.android.tools.r8.com.android.aapt.Resources$Array$Element -> com.android.tools.r8.internal.O50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T50;"}
+com.android.tools.r8.com.android.aapt.Resources$Array$Element -> com.android.tools.r8.internal.S50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Array$Element DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S50;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q50;"}
     1:9:void <clinit>():42681:42689 -> <clinit>
     1:223:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):41669:41891 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R50;)V"}
     224:444:void <init>():41671:41891 -> <init>
     445:445:void <init>():41672:41672 -> <init>
     1:5:boolean isInitialized():41894:41898 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):41905:41914 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42074:42074 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):41662 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Array$Element getDefaultInstanceForType():42710:42710 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():41662 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -15874,9 +15874,9 @@
     16:17:int getSerializedSize():41934:41935 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder toBuilder():42067:42068 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():41662 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():41685:41685 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):41944:41947 -> equals
     5:5:boolean hasSource():41781:41781 -> equals
     5:5:boolean equals(java.lang.Object):41949 -> equals
@@ -15914,21 +15914,21 @@
     18:18:int hashCode():41978 -> hashCode
     19:22:int hashCode():41980:41983 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():41764:41765 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item getItem():41877:41877 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item getItem():41877 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():41793:41793 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():41793 -> l
-com.android.tools.r8.com.android.aapt.Resources$Array$Element$1 -> com.android.tools.r8.internal.M50:
+com.android.tools.r8.com.android.aapt.Resources$Array$Element$1 -> com.android.tools.r8.internal.Q50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():42689:42689 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Array$Element parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42695:42695 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42689 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Array$Element.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41691:41693 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Array$Element parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42695 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42689 -> a
@@ -15985,30 +15985,30 @@
     72:72:void com.android.tools.r8.com.android.aapt.Resources$Array$Element.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41752:41752 -> a
     72:72:com.android.tools.r8.com.android.aapt.Resources$Array$Element parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42695 -> a
     72:72:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42689 -> a
-com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder -> com.android.tools.r8.internal.N50:
+com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder -> com.android.tools.r8.internal.R50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():42102 -> <init>
     2:2:void <init>():42412:42412 -> <init>
     3:3:void maybeForceBuilderInitialization():42113:42113 -> <init>
     3:3:void <init>():42103 -> <init>
     4:308:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42108:42412 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     309:309:void maybeForceBuilderInitialization():42113:42113 -> <init>
     309:309:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42109 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42084:42084 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42096:42097 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42204 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42084 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42204 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42084 -> a
@@ -16017,10 +16017,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42671:42671 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42084 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Array$Element com.android.tools.r8.com.android.aapt.Resources$Array$Element.getDefaultInstance():42685:42685 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Array$Element):42217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O50;)Lcom/android/tools/r8/internal/N50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S50;)Lcom/android/tools/r8/internal/R50;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Array$Element.hasSource():41781:41781 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Array$Element):42218 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16054,14 +16054,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42665 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42084 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42084:42084 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42096:42097 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42182 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42084 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42182 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42084 -> b
@@ -16075,11 +16075,11 @@
     1:13:com.android.tools.r8.com.android.aapt.Resources$Array$Element buildPartial():42158:42170 -> build
     1:13:com.android.tools.r8.com.android.aapt.Resources$Array$Element build():42149 -> build
     1:13:com.android.tools.r8.com.google.protobuf.MessageLite build():42084 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     14:15:com.android.tools.r8.com.android.aapt.Resources$Array$Element build():42150:42151 -> build
     14:15:com.android.tools.r8.com.google.protobuf.MessageLite build():42084 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42245:42251 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/N50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/R50;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42247 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42247:42253 -> c
@@ -16089,9 +16089,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Array$Element$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42665 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42084 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():42139:42139 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:13:com.android.tools.r8.com.android.aapt.Resources$Array$Element buildPartial():42158:42170 -> h
     1:13:com.android.tools.r8.com.android.aapt.Resources$Array$Element build():42149 -> h
     1:13:com.android.tools.r8.com.google.protobuf.Message build():42084 -> h
@@ -16102,8 +16102,8 @@
     1:13:com.android.tools.r8.com.google.protobuf.Message buildPartial():42084 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42096:42097 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Attribute -> com.android.tools.r8.internal.V50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Attribute -> com.android.tools.r8.internal.Z50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int formatFlags_ -> e
     int minInt_ -> f
@@ -16111,19 +16111,19 @@
     java.util.List symbol_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.android.aapt.Resources$Attribute DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z50;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U50;"}
     1:9:void <clinit>():36507:36515 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):33784:33784 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V50;)V"}
     1841:1841:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):35624:35624 -> <init>
     1842:1842:void <init>():33786:33786 -> <init>
     3680:3680:void <init>():35624:35624 -> <init>
     3681:3681:void <init>():33787:33787 -> <init>
     1:5:boolean isInitialized():35627:35631 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):35638:35639 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):35639 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16144,7 +16144,7 @@
     18:21:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):35647:35650 -> a
     22:22:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35811:35811 -> a
     22:22:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):33777 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Attribute getDefaultInstanceForType():36536:36536 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():33777 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -16161,15 +16161,15 @@
     18:18:int com.android.tools.r8.internal.Resources$Attribute.getSerializedSize():0 -> c
     19:19:int getSerializedSize():0:0 -> c
     19:19:int com.android.tools.r8.internal.Resources$Attribute.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35696},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35696},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     35694:35695:int getSerializedSize():35675:35676 -> c
     35694:35695:int com.android.tools.r8.internal.Resources$Attribute.getSerializedSize():0 -> c
     35696:35696:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     35696:35696:int getSerializedSize():35673 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():33777:33777 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():33800:33800 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):35685:35688 -> equals
     5:5:int getFormatFlags():35524:35524 -> equals
     5:5:boolean equals(java.lang.Object):35690 -> equals
@@ -16201,7 +16201,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Attribute.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Attribute.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getFormatFlags():35524:35524 -> hashCode
     4:4:int hashCode():35710 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$Attribute.hashCode():0 -> hashCode
@@ -16227,15 +16227,15 @@
     12:15:int com.android.tools.r8.internal.Resources$Attribute.hashCode():0 -> hashCode
     16:16:int hashCode():35708:35708 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():33875:33876 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder toBuilder():35804:35805 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R50;"}
-com.android.tools.r8.com.android.aapt.Resources$Attribute$1 -> com.android.tools.r8.internal.Q50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V50;"}
+com.android.tools.r8.com.android.aapt.Resources$Attribute$1 -> com.android.tools.r8.internal.U50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():36515:36515 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Attribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36521:36521 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36515 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Attribute.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33806:33808 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Attribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36521 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36515 -> a
@@ -16291,7 +16291,7 @@
     66:68:void com.android.tools.r8.com.android.aapt.Resources$Attribute.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33861:33863 -> a
     66:68:com.android.tools.r8.com.android.aapt.Resources$Attribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36521 -> a
     66:68:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36515 -> a
-com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder -> com.android.tools.r8.internal.R50:
+com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder -> com.android.tools.r8.internal.V50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     int formatFlags_ -> g
@@ -16299,23 +16299,23 @@
     int maxInt_ -> i
     java.util.List symbol_ -> j
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 symbolBuilder_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():35839 -> <init>
     2:2:void <init>():36160:36160 -> <init>
     3:3:void maybeForceBuilderInitialization():35850:35850 -> <init>
     3:3:void <init>():35840 -> <init>
     4:319:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35845:36160 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     320:320:void maybeForceBuilderInitialization():35850:35850 -> <init>
     320:320:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35846 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35821:35821 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35833:35834 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35942 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35821 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35942 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35821 -> a
@@ -16324,10 +16324,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36497:36497 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35821 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Attribute com.android.tools.r8.com.android.aapt.Resources$Attribute.getDefaultInstance():36511:36511 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Attribute):35955 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V50;)Lcom/android/tools/r8/internal/R50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z50;)Lcom/android/tools/r8/internal/V50;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$Attribute.getFormatFlags():35524:35524 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Attribute):35956 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16364,14 +16364,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36491 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35821 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35821:35821 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35833:35834 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35920 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35821 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35920 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35821 -> b
@@ -16384,9 +16384,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Attribute build():35885:35887 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():35821 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36008:36014 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/R50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/V50;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36010 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36010:36016 -> c
@@ -16396,41 +16396,41 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36491 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35821 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():35875:35875 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Attribute build():35885:35887 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():35821 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():35821:35821 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35833:35834 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:15:com.android.tools.r8.com.android.aapt.Resources$Attribute buildPartial():35894:35908 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V50;"}
-com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol -> com.android.tools.r8.internal.U50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z50;"}
+com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol -> com.android.tools.r8.internal.Y50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference name_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     int value_ -> h
     int type_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y50;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W50;"}
     1:9:void <clinit>():35477:35485 -> <clinit>
     1:266:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):34293:34558 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X50;)V"}
     267:530:void <init>():34295:34558 -> <init>
     531:531:void <init>():34296:34296 -> <init>
     1:5:boolean isInitialized():34561:34565 -> a
     6:16:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):34572:34582 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     17:17:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     17:17:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):34582 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16445,7 +16445,7 @@
     23:23:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):34587:34587 -> a
     24:24:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34763:34763 -> a
     24:24:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol getDefaultInstanceForType():35506:35506 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():34286 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -16467,7 +16467,7 @@
     17:17:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
     18:18:int getSerializedSize():0:0 -> c
     18:18:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":69248},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":69248},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     34629:34629:int getSerializedSize():34611:34611 -> c
     34629:34629:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
     34630:34630:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -16475,7 +16475,7 @@
     34630:34630:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
     34631:34631:int getSerializedSize():0:0 -> c
     34631:34631:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":69249},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":69249},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     69246:69247:int getSerializedSize():34615:34616 -> c
     69246:69247:int com.android.tools.r8.internal.Resources$Attribute$Symbol.getSerializedSize():0 -> c
     69248:69248:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -16484,9 +16484,9 @@
     69249:69249:int getSerializedSize():34613 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder toBuilder():34756:34757 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():34286 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():34309:34309 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):34625:34628 -> equals
     5:5:boolean hasSource():34415:34415 -> equals
     5:5:boolean equals(java.lang.Object):34630 -> equals
@@ -16539,21 +16539,21 @@
     25:25:int hashCode():34670 -> hashCode
     26:27:int hashCode():34671:34672 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34398:34399 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference getName():34513:34513 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference getName():34513 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():34427:34427 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():34427 -> l
-com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$1 -> com.android.tools.r8.internal.S50:
+com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$1 -> com.android.tools.r8.internal.W50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():35485:35485 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35491:35491 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35485 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34315:34317 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35491 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35485 -> a
@@ -16616,14 +16616,14 @@
     84:84:void com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34386:34386 -> a
     84:84:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35491 -> a
     84:84:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35485 -> a
-com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder -> com.android.tools.r8.internal.T50:
+com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder -> com.android.tools.r8.internal.X50:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference name_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     int value_ -> i
     int type_ -> j
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -16632,16 +16632,16 @@
     3:3:void maybeForceBuilderInitialization():34802:34802 -> <init>
     3:3:void <init>():34792 -> <init>
     4:320:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34797:35113 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     321:321:void maybeForceBuilderInitialization():34802:34802 -> <init>
     321:321:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34798 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34773:34773 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34785:34786 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34899 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34773 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34899 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34773 -> a
@@ -16650,10 +16650,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35467:35467 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34773 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol.getDefaultInstance():35481:35481 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol):34912 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U50;)Lcom/android/tools/r8/internal/T50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y50;)Lcom/android/tools/r8/internal/X50;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol.hasSource():34415:34415 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol):34913 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16695,14 +16695,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35461 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34773 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34773:34773 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34785:34786 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34877 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34773 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34877 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34773 -> b
@@ -16716,11 +16716,11 @@
     1:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol buildPartial():34851:34865 -> build
     1:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol build():34842 -> build
     1:15:com.android.tools.r8.com.google.protobuf.MessageLite build():34773 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     16:17:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol build():34843:34844 -> build
     16:17:com.android.tools.r8.com.google.protobuf.MessageLite build():34773 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34946:34952 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/T50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/X50;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34948 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34948:34954 -> c
@@ -16730,9 +16730,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35461 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34773 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():34832:34832 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol buildPartial():34851:34865 -> h
     1:15:com.android.tools.r8.com.android.aapt.Resources$Attribute$Symbol build():34842 -> h
     1:15:com.android.tools.r8.com.google.protobuf.Message build():34773 -> h
@@ -16743,22 +16743,22 @@
     1:15:com.android.tools.r8.com.google.protobuf.Message buildPartial():34773 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34785:34786 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Boolean -> com.android.tools.r8.internal.Y50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Boolean -> com.android.tools.r8.internal.c60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     boolean value_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$Boolean DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a60;"}
     1:9:void <clinit>():24851:24859 -> <clinit>
     1:84:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):24412:24495 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b60;)V"}
     85:166:void <init>():24414:24495 -> <init>
     167:248:void <init>():24414:24495 -> <init>
     167:248:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24433 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     249:249:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24435:24435 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -16777,10 +16777,10 @@
     280:280:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24467:24467 -> <init>
     1:5:boolean isInitialized():24498:24502 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):24509:24512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24648:24648 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Boolean getDefaultInstanceForType():24880:24880 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():24405 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -16789,9 +16789,9 @@
     6:6:int getSerializedSize():24523 -> c
     7:8:int getSerializedSize():24525:24526 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():24405:24405 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():24427:24427 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):24535:24538 -> equals
     5:5:boolean getValue():24492:24492 -> equals
     5:5:boolean equals(java.lang.Object):24540 -> equals
@@ -16811,7 +16811,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Boolean.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Boolean.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:boolean getValue():24492:24492 -> hashCode
     4:4:int hashCode():24555 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$Boolean.hashCode():0 -> hashCode
@@ -16819,16 +16819,16 @@
     5:8:int com.android.tools.r8.internal.Resources$Boolean.hashCode():0 -> hashCode
     9:9:int hashCode():24552:24552 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24479:24480 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder toBuilder():24641:24642 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X50;"}
-com.android.tools.r8.com.android.aapt.Resources$Boolean$1 -> com.android.tools.r8.internal.W50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b60;"}
+com.android.tools.r8.com.android.aapt.Resources$Boolean$1 -> com.android.tools.r8.internal.a60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():24859:24859 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Boolean parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24865:24865 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24859 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder -> com.android.tools.r8.internal.X50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder -> com.android.tools.r8.internal.b60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     boolean value_ -> f
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -16836,16 +16836,16 @@
     2:2:void maybeForceBuilderInitialization():24687:24687 -> <init>
     2:2:void <init>():24677 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24682:24682 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():24687:24687 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24683 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24658:24658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24670:24671 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24756 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24756 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24658 -> a
@@ -16854,10 +16854,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24841:24841 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Boolean com.android.tools.r8.com.android.aapt.Resources$Boolean.getDefaultInstance():24855:24855 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Boolean):24769 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y50;)Lcom/android/tools/r8/internal/X50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c60;)Lcom/android/tools/r8/internal/b60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Boolean.getValue():24492:24492 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Boolean):24770 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -16872,14 +16872,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24835 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24658 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24658:24658 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24670:24671 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24734 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24658 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24734 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24658 -> b
@@ -16893,11 +16893,11 @@
     1:3:com.android.tools.r8.com.android.aapt.Resources$Boolean buildPartial():24720:24722 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$Boolean build():24711 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():24658 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$Boolean build():24712:24713 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():24658 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24790:24790 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/X50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/b60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Boolean com.android.tools.r8.com.android.aapt.Resources$Boolean$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24865:24865 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$Boolean$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24859 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24790 -> c
@@ -16911,9 +16911,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Boolean$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24835 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24658 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():24701:24701 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Boolean buildPartial():24720:24722 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$Boolean build():24711 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():24658 -> h
@@ -16924,27 +16924,27 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():24658 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24670:24671 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$CompoundValue -> com.android.tools.r8.internal.b60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$CompoundValue -> com.android.tools.r8.internal.f60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> e
     java.lang.Object value_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BN;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$CompoundValue DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d60;"}
     1:9:void <clinit>():24354:24362 -> <clinit>
     1:387:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):22625:23011 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e60;)V"}
     388:772:void <init>():22627:23011 -> <init>
     1:5:boolean isInitialized():23014:23018 -> a
     6:24:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):23025:23043 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     25:25:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):23251:23251 -> a
     25:25:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):22618 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$CompoundValue getDefaultInstanceForType():24383:24383 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():22618 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -16968,9 +16968,9 @@
     22:22:int getSerializedSize():23074 -> c
     23:24:int getSerializedSize():23076:23077 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():22618:22618 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():22640:22640 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:7:boolean equals(java.lang.Object):23086:23092 -> equals
     8:8:com.android.tools.r8.com.android.aapt.Resources$MacroBody getMacro():22996:22996 -> equals
     8:8:boolean equals(java.lang.Object):23114 -> equals
@@ -17072,21 +17072,21 @@
     46:46:int hashCode():23134 -> hashCode
     47:73:int hashCode():23134:23160 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():22771:22772 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style getStyle():22871:22872 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/N70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R70;"}
     3:3:com.android.tools.r8.com.android.aapt.Resources$Style com.android.tools.r8.com.android.aapt.Resources$Style.getDefaultInstance():39351:39351 -> k
     3:3:com.android.tools.r8.com.android.aapt.Resources$Style getStyle():22874 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$ValueCase getValueCase():22821:22821 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder toBuilder():23244:23245 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a60;"}
-com.android.tools.r8.com.android.aapt.Resources$CompoundValue$1 -> com.android.tools.r8.internal.Z50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e60;"}
+com.android.tools.r8.com.android.aapt.Resources$CompoundValue$1 -> com.android.tools.r8.internal.d60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():24362:24362 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$CompoundValue parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24368:24368 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$CompoundValue.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22646:22648 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$CompoundValue parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24368 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24362 -> a
@@ -17180,27 +17180,27 @@
     158:158:void com.android.tools.r8.com.android.aapt.Resources$CompoundValue.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22759:22759 -> a
     158:158:com.android.tools.r8.com.android.aapt.Resources$CompoundValue parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24368 -> a
     158:158:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24362 -> a
-com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder -> com.android.tools.r8.internal.a60:
+com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder -> com.android.tools.r8.internal.e60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> f
     java.lang.Object value_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/as;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cs;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():23281 -> <init>
     2:2:void <init>():23474:23474 -> <init>
     3:3:void maybeForceBuilderInitialization():23292:23292 -> <init>
     3:3:void <init>():23282 -> <init>
     4:191:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):23287:23474 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     192:192:void maybeForceBuilderInitialization():23292:23292 -> <init>
     192:192:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):23288 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):23263:23263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():23275:23276 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23403 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23403 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23263 -> a
@@ -17209,10 +17209,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24344:24344 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):23263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$CompoundValue com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getDefaultInstance():24358:24358 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$CompoundValue):23416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b60;)Lcom/android/tools/r8/internal/a60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f60;)Lcom/android/tools/r8/internal/e60;"}
     11:11:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$CompoundValue):23417:23417 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$MacroBody com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getMacro():22995:22996 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$CompoundValue):23439 -> a
@@ -17321,14 +17321,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24338 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):23263 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):23263:23263 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():23275:23276 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23381 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23263 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23381 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):23263 -> b
@@ -17341,9 +17341,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$CompoundValue build():23316:23318 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():23263 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):23463:23469 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/a60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/e60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):23465 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):23465:23471 -> c
@@ -17353,36 +17353,36 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$CompoundValue$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24338 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):23263 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():23306:23306 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$CompoundValue build():23316:23318 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():23263 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():23263:23263 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():23275:23276 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:45:com.android.tools.r8.com.android.aapt.Resources$CompoundValue buildPartial():23325:23369 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b60;"}
-com.android.tools.r8.com.android.aapt.Resources$ConfigValue -> com.android.tools.r8.internal.e60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f60;"}
+com.android.tools.r8.com.android.aapt.Resources$ConfigValue -> com.android.tools.r8.internal.i60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration config_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ag;"}
     com.android.tools.r8.com.android.aapt.Resources$Value value_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$ConfigValue DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g60;"}
     1:9:void <clinit>():18880:18888 -> <clinit>
     1:146:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):18130:18275 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h60;)V"}
     147:290:void <init>():18132:18275 -> <init>
     291:434:void <init>():18132:18275 -> <init>
     291:434:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18151 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     435:435:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18153:18153 -> <init>
     436:436:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     436:436:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -17408,10 +17408,10 @@
     494:494:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18206:18206 -> <init>
     1:5:boolean isInitialized():18278:18282 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):18289:18295 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18448:18448 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$ConfigValue getDefaultInstanceForType():18909:18909 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():18123 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -17424,9 +17424,9 @@
     13:14:int getSerializedSize():18312:18313 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder toBuilder():18441:18442 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():18123 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():18145:18145 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):18322:18325 -> equals
     5:5:boolean hasConfig():18231:18231 -> equals
     5:5:boolean equals(java.lang.Object):18327 -> equals
@@ -17450,43 +17450,43 @@
     4:4:int hashCode():18348 -> hashCode
     5:12:int hashCode():18350:18357 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18218:18219 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration getConfig():18239:18239 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ag;"}
     2:2:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration.getDefaultInstance():5605:5605 -> k
     2:2:com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration getConfig():18239 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Value getValue():18265:18265 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y80;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Value com.android.tools.r8.com.android.aapt.Resources$Value.getDefaultInstance():20379:20379 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Value getValue():18265 -> l
     1:1:boolean hasValue():18257:18257 -> m
-com.android.tools.r8.com.android.aapt.Resources$ConfigValue$1 -> com.android.tools.r8.internal.c60:
+com.android.tools.r8.com.android.aapt.Resources$ConfigValue$1 -> com.android.tools.r8.internal.g60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():18888:18888 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$ConfigValue parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18894:18894 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder -> com.android.tools.r8.internal.d60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder -> com.android.tools.r8.internal.h60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.ConfigurationOuterClass$Configuration config_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ag;"}
     com.android.tools.r8.com.android.aapt.Resources$Value value_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():18476 -> <init>
     2:2:void maybeForceBuilderInitialization():18487:18487 -> <init>
     2:2:void <init>():18477 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18482:18482 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():18487:18487 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18483 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18458:18458 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18470:18471 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18575 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18458 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18575 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18458 -> a
@@ -17495,10 +17495,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18870:18870 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18458 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$ConfigValue com.android.tools.r8.com.android.aapt.Resources$ConfigValue.getDefaultInstance():18884:18884 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ConfigValue):18588 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e60;)Lcom/android/tools/r8/internal/d60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i60;)Lcom/android/tools/r8/internal/h60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$ConfigValue.hasConfig():18231:18231 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ConfigValue):18589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -17527,14 +17527,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18864 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18458 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18458:18458 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18470:18471 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18553 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18458 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18553 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18458 -> b
@@ -17548,11 +17548,11 @@
     1:12:com.android.tools.r8.com.android.aapt.Resources$ConfigValue buildPartial():18530:18541 -> build
     1:12:com.android.tools.r8.com.android.aapt.Resources$ConfigValue build():18521 -> build
     1:12:com.android.tools.r8.com.google.protobuf.MessageLite build():18458 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     13:14:com.android.tools.r8.com.android.aapt.Resources$ConfigValue build():18522:18523 -> build
     13:14:com.android.tools.r8.com.google.protobuf.MessageLite build():18458 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18612:18612 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/d60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/h60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$ConfigValue com.android.tools.r8.com.android.aapt.Resources$ConfigValue$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18894:18894 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$ConfigValue$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18888 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18612 -> c
@@ -17566,9 +17566,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$ConfigValue$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18864 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18458 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():18511:18511 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:12:com.android.tools.r8.com.android.aapt.Resources$ConfigValue buildPartial():18530:18541 -> h
     1:12:com.android.tools.r8.com.android.aapt.Resources$ConfigValue build():18521 -> h
     1:12:com.android.tools.r8.com.google.protobuf.Message build():18458 -> h
@@ -17579,29 +17579,29 @@
     1:12:com.android.tools.r8.com.google.protobuf.Message buildPartial():18458 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18470:18471 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable -> com.android.tools.r8.internal.h60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable -> com.android.tools.r8.internal.l60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$PackageId packageId_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
     java.lang.Object packageName_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j60;"}
     1:9:void <clinit>():3273:3281 -> <clinit>
     1:152:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2573:2724 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k60;)V"}
     153:302:void <init>():2575:2724 -> <init>
     303:303:void <init>():2576:2576 -> <init>
     1:5:boolean isInitialized():2727:2731 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):2738:2744 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2891:2891 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2566 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable getDefaultInstanceForType():3302:3302 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():2566 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -17611,9 +17611,9 @@
     9:13:int getSerializedSize():2757:2761 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder toBuilder():2884:2885 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():2566 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():2589:2589 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):2770:2773 -> equals
     5:5:boolean hasPackageId():2668:2668 -> equals
     5:5:boolean equals(java.lang.Object):2775 -> equals
@@ -17645,17 +17645,17 @@
     9:16:int hashCode():2798 -> hashCode
     17:19:int hashCode():2798:2800 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2655:2656 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$PackageId getPackageId():2676:2676 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId com.android.tools.r8.com.android.aapt.Resources$PackageId.getDefaultInstance():6304:6304 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId getPackageId():2676 -> k
-com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$1 -> com.android.tools.r8.internal.f60:
+com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$1 -> com.android.tools.r8.internal.j60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():3281:3281 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3287:3287 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2595:2597 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3287 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3281 -> a
@@ -17702,10 +17702,10 @@
     52:52:void com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2643:2643 -> a
     52:52:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3287 -> a
     52:52:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3281 -> a
-com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder -> com.android.tools.r8.internal.g60:
+com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder -> com.android.tools.r8.internal.k60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$PackageId packageId_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
     java.lang.Object packageName_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -17714,16 +17714,16 @@
     3:3:void maybeForceBuilderInitialization():2930:2930 -> <init>
     3:3:void <init>():2920 -> <init>
     4:258:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2925:3179 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     259:259:void maybeForceBuilderInitialization():2930:2930 -> <init>
     259:259:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2926 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2901:2901 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2913:2914 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3010 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2901 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):3010 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2901 -> a
@@ -17732,10 +17732,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3263:3263 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2901 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable.getDefaultInstance():3277:3277 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable):3023 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h60;)Lcom/android/tools/r8/internal/g60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l60;)Lcom/android/tools/r8/internal/k60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable.hasPackageId():2668:2668 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable):3024 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -17759,14 +17759,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3257 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2901 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2901:2901 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2913:2914 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2988 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2901 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2988 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2901 -> b
@@ -17780,11 +17780,11 @@
     1:8:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable buildPartial():2969:2976 -> build
     1:8:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable build():2960 -> build
     1:8:com.android.tools.r8.com.google.protobuf.MessageLite build():2901 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     9:10:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable build():2961:2962 -> build
     9:10:com.android.tools.r8.com.google.protobuf.MessageLite build():2901 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3048:3054 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/g60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/k60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3050 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3050:3056 -> c
@@ -17794,9 +17794,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):3257 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2901 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():2950:2950 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:8:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable buildPartial():2969:2976 -> h
     1:8:com.android.tools.r8.com.android.aapt.Resources$DynamicRefTable build():2960 -> h
     1:8:com.android.tools.r8.com.google.protobuf.Message build():2901 -> h
@@ -17807,38 +17807,38 @@
     1:8:com.android.tools.r8.com.google.protobuf.Message buildPartial():2901 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2913:2914 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Entry -> com.android.tools.r8.internal.k60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Entry -> com.android.tools.r8.internal.o60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$EntryId entryId_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r60;"}
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Visibility visibility_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C80;"}
     com.android.tools.r8.com.android.aapt.Resources$AllowNew allowNew_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M50;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem overlayableItem_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q60;"}
     java.util.List configValue_ -> j
     com.android.tools.r8.com.android.aapt.Resources$StagedId stagedId_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F70;"}
     byte memoizedIsInitialized -> l
     com.android.tools.r8.com.android.aapt.Resources$Entry DEFAULT_INSTANCE -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m60;"}
     1:9:void <clinit>():18048:18056 -> <clinit>
     1:469:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):15805:16273 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n60;)V"}
     470:936:void <init>():15807:16273 -> <init>
     937:938:void <init>():15808:15809 -> <init>
     1:5:boolean isInitialized():16276:16280 -> a
     6:27:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):16287:16308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     28:28:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):16517:16517 -> a
     28:28:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15798 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Entry getDefaultInstanceForType():18077:18077 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():15798 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -17870,7 +17870,7 @@
     27:27:int com.android.tools.r8.internal.Resources$Entry.getSerializedSize():0 -> c
     28:28:int getSerializedSize():0:0 -> c
     28:28:int com.android.tools.r8.internal.Resources$Entry.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16374},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16374},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     16368:16370:int getSerializedSize():16340:16342 -> c
     16368:16370:int com.android.tools.r8.internal.Resources$Entry.getSerializedSize():0 -> c
     16371:16371:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -17882,9 +17882,9 @@
     16374:16374:int getSerializedSize():16338 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder toBuilder():16510:16511 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():15798 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():15822:15822 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):16354:16357 -> equals
     5:5:boolean hasEntryId():15973:15973 -> equals
     5:5:boolean equals(java.lang.Object):16359 -> equals
@@ -17937,35 +17937,35 @@
     21:21:int hashCode():16421 -> hashCode
     22:25:int hashCode():16423:16426 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15953:15954 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$AllowNew getAllowNew():16117:16117 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M50;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$AllowNew com.android.tools.r8.com.android.aapt.Resources$AllowNew.getDefaultInstance():11744:11744 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$AllowNew getAllowNew():16117 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$EntryId getEntryId():15988:15988 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$EntryId com.android.tools.r8.com.android.aapt.Resources$EntryId.getDefaultInstance():15537:15537 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$EntryId getEntryId():15988 -> l
     1:8:java.lang.String getName():16018:16025 -> m
     1:1:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem getOverlayableItem():16156:16156 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem com.android.tools.r8.com.android.aapt.Resources$OverlayableItem.getDefaultInstance():14342:14342 -> n
     2:2:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem getOverlayableItem():16156 -> n
     1:1:com.android.tools.r8.com.android.aapt.Resources$StagedId getStagedId():16259:16259 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$StagedId com.android.tools.r8.com.android.aapt.Resources$StagedId.getDefaultInstance():15041:15041 -> o
     2:2:com.android.tools.r8.com.android.aapt.Resources$StagedId getStagedId():16259 -> o
     1:1:com.android.tools.r8.com.android.aapt.Resources$Visibility getVisibility():16077:16077 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C80;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Visibility com.android.tools.r8.com.android.aapt.Resources$Visibility.getDefaultInstance():10867:10867 -> p
     2:2:com.android.tools.r8.com.android.aapt.Resources$Visibility getVisibility():16077 -> p
     1:1:boolean hasOverlayableItem():16144:16144 -> q
-com.android.tools.r8.com.android.aapt.Resources$Entry$1 -> com.android.tools.r8.internal.i60:
+com.android.tools.r8.com.android.aapt.Resources$Entry$1 -> com.android.tools.r8.internal.m60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():18056:18056 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18062:18062 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18056 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15828:15830 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18062 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18056 -> a
@@ -18086,40 +18086,40 @@
     170:172:void com.android.tools.r8.com.android.aapt.Resources$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15939:15941 -> a
     170:172:com.android.tools.r8.com.android.aapt.Resources$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18062 -> a
     170:172:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18056 -> a
-com.android.tools.r8.com.android.aapt.Resources$Entry$Builder -> com.android.tools.r8.internal.j60:
+com.android.tools.r8.com.android.aapt.Resources$Entry$Builder -> com.android.tools.r8.internal.n60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$EntryId entryId_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r60;"}
     java.lang.Object name_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Visibility visibility_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C80;"}
     com.android.tools.r8.com.android.aapt.Resources$AllowNew allowNew_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M50;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem overlayableItem_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q60;"}
     java.util.List configValue_ -> l
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 configValueBuilder_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.android.aapt.Resources$StagedId stagedId_ -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():16547 -> <init>
     2:578:void <init>():16970:17546 -> <init>
     579:579:void maybeForceBuilderInitialization():16558:16558 -> <init>
     579:579:void <init>():16548 -> <init>
     580:1573:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):16553:17546 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1574:1574:void maybeForceBuilderInitialization():16558:16558 -> <init>
     1574:1574:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):16554 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16529:16529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():16541:16542 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16699 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16699 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16529 -> a
@@ -18128,10 +18128,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18038:18038 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Entry com.android.tools.r8.com.android.aapt.Resources$Entry.getDefaultInstance():18052:18052 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Entry):16712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k60;)Lcom/android/tools/r8/internal/j60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o60;)Lcom/android/tools/r8/internal/n60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Entry.hasEntryId():15973:15973 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Entry):16713 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -18220,14 +18220,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18032 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16529 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16529:16529 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():16541:16542 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16677 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16529 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16677 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16529 -> b
@@ -18240,9 +18240,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Entry build():16619:16621 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():16529 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16775:16781 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/j60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/n60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16777 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16777:16783 -> c
@@ -18252,33 +18252,33 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18032 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16529 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():16609:16609 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Entry build():16619:16621 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():16529 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():16529:16529 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():16541:16542 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:38:com.android.tools.r8.com.android.aapt.Resources$Entry buildPartial():16628:16665 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k60;"}
-com.android.tools.r8.com.android.aapt.Resources$EntryId -> com.android.tools.r8.internal.n60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o60;"}
+com.android.tools.r8.com.android.aapt.Resources$EntryId -> com.android.tools.r8.internal.r60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$EntryId DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p60;"}
     1:9:void <clinit>():15533:15541 -> <clinit>
     1:84:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):15095:15178 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/q60;)V"}
     85:166:void <init>():15097:15178 -> <init>
     167:248:void <init>():15097:15178 -> <init>
     167:248:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     249:249:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15118:15118 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -18297,7 +18297,7 @@
     280:280:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15150:15150 -> <init>
     1:5:boolean isInitialized():15181:15185 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15192:15193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15193 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -18306,7 +18306,7 @@
     10:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15195:15195 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15330:15330 -> a
     11:11:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15088 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$EntryId getDefaultInstanceForType():15562:15562 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():15088 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -18315,9 +18315,9 @@
     6:6:int getSerializedSize():15206 -> c
     7:8:int getSerializedSize():15208:15209 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():15088:15088 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():15110:15110 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):15218:15221 -> equals
     5:5:int getId():15175:15175 -> equals
     5:5:boolean equals(java.lang.Object):15223 -> equals
@@ -18337,7 +18337,7 @@
     2:2:int com.android.tools.r8.internal.Resources$EntryId.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$EntryId.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getId():15175:15175 -> hashCode
     4:4:int hashCode():15237 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$EntryId.hashCode():0 -> hashCode
@@ -18345,16 +18345,16 @@
     5:6:int com.android.tools.r8.internal.Resources$EntryId.hashCode():0 -> hashCode
     7:7:int hashCode():15235:15235 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15162:15163 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder toBuilder():15323:15324 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m60;"}
-com.android.tools.r8.com.android.aapt.Resources$EntryId$1 -> com.android.tools.r8.internal.l60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q60;"}
+com.android.tools.r8.com.android.aapt.Resources$EntryId$1 -> com.android.tools.r8.internal.p60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():15541:15541 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$EntryId parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15547:15547 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15541 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder -> com.android.tools.r8.internal.m60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder -> com.android.tools.r8.internal.q60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> f
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -18362,16 +18362,16 @@
     2:2:void maybeForceBuilderInitialization():15369:15369 -> <init>
     2:2:void <init>():15359 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15364:15364 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():15369:15369 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15365 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15340:15340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15352:15353 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15438 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15438 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15340 -> a
@@ -18380,10 +18380,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15523:15523 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$EntryId com.android.tools.r8.com.android.aapt.Resources$EntryId.getDefaultInstance():15537:15537 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$EntryId):15451 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n60;)Lcom/android/tools/r8/internal/m60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r60;)Lcom/android/tools/r8/internal/q60;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$EntryId.getId():15175:15175 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$EntryId):15452 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -18398,14 +18398,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15517 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15340 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15340:15340 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15352:15353 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15416 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15340 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15416 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15340 -> b
@@ -18419,11 +18419,11 @@
     1:3:com.android.tools.r8.com.android.aapt.Resources$EntryId buildPartial():15402:15404 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$EntryId build():15393 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():15340 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$EntryId build():15394:15395 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():15340 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15472:15472 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/m60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/q60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$EntryId com.android.tools.r8.com.android.aapt.Resources$EntryId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15547:15547 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$EntryId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15541 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15472 -> c
@@ -18437,9 +18437,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$EntryId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15517 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15340 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():15383:15383 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$EntryId buildPartial():15402:15404 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$EntryId build():15393 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():15340 -> h
@@ -18450,31 +18450,31 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():15340 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15352:15353 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$FileReference -> com.android.tools.r8.internal.r60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$FileReference -> com.android.tools.r8.internal.v60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object path_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     int type_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$FileReference DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s60;"}
     1:9:void <clinit>():30586:30594 -> <clinit>
     1:283:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):29789:30071 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t60;)V"}
     284:564:void <init>():29791:30071 -> <init>
     565:566:void <init>():29792:29793 -> <init>
     1:5:boolean isInitialized():30074:30078 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):30085:30088 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:int com.android.tools.r8.com.android.aapt.Resources$FileReference$Type.getNumber():29917:29917 -> a
     10:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):30088 -> a
     11:13:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):30089:30091 -> a
     14:14:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30232:30232 -> a
     14:14:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29782 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$FileReference getDefaultInstanceForType():30615:30615 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():29782 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -18491,15 +18491,15 @@
     11:11:int com.android.tools.r8.internal.Resources$FileReference.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.Resources$FileReference.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":30121},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":30121},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     30119:30120:int getSerializedSize():30107:30108 -> c
     30119:30120:int com.android.tools.r8.internal.Resources$FileReference.getSerializedSize():0 -> c
     30121:30121:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeEnumSize(int,int):613:613 -> c
     30121:30121:int getSerializedSize():30105 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():29782:29782 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():29806:29806 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:9:boolean equals(java.lang.Object):30117:30125 -> equals
     1:1:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder newBuilder():30218:30218 -> h
     1:1:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder newBuilderForType():30216 -> h
@@ -18513,21 +18513,21 @@
     2:2:int com.android.tools.r8.internal.Resources$FileReference.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$FileReference.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":30145},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":30145},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     30140:30144:int hashCode():30137:30141 -> hashCode
     30140:30144:int com.android.tools.r8.internal.Resources$FileReference.hashCode():0 -> hashCode
     30145:30145:int hashCode():30135:30135 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29865:29866 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:8:java.lang.String getPath():30008:30015 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder toBuilder():30225:30226 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p60;"}
-com.android.tools.r8.com.android.aapt.Resources$FileReference$1 -> com.android.tools.r8.internal.o60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t60;"}
+com.android.tools.r8.com.android.aapt.Resources$FileReference$1 -> com.android.tools.r8.internal.s60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():30594:30594 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$FileReference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30600:30600 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30594 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$FileReference.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29812:29814 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$FileReference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30600 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30594 -> a
@@ -18567,7 +18567,7 @@
     46:46:void com.android.tools.r8.com.android.aapt.Resources$FileReference.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29853:29853 -> a
     46:46:com.android.tools.r8.com.android.aapt.Resources$FileReference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30600 -> a
     46:46:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30594 -> a
-com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder -> com.android.tools.r8.internal.p60:
+com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder -> com.android.tools.r8.internal.t60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object path_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -18578,16 +18578,16 @@
     99:99:void maybeForceBuilderInitialization():30271:30271 -> <init>
     99:99:void <init>():30261 -> <init>
     100:323:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30266:30489 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     324:324:void maybeForceBuilderInitialization():30271:30271 -> <init>
     324:324:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30267 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30242:30242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30254:30255 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30343 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30343 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30242 -> a
@@ -18596,10 +18596,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30576:30576 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$FileReference com.android.tools.r8.com.android.aapt.Resources$FileReference.getDefaultInstance():30590:30590 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$FileReference):30356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r60;)Lcom/android/tools/r8/internal/p60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v60;)Lcom/android/tools/r8/internal/t60;"}
     11:15:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$FileReference):30357:30361 -> a
     16:17:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder setTypeValue(int):30514:30515 -> a
     16:17:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$FileReference):30362 -> a
@@ -18612,14 +18612,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30570 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30242:30242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30254:30255 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30321 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30321 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):30242 -> b
@@ -18633,11 +18633,11 @@
     1:4:com.android.tools.r8.com.android.aapt.Resources$FileReference buildPartial():30306:30309 -> build
     1:4:com.android.tools.r8.com.android.aapt.Resources$FileReference build():30297 -> build
     1:4:com.android.tools.r8.com.google.protobuf.MessageLite build():30242 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     5:6:com.android.tools.r8.com.android.aapt.Resources$FileReference build():30298:30299 -> build
     5:6:com.android.tools.r8.com.google.protobuf.MessageLite build():30242 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30381:30387 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/p60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/t60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30383 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30383:30389 -> c
@@ -18647,9 +18647,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$FileReference$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30570 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30242 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():30287:30287 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:4:com.android.tools.r8.com.android.aapt.Resources$FileReference buildPartial():30306:30309 -> h
     1:4:com.android.tools.r8.com.android.aapt.Resources$FileReference build():30297 -> h
     1:4:com.android.tools.r8.com.google.protobuf.Message build():30242 -> h
@@ -18660,28 +18660,28 @@
     1:4:com.android.tools.r8.com.google.protobuf.Message buildPartial():30242 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30254:30255 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
 com.android.tools.r8.com.android.aapt.Resources$FileReference$Type -> R8$$REMOVED$$CLASS$$17:
 # {"id":"sourceFile","fileName":"Resources.java"}
-com.android.tools.r8.com.android.aapt.Resources$FileReference$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.q60:
+com.android.tools.r8.com.android.aapt.Resources$FileReference$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.u60:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.Resources$FileReference$Type$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources$Id -> com.android.tools.r8.internal.u60:
+com.android.tools.r8.com.android.aapt.Resources$Id -> com.android.tools.r8.internal.y60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     byte memoizedIsInitialized -> e
     com.android.tools.r8.com.android.aapt.Resources$Id DEFAULT_INSTANCE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w60;"}
     1:9:void <clinit>():26752:26760 -> <clinit>
     1:68:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):26377:26444 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x60;)V"}
     69:134:void <init>():26379:26444 -> <init>
     135:200:void <init>():26379:26444 -> <init>
     135:200:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26398 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     201:201:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26400:26400 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -18700,18 +18700,18 @@
     217:217:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26427:26427 -> <init>
     1:5:boolean isInitialized():26447:26451 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):26458:26458 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:com.android.tools.r8.com.android.aapt.Resources$Id$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26585:26585 -> a
     7:7:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Id getDefaultInstanceForType():26781:26781 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():26370 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:6:int getSerializedSize():26463:26468 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():26370:26370 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():26392:26392 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:6:boolean equals(java.lang.Object):26477:26482 -> equals
     1:1:com.android.tools.r8.com.android.aapt.Resources$Id$Builder newBuilder():26571:26571 -> h
     1:1:com.android.tools.r8.com.android.aapt.Resources$Id$Builder newBuilderForType():26569 -> h
@@ -18722,32 +18722,32 @@
     2:2:int hashCode():26492 -> hashCode
     3:5:int hashCode():26492:26494 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():26439:26440 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id$Builder toBuilder():26578:26579 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t60;"}
-com.android.tools.r8.com.android.aapt.Resources$Id$1 -> com.android.tools.r8.internal.s60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+com.android.tools.r8.com.android.aapt.Resources$Id$1 -> com.android.tools.r8.internal.w60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():26760:26760 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Id parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26766:26766 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26760 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$Id$Builder -> com.android.tools.r8.internal.t60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$Id$Builder -> com.android.tools.r8.internal.x60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():26614 -> <init>
     2:2:void maybeForceBuilderInitialization():26625:26625 -> <init>
     2:2:void <init>():26615 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26620:26620 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():26625:26625 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26621 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26596:26596 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():26608:26609 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Id$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26691 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26596 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Id$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26691 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26596 -> a
@@ -18756,10 +18756,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26742:26742 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26596 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Id com.android.tools.r8.com.android.aapt.Resources$Id.getDefaultInstance():26756:26756 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Id):26704 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u60;)Lcom/android/tools/r8/internal/t60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y60;)Lcom/android/tools/r8/internal/x60;"}
     11:11:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.android.aapt.Resources$Id.access$6700(com.android.tools.r8.com.android.aapt.Resources$Id):26370:26370 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Id):26705 -> a
     12:12:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26742:26742 -> a
@@ -18769,14 +18769,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26736 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26596 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26596:26596 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():26608:26609 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Id$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26669 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26596 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Id$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26669 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):26596 -> b
@@ -18790,11 +18790,11 @@
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id buildPartial():26656:26657 -> build
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id build():26647 -> build
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite build():26596 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     3:4:com.android.tools.r8.com.android.aapt.Resources$Id build():26648:26649 -> build
     3:4:com.android.tools.r8.com.google.protobuf.MessageLite build():26596 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26722:26722 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/t60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/x60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Id com.android.tools.r8.com.android.aapt.Resources$Id$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26766:26766 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$Id$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26760 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$Id$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26722 -> c
@@ -18808,9 +18808,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26736 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26596 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():26637:26637 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id buildPartial():26656:26657 -> h
     1:2:com.android.tools.r8.com.android.aapt.Resources$Id build():26647 -> h
     1:2:com.android.tools.r8.com.google.protobuf.Message build():26596 -> h
@@ -18821,27 +18821,27 @@
     1:2:com.android.tools.r8.com.google.protobuf.Message buildPartial():26596 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():26608:26609 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Item -> com.android.tools.r8.internal.x60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Item -> com.android.tools.r8.internal.B60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> e
     java.lang.Object value_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BN;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$Item DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z60;"}
     1:9:void <clinit>():22479:22487 -> <clinit>
     1:434:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):20536:20969 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A60;)V"}
     435:866:void <init>():20538:20969 -> <init>
     1:5:boolean isInitialized():20972:20976 -> a
     6:27:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):20983:21004 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     28:28:com.android.tools.r8.com.android.aapt.Resources$Item$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):21224:21224 -> a
     28:28:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):20529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item getDefaultInstanceForType():22508:22508 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():20529 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -18868,9 +18868,9 @@
     25:25:int getSerializedSize():21039 -> c
     26:27:int getSerializedSize():21041:21042 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():20529:20529 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():20551:20551 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:7:boolean equals(java.lang.Object):21051:21057 -> equals
     8:8:com.android.tools.r8.com.android.aapt.Resources$Primitive getPrim():20954:20954 -> equals
     8:8:boolean equals(java.lang.Object):21083 -> equals
@@ -18974,25 +18974,25 @@
     51:51:int hashCode():21107:21107 -> hashCode
     52:82:int hashCode():21103:21133 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():20696:20697 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$FileReference getFile():20891:20892 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v60;"}
     3:3:com.android.tools.r8.com.android.aapt.Resources$FileReference com.android.tools.r8.com.android.aapt.Resources$FileReference.getDefaultInstance():30590:30590 -> k
     3:3:com.android.tools.r8.com.android.aapt.Resources$FileReference getFile():20894 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$Reference getRef():20767:20768 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
     3:3:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> l
     3:3:com.android.tools.r8.com.android.aapt.Resources$Reference getRef():20770 -> l
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item$ValueCase getValueCase():20748:20748 -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Item$Builder toBuilder():21217:21218 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/w60;"}
-com.android.tools.r8.com.android.aapt.Resources$Item$1 -> com.android.tools.r8.internal.v60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A60;"}
+com.android.tools.r8.com.android.aapt.Resources$Item$1 -> com.android.tools.r8.internal.z60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():22487:22487 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22493:22493 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22487 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Item.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20557:20559 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Item parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22493 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22487 -> a
@@ -19124,27 +19124,27 @@
     193:193:void com.android.tools.r8.com.android.aapt.Resources$Item.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20684:20684 -> a
     193:193:com.android.tools.r8.com.android.aapt.Resources$Item parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22493 -> a
     193:193:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22487 -> a
-com.android.tools.r8.com.android.aapt.Resources$Item$Builder -> com.android.tools.r8.internal.w60:
+com.android.tools.r8.com.android.aapt.Resources$Item$Builder -> com.android.tools.r8.internal.A60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> f
     java.lang.Object value_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/as;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cs;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():21254 -> <init>
     2:2:void <init>():21458:21458 -> <init>
     3:3:void maybeForceBuilderInitialization():21265:21265 -> <init>
     3:3:void <init>():21255 -> <init>
     4:202:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):21260:21458 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     203:203:void maybeForceBuilderInitialization():21265:21265 -> <init>
     203:203:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):21261 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21236:21236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():21248:21249 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Item$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21383 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Item$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21383 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21236 -> a
@@ -19153,10 +19153,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):22469:22469 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Item):21396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x60;)Lcom/android/tools/r8/internal/w60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B60;)Lcom/android/tools/r8/internal/A60;"}
     11:11:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Item):21397:21397 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Primitive com.android.tools.r8.com.android.aapt.Resources$Item.getPrim():20953:20954 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Item):21423 -> a
@@ -19298,14 +19298,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Item$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):22463 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21236 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21236:21236 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():21248:21249 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Item$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21361 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21236 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Item$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21361 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):21236 -> b
@@ -19318,9 +19318,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Item build():21289:21291 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():21236 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21447:21453 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/w60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/A60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21449 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Item$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21449:21455 -> c
@@ -19330,44 +19330,44 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Item$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):22463 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21236 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():21279:21279 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Item build():21289:21291 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():21236 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():21236:21236 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():21248:21249 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:52:com.android.tools.r8.com.android.aapt.Resources$Item buildPartial():21298:21349 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
-com.android.tools.r8.com.android.aapt.Resources$MacroBody -> com.android.tools.r8.internal.A60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
+com.android.tools.r8.com.android.aapt.Resources$MacroBody -> com.android.tools.r8.internal.E60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object rawString_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$StyleString styleString_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X70;"}
     java.util.List untranslatableSections_ -> g
     java.util.List namespaceStack_ -> h
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.android.aapt.Resources$MacroBody DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C60;"}
     1:9:void <clinit>():53436:53444 -> <clinit>
     1:298:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):51853:52150 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D60;)V"}
     299:594:void <init>():51855:52150 -> <init>
     595:597:void <init>():51856:51858 -> <init>
     1:5:boolean isInitialized():52153:52157 -> a
     6:21:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):52164:52179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     22:22:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):52359:52359 -> a
     22:22:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):51846 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$MacroBody getDefaultInstanceForType():53465:53465 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():51846 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -19384,7 +19384,7 @@
     15:15:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
     16:16:int getSerializedSize():0:0 -> c
     16:16:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":104428},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":104428},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     52215:52217:int getSerializedSize():52199:52201 -> c
     52215:52217:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
     52218:52218:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -19392,7 +19392,7 @@
     52218:52218:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
     52219:52219:int getSerializedSize():0:0 -> c
     52219:52219:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":104429},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":104429},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     104422:104424:int getSerializedSize():52203:52205 -> c
     104422:104424:int com.android.tools.r8.internal.Resources$MacroBody.getSerializedSize():0 -> c
     104425:104425:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -19405,9 +19405,9 @@
     104429:104429:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     104429:104429:int getSerializedSize():52201 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():51846:51846 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():51871:51871 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):52217:52220 -> equals
     5:12:java.lang.String getRawString():51988:51995 -> equals
     5:12:boolean equals(java.lang.Object):52222 -> equals
@@ -19445,7 +19445,7 @@
     2:2:int com.android.tools.r8.internal.Resources$MacroBody.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$MacroBody.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":28},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":28},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getRawString():51988:51995 -> hashCode
     4:11:int hashCode():52250 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$MacroBody.hashCode():0 -> hashCode
@@ -19483,23 +19483,23 @@
     24:27:int com.android.tools.r8.internal.Resources$MacroBody.hashCode():0 -> hashCode
     28:28:int hashCode():52248:52248 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():51975:51976 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():52140:52140 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():52140 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyleString getStyleString():52034:52034 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$StyleString com.android.tools.r8.com.android.aapt.Resources$StyleString.getDefaultInstance():55880:55880 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$StyleString getStyleString():52034 -> l
     1:2:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder toBuilder():52352:52353 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z60;"}
-com.android.tools.r8.com.android.aapt.Resources$MacroBody$1 -> com.android.tools.r8.internal.y60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D60;"}
+com.android.tools.r8.com.android.aapt.Resources$MacroBody$1 -> com.android.tools.r8.internal.C60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():53444:53444 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$MacroBody parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53450:53450 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53444 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$MacroBody.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51877:51879 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$MacroBody parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53450 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53444 -> a
@@ -19582,37 +19582,37 @@
     115:120:void com.android.tools.r8.com.android.aapt.Resources$MacroBody.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51958:51963 -> a
     115:120:com.android.tools.r8.com.android.aapt.Resources$MacroBody parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53450 -> a
     115:120:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53444 -> a
-com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder -> com.android.tools.r8.internal.z60:
+com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder -> com.android.tools.r8.internal.D60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.lang.Object rawString_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$StyleString styleString_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X70;"}
     java.util.List untranslatableSections_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 untranslatableSectionsBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List namespaceStack_ -> k
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 namespaceStackBuilder_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():52383 -> <init>
     2:438:void <init>():52624:53060 -> <init>
     439:439:void maybeForceBuilderInitialization():52394:52394 -> <init>
     439:439:void <init>():52384 -> <init>
     440:1111:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):52389:53060 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1112:1112:void maybeForceBuilderInitialization():52394:52394 -> <init>
     1112:1112:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):52390 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):52365:52365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():52377:52378 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52518 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52518 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52365 -> a
@@ -19621,10 +19621,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53426:53426 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):52365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$MacroBody com.android.tools.r8.com.android.aapt.Resources$MacroBody.getDefaultInstance():53440:53440 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$MacroBody):52531 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A60;)Lcom/android/tools/r8/internal/z60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E60;)Lcom/android/tools/r8/internal/D60;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$MacroBody.getRawString():51988:51988 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$MacroBody):52532 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -19687,14 +19687,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53420 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):52365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):52365:52365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():52377:52378 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52496 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52496 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):52365 -> b
@@ -19707,9 +19707,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$MacroBody build():52444:52446 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():52365 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):52611:52617 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/z60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/D60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):52613 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):52613:52619 -> c
@@ -19719,19 +19719,19 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$MacroBody$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53420 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):52365 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():52434:52434 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$MacroBody build():52444:52446 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():52365 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():52365:52365 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():52377:52378 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:32:com.android.tools.r8.com.android.aapt.Resources$MacroBody buildPartial():52453:52484 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A60;"}
-com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias -> com.android.tools.r8.internal.E60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E60;"}
+com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias -> com.android.tools.r8.internal.I60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object prefix_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -19740,20 +19740,20 @@
     boolean isPrivate_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G60;"}
     1:9:void <clinit>():54225:54233 -> <clinit>
     1:174:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):53514:53687 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H60;)V"}
     175:346:void <init>():53516:53687 -> <init>
     347:348:void <init>():53517:53518 -> <init>
     1:5:boolean isInitialized():53690:53694 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):53701:53710 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):53860:53860 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):53507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias getDefaultInstanceForType():54254:54254 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():53507 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -19762,16 +19762,16 @@
       # {"id":"com.android.tools.r8.synthesized"}
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.Resources$NamespaceAlias.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":53743},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":53743},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     53741:53742:int getSerializedSize():53729:53730 -> c
     53741:53742:int com.android.tools.r8.internal.Resources$NamespaceAlias.getSerializedSize():0 -> c
     53743:53743:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
     53743:53743:int getSerializedSize():53727 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder toBuilder():53853:53854 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():53507 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():53531:53531 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):53739:53742 -> equals
     5:12:java.lang.String getPrefix():53608:53615 -> equals
     5:12:boolean equals(java.lang.Object):53744 -> equals
@@ -19807,7 +19807,7 @@
     2:2:int com.android.tools.r8.internal.Resources$NamespaceAlias.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$NamespaceAlias.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":27},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":27},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getPrefix():53608:53615 -> hashCode
     4:11:int hashCode():53762 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$NamespaceAlias.hashCode():0 -> hashCode
@@ -19825,19 +19825,19 @@
     23:26:int com.android.tools.r8.internal.Resources$NamespaceAlias.hashCode():0 -> hashCode
     27:27:int hashCode():53760:53760 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():53595:53596 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.B60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.F60:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:int com.android.tools.r8.internal.Resources$NamespaceAlias$$ExternalSyntheticOutline0.m(int,int,int):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$1 -> com.android.tools.r8.internal.C60:
+com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$1 -> com.android.tools.r8.internal.G60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():54233:54233 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54239:54239 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53537:53539 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54239 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54233 -> a
@@ -19880,7 +19880,7 @@
     52:52:void com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53583:53583 -> a
     52:52:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54239 -> a
     52:52:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54233 -> a
-com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder -> com.android.tools.r8.internal.D60:
+com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder -> com.android.tools.r8.internal.H60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object prefix_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -19893,16 +19893,16 @@
     79:79:void maybeForceBuilderInitialization():53895:53895 -> <init>
     79:79:void <init>():53885 -> <init>
     80:290:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):53890:54100 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     291:291:void maybeForceBuilderInitialization():53895:53895 -> <init>
     291:291:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):53891 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53866:53866 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():53878:53879 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53970 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53866 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53970 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53866 -> a
@@ -19911,10 +19911,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54215:54215 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53866 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias.getDefaultInstance():54229:54229 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias):53983 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E60;)Lcom/android/tools/r8/internal/D60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I60;)Lcom/android/tools/r8/internal/H60;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias.getPrefix():53608:53608 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias):53984 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -19937,14 +19937,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54209 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53866 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):53866:53866 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():53878:53879 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53948 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53866 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53948 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):53866 -> b
@@ -19958,11 +19958,11 @@
     1:5:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias buildPartial():53932:53936 -> build
     1:5:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias build():53923 -> build
     1:5:com.android.tools.r8.com.google.protobuf.MessageLite build():53866 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     6:7:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias build():53924:53925 -> build
     6:7:com.android.tools.r8.com.google.protobuf.MessageLite build():53866 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54012:54018 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/D60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54014 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54014:54020 -> c
@@ -19972,9 +19972,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54209 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):53866 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():53913:53913 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:5:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias buildPartial():53932:53936 -> h
     1:5:com.android.tools.r8.com.android.aapt.Resources$NamespaceAlias build():53923 -> h
     1:5:com.android.tools.r8.com.google.protobuf.Message build():53866 -> h
@@ -19985,31 +19985,31 @@
     1:5:com.android.tools.r8.com.google.protobuf.Message buildPartial():53866 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():53878:53879 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Overlayable -> com.android.tools.r8.internal.H60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Overlayable -> com.android.tools.r8.internal.L60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object name_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object actor_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Overlayable DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J60;"}
     1:9:void <clinit>():12801:12809 -> <clinit>
     1:225:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):11859:12083 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K60;)V"}
     226:448:void <init>():11861:12083 -> <init>
     449:450:void <init>():11862:11863 -> <init>
     1:5:boolean isInitialized():12086:12090 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):12097:12106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):12260:12260 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):11852 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Overlayable getDefaultInstanceForType():12830:12830 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():11852 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -20019,9 +20019,9 @@
     12:16:int getSerializedSize():12122:12126 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder toBuilder():12253:12254 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():11852 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():11876:11876 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):12135:12138 -> equals
     5:12:java.lang.String getName():11965:11972 -> equals
     5:12:boolean equals(java.lang.Object):12140 -> equals
@@ -20055,7 +20055,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Overlayable.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Overlayable.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getName():11965:11972 -> hashCode
     4:11:int hashCode():12161 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$Overlayable.hashCode():0 -> hashCode
@@ -20073,17 +20073,17 @@
     26:28:int com.android.tools.r8.internal.Resources$Overlayable.hashCode():0 -> hashCode
     29:29:int hashCode():12159:12159 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11948:11949 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():12023:12023 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():12023 -> k
-com.android.tools.r8.com.android.aapt.Resources$Overlayable$1 -> com.android.tools.r8.internal.F60:
+com.android.tools.r8.com.android.aapt.Resources$Overlayable$1 -> com.android.tools.r8.internal.J60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():12809:12809 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Overlayable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12815:12815 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12809 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Overlayable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11882:11884 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Overlayable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12815 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12809 -> a
@@ -20133,12 +20133,12 @@
     66:66:void com.android.tools.r8.com.android.aapt.Resources$Overlayable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11936:11936 -> a
     66:66:com.android.tools.r8.com.android.aapt.Resources$Overlayable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12815 -> a
     66:66:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12809 -> a
-com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder -> com.android.tools.r8.internal.G60:
+com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder -> com.android.tools.r8.internal.K60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object actor_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -20147,16 +20147,16 @@
     254:254:void maybeForceBuilderInitialization():12299:12299 -> <init>
     254:254:void <init>():12289 -> <init>
     255:648:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):12294:12687 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     649:649:void maybeForceBuilderInitialization():12299:12299 -> <init>
     649:649:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):12295 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12270:12270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():12282:12283 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12382 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12382 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12270 -> a
@@ -20165,10 +20165,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12791:12791 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Overlayable com.android.tools.r8.com.android.aapt.Resources$Overlayable.getDefaultInstance():12805:12805 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Overlayable):12395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H60;)Lcom/android/tools/r8/internal/G60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L60;)Lcom/android/tools/r8/internal/K60;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$Overlayable.getName():11965:11965 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Overlayable):12396 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -20197,14 +20197,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12785 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12270 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12270:12270 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():12282:12283 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12360 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12270 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12360 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):12270 -> b
@@ -20218,11 +20218,11 @@
     1:9:com.android.tools.r8.com.android.aapt.Resources$Overlayable buildPartial():12340:12348 -> build
     1:9:com.android.tools.r8.com.android.aapt.Resources$Overlayable build():12331 -> build
     1:9:com.android.tools.r8.com.google.protobuf.MessageLite build():12270 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     10:11:com.android.tools.r8.com.android.aapt.Resources$Overlayable build():12332:12333 -> build
     10:11:com.android.tools.r8.com.google.protobuf.MessageLite build():12270 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12424:12430 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/G60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/K60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12426 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12426:12432 -> c
@@ -20232,9 +20232,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Overlayable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12785 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):12270 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():12321:12321 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:9:com.android.tools.r8.com.android.aapt.Resources$Overlayable buildPartial():12340:12348 -> h
     1:9:com.android.tools.r8.com.android.aapt.Resources$Overlayable build():12331 -> h
     1:9:com.android.tools.r8.com.google.protobuf.Message build():12270 -> h
@@ -20245,11 +20245,11 @@
     1:9:com.android.tools.r8.com.google.protobuf.Message buildPartial():12270 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():12282:12283 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$OverlayableItem -> com.android.tools.r8.internal.M60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$OverlayableItem -> com.android.tools.r8.internal.Q60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List policy_ -> g
@@ -20257,19 +20257,19 @@
     int overlayableIdx_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.google.protobuf.Internal$ListAdapter$Converter policy_converter_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I60;"}
-    com.android.tools.r8.com.android.aapt.Resources$OverlayableItem DEFAULT_INSTANCE -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M60;"}
+    com.android.tools.r8.com.android.aapt.Resources$OverlayableItem DEFAULT_INSTANCE -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N60;"}
     1:1000:void <clinit>():13347:14346 -> <clinit>
     1:479:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):12960:13438 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O60;)V"}
     480:956:void <init>():12962:13438 -> <init>
     957:958:void <init>():12963:12964 -> <init>
     1:5:boolean isInitialized():13441:13445 -> a
     6:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):13452:13457 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     12:12:java.util.List getPolicyList():13366:13366 -> a
     12:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):13459 -> a
     13:13:int com.android.tools.r8.com.google.protobuf.Internal$ListAdapter.size():416:416 -> a
@@ -20287,7 +20287,7 @@
     24:24:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):13469:13469 -> a
     25:25:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):13641:13641 -> a
     25:25:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):12953 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem getDefaultInstanceForType():14367:14367 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():12953 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -20309,15 +20309,15 @@
     24:24:int com.android.tools.r8.internal.Resources$OverlayableItem.getSerializedSize():0 -> c
     25:25:int getSerializedSize():0:0 -> c
     25:25:int com.android.tools.r8.internal.Resources$OverlayableItem.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13528},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13528},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     13526:13527:int getSerializedSize():13501:13502 -> c
     13526:13527:int com.android.tools.r8.internal.Resources$OverlayableItem.getSerializedSize():0 -> c
     13528:13528:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
     13528:13528:int getSerializedSize():13499 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():12953:12953 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():12977:12977 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):13511:13514 -> equals
     5:5:boolean hasSource():13272:13272 -> equals
     5:5:boolean equals(java.lang.Object):13516 -> equals
@@ -20356,22 +20356,22 @@
     23:23:int hashCode():13548 -> hashCode
     24:25:int hashCode():13549:13550 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13075:13076 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():13284:13284 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():13284 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder toBuilder():13634:13635 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K60;"}
-com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$1 -> com.android.tools.r8.internal.I60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/O60;"}
+com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$1 -> com.android.tools.r8.internal.M60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():13349:13349 -> <init>
-com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$2 -> com.android.tools.r8.internal.J60:
+com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$2 -> com.android.tools.r8.internal.N60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():14346:14346 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14352:14352 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$OverlayableItem.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):12983:12985 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14352 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14346 -> a
@@ -20427,11 +20427,11 @@
     101:103:void com.android.tools.r8.com.android.aapt.Resources$OverlayableItem.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13061:13063 -> a
     101:103:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14352 -> a
     101:103:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14346 -> a
-com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder -> com.android.tools.r8.internal.K60:
+com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder -> com.android.tools.r8.internal.O60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List policy_ -> i
@@ -20442,16 +20442,16 @@
     100:100:void maybeForceBuilderInitialization():13680:13680 -> <init>
     100:100:void <init>():13670 -> <init>
     101:513:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):13675:14087 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     514:514:void maybeForceBuilderInitialization():13680:13680 -> <init>
     514:514:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):13676 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13651:13651 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13663:13664 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13771 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13651 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13771 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13651 -> a
@@ -20460,10 +20460,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14328:14328 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13651 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem com.android.tools.r8.com.android.aapt.Resources$OverlayableItem.getDefaultInstance():14342:14342 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$OverlayableItem):13784 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M60;)Lcom/android/tools/r8/internal/K60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q60;)Lcom/android/tools/r8/internal/O60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$OverlayableItem.hasSource():13272:13272 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$OverlayableItem):13785 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -20494,14 +20494,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14322 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13651 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13651:13651 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13663:13664 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13749 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13651 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13749 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13651 -> b
@@ -20514,9 +20514,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem build():13714:13716 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():13651 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13822:13828 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/K60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/O60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13824 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13824:13830 -> c
@@ -20526,71 +20526,71 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14322 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13651 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():13704:13704 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem build():13714:13716 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():13651 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():13651:13651 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13663:13664 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:15:com.android.tools.r8.com.android.aapt.Resources$OverlayableItem buildPartial():13723:13737 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M60;"}
-com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy -> com.android.tools.r8.internal.L60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q60;"}
+com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy -> com.android.tools.r8.internal.P60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int value -> b
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy NONE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy PUBLIC -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy SYSTEM -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy VENDOR -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy PRODUCT -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy SIGNATURE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy ODM -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy OEM -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy ACTOR -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy CONFIG_SIGNATURE -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$Policy UNRECOGNIZED -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
     1:38:void <clinit>():13088:13125 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):13253:13254 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:5:int getNumber():13171:13175 -> a
     6:6:int getNumber():13172:13172 -> a
-com.android.tools.r8.com.android.aapt.Resources$Package -> com.android.tools.r8.internal.P60:
+com.android.tools.r8.com.android.aapt.Resources$Package -> com.android.tools.r8.internal.T60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$PackageId packageId_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
     java.lang.Object packageName_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List type_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Package DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R60;"}
     1:9:void <clinit>():7752:7760 -> <clinit>
     1:264:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):6461:6724 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S60;)V"}
     265:526:void <init>():6463:6724 -> <init>
     527:528:void <init>():6464:6465 -> <init>
     1:5:boolean isInitialized():6727:6731 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):6738:6747 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Package$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6904:6904 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Package getDefaultInstanceForType():7781:7781 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():6454 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -20607,16 +20607,16 @@
     15:15:int com.android.tools.r8.internal.Resources$Package.getSerializedSize():0 -> c
     16:16:int getSerializedSize():0:0 -> c
     16:16:int com.android.tools.r8.internal.Resources$Package.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6785},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6785},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     6783:6784:int getSerializedSize():6767:6768 -> c
     6783:6784:int com.android.tools.r8.internal.Resources$Package.getSerializedSize():0 -> c
     6785:6785:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     6785:6785:int getSerializedSize():6765 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Package$Builder toBuilder():6897:6898 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():6454 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():6478:6478 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):6777:6780 -> equals
     5:5:boolean hasPackageId():6580:6580 -> equals
     5:5:boolean equals(java.lang.Object):6782 -> equals
@@ -20651,18 +20651,18 @@
     11:11:int hashCode():6810 -> hashCode
     12:15:int hashCode():6810:6813 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6557:6558 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$PackageId getPackageId():6598:6598 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId com.android.tools.r8.com.android.aapt.Resources$PackageId.getDefaultInstance():6304:6304 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId getPackageId():6598 -> k
     1:8:java.lang.String getPackageName():6630:6637 -> l
-com.android.tools.r8.com.android.aapt.Resources$Package$1 -> com.android.tools.r8.internal.N60:
+com.android.tools.r8.com.android.aapt.Resources$Package$1 -> com.android.tools.r8.internal.R60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():7760:7760 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Package parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7766:7766 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7760 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Package.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6484:6486 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Package parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7766 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7760 -> a
@@ -20722,32 +20722,32 @@
     71:73:void com.android.tools.r8.com.android.aapt.Resources$Package.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6543:6545 -> a
     71:73:com.android.tools.r8.com.android.aapt.Resources$Package parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7766 -> a
     71:73:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7760 -> a
-com.android.tools.r8.com.android.aapt.Resources$Package$Builder -> com.android.tools.r8.internal.O60:
+com.android.tools.r8.com.android.aapt.Resources$Package$Builder -> com.android.tools.r8.internal.S60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$PackageId packageId_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
     java.lang.Object packageName_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List type_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 typeBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():6932 -> <init>
     2:99:void <init>():7326:7423 -> <init>
     100:100:void maybeForceBuilderInitialization():6943:6943 -> <init>
     100:100:void <init>():6933 -> <init>
     101:586:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6938:7423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     587:587:void maybeForceBuilderInitialization():6943:6943 -> <init>
     587:587:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6939 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6914:6914 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6926:6927 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Package$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7040 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6914 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Package$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7040 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6914 -> a
@@ -20756,10 +20756,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7742:7742 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6914 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Package com.android.tools.r8.com.android.aapt.Resources$Package.getDefaultInstance():7756:7756 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Package):7053 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P60;)Lcom/android/tools/r8/internal/O60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T60;)Lcom/android/tools/r8/internal/S60;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Package.hasPackageId():6580:6580 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Package):7054 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -20794,14 +20794,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Package$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7736 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6914 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6914:6914 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6926:6927 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Package$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7018 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6914 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Package$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7018 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6914 -> b
@@ -20814,9 +20814,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Package build():6980:6982 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():6914 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7104:7110 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/O60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/S60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7106 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Package$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7106:7112 -> c
@@ -20826,33 +20826,33 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Package$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7736 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6914 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():6970:6970 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Package build():6980:6982 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():6914 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():6914:6914 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6926:6927 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:18:com.android.tools.r8.com.android.aapt.Resources$Package buildPartial():6989:7006 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P60;"}
-com.android.tools.r8.com.android.aapt.Resources$PackageId -> com.android.tools.r8.internal.S60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T60;"}
+com.android.tools.r8.com.android.aapt.Resources$PackageId -> com.android.tools.r8.internal.W60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$PackageId DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U60;"}
     1:9:void <clinit>():6300:6308 -> <clinit>
     1:84:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):5862:5945 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V60;)V"}
     85:166:void <init>():5864:5945 -> <init>
     167:248:void <init>():5864:5945 -> <init>
     167:248:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5883 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     249:249:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5885:5885 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -20871,7 +20871,7 @@
     280:280:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5917:5917 -> <init>
     1:5:boolean isInitialized():5948:5952 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5959:5960 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5960 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -20880,7 +20880,7 @@
     10:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5962:5962 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6097:6097 -> a
     11:11:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):5855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$PackageId getDefaultInstanceForType():6329:6329 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():5855 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -20889,9 +20889,9 @@
     6:6:int getSerializedSize():5973 -> c
     7:8:int getSerializedSize():5975:5976 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():5855:5855 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():5877:5877 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):5985:5988 -> equals
     5:5:int getId():5942:5942 -> equals
     5:5:boolean equals(java.lang.Object):5990 -> equals
@@ -20911,7 +20911,7 @@
     2:2:int com.android.tools.r8.internal.Resources$PackageId.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$PackageId.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getId():5942:5942 -> hashCode
     4:4:int hashCode():6004 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$PackageId.hashCode():0 -> hashCode
@@ -20919,16 +20919,16 @@
     5:6:int com.android.tools.r8.internal.Resources$PackageId.hashCode():0 -> hashCode
     7:7:int hashCode():6002:6002 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5929:5930 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder toBuilder():6090:6091 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R60;"}
-com.android.tools.r8.com.android.aapt.Resources$PackageId$1 -> com.android.tools.r8.internal.Q60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V60;"}
+com.android.tools.r8.com.android.aapt.Resources$PackageId$1 -> com.android.tools.r8.internal.U60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():6308:6308 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$PackageId parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6314:6314 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder -> com.android.tools.r8.internal.R60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder -> com.android.tools.r8.internal.V60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> f
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -20936,16 +20936,16 @@
     2:2:void maybeForceBuilderInitialization():6136:6136 -> <init>
     2:2:void <init>():6126 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6131:6131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():6136:6136 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6132 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6107:6107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6119:6120 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6205 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6205 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6107 -> a
@@ -20954,10 +20954,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6290:6290 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$PackageId com.android.tools.r8.com.android.aapt.Resources$PackageId.getDefaultInstance():6304:6304 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$PackageId):6218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S60;)Lcom/android/tools/r8/internal/R60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W60;)Lcom/android/tools/r8/internal/V60;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$PackageId.getId():5942:5942 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$PackageId):6219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -20972,14 +20972,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6284 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6107 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6107:6107 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6119:6120 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6183 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6107 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6183 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6107 -> b
@@ -20992,9 +20992,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$PackageId build():6160:6162 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():6107 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6239:6239 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/R60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/V60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId com.android.tools.r8.com.android.aapt.Resources$PackageId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6314:6314 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$PackageId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6308 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6239 -> c
@@ -21008,39 +21008,39 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$PackageId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6284 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6107 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():6150:6150 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$PackageId build():6160:6162 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():6107 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():6107:6107 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6119:6120 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$PackageId buildPartial():6169:6171 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S60;"}
-com.android.tools.r8.com.android.aapt.Resources$Plural -> com.android.tools.r8.internal.Z60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W60;"}
+com.android.tools.r8.com.android.aapt.Resources$Plural -> com.android.tools.r8.internal.d70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.util.List entry_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$Plural DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X60;"}
     1:9:void <clinit>():45793:45801 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):43547:43547 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z60;)V"}
     1571:1571:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):45117:45117 -> <init>
     1572:1572:void <init>():43549:43549 -> <init>
     3140:3140:void <init>():45117:45117 -> <init>
     3141:3141:void <init>():43550:43550 -> <init>
     1:5:boolean isInitialized():45120:45124 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):45131:45134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):45271:45271 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):43540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Plural getDefaultInstanceForType():45822:45822 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():43540 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -21052,15 +21052,15 @@
     8:8:int com.android.tools.r8.internal.Resources$Plural.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.Resources$Plural.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":45158},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":45158},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     45156:45157:int getSerializedSize():45147:45148 -> c
     45156:45157:int com.android.tools.r8.internal.Resources$Plural.getSerializedSize():0 -> c
     45158:45158:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     45158:45158:int getSerializedSize():45145 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():43540:43540 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():43563:43563 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):45157:45160 -> equals
     5:5:java.util.List getEntryList():45068:45068 -> equals
     5:5:boolean equals(java.lang.Object):45162 -> equals
@@ -21083,15 +21083,15 @@
     6:6:int hashCode():45177 -> hashCode
     7:10:int hashCode():45177:45180 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():43623:43624 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder toBuilder():45264:45265 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V60;"}
-com.android.tools.r8.com.android.aapt.Resources$Plural$1 -> com.android.tools.r8.internal.T60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z60;"}
+com.android.tools.r8.com.android.aapt.Resources$Plural$1 -> com.android.tools.r8.internal.X60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():45801:45801 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Plural parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45807:45807 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45801 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Plural.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43569:43571 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Plural parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45807 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45801 -> a
@@ -21140,33 +21140,33 @@
     45:47:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45801 -> a
 com.android.tools.r8.com.android.aapt.Resources$Plural$Arity -> R8$$REMOVED$$CLASS$$18:
 # {"id":"sourceFile","fileName":"Resources.java"}
-com.android.tools.r8.com.android.aapt.Resources$Plural$Arity$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.U60:
+com.android.tools.r8.com.android.aapt.Resources$Plural$Arity$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Y60:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.Resources$Plural$Arity$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources$Plural$Builder -> com.android.tools.r8.internal.V60:
+com.android.tools.r8.com.android.aapt.Resources$Plural$Builder -> com.android.tools.r8.internal.Z60:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.util.List entry_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 entryBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():45299 -> <init>
     2:2:void <init>():45464:45464 -> <init>
     3:3:void maybeForceBuilderInitialization():45310:45310 -> <init>
     3:3:void <init>():45300 -> <init>
     4:163:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):45305:45464 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     164:164:void maybeForceBuilderInitialization():45310:45310 -> <init>
     164:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):45306 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45281:45281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():45293:45294 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45393 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45393 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45281 -> a
@@ -21175,10 +21175,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45783:45783 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$Plural.getDefaultInstance():45797:45797 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Plural):45406 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z60;)Lcom/android/tools/r8/internal/V60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d70;)Lcom/android/tools/r8/internal/Z60;"}
     11:15:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Plural):45407:45411 -> a
     16:18:void ensureEntryIsMutable():45466:45468 -> a
     16:18:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Plural):45413 -> a
@@ -21202,14 +21202,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45777 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45281 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45281:45281 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():45293:45294 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45371 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45281 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45371 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):45281 -> b
@@ -21222,9 +21222,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Plural build():45339:45341 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():45281 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45450:45456 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/V60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Z60;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45452 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45452:45458 -> c
@@ -21234,46 +21234,46 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45777 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45281 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():45329:45329 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Plural build():45339:45341 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():45281 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():45281:45281 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():45293:45294 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:12:com.android.tools.r8.com.android.aapt.Resources$Plural buildPartial():45348:45359 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z60;"}
-com.android.tools.r8.com.android.aapt.Resources$Plural$Entry -> com.android.tools.r8.internal.Y60:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d70;"}
+com.android.tools.r8.com.android.aapt.Resources$Plural$Entry -> com.android.tools.r8.internal.c70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     int arity_ -> g
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.android.aapt.Resources$Plural$Entry DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a70;"}
     1:9:void <clinit>():45023:45031 -> <clinit>
     1:257:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):43887:44143 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b70;)V"}
     258:512:void <init>():43889:44143 -> <init>
     513:514:void <init>():43890:43891 -> <init>
     1:5:boolean isInitialized():44146:44150 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):44157:44163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:int com.android.tools.r8.com.android.aapt.Resources$Plural$Arity.getNumber():43695:43695 -> a
     13:13:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):44163 -> a
     14:19:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):44164:44169 -> a
     20:20:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):44336:44336 -> a
     20:20:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):43880 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry getDefaultInstanceForType():45052:45052 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():43880 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -21295,7 +21295,7 @@
     15:15:int com.android.tools.r8.internal.Resources$Plural$Entry.getSerializedSize():0 -> c
     16:16:int getSerializedSize():0:0 -> c
     16:16:int com.android.tools.r8.internal.Resources$Plural$Entry.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44211},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44211},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     44205:44207:int getSerializedSize():44189:44191 -> c
     44205:44207:int com.android.tools.r8.internal.Resources$Plural$Entry.getSerializedSize():0 -> c
     44208:44208:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -21307,9 +21307,9 @@
     44211:44211:int getSerializedSize():44187 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder toBuilder():44329:44330 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():43880 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():43904:43904 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):44203:44206 -> equals
     5:5:boolean hasSource():44006:44006 -> equals
     5:5:boolean equals(java.lang.Object):44208 -> equals
@@ -21347,21 +21347,21 @@
     20:20:int hashCode():44240 -> hashCode
     21:24:int hashCode():44242:44245 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():43989:43990 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item getItem():44129:44129 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item getItem():44129 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():44018:44018 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():44018 -> l
-com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$1 -> com.android.tools.r8.internal.W60:
+com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$1 -> com.android.tools.r8.internal.a70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():45031:45031 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45037:45037 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45031 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Plural$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43910:43912 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45037 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45031 -> a
@@ -21421,31 +21421,31 @@
     81:81:void com.android.tools.r8.com.android.aapt.Resources$Plural$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43977:43977 -> a
     81:81:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45037 -> a
     81:81:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45031 -> a
-com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder -> com.android.tools.r8.internal.X60:
+com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder -> com.android.tools.r8.internal.b70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     int arity_ -> h
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():44364 -> <init>
     2:98:void <init>():44680:44776 -> <init>
     99:99:void maybeForceBuilderInitialization():44375:44375 -> <init>
     99:99:void <init>():44365 -> <init>
     100:506:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):44370:44776 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     507:507:void maybeForceBuilderInitialization():44375:44375 -> <init>
     507:507:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):44371 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):44346:44346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():44358:44359 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44469 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44469 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44346 -> a
@@ -21454,10 +21454,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45013:45013 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):44346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry com.android.tools.r8.com.android.aapt.Resources$Plural$Entry.getDefaultInstance():45027:45027 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Plural$Entry):44482 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y60;)Lcom/android/tools/r8/internal/X60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c70;)Lcom/android/tools/r8/internal/b70;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Plural$Entry.hasSource():44006:44006 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Plural$Entry):44483 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -21493,14 +21493,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45007 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):44346 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):44346:44346 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():44358:44359 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44447 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44346 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44447 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):44346 -> b
@@ -21514,11 +21514,11 @@
     1:14:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry buildPartial():44422:44435 -> build
     1:14:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry build():44413 -> build
     1:14:com.android.tools.r8.com.google.protobuf.MessageLite build():44346 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     15:16:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry build():44414:44415 -> build
     15:16:com.android.tools.r8.com.google.protobuf.MessageLite build():44346 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):44513:44519 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/X60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/b70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):44515 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):44515:44521 -> c
@@ -21528,9 +21528,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):45007 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):44346 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():44403:44403 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:14:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry buildPartial():44422:44435 -> h
     1:14:com.android.tools.r8.com.android.aapt.Resources$Plural$Entry build():44413 -> h
     1:14:com.android.tools.r8.com.google.protobuf.Message build():44346 -> h
@@ -21541,23 +21541,23 @@
     1:14:com.android.tools.r8.com.google.protobuf.Message buildPartial():44346 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():44358:44359 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive -> com.android.tools.r8.internal.i70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive -> com.android.tools.r8.internal.m70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int oneofValueCase_ -> e
     java.lang.Object oneofValue_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$Primitive DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e70;"}
     1:9:void <clinit>():33650:33658 -> <clinit>
     1:1375:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):30807:32181 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f70;)V"}
     1376:2748:void <init>():30809:32181 -> <init>
     1:5:boolean isInitialized():32184:32188 -> a
     6:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):32195:32203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     15:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):32202:32202 -> a
     16:16:void com.android.tools.r8.com.google.protobuf.CodedOutputStream.writeFloat(int,float):279:279 -> a
     16:16:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):32202 -> a
@@ -21638,7 +21638,7 @@
     87:87:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):32249:32249 -> a
     88:88:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):32572:32572 -> a
     88:88:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30800 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive getDefaultInstanceForType():33679:33679 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():30800 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -21677,7 +21677,7 @@
     37:37:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     38:38:int getSerializedSize():0:0 -> c
     38:38:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226247},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226247},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     32329:32332:int getSerializedSize():32291:32294 -> c
     32329:32332:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     32333:32333:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
@@ -21690,7 +21690,7 @@
     32338:32338:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     32339:32339:int getSerializedSize():0:0 -> c
     32339:32339:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226248},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226248},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     64640:64643:int getSerializedSize():32301:32304 -> c
     64640:64643:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     64644:64644:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21698,7 +21698,7 @@
     64644:64644:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     64645:64645:int getSerializedSize():0:0 -> c
     64645:64645:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226249},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226249},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     96951:96954:int getSerializedSize():32306:32309 -> c
     96951:96954:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     96955:96955:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21706,7 +21706,7 @@
     96955:96955:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     96956:96956:int getSerializedSize():0:0 -> c
     96956:96956:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226250},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226250},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     129267:129270:int getSerializedSize():32311:32314 -> c
     129267:129270:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     129271:129271:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21714,7 +21714,7 @@
     129271:129271:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     129272:129272:int getSerializedSize():0:0 -> c
     129272:129272:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226251},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226251},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     161588:161591:int getSerializedSize():32316:32319 -> c
     161588:161591:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     161592:161592:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21722,7 +21722,7 @@
     161592:161592:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     161593:161593:int getSerializedSize():0:0 -> c
     161593:161593:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226252},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226252},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     193914:193917:int getSerializedSize():32321:32324 -> c
     193914:193917:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     193918:193918:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21730,7 +21730,7 @@
     193918:193918:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     193919:193919:int getSerializedSize():0:0 -> c
     193919:193919:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226253},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226253},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     226245:226246:int getSerializedSize():32326:32327 -> c
     226245:226246:int com.android.tools.r8.internal.Resources$Primitive.getSerializedSize():0 -> c
     226247:226247:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -21748,9 +21748,9 @@
     226253:226253:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
     226253:226253:int getSerializedSize():32323 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():30800:30800 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():30822:30822 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:7:boolean equals(java.lang.Object):32336:32342 -> equals
     8:8:int getFractionValue():31983:31983 -> equals
     8:8:boolean equals(java.lang.Object):32361 -> equals
@@ -21890,17 +21890,17 @@
     58:58:int hashCode():32419 -> hashCode
     59:121:int hashCode():32419:32481 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30957:30958 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$OneofValueCase getOneofValueCase():31859:31859 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder toBuilder():32565:32566 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b70;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$1 -> com.android.tools.r8.internal.a70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f70;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$1 -> com.android.tools.r8.internal.e70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():33658:33658 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33664:33664 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Primitive.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30828:30830 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Primitive parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33664 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33658 -> a
@@ -22004,7 +22004,7 @@
     154:154:void com.android.tools.r8.com.android.aapt.Resources$Primitive.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30945:30945 -> a
     154:154:com.android.tools.r8.com.android.aapt.Resources$Primitive parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33664 -> a
     154:154:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33658 -> a
-com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder -> com.android.tools.r8.internal.b70:
+com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder -> com.android.tools.r8.internal.f70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int oneofValueCase_ -> f
     java.lang.Object oneofValue_ -> g
@@ -22015,16 +22015,16 @@
     3:3:void maybeForceBuilderInitialization():32612:32612 -> <init>
     3:3:void <init>():32602 -> <init>
     4:231:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):32607:32834 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     232:232:void maybeForceBuilderInitialization():32612:32612 -> <init>
     232:232:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):32608 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32583:32583 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():32595:32596 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32731 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32583 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32731 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32583 -> a
@@ -22033,10 +22033,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33640:33640 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32583 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive com.android.tools.r8.com.android.aapt.Resources$Primitive.getDefaultInstance():33654:33654 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive):32744 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i70;)Lcom/android/tools/r8/internal/b70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m70;)Lcom/android/tools/r8/internal/f70;"}
     11:11:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive):32745:32745 -> a
     12:13:float com.android.tools.r8.com.android.aapt.Resources$Primitive.getFractionValueDeprecated():32175:32176 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive):32799 -> a
@@ -22139,14 +22139,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33634 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32583 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32583:32583 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():32595:32596 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32709 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32583 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32709 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32583 -> b
@@ -22159,9 +22159,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Primitive build():32636:32638 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():32583 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32823:32829 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/b70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/f70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32825 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32825:32831 -> c
@@ -22171,32 +22171,32 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33634 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32583 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():32626:32626 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Primitive build():32636:32638 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():32583 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():32583:32583 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():32595:32596 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:53:com.android.tools.r8.com.android.aapt.Resources$Primitive buildPartial():32645:32697 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i70;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType -> com.android.tools.r8.internal.e70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m70;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType -> com.android.tools.r8.internal.i70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     byte memoizedIsInitialized -> e
     com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType DEFAULT_INSTANCE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g70;"}
     1:9:void <clinit>():31764:31772 -> <clinit>
     1:68:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):31394:31461 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h70;)V"}
     69:134:void <init>():31396:31461 -> <init>
     135:200:void <init>():31396:31461 -> <init>
     135:200:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31415 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     201:201:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31417:31417 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -22215,18 +22215,18 @@
     217:217:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31444:31444 -> <init>
     1:5:boolean isInitialized():31464:31468 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):31475:31475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31602:31602 -> a
     7:7:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType getDefaultInstanceForType():31793:31793 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():31387 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:6:int getSerializedSize():31480:31485 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():31387:31387 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():31409:31409 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:6:boolean equals(java.lang.Object):31494:31499 -> equals
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder newBuilder():31588:31588 -> h
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder newBuilderForType():31586 -> h
@@ -22237,32 +22237,32 @@
     2:2:int hashCode():31509 -> hashCode
     3:5:int hashCode():31509:31511 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31456:31457 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder toBuilder():31595:31596 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d70;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$1 -> com.android.tools.r8.internal.c70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h70;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$1 -> com.android.tools.r8.internal.g70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():31772:31772 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31778:31778 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31772 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder -> com.android.tools.r8.internal.d70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder -> com.android.tools.r8.internal.h70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():31626 -> <init>
     2:2:void maybeForceBuilderInitialization():31637:31637 -> <init>
     2:2:void <init>():31627 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31632:31632 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():31637:31637 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31633 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31608:31608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31620:31621 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31703 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31703 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31608 -> a
@@ -22271,10 +22271,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31754:31754 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType.getDefaultInstance():31768:31768 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType):31716 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e70;)Lcom/android/tools/r8/internal/d70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i70;)Lcom/android/tools/r8/internal/h70;"}
     11:11:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType.access$8700(com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType):31387:31387 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType):31717 -> a
     12:12:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31754:31754 -> a
@@ -22284,14 +22284,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31748 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31608:31608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31620:31621 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31681 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31608 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31681 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31608 -> b
@@ -22305,11 +22305,11 @@
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType buildPartial():31668:31669 -> build
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType build():31659 -> build
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite build():31608 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     3:4:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType build():31660:31661 -> build
     3:4:com.android.tools.r8.com.google.protobuf.MessageLite build():31608 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31734:31734 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/d70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/h70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31778:31778 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31772 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31734 -> c
@@ -22323,9 +22323,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31748 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31608 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():31649:31649 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType buildPartial():31668:31669 -> h
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$EmptyType build():31659 -> h
     1:2:com.android.tools.r8.com.google.protobuf.Message build():31608 -> h
@@ -22336,21 +22336,21 @@
     1:2:com.android.tools.r8.com.google.protobuf.Message buildPartial():31608 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31620:31621 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType -> com.android.tools.r8.internal.h70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType -> com.android.tools.r8.internal.l70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     byte memoizedIsInitialized -> e
     com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType DEFAULT_INSTANCE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j70;"}
     1:9:void <clinit>():31346:31354 -> <clinit>
     1:68:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):30976:31043 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k70;)V"}
     69:134:void <init>():30978:31043 -> <init>
     135:200:void <init>():30978:31043 -> <init>
     135:200:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30997 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     201:201:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30999:30999 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     202:202:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -22369,18 +22369,18 @@
     217:217:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31026:31026 -> <init>
     1:5:boolean isInitialized():31046:31050 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):31057:31057 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31184:31184 -> a
     7:7:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30969 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType getDefaultInstanceForType():31375:31375 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():30969 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:6:int getSerializedSize():31062:31067 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():30969:30969 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():30991:30991 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:6:boolean equals(java.lang.Object):31076:31081 -> equals
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder newBuilder():31170:31170 -> h
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder newBuilderForType():31168 -> h
@@ -22391,32 +22391,32 @@
     2:2:int hashCode():31091 -> hashCode
     3:5:int hashCode():31091:31093 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31038:31039 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder toBuilder():31177:31178 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/g70;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$1 -> com.android.tools.r8.internal.f70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k70;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$1 -> com.android.tools.r8.internal.j70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():31354:31354 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31360:31360 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder -> com.android.tools.r8.internal.g70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder -> com.android.tools.r8.internal.k70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():31208 -> <init>
     2:2:void maybeForceBuilderInitialization():31219:31219 -> <init>
     2:2:void <init>():31209 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31214:31214 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():31219:31219 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31215 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31190:31190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31202:31203 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31285 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31285 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31190 -> a
@@ -22425,10 +22425,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31336:31336 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType.getDefaultInstance():31350:31350 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType):31298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h70;)Lcom/android/tools/r8/internal/g70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l70;)Lcom/android/tools/r8/internal/k70;"}
     11:11:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType.access$8500(com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType):30969:30969 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType):31299 -> a
     12:12:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31336:31336 -> a
@@ -22438,14 +22438,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31330 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31190 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31190:31190 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31202:31203 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31263 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31190 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31263 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31190 -> b
@@ -22459,11 +22459,11 @@
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType buildPartial():31250:31251 -> build
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType build():31241 -> build
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite build():31190 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     3:4:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType build():31242:31243 -> build
     3:4:com.android.tools.r8.com.google.protobuf.MessageLite build():31190 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31316:31316 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/g70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/k70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31360:31360 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31354 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31316 -> c
@@ -22477,9 +22477,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31330 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31190 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():31231:31231 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType buildPartial():31250:31251 -> h
     1:2:com.android.tools.r8.com.android.aapt.Resources$Primitive$NullType build():31241 -> h
     1:2:com.android.tools.r8.com.google.protobuf.Message build():31190 -> h
@@ -22490,35 +22490,35 @@
     1:2:com.android.tools.r8.com.google.protobuf.Message buildPartial():31190 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31202:31203 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$RawString -> com.android.tools.r8.internal.l70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$RawString -> com.android.tools.r8.internal.p70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object value_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$RawString DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n70;"}
     1:9:void <clinit>():27908:27916 -> <clinit>
     1:113:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):27394:27506 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o70;)V"}
     114:224:void <init>():27396:27506 -> <init>
     225:225:void <init>():27397:27397 -> <init>
     1:5:boolean isInitialized():27509:27513 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):27520:27523 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27657:27657 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$RawString getDefaultInstanceForType():27937:27937 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():27387 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:9:int getSerializedSize():27528:27536 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():27387:27387 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():27410:27410 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):27545:27548 -> equals
     5:12:java.lang.String getValue():27476:27483 -> equals
     5:12:boolean equals(java.lang.Object):27550 -> equals
@@ -22540,7 +22540,7 @@
     2:2:int com.android.tools.r8.internal.Resources$RawString.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$RawString.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getValue():27476:27483 -> hashCode
     4:11:int hashCode():27564 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$RawString.hashCode():0 -> hashCode
@@ -22548,15 +22548,15 @@
     12:14:int com.android.tools.r8.internal.Resources$RawString.hashCode():0 -> hashCode
     15:15:int hashCode():27562:27562 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27463:27464 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder toBuilder():27650:27651 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k70;"}
-com.android.tools.r8.com.android.aapt.Resources$RawString$1 -> com.android.tools.r8.internal.j70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o70;"}
+com.android.tools.r8.com.android.aapt.Resources$RawString$1 -> com.android.tools.r8.internal.n70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():27916:27916 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$RawString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27922:27922 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27916 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$RawString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27416:27418 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$RawString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27922 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27916 -> a
@@ -22593,7 +22593,7 @@
     37:37:void com.android.tools.r8.com.android.aapt.Resources$RawString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27451:27451 -> a
     37:37:com.android.tools.r8.com.android.aapt.Resources$RawString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27922 -> a
     37:37:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27916 -> a
-com.android.tools.r8.com.android.aapt.Resources$RawString$Builder -> com.android.tools.r8.internal.k70:
+com.android.tools.r8.com.android.aapt.Resources$RawString$Builder -> com.android.tools.r8.internal.o70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object value_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -22603,16 +22603,16 @@
     3:3:void maybeForceBuilderInitialization():27698:27698 -> <init>
     3:3:void <init>():27688 -> <init>
     4:125:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27693:27814 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     126:126:void maybeForceBuilderInitialization():27698:27698 -> <init>
     126:126:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27694 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27669:27669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27681:27682 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27767 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27767 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27669 -> a
@@ -22621,10 +22621,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27898:27898 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$RawString com.android.tools.r8.com.android.aapt.Resources$RawString.getDefaultInstance():27912:27912 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$RawString):27780 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l70;)Lcom/android/tools/r8/internal/k70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p70;)Lcom/android/tools/r8/internal/o70;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$RawString.getValue():27476:27476 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$RawString):27781 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -22640,14 +22640,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27892 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27669 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27669:27669 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27681:27682 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27745 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27669 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27745 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27669 -> b
@@ -22661,11 +22661,11 @@
     1:3:com.android.tools.r8.com.android.aapt.Resources$RawString buildPartial():27731:27733 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$RawString build():27722 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():27669 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$RawString build():27723:27724 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():27669 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27802:27808 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/k70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/o70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27804 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27804:27810 -> c
@@ -22675,9 +22675,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$RawString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27892 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27669 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():27712:27712 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$RawString buildPartial():27731:27733 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$RawString build():27722 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():27669 -> h
@@ -22688,8 +22688,8 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():27669 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27681:27682 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Reference -> com.android.tools.r8.internal.p70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Reference -> com.android.tools.r8.internal.t70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int type_ -> e
     int id_ -> f
@@ -22697,22 +22697,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean private_ -> h
     com.android.tools.r8.com.android.aapt.Resources$Boolean isDynamic_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c60;"}
     int typeFlags_ -> j
     boolean allowRaw_ -> k
     byte memoizedIsInitialized -> l
     com.android.tools.r8.com.android.aapt.Resources$Reference DEFAULT_INSTANCE -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q70;"}
     1:9:void <clinit>():26324:26332 -> <clinit>
     1:403:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):25002:25404 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r70;)V"}
     404:804:void <init>():25004:25404 -> <init>
     805:806:void <init>():25005:25006 -> <init>
     1:5:boolean isInitialized():25407:25411 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):25418:25418 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:int com.android.tools.r8.com.android.aapt.Resources$Reference$Type.getNumber():25163:25163 -> a
     7:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):25418 -> a
     8:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):25419:25422 -> a
@@ -22730,7 +22730,7 @@
     27:30:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):25436:25439 -> a
     31:31:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):25627:25627 -> a
     31:31:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24995 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference getDefaultInstanceForType():26353:26353 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():24995 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -22752,12 +22752,12 @@
     10:10:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     11:11:int getSerializedSize():0:0 -> c
     11:11:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101889},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101889},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     25467:25470:int getSerializedSize():25456:25459 -> c
     25467:25470:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     25471:25471:int getSerializedSize():0:0 -> c
     25471:25471:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101890},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101890},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     50934:50936:int getSerializedSize():25463:25465 -> c
     50934:50936:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     50937:50937:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -22770,12 +22770,12 @@
     50939:50939:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     50940:50940:int getSerializedSize():0:0 -> c
     50940:50940:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101891},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101891},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     76411:76411:int getSerializedSize():25471:25471 -> c
     76411:76411:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     76412:76412:int getSerializedSize():0:0 -> c
     76412:76412:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101892},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101892},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     101887:101888:int getSerializedSize():25475:25476 -> c
     101887:101888:int com.android.tools.r8.internal.Resources$Reference.getSerializedSize():0 -> c
     101889:101889:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -22787,9 +22787,9 @@
     101892:101892:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
     101892:101892:int getSerializedSize():25473 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():24995:24995 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():25019:25019 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:6:boolean equals(java.lang.Object):25485:25490 -> equals
     7:7:int getId():25271:25271 -> equals
     7:7:boolean equals(java.lang.Object):25491 -> equals
@@ -22824,7 +22824,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Reference.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Reference.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":25540},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":25540},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     25521:25523:int hashCode():25518:25520 -> hashCode
     25521:25523:int com.android.tools.r8.internal.Resources$Reference.hashCode():0 -> hashCode
     25524:25524:int getId():25271:25271 -> hashCode
@@ -22854,21 +22854,21 @@
     25536:25539:int com.android.tools.r8.internal.Resources$Reference.hashCode():0 -> hashCode
     25540:25540:int hashCode():25516:25516 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():25111:25112 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:int getId():25271:25271 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Boolean getIsDynamic():25359:25359 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Boolean com.android.tools.r8.com.android.aapt.Resources$Boolean.getDefaultInstance():24855:24855 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Boolean getIsDynamic():25359 -> l
     1:8:java.lang.String getName():25286:25293 -> m
     1:2:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder toBuilder():25620:25621 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n70;"}
-com.android.tools.r8.com.android.aapt.Resources$Reference$1 -> com.android.tools.r8.internal.m70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r70;"}
+com.android.tools.r8.com.android.aapt.Resources$Reference$1 -> com.android.tools.r8.internal.q70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():26332:26332 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26338:26338 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Reference.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25025:25027 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Reference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26338 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26332 -> a
@@ -22937,7 +22937,7 @@
     93:93:void com.android.tools.r8.com.android.aapt.Resources$Reference.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25099:25099 -> a
     93:93:com.android.tools.r8.com.android.aapt.Resources$Reference parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26338 -> a
     93:93:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26332 -> a
-com.android.tools.r8.com.android.aapt.Resources$Reference$Builder -> com.android.tools.r8.internal.n70:
+com.android.tools.r8.com.android.aapt.Resources$Reference$Builder -> com.android.tools.r8.internal.r70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int type_ -> f
     int id_ -> g
@@ -22945,7 +22945,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean private_ -> i
     com.android.tools.r8.com.android.aapt.Resources$Boolean isDynamic_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c60;"}
     int typeFlags_ -> k
     boolean allowRaw_ -> l
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -22954,16 +22954,16 @@
     100:100:void maybeForceBuilderInitialization():25666:25666 -> <init>
     100:100:void <init>():25656 -> <init>
     101:363:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):25661:25923 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     364:364:void maybeForceBuilderInitialization():25666:25666 -> <init>
     364:364:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):25662 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25637:25637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():25649:25650 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25761 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25761 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25637 -> a
@@ -22972,10 +22972,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26314:26314 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):25637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Reference):25774 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p70;)Lcom/android/tools/r8/internal/n70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t70;)Lcom/android/tools/r8/internal/r70;"}
     11:11:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Reference):25775:25775 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder setTypeValue(int):25841:25842 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Reference):25776 -> a
@@ -23020,14 +23020,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26308 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):25637 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25637:25637 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():25649:25650 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25739 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25637 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25739 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):25637 -> b
@@ -23040,9 +23040,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Reference build():25706:25708 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():25637 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25814:25820 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/n70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/r70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25816 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):25816:25822 -> c
@@ -23052,51 +23052,51 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Reference$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26308 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):25637 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():25696:25696 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Reference build():25706:25708 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():25637 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():25637:25637 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():25649:25650 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:13:com.android.tools.r8.com.android.aapt.Resources$Reference buildPartial():25715:25727 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
 com.android.tools.r8.com.android.aapt.Resources$Reference$Type -> R8$$REMOVED$$CLASS$$19:
 # {"id":"sourceFile","fileName":"Resources.java"}
-com.android.tools.r8.com.android.aapt.Resources$Reference$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.o70:
+com.android.tools.r8.com.android.aapt.Resources$Reference$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.s70:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.Resources$Reference$Type$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources$ResourceTable -> com.android.tools.r8.internal.s70:
+com.android.tools.r8.com.android.aapt.Resources$ResourceTable -> com.android.tools.r8.internal.w70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$StringPool sourcePool_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L70;"}
     java.util.List package_ -> f
     java.util.List overlayable_ -> g
     java.util.List toolFingerprint_ -> h
     java.util.List dynamicRefTable_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.android.aapt.Resources$ResourceTable DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u70;"}
     1:9:void <clinit>():5804:5812 -> <clinit>
     1:395:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):3511:3905 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v70;)V"}
     396:788:void <init>():3513:3905 -> <init>
     789:792:void <init>():3514:3517 -> <init>
     1:5:boolean isInitialized():3908:3912 -> a
     6:21:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):3919:3934 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     22:22:com.android.tools.r8.com.android.aapt.Resources$ResourceTable parseFrom(byte[]):4051:4051 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/w70;"}
     23:23:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):4114:4114 -> a
     23:23:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):3504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$ResourceTable getDefaultInstanceForType():5833:5833 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():3504 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -23113,7 +23113,7 @@
     12:12:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     13:13:int getSerializedSize():0:0 -> c
     13:13:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15855},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15855},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     3964:3966:int getSerializedSize():3951:3953 -> c
     3964:3966:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     3967:3967:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -23121,7 +23121,7 @@
     3967:3967:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     3968:3968:int getSerializedSize():0:0 -> c
     3968:3968:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15856},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15856},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     7923:7925:int getSerializedSize():3955:3957 -> c
     7923:7925:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     7926:7926:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -23129,7 +23129,7 @@
     7926:7926:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     7927:7927:int getSerializedSize():0:0 -> c
     7927:7927:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15857},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15857},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     11886:11888:int getSerializedSize():3959:3961 -> c
     11886:11888:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     11889:11889:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -23137,7 +23137,7 @@
     11889:11889:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     11890:11890:int getSerializedSize():0:0 -> c
     11890:11890:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15858},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15858},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     15853:15854:int getSerializedSize():3963:3964 -> c
     15853:15854:int com.android.tools.r8.internal.Resources$ResourceTable.getSerializedSize():0 -> c
     15855:15855:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -23150,9 +23150,9 @@
     15858:15858:int getSerializedSize():3961 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder toBuilder():4107:4108 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():3504 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():3530:3530 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):3973:3976 -> equals
     5:5:boolean hasSourcePool():3657:3657 -> equals
     5:5:boolean equals(java.lang.Object):3978 -> equals
@@ -23220,17 +23220,17 @@
     20:20:int hashCode():4020 -> hashCode
     21:24:int hashCode():4020:4023 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():3639:3640 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StringPool getSourcePool():3670:3670 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$StringPool com.android.tools.r8.com.android.aapt.Resources$StringPool.getDefaultInstance():487:487 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$StringPool getSourcePool():3670 -> k
-com.android.tools.r8.com.android.aapt.Resources$ResourceTable$1 -> com.android.tools.r8.internal.q70:
+com.android.tools.r8.com.android.aapt.Resources$ResourceTable$1 -> com.android.tools.r8.internal.u70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():5812:5812 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$ResourceTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5818:5818 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5812 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$ResourceTable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3536:3538 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$ResourceTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5818 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5812 -> a
@@ -23333,39 +23333,39 @@
     122:133:void com.android.tools.r8.com.android.aapt.Resources$ResourceTable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):3616:3627 -> a
     122:133:com.android.tools.r8.com.android.aapt.Resources$ResourceTable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5818 -> a
     122:133:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5812 -> a
-com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder -> com.android.tools.r8.internal.r70:
+com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder -> com.android.tools.r8.internal.v70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$StringPool sourcePool_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L70;"}
     java.util.List package_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 packageBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List overlayable_ -> j
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 overlayableBuilder_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List toolFingerprint_ -> l
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 toolFingerprintBuilder_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List dynamicRefTable_ -> n
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 dynamicRefTableBuilder_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():4142 -> <init>
     2:938:void <init>():4611:5547 -> <init>
     939:939:void maybeForceBuilderInitialization():4153:4153 -> <init>
     939:939:void <init>():4143 -> <init>
     940:2339:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):4148:5547 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     2340:2340:void maybeForceBuilderInitialization():4153:4153 -> <init>
     2340:2340:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):4149 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4124:4124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():4136:4137 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4295 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4295 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4124 -> a
@@ -23374,10 +23374,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5794:5794 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.com.android.aapt.Resources$ResourceTable.getDefaultInstance():5808:5808 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ResourceTable):4308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;)Lcom/android/tools/r8/internal/r70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;)Lcom/android/tools/r8/internal/v70;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$ResourceTable.hasSourcePool():3657:3657 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ResourceTable):4309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23456,14 +23456,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5788 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4124:4124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():4136:4137 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4273 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4273 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):4124 -> b
@@ -23476,9 +23476,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$ResourceTable build():4209:4211 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():4124 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4433:4439 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/r70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/v70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4435 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4435:4441 -> c
@@ -23488,35 +23488,35 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5788 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4124 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():4199:4199 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$ResourceTable build():4209:4211 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():4124 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():4124:4124 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():4136:4137 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:44:com.android.tools.r8.com.android.aapt.Resources$ResourceTable buildPartial():4218:4261 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/s70;"}
-com.android.tools.r8.com.android.aapt.Resources$Source -> com.android.tools.r8.internal.v70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/w70;"}
+com.android.tools.r8.com.android.aapt.Resources$Source -> com.android.tools.r8.internal.z70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int pathIdx_ -> e
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition position_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$Source DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x70;"}
     1:9:void <clinit>():1768:1776 -> <clinit>
     1:127:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):1126:1252 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y70;)V"}
     128:252:void <init>():1128:1252 -> <init>
     253:377:void <init>():1128:1252 -> <init>
     253:377:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1147 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     378:378:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1149:1149 -> <init>
     379:379:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     379:379:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -23539,7 +23539,7 @@
     429:429:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1194:1194 -> <init>
     1:5:boolean isInitialized():1255:1259 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):1266:1267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):1267 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23548,7 +23548,7 @@
     10:13:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):1269:1272 -> a
     14:14:com.android.tools.r8.com.android.aapt.Resources$Source$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1420:1420 -> a
     14:14:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getDefaultInstanceForType():1797:1797 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():1119 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -23560,9 +23560,9 @@
     10:10:int getSerializedSize():1287 -> c
     11:12:int getSerializedSize():1289:1290 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():1119:1119 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():1141:1141 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):1299:1302 -> equals
     5:5:int getPathIdx():1223:1223 -> equals
     5:5:boolean equals(java.lang.Object):1304 -> equals
@@ -23584,7 +23584,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Source.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Source.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getPathIdx():1223:1223 -> hashCode
     4:4:int hashCode():1323 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$Source.hashCode():0 -> hashCode
@@ -23595,39 +23595,39 @@
     6:9:int com.android.tools.r8.internal.Resources$Source.hashCode():0 -> hashCode
     10:10:int hashCode():1321:1321 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1206:1207 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getPosition():1242:1242 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getPosition():1242 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$Source$Builder toBuilder():1413:1414 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u70;"}
-com.android.tools.r8.com.android.aapt.Resources$Source$1 -> com.android.tools.r8.internal.t70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+com.android.tools.r8.com.android.aapt.Resources$Source$1 -> com.android.tools.r8.internal.x70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():1776:1776 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1782:1782 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1776 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$Source$Builder -> com.android.tools.r8.internal.u70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$Source$Builder -> com.android.tools.r8.internal.y70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int pathIdx_ -> f
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition position_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():1448 -> <init>
     2:2:void maybeForceBuilderInitialization():1459:1459 -> <init>
     2:2:void <init>():1449 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1454:1454 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():1459:1459 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1455 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1430:1430 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1442:1443 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Source$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1539 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1430 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Source$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1539 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1430 -> a
@@ -23636,10 +23636,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Source$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1758:1758 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1430 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Source$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Source):1552 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v70;)Lcom/android/tools/r8/internal/u70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z70;)Lcom/android/tools/r8/internal/y70;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$Source.getPathIdx():1223:1223 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Source$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Source):1553 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23664,14 +23664,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Source$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1752 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1430 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1430:1430 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1442:1443 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Source$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1517 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1430 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Source$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1517 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1430 -> b
@@ -23684,9 +23684,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Source build():1489:1491 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():1430 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1576:1576 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/u70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/y70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1782:1782 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$Source$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1776 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1576 -> c
@@ -23700,34 +23700,34 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Source$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1752 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1430 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():1479:1479 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Source build():1489:1491 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():1430 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():1430:1430 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1442:1443 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:8:com.android.tools.r8.com.android.aapt.Resources$Source buildPartial():1498:1505 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
-com.android.tools.r8.com.android.aapt.Resources$SourcePosition -> com.android.tools.r8.internal.y70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
+com.android.tools.r8.com.android.aapt.Resources$SourcePosition -> com.android.tools.r8.internal.C70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int lineNumber_ -> e
     int columnNumber_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A70;"}
     1:9:void <clinit>():1049:1057 -> <clinit>
     1:100:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):547:646 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B70;)V"}
     101:198:void <init>():549:646 -> <init>
     199:296:void <init>():549:646 -> <init>
     199:296:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):568 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     297:297:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):570:570 -> <init>
     298:298:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     298:298:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -23747,7 +23747,7 @@
     334:334:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):607:607 -> <init>
     1:5:boolean isInitialized():649:653 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):660:661 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):661 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23762,7 +23762,7 @@
     14:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):666:666 -> a
     15:15:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):809:809 -> a
     15:15:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getDefaultInstanceForType():1078:1078 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():540 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -23779,15 +23779,15 @@
     8:8:int com.android.tools.r8.internal.Resources$SourcePosition.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.Resources$SourcePosition.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":694},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":694},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     692:693:int getSerializedSize():683:684 -> c
     692:693:int com.android.tools.r8.internal.Resources$SourcePosition.getSerializedSize():0 -> c
     694:694:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
     694:694:int getSerializedSize():681 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():540:540 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():562:562 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):693:696 -> equals
     5:5:int getLineNumber():632:632 -> equals
     5:5:boolean equals(java.lang.Object):698 -> equals
@@ -23811,7 +23811,7 @@
     2:2:int com.android.tools.r8.internal.Resources$SourcePosition.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$SourcePosition.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getLineNumber():632:632 -> hashCode
     4:4:int hashCode():714 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$SourcePosition.hashCode():0 -> hashCode
@@ -23824,16 +23824,16 @@
     7:8:int com.android.tools.r8.internal.Resources$SourcePosition.hashCode():0 -> hashCode
     9:9:int hashCode():712:712 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():619:620 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder toBuilder():802:803 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x70;"}
-com.android.tools.r8.com.android.aapt.Resources$SourcePosition$1 -> com.android.tools.r8.internal.w70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B70;"}
+com.android.tools.r8.com.android.aapt.Resources$SourcePosition$1 -> com.android.tools.r8.internal.A70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():1057:1057 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1063:1063 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1057 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder -> com.android.tools.r8.internal.x70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder -> com.android.tools.r8.internal.B70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int lineNumber_ -> f
     int columnNumber_ -> g
@@ -23842,16 +23842,16 @@
     2:2:void maybeForceBuilderInitialization():848:848 -> <init>
     2:2:void <init>():838 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):843:843 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():848:848 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):844 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):819:819 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():831:832 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):920 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):819 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):920 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):819 -> a
@@ -23860,10 +23860,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1039:1039 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):819 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$SourcePosition):933 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y70;)Lcom/android/tools/r8/internal/x70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C70;)Lcom/android/tools/r8/internal/B70;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getLineNumber():632:632 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$SourcePosition):934 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23882,14 +23882,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1033 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):819 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):819:819 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():831:832 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):898 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):819 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):898 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):819 -> b
@@ -23902,9 +23902,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$SourcePosition build():874:876 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():819 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):957:957 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/x70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/B70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1063:1063 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$SourcePosition$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1057 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):957 -> c
@@ -23918,35 +23918,35 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):1033 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):819 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():864:864 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$SourcePosition build():874:876 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():819 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():819:819 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():831:832 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:4:com.android.tools.r8.com.android.aapt.Resources$SourcePosition buildPartial():883:886 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
-com.android.tools.r8.com.android.aapt.Resources$StagedId -> com.android.tools.r8.internal.B70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
+com.android.tools.r8.com.android.aapt.Resources$StagedId -> com.android.tools.r8.internal.F70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     int stagedId_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$StagedId DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D70;"}
     1:9:void <clinit>():15037:15045 -> <clinit>
     1:123:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):14411:14533 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E70;)V"}
     124:244:void <init>():14413:14533 -> <init>
     245:365:void <init>():14413:14533 -> <init>
     245:365:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14432 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     366:366:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14434:14434 -> <init>
     367:367:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     367:367:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -23969,7 +23969,7 @@
     411:411:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14479:14479 -> <init>
     1:5:boolean isInitialized():14536:14540 -> a
     6:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):14547:14551 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     11:11:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     11:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):14551 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23978,7 +23978,7 @@
     13:13:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):14553:14553 -> a
     14:14:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14701:14701 -> a
     14:14:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14404 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StagedId getDefaultInstanceForType():15066:15066 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():14404 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -23995,15 +23995,15 @@
     10:10:int com.android.tools.r8.internal.Resources$StagedId.getSerializedSize():0 -> c
     11:11:int getSerializedSize():0:0 -> c
     11:11:int com.android.tools.r8.internal.Resources$StagedId.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14583},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14583},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     14581:14582:int getSerializedSize():14570:14571 -> c
     14581:14582:int com.android.tools.r8.internal.Resources$StagedId.getSerializedSize():0 -> c
     14583:14583:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
     14583:14583:int getSerializedSize():14568 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():14404:14404 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():14426:14426 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):14580:14583 -> equals
     5:5:boolean hasSource():14504:14504 -> equals
     5:5:boolean equals(java.lang.Object):14585 -> equals
@@ -24031,39 +24031,39 @@
     9:9:int hashCode():14608 -> hashCode
     10:11:int hashCode():14609:14610 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14491:14492 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():14512:14512 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():14512 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder toBuilder():14694:14695 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A70;"}
-com.android.tools.r8.com.android.aapt.Resources$StagedId$1 -> com.android.tools.r8.internal.z70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E70;"}
+com.android.tools.r8.com.android.aapt.Resources$StagedId$1 -> com.android.tools.r8.internal.D70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():15045:15045 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StagedId parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15051:15051 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15045 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder -> com.android.tools.r8.internal.A70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder -> com.android.tools.r8.internal.E70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     int stagedId_ -> g
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():14729 -> <init>
     2:2:void maybeForceBuilderInitialization():14740:14740 -> <init>
     2:2:void <init>():14730 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14735:14735 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():14740:14740 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14736 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14711:14711 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14723:14724 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14820 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14711 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14820 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14711 -> a
@@ -24072,10 +24072,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15027:15027 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14711 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StagedId com.android.tools.r8.com.android.aapt.Resources$StagedId.getDefaultInstance():15041:15041 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StagedId):14833 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B70;)Lcom/android/tools/r8/internal/A70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F70;)Lcom/android/tools/r8/internal/E70;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$StagedId.hasSource():14504:14504 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StagedId):14834 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -24100,14 +24100,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15021 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14711 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14711:14711 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14723:14724 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14798 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14711 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14798 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14711 -> b
@@ -24121,11 +24121,11 @@
     1:8:com.android.tools.r8.com.android.aapt.Resources$StagedId buildPartial():14779:14786 -> build
     1:8:com.android.tools.r8.com.android.aapt.Resources$StagedId build():14770 -> build
     1:8:com.android.tools.r8.com.google.protobuf.MessageLite build():14711 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     9:10:com.android.tools.r8.com.android.aapt.Resources$StagedId build():14771:14772 -> build
     9:10:com.android.tools.r8.com.google.protobuf.MessageLite build():14711 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14857:14857 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/A70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/E70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$StagedId com.android.tools.r8.com.android.aapt.Resources$StagedId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15051:15051 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$StagedId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15045 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14857 -> c
@@ -24139,9 +24139,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StagedId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15021 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14711 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():14760:14760 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:8:com.android.tools.r8.com.android.aapt.Resources$StagedId buildPartial():14779:14786 -> h
     1:8:com.android.tools.r8.com.android.aapt.Resources$StagedId build():14770 -> h
     1:8:com.android.tools.r8.com.google.protobuf.Message build():14711 -> h
@@ -24152,35 +24152,35 @@
     1:8:com.android.tools.r8.com.google.protobuf.Message buildPartial():14711 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14723:14724 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$String -> com.android.tools.r8.internal.E70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$String -> com.android.tools.r8.internal.I70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object value_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$String DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G70;"}
     1:9:void <clinit>():27328:27336 -> <clinit>
     1:113:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):26816:26928 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H70;)V"}
     114:224:void <init>():26818:26928 -> <init>
     225:225:void <init>():26819:26819 -> <init>
     1:5:boolean isInitialized():26931:26935 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):26942:26945 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$String$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27079:27079 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26809 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$String getDefaultInstanceForType():27357:27357 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():26809 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:9:int getSerializedSize():26950:26958 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():26809:26809 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():26832:26832 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):26967:26970 -> equals
     5:12:java.lang.String getValue():26898:26905 -> equals
     5:12:boolean equals(java.lang.Object):26972 -> equals
@@ -24202,7 +24202,7 @@
     2:2:int com.android.tools.r8.internal.Resources$String.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$String.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getValue():26898:26905 -> hashCode
     4:11:int hashCode():26986 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$String.hashCode():0 -> hashCode
@@ -24210,15 +24210,15 @@
     12:14:int com.android.tools.r8.internal.Resources$String.hashCode():0 -> hashCode
     15:15:int hashCode():26984:26984 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():26885:26886 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$String$Builder toBuilder():27072:27073 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D70;"}
-com.android.tools.r8.com.android.aapt.Resources$String$1 -> com.android.tools.r8.internal.C70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H70;"}
+com.android.tools.r8.com.android.aapt.Resources$String$1 -> com.android.tools.r8.internal.G70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():27336:27336 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$String parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27342:27342 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$String.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26838:26840 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$String parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27342 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27336 -> a
@@ -24255,7 +24255,7 @@
     37:37:void com.android.tools.r8.com.android.aapt.Resources$String.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26873:26873 -> a
     37:37:com.android.tools.r8.com.android.aapt.Resources$String parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27342 -> a
     37:37:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27336 -> a
-com.android.tools.r8.com.android.aapt.Resources$String$Builder -> com.android.tools.r8.internal.D70:
+com.android.tools.r8.com.android.aapt.Resources$String$Builder -> com.android.tools.r8.internal.H70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object value_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -24265,16 +24265,16 @@
     3:3:void maybeForceBuilderInitialization():27118:27118 -> <init>
     3:3:void <init>():27108 -> <init>
     4:125:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27113:27234 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     126:126:void maybeForceBuilderInitialization():27118:27118 -> <init>
     126:126:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27114 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27089:27089 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27101:27102 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$String$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27187 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27089 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$String$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27187 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27089 -> a
@@ -24283,10 +24283,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27318:27318 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27089 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$String com.android.tools.r8.com.android.aapt.Resources$String.getDefaultInstance():27332:27332 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$String):27200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E70;)Lcom/android/tools/r8/internal/D70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I70;)Lcom/android/tools/r8/internal/H70;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$String.getValue():26898:26898 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$String):27201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -24302,14 +24302,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$String$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27312 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27089 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27089:27089 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27101:27102 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$String$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27165 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27089 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$String$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27165 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27089 -> b
@@ -24323,11 +24323,11 @@
     1:3:com.android.tools.r8.com.android.aapt.Resources$String buildPartial():27151:27153 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$String build():27142 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():27089 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$String build():27143:27144 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():27089 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27222:27228 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/D70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27224 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$String$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27224:27230 -> c
@@ -24337,9 +24337,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$String$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27312 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27089 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():27132:27132 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$String buildPartial():27151:27153 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$String build():27142 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():27089 -> h
@@ -24350,24 +24350,24 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():27089 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27101:27102 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$StringPool -> com.android.tools.r8.internal.H70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$StringPool -> com.android.tools.r8.internal.L70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.google.protobuf.ByteString data_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V7;"}
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$StringPool DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J70;"}
     1:9:void <clinit>():483:491 -> <clinit>
     1:85:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):41:125 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K70;)V"}
     86:168:void <init>():43:125 -> <init>
     169:169:void <init>():44:44 -> <init>
     1:5:boolean isInitialized():128:132 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:boolean com.android.tools.r8.com.google.protobuf.ByteString.isEmpty():236:236 -> a
     7:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):139 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -24380,7 +24380,7 @@
     11:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):142:142 -> a
     12:12:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):277:277 -> a
     12:12:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StringPool getDefaultInstanceForType():512:512 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():34 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -24393,9 +24393,9 @@
     8:8:int getSerializedSize():153 -> c
     9:10:int getSerializedSize():155:156 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():34:34 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():57:57 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):165:168 -> equals
     5:5:com.android.tools.r8.com.google.protobuf.ByteString getData():122:122 -> equals
     5:5:boolean equals(java.lang.Object):170 -> equals
@@ -24415,7 +24415,7 @@
     2:2:int com.android.tools.r8.internal.Resources$StringPool.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$StringPool.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:com.android.tools.r8.com.google.protobuf.ByteString getData():122:122 -> hashCode
     4:4:int hashCode():184 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$StringPool.hashCode():0 -> hashCode
@@ -24423,15 +24423,15 @@
     5:7:int com.android.tools.r8.internal.Resources$StringPool.hashCode():0 -> hashCode
     8:8:int hashCode():182:182 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():109:110 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder toBuilder():270:271 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G70;"}
-com.android.tools.r8.com.android.aapt.Resources$StringPool$1 -> com.android.tools.r8.internal.F70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K70;"}
+com.android.tools.r8.com.android.aapt.Resources$StringPool$1 -> com.android.tools.r8.internal.J70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():491:491 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StringPool parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):497:497 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$StringPool.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):63:65 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$StringPool parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):497 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):491 -> a
@@ -24468,12 +24468,12 @@
     35:35:void com.android.tools.r8.com.android.aapt.Resources$StringPool.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):97:97 -> a
     35:35:com.android.tools.r8.com.android.aapt.Resources$StringPool parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):497 -> a
     35:35:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):491 -> a
-com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder -> com.android.tools.r8.internal.G70:
+com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder -> com.android.tools.r8.internal.K70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.google.protobuf.ByteString data_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V7;"}
     1:121:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):311:431 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     122:122:void maybeForceBuilderInitialization():316:316 -> <init>
     122:122:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):312 -> <init>
     123:123:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -24482,12 +24482,12 @@
     125:125:void maybeForceBuilderInitialization():316:316 -> <init>
     125:125:void <init>():306 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):287:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():299:300 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):385 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):385 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):287 -> a
@@ -24496,10 +24496,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):473:473 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StringPool com.android.tools.r8.com.android.aapt.Resources$StringPool.getDefaultInstance():487:487 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StringPool):398 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H70;)Lcom/android/tools/r8/internal/G70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L70;)Lcom/android/tools/r8/internal/K70;"}
     11:11:com.android.tools.r8.com.google.protobuf.ByteString com.android.tools.r8.com.android.aapt.Resources$StringPool.getData():122:122 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StringPool):399 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -24512,12 +24512,12 @@
     19:19:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StringPool):402 -> a
     20:20:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StringPool):403:403 -> a
     1:1:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):287:287 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():299:300 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     2:3:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):363 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):287 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     4:4:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):363 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):287 -> b
@@ -24532,15 +24532,15 @@
     10:11:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     10:11:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):467 -> b
     10:11:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):287 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StringPool buildPartial():349:351 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$StringPool build():340 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():287 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$StringPool build():341:342 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():287 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):419:425 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/G70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/K70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):421 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):421:427 -> c
@@ -24550,9 +24550,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StringPool$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):467 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):287 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():330:330 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StringPool buildPartial():349:351 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$StringPool build():340 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():287 -> h
@@ -24563,32 +24563,32 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():287 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():299:300 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Style -> com.android.tools.r8.internal.N70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Style -> com.android.tools.r8.internal.R70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Reference parent_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     com.android.tools.r8.com.android.aapt.Resources$Source parentSource_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.util.List entry_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Style DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M70;"}
     1:9:void <clinit>():39347:39355 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):36657:36657 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N70;)V"}
     1645:1645:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):38301:38301 -> <init>
     1646:1646:void <init>():36659:36659 -> <init>
     3288:3288:void <init>():38301:38301 -> <init>
     3289:3289:void <init>():36660:36660 -> <init>
     1:5:boolean isInitialized():38304:38308 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):38315:38324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Style$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):38487:38487 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):36650 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Style getDefaultInstanceForType():39376:39376 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():36650 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -24610,15 +24610,15 @@
     16:16:int com.android.tools.r8.internal.Resources$Style.getSerializedSize():0 -> c
     17:17:int getSerializedSize():0:0 -> c
     17:17:int com.android.tools.r8.internal.Resources$Style.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38364},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38364},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     38362:38363:int getSerializedSize():38345:38346 -> c
     38362:38363:int com.android.tools.r8.internal.Resources$Style.getSerializedSize():0 -> c
     38364:38364:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     38364:38364:int getSerializedSize():38343 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():36650:36650 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():36673:36673 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):38355:38358 -> equals
     5:5:boolean hasParent():38177:38177 -> equals
     5:5:boolean equals(java.lang.Object):38360 -> equals
@@ -24655,23 +24655,23 @@
     10:10:int hashCode():38393 -> hashCode
     11:14:int hashCode():38393:38396 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():36759:36760 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference getParent():38189:38189 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference getParent():38189 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getParentSource():38227:38227 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getParentSource():38227 -> l
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Builder toBuilder():38480:38481 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J70;"}
-com.android.tools.r8.com.android.aapt.Resources$Style$1 -> com.android.tools.r8.internal.I70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/N70;"}
+com.android.tools.r8.com.android.aapt.Resources$Style$1 -> com.android.tools.r8.internal.M70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():39355:39355 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Style parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39361:39361 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39355 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Style.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36679:36681 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Style parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39361 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39355 -> a
@@ -24738,32 +24738,32 @@
     82:84:void com.android.tools.r8.com.android.aapt.Resources$Style.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36745:36747 -> a
     82:84:com.android.tools.r8.com.android.aapt.Resources$Style parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39361 -> a
     82:84:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39355 -> a
-com.android.tools.r8.com.android.aapt.Resources$Style$Builder -> com.android.tools.r8.internal.J70:
+com.android.tools.r8.com.android.aapt.Resources$Style$Builder -> com.android.tools.r8.internal.N70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$Reference parent_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     com.android.tools.r8.com.android.aapt.Resources$Source parentSource_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.util.List entry_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 entryBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():38515 -> <init>
     2:2:void <init>():39018:39018 -> <init>
     3:3:void maybeForceBuilderInitialization():38526:38526 -> <init>
     3:3:void <init>():38516 -> <init>
     4:501:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):38521:39018 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     502:502:void maybeForceBuilderInitialization():38526:38526 -> <init>
     502:502:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):38522 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38497:38497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():38509:38510 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Style$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38631 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Style$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38631 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38497 -> a
@@ -24772,10 +24772,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39337:39337 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Style com.android.tools.r8.com.android.aapt.Resources$Style.getDefaultInstance():39351:39351 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Style):38644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N70;)Lcom/android/tools/r8/internal/J70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R70;)Lcom/android/tools/r8/internal/N70;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Style.hasParent():38177:38177 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Style):38645 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -24820,14 +24820,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39331 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38497:38497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():38509:38510 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Style$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38609 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Style$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38609 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38497 -> b
@@ -24840,9 +24840,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Style build():38567:38569 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():38497 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38694:38700 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/J70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/N70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38696 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Style$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38696:38702 -> c
@@ -24852,44 +24852,44 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39331 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38497 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():38557:38557 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Style build():38567:38569 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():38497 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():38497:38497 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():38509:38510 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:22:com.android.tools.r8.com.android.aapt.Resources$Style buildPartial():38576:38597 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/N70;"}
-com.android.tools.r8.com.android.aapt.Resources$Style$Entry -> com.android.tools.r8.internal.M70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R70;"}
+com.android.tools.r8.com.android.aapt.Resources$Style$Entry -> com.android.tools.r8.internal.Q70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference key_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.android.aapt.Resources$Style$Entry DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O70;"}
     1:9:void <clinit>():38131:38139 -> <clinit>
     1:274:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):36883:37156 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P70;)V"}
     275:546:void <init>():36885:37156 -> <init>
     547:547:void <init>():36886:36886 -> <init>
     1:5:boolean isInitialized():37159:37163 -> a
     6:18:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):37170:37182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     19:19:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):37355:37355 -> a
     19:19:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):36876 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Style$Entry getDefaultInstanceForType():38160:38160 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():36876 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -24905,9 +24905,9 @@
     20:21:int getSerializedSize():37206:37207 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder toBuilder():37348:37349 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():36876 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():36899:36899 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):37216:37219 -> equals
     5:5:boolean hasSource():37008:37008 -> equals
     5:5:boolean equals(java.lang.Object):37221 -> equals
@@ -24951,25 +24951,25 @@
     20:20:int hashCode():37259 -> hashCode
     21:24:int hashCode():37261:37264 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():36991:36992 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item getItem():37142:37142 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item getItem():37142 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference getKey():37104:37104 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference getKey():37104 -> l
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():37020:37020 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> m
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():37020 -> m
-com.android.tools.r8.com.android.aapt.Resources$Style$Entry$1 -> com.android.tools.r8.internal.K70:
+com.android.tools.r8.com.android.aapt.Resources$Style$Entry$1 -> com.android.tools.r8.internal.O70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():38139:38139 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Style$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38145:38145 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Style$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36905:36907 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Style$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38145 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38139 -> a
@@ -25036,32 +25036,32 @@
     92:92:void com.android.tools.r8.com.android.aapt.Resources$Style$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36979:36979 -> a
     92:92:com.android.tools.r8.com.android.aapt.Resources$Style$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38145 -> a
     92:92:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38139 -> a
-com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder -> com.android.tools.r8.internal.L70:
+com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder -> com.android.tools.r8.internal.P70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference key_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     com.android.tools.r8.com.android.aapt.Resources$Item item_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():37383 -> <init>
     2:2:void <init>():37707:37707 -> <init>
     3:3:void maybeForceBuilderInitialization():37394:37394 -> <init>
     3:3:void <init>():37384 -> <init>
     4:322:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):37389:37707 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     323:323:void maybeForceBuilderInitialization():37394:37394 -> <init>
     323:323:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):37390 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37365:37365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37377:37378 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37496 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37496 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37365 -> a
@@ -25070,10 +25070,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38121:38121 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Style$Entry com.android.tools.r8.com.android.aapt.Resources$Style$Entry.getDefaultInstance():38135:38135 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):37509 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M70;)Lcom/android/tools/r8/internal/L70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q70;)Lcom/android/tools/r8/internal/P70;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Style$Entry.hasSource():37008:37008 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):37510 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -25117,14 +25117,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38115 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37365:37365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37377:37378 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37474 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37474 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37365 -> b
@@ -25138,11 +25138,11 @@
     1:18:com.android.tools.r8.com.android.aapt.Resources$Style$Entry buildPartial():37445:37462 -> build
     1:18:com.android.tools.r8.com.android.aapt.Resources$Style$Entry build():37436 -> build
     1:18:com.android.tools.r8.com.google.protobuf.MessageLite build():37365 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     19:20:com.android.tools.r8.com.android.aapt.Resources$Style$Entry build():37437:37438 -> build
     19:20:com.android.tools.r8.com.google.protobuf.MessageLite build():37365 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37540:37546 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/L70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/P70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37542 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37542:37548 -> c
@@ -25152,9 +25152,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Style$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38115 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37365 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():37426:37426 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:18:com.android.tools.r8.com.android.aapt.Resources$Style$Entry buildPartial():37445:37462 -> h
     1:18:com.android.tools.r8.com.android.aapt.Resources$Style$Entry build():37436 -> h
     1:18:com.android.tools.r8.com.google.protobuf.Message build():37365 -> h
@@ -25165,28 +25165,28 @@
     1:18:com.android.tools.r8.com.google.protobuf.Message buildPartial():37365 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37377:37378 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$StyleString -> com.android.tools.r8.internal.T70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$StyleString -> com.android.tools.r8.internal.X70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object str_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List spans_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$StyleString DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S70;"}
     1:9:void <clinit>():55876:55884 -> <clinit>
     1:875:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):54309:55183 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T70;)V"}
     876:1748:void <init>():54311:55183 -> <init>
     1749:1750:void <init>():54312:54313 -> <init>
     1:5:boolean isInitialized():55186:55190 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):55197:55203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):55347:55347 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):54302 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyleString getDefaultInstanceForType():55905:55905 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():54302 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -25198,15 +25198,15 @@
     11:11:int com.android.tools.r8.internal.Resources$StyleString.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.Resources$StyleString.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":55233},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":55233},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     55231:55232:int getSerializedSize():55219:55220 -> c
     55231:55232:int com.android.tools.r8.internal.Resources$StyleString.getSerializedSize():0 -> c
     55233:55233:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     55233:55233:int getSerializedSize():55217 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():54302:54302 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():54326:54326 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):55229:55232 -> equals
     5:12:java.lang.String getStr():55113:55120 -> equals
     5:12:boolean equals(java.lang.Object):55234 -> equals
@@ -25233,7 +25233,7 @@
     2:2:int com.android.tools.r8.internal.Resources$StyleString.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$StyleString.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getStr():55113:55120 -> hashCode
     4:11:int hashCode():55250 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$StyleString.hashCode():0 -> hashCode
@@ -25251,15 +25251,15 @@
     16:19:int com.android.tools.r8.internal.Resources$StyleString.hashCode():0 -> hashCode
     20:20:int hashCode():55248:55248 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():54392:54393 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder toBuilder():55340:55341 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P70;"}
-com.android.tools.r8.com.android.aapt.Resources$StyleString$1 -> com.android.tools.r8.internal.O70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T70;"}
+com.android.tools.r8.com.android.aapt.Resources$StyleString$1 -> com.android.tools.r8.internal.S70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():55884:55884 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyleString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55890:55890 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55884 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$StyleString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54332:54334 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$StyleString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55890 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55884 -> a
@@ -25309,30 +25309,30 @@
     56:58:void com.android.tools.r8.com.android.aapt.Resources$StyleString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54378:54380 -> a
     56:58:com.android.tools.r8.com.android.aapt.Resources$StyleString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55890 -> a
     56:58:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55884 -> a
-com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder -> com.android.tools.r8.internal.P70:
+com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder -> com.android.tools.r8.internal.T70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.lang.Object str_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List spans_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 spansBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():55371 -> <init>
     2:79:void <init>():55542:55619 -> <init>
     80:80:void maybeForceBuilderInitialization():55382:55382 -> <init>
     80:80:void <init>():55372 -> <init>
     81:323:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):55377:55619 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     324:324:void maybeForceBuilderInitialization():55382:55382 -> <init>
     324:324:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):55378 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55353:55353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():55365:55366 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55468 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55468 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55353 -> a
@@ -25341,10 +25341,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55866:55866 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyleString com.android.tools.r8.com.android.aapt.Resources$StyleString.getDefaultInstance():55880:55880 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyleString):55481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T70;)Lcom/android/tools/r8/internal/P70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X70;)Lcom/android/tools/r8/internal/T70;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$StyleString.getStr():55113:55113 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyleString):55482 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -25373,14 +25373,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55860 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55353 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55353:55353 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():55365:55366 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55446 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55353 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55446 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):55353 -> b
@@ -25393,9 +25393,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StyleString build():55413:55415 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():55353 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55529:55535 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/P70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/T70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55531 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55531:55537 -> c
@@ -25405,19 +25405,19 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55860 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55353 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():55403:55403 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StyleString build():55413:55415 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():55353 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():55353:55353 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():55365:55366 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:13:com.android.tools.r8.com.android.aapt.Resources$StyleString buildPartial():55422:55434 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T70;"}
-com.android.tools.r8.com.android.aapt.Resources$StyleString$Span -> com.android.tools.r8.internal.S70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X70;"}
+com.android.tools.r8.com.android.aapt.Resources$StyleString$Span -> com.android.tools.r8.internal.W70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object name_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -25425,17 +25425,17 @@
     int endIndex_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$StyleString$Span DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W70;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U70;"}
     1:9:void <clinit>():55071:55079 -> <clinit>
     1:145:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):54435:54579 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V70;)V"}
     146:288:void <init>():54437:54579 -> <init>
     289:289:void <init>():54438:54438 -> <init>
     1:5:boolean isInitialized():54582:54586 -> a
     6:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):54593:54597 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     11:11:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     11:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):54597 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -25450,7 +25450,7 @@
     17:17:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):54602:54602 -> a
     18:18:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):54752:54752 -> a
     18:18:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):54428 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span getDefaultInstanceForType():55100:55100 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():54428 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -25462,7 +25462,7 @@
     9:9:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
     10:10:int getSerializedSize():0:0 -> c
     10:10:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109254},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109254},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     54628:54628:int getSerializedSize():54618:54618 -> c
     54628:54628:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
     54629:54629:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -25470,7 +25470,7 @@
     54629:54629:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
     54630:54630:int getSerializedSize():0:0 -> c
     54630:54630:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109255},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109255},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     109252:109253:int getSerializedSize():54622:54623 -> c
     109252:109253:int com.android.tools.r8.internal.Resources$StyleString$Span.getSerializedSize():0 -> c
     109254:109254:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -25479,9 +25479,9 @@
     109255:109255:int getSerializedSize():54620 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder toBuilder():54745:54746 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():54428 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():54451:54451 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):54632:54635 -> equals
     5:12:java.lang.String getName():54527:54534 -> equals
     5:12:boolean equals(java.lang.Object):54637 -> equals
@@ -25516,7 +25516,7 @@
     2:2:int com.android.tools.r8.internal.Resources$StyleString$Span.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$StyleString$Span.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getName():54527:54534 -> hashCode
     4:11:int hashCode():54655 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$StyleString$Span.hashCode():0 -> hashCode
@@ -25534,13 +25534,13 @@
     16:17:int com.android.tools.r8.internal.Resources$StyleString$Span.hashCode():0 -> hashCode
     18:18:int hashCode():54653:54653 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():54514:54515 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$1 -> com.android.tools.r8.internal.Q70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$1 -> com.android.tools.r8.internal.U70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():55079:55079 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55085:55085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55079 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$StyleString$Span.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54457:54459 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55085 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55079 -> a
@@ -25583,7 +25583,7 @@
     49:49:void com.android.tools.r8.com.android.aapt.Resources$StyleString$Span.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54502:54502 -> a
     49:49:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55085 -> a
     49:49:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55079 -> a
-com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder -> com.android.tools.r8.internal.R70:
+com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder -> com.android.tools.r8.internal.V70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -25595,16 +25595,16 @@
     3:3:void maybeForceBuilderInitialization():54787:54787 -> <init>
     3:3:void <init>():54777 -> <init>
     4:137:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):54782:54915 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     138:138:void maybeForceBuilderInitialization():54787:54787 -> <init>
     138:138:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):54783 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54758:54758 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():54770:54771 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54862 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54758 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54862 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54758 -> a
@@ -25613,10 +25613,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55061:55061 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54758 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span com.android.tools.r8.com.android.aapt.Resources$StyleString$Span.getDefaultInstance():55075:55075 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyleString$Span):54875 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S70;)Lcom/android/tools/r8/internal/R70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W70;)Lcom/android/tools/r8/internal/V70;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$StyleString$Span.getName():54527:54527 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyleString$Span):54876 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -25640,14 +25640,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55055 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54758 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54758:54758 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():54770:54771 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54840 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54758 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54840 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):54758 -> b
@@ -25661,11 +25661,11 @@
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span buildPartial():54824:54828 -> build
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span build():54815 -> build
     1:5:com.android.tools.r8.com.google.protobuf.MessageLite build():54758 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     6:7:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span build():54816:54817 -> build
     6:7:com.android.tools.r8.com.google.protobuf.MessageLite build():54758 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54903:54909 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/R70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/V70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54905 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):54905:54911 -> c
@@ -25675,9 +25675,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):55055 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):54758 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():54805:54805 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span buildPartial():54824:54828 -> h
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyleString$Span build():54815 -> h
     1:5:com.android.tools.r8.com.google.protobuf.Message build():54758 -> h
@@ -25688,28 +25688,28 @@
     1:5:com.android.tools.r8.com.google.protobuf.Message buildPartial():54758 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():54770:54771 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Styleable -> com.android.tools.r8.internal.Z70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Styleable -> com.android.tools.r8.internal.d80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.util.List entry_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$Styleable DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y70;"}
     1:9:void <clinit>():41400:41408 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):39444:39444 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z70;)V"}
     1280:1280:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):40723:40723 -> <init>
     1281:1281:void <init>():39446:39446 -> <init>
     2558:2558:void <init>():40723:40723 -> <init>
     2559:2559:void <init>():39447:39447 -> <init>
     1:5:boolean isInitialized():40726:40730 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):40737:40740 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40877:40877 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):39437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Styleable getDefaultInstanceForType():41429:41429 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():39437 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -25721,15 +25721,15 @@
     8:8:int com.android.tools.r8.internal.Resources$Styleable.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.Resources$Styleable.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":40764},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":40764},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     40762:40763:int getSerializedSize():40753:40754 -> c
     40762:40763:int com.android.tools.r8.internal.Resources$Styleable.getSerializedSize():0 -> c
     40764:40764:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     40764:40764:int getSerializedSize():40751 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():39437:39437 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():39460:39460 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):40763:40766 -> equals
     5:5:java.util.List getEntryList():40674:40674 -> equals
     5:5:boolean equals(java.lang.Object):40768 -> equals
@@ -25752,15 +25752,15 @@
     6:6:int hashCode():40783 -> hashCode
     7:10:int hashCode():40783:40786 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39520:39521 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder toBuilder():40870:40871 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V70;"}
-com.android.tools.r8.com.android.aapt.Resources$Styleable$1 -> com.android.tools.r8.internal.U70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z70;"}
+com.android.tools.r8.com.android.aapt.Resources$Styleable$1 -> com.android.tools.r8.internal.Y70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():41408:41408 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Styleable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41414:41414 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Styleable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39466:39468 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Styleable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41414 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41408 -> a
@@ -25807,28 +25807,28 @@
     45:47:void com.android.tools.r8.com.android.aapt.Resources$Styleable.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39506:39508 -> a
     45:47:com.android.tools.r8.com.android.aapt.Resources$Styleable parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41414 -> a
     45:47:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41408 -> a
-com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder -> com.android.tools.r8.internal.V70:
+com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder -> com.android.tools.r8.internal.Z70:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.util.List entry_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 entryBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():40906 -> <init>
     2:2:void <init>():41071:41071 -> <init>
     3:3:void maybeForceBuilderInitialization():40917:40917 -> <init>
     3:3:void <init>():40907 -> <init>
     4:163:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40912:41071 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     164:164:void maybeForceBuilderInitialization():40917:40917 -> <init>
     164:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40913 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40888:40888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40900:40901 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):41000 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):41000 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40888 -> a
@@ -25837,10 +25837,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41390:41390 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Styleable com.android.tools.r8.com.android.aapt.Resources$Styleable.getDefaultInstance():41404:41404 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Styleable):41013 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z70;)Lcom/android/tools/r8/internal/V70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d80;)Lcom/android/tools/r8/internal/Z70;"}
     11:15:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Styleable):41014:41018 -> a
     16:18:void ensureEntryIsMutable():41073:41075 -> a
     16:18:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Styleable):41020 -> a
@@ -25864,14 +25864,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41384 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40888 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40888:40888 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40900:40901 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40978 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40888 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40978 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40888 -> b
@@ -25884,9 +25884,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Styleable build():40946:40948 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():40888 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41057:41063 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/V70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Z70;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41059 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41059:41065 -> c
@@ -25896,42 +25896,42 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41384 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40888 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():40936:40936 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Styleable build():40946:40948 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():40888 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():40888:40888 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40900:40901 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:12:com.android.tools.r8.com.android.aapt.Resources$Styleable buildPartial():40955:40966 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z70;"}
-com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry -> com.android.tools.r8.internal.Y70:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d80;"}
+com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry -> com.android.tools.r8.internal.c80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference attr_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a80;"}
     1:9:void <clinit>():40629:40637 -> <clinit>
     1:223:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):39617:39839 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b80;)V"}
     224:444:void <init>():39619:39839 -> <init>
     445:445:void <init>():39620:39620 -> <init>
     1:5:boolean isInitialized():39842:39846 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):39853:39862 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40022:40022 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):39610 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry getDefaultInstanceForType():40658:40658 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():39610 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -25944,9 +25944,9 @@
     16:17:int getSerializedSize():39882:39883 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder toBuilder():40015:40016 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():39610 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():39633:39633 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):39892:39895 -> equals
     5:5:boolean hasSource():39729:39729 -> equals
     5:5:boolean equals(java.lang.Object):39897 -> equals
@@ -25984,21 +25984,21 @@
     18:18:int hashCode():39926 -> hashCode
     19:22:int hashCode():39928:39931 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39712:39713 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Reference getAttr():39825:39825 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference com.android.tools.r8.com.android.aapt.Resources$Reference.getDefaultInstance():26328:26328 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Reference getAttr():39825 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():39741:39741 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():39741 -> l
-com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$1 -> com.android.tools.r8.internal.W70:
+com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$1 -> com.android.tools.r8.internal.a80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():40637:40637 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40643:40643 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39639:39641 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40643 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40637 -> a
@@ -26055,30 +26055,30 @@
     72:72:void com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39700:39700 -> a
     72:72:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40643 -> a
     72:72:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40637 -> a
-com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder -> com.android.tools.r8.internal.X70:
+com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder -> com.android.tools.r8.internal.b80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$Reference attr_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():40050 -> <init>
     2:2:void <init>():40360:40360 -> <init>
     3:3:void maybeForceBuilderInitialization():40061:40061 -> <init>
     3:3:void <init>():40051 -> <init>
     4:308:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40056:40360 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     309:309:void maybeForceBuilderInitialization():40061:40061 -> <init>
     309:309:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40057 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40032:40032 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40044:40045 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40152 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40032 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40152 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40032 -> a
@@ -26087,10 +26087,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40619:40619 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40032 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry.getDefaultInstance():40633:40633 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry):40165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y70;)Lcom/android/tools/r8/internal/X70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c80;)Lcom/android/tools/r8/internal/b80;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry.hasSource():39729:39729 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry):40166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -26124,14 +26124,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40613 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40032 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40032:40032 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40044:40045 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40130 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40032 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40130 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40032 -> b
@@ -26145,11 +26145,11 @@
     1:13:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry buildPartial():40106:40118 -> build
     1:13:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry build():40097 -> build
     1:13:com.android.tools.r8.com.google.protobuf.MessageLite build():40032 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     14:15:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry build():40098:40099 -> build
     14:15:com.android.tools.r8.com.google.protobuf.MessageLite build():40032 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40193:40199 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/X70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/b80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40195 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40195:40201 -> c
@@ -26159,9 +26159,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40613 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40032 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():40087:40087 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:13:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry buildPartial():40106:40118 -> h
     1:13:com.android.tools.r8.com.android.aapt.Resources$Styleable$Entry build():40097 -> h
     1:13:com.android.tools.r8.com.google.protobuf.Message build():40032 -> h
@@ -26172,28 +26172,28 @@
     1:13:com.android.tools.r8.com.google.protobuf.Message buildPartial():40032 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40044:40045 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$StyledString -> com.android.tools.r8.internal.f80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$StyledString -> com.android.tools.r8.internal.j80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object value_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List span_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$StyledString DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e80;"}
     1:9:void <clinit>():29696:29704 -> <clinit>
     1:976:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):28004:28979 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f80;)V"}
     977:1950:void <init>():28006:28979 -> <init>
     1951:1952:void <init>():28007:28008 -> <init>
     1:5:boolean isInitialized():28982:28986 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):28993:28999 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29143:29143 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27997 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyledString getDefaultInstanceForType():29725:29725 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():27997 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -26205,15 +26205,15 @@
     11:11:int com.android.tools.r8.internal.Resources$StyledString.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.Resources$StyledString.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29029},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29029},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     29027:29028:int getSerializedSize():29015:29016 -> c
     29027:29028:int com.android.tools.r8.internal.Resources$StyledString.getSerializedSize():0 -> c
     29029:29029:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     29029:29029:int getSerializedSize():29013 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():27997:27997 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():28021:28021 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):29025:29028 -> equals
     5:12:java.lang.String getValue():28905:28912 -> equals
     5:12:boolean equals(java.lang.Object):29030 -> equals
@@ -26240,7 +26240,7 @@
     2:2:int com.android.tools.r8.internal.Resources$StyledString.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$StyledString.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getValue():28905:28912 -> hashCode
     4:11:int hashCode():29046 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$StyledString.hashCode():0 -> hashCode
@@ -26258,15 +26258,15 @@
     16:19:int com.android.tools.r8.internal.Resources$StyledString.hashCode():0 -> hashCode
     20:20:int hashCode():29044:29044 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28087:28088 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder toBuilder():29136:29137 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b80;"}
-com.android.tools.r8.com.android.aapt.Resources$StyledString$1 -> com.android.tools.r8.internal.a80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f80;"}
+com.android.tools.r8.com.android.aapt.Resources$StyledString$1 -> com.android.tools.r8.internal.e80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():29704:29704 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyledString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29710:29710 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29704 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$StyledString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28027:28029 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$StyledString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29710 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29704 -> a
@@ -26316,30 +26316,30 @@
     56:58:void com.android.tools.r8.com.android.aapt.Resources$StyledString.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28073:28075 -> a
     56:58:com.android.tools.r8.com.android.aapt.Resources$StyledString parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29710 -> a
     56:58:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29704 -> a
-com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder -> com.android.tools.r8.internal.b80:
+com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder -> com.android.tools.r8.internal.f80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.lang.Object value_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List span_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 spanBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():29171 -> <init>
     2:99:void <init>():29342:29439 -> <init>
     100:100:void maybeForceBuilderInitialization():29182:29182 -> <init>
     100:100:void <init>():29172 -> <init>
     101:363:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29177:29439 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     364:364:void maybeForceBuilderInitialization():29182:29182 -> <init>
     364:364:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29178 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29153:29153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29165:29166 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29268 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29268 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29153 -> a
@@ -26348,10 +26348,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29686:29686 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyledString com.android.tools.r8.com.android.aapt.Resources$StyledString.getDefaultInstance():29700:29700 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyledString):29281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f80;)Lcom/android/tools/r8/internal/b80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j80;)Lcom/android/tools/r8/internal/f80;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$StyledString.getValue():28905:28905 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyledString):29282 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -26380,14 +26380,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29680 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29153 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29153:29153 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29165:29166 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29246 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29153 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29246 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29153 -> b
@@ -26400,9 +26400,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StyledString build():29213:29215 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():29153 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29329:29335 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/b80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/f80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29331 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29331:29337 -> c
@@ -26412,19 +26412,19 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29680 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29153 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():29203:29203 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$StyledString build():29213:29215 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():29153 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():29153:29153 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29165:29166 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:13:com.android.tools.r8.com.android.aapt.Resources$StyledString buildPartial():29222:29234 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f80;"}
-com.android.tools.r8.com.android.aapt.Resources$StyledString$Span -> com.android.tools.r8.internal.e80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j80;"}
+com.android.tools.r8.com.android.aapt.Resources$StyledString$Span -> com.android.tools.r8.internal.i80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object tag_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -26432,17 +26432,17 @@
     int lastChar_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$StyledString$Span DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g80;"}
     1:9:void <clinit>():28859:28867 -> <clinit>
     1:163:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):28152:28314 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h80;)V"}
     164:324:void <init>():28154:28314 -> <init>
     325:325:void <init>():28155:28155 -> <init>
     1:5:boolean isInitialized():28317:28321 -> a
     6:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):28328:28332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     11:11:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     11:11:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):28332 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -26457,7 +26457,7 @@
     17:17:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):28337:28337 -> a
     18:18:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):28487:28487 -> a
     18:18:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):28145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span getDefaultInstanceForType():28888:28888 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():28145 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -26469,7 +26469,7 @@
     9:9:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
     10:10:int getSerializedSize():0:0 -> c
     10:10:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56724},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56724},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     28363:28363:int getSerializedSize():28353:28353 -> c
     28363:28363:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
     28364:28364:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -26477,7 +26477,7 @@
     28364:28364:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
     28365:28365:int getSerializedSize():0:0 -> c
     28365:28365:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56725},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56725},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     56722:56723:int getSerializedSize():28357:28358 -> c
     56722:56723:int com.android.tools.r8.internal.Resources$StyledString$Span.getSerializedSize():0 -> c
     56724:56724:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt32Size(int,int):517:517 -> c
@@ -26486,9 +26486,9 @@
     56725:56725:int getSerializedSize():28355 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder toBuilder():28480:28481 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():28145 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():28168:28168 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):28367:28370 -> equals
     5:12:java.lang.String getTag():28249:28256 -> equals
     5:12:boolean equals(java.lang.Object):28372 -> equals
@@ -26523,7 +26523,7 @@
     2:2:int com.android.tools.r8.internal.Resources$StyledString$Span.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$StyledString$Span.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getTag():28249:28256 -> hashCode
     4:11:int hashCode():28390 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$StyledString$Span.hashCode():0 -> hashCode
@@ -26541,13 +26541,13 @@
     16:17:int com.android.tools.r8.internal.Resources$StyledString$Span.hashCode():0 -> hashCode
     18:18:int hashCode():28388:28388 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28231:28232 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$1 -> com.android.tools.r8.internal.c80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$1 -> com.android.tools.r8.internal.g80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():28867:28867 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28873:28873 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28867 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$StyledString$Span.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28174:28176 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28873 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28867 -> a
@@ -26590,7 +26590,7 @@
     49:49:void com.android.tools.r8.com.android.aapt.Resources$StyledString$Span.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28219:28219 -> a
     49:49:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28873 -> a
     49:49:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28867 -> a
-com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder -> com.android.tools.r8.internal.d80:
+com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder -> com.android.tools.r8.internal.h80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object tag_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -26602,16 +26602,16 @@
     3:3:void maybeForceBuilderInitialization():28526:28526 -> <init>
     3:3:void <init>():28516 -> <init>
     4:137:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):28521:28654 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     138:138:void maybeForceBuilderInitialization():28526:28526 -> <init>
     138:138:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):28522 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28497:28497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28509:28510 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28601 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28601 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28497 -> a
@@ -26620,10 +26620,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28849:28849 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span com.android.tools.r8.com.android.aapt.Resources$StyledString$Span.getDefaultInstance():28863:28863 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyledString$Span):28614 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e80;)Lcom/android/tools/r8/internal/d80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i80;)Lcom/android/tools/r8/internal/h80;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$StyledString$Span.getTag():28249:28249 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$StyledString$Span):28615 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -26647,14 +26647,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28843 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28497:28497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28509:28510 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28579 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28497 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28579 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):28497 -> b
@@ -26668,11 +26668,11 @@
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span buildPartial():28563:28567 -> build
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span build():28554 -> build
     1:5:com.android.tools.r8.com.google.protobuf.MessageLite build():28497 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     6:7:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span build():28555:28556 -> build
     6:7:com.android.tools.r8.com.google.protobuf.MessageLite build():28497 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28642:28648 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/d80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/h80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28644 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28644:28650 -> c
@@ -26682,9 +26682,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28843 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28497 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():28544:28544 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span buildPartial():28563:28567 -> h
     1:5:com.android.tools.r8.com.android.aapt.Resources$StyledString$Span build():28554 -> h
     1:5:com.android.tools.r8.com.google.protobuf.Message build():28497 -> h
@@ -26695,8 +26695,8 @@
     1:5:com.android.tools.r8.com.google.protobuf.Message buildPartial():28497 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28509:28510 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint -> com.android.tools.r8.internal.i80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint -> com.android.tools.r8.internal.m80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object tool_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -26704,29 +26704,29 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k80;"}
     1:9:void <clinit>():2494:2502 -> <clinit>
     1:158:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):1844:2001 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l80;)V"}
     159:314:void <init>():1846:2001 -> <init>
     315:316:void <init>():1847:1848 -> <init>
     1:5:boolean isInitialized():2004:2008 -> a
     6:12:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):2015:2021 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     13:13:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2162:2162 -> a
     13:13:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1837 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint getDefaultInstanceForType():2523:2523 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():1837 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:12:int getSerializedSize():2026:2037 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder toBuilder():2155:2156 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():1837 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():1861:1861 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):2046:2049 -> equals
     5:12:java.lang.String getTool():1933:1940 -> equals
     5:12:boolean equals(java.lang.Object):2051 -> equals
@@ -26757,7 +26757,7 @@
     2:2:int com.android.tools.r8.internal.Resources$ToolFingerprint.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$ToolFingerprint.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":24},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":24},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getTool():1933:1940 -> hashCode
     4:11:int hashCode():2067 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$ToolFingerprint.hashCode():0 -> hashCode
@@ -26770,13 +26770,13 @@
     21:23:int com.android.tools.r8.internal.Resources$ToolFingerprint.hashCode():0 -> hashCode
     24:24:int hashCode():2065:2065 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1920:1921 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$1 -> com.android.tools.r8.internal.g80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$1 -> com.android.tools.r8.internal.k80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():2502:2502 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2508:2508 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2502 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1867:1869 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2508 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2502 -> a
@@ -26816,7 +26816,7 @@
     46:46:void com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1908:1908 -> a
     46:46:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2508 -> a
     46:46:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2502 -> a
-com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder -> com.android.tools.r8.internal.h80:
+com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder -> com.android.tools.r8.internal.l80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object tool_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -26828,16 +26828,16 @@
     79:79:void maybeForceBuilderInitialization():2201:2201 -> <init>
     79:79:void <init>():2191 -> <init>
     80:284:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2196:2400 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     285:285:void maybeForceBuilderInitialization():2201:2201 -> <init>
     285:285:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2197 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2172:2172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2184:2185 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2273 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2273 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2172 -> a
@@ -26846,10 +26846,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2484:2484 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint.getDefaultInstance():2498:2498 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint):2286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i80;)Lcom/android/tools/r8/internal/h80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m80;)Lcom/android/tools/r8/internal/l80;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint.getTool():1933:1933 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint):2287 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -26868,14 +26868,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2478 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2172 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2172:2172 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2184:2185 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2251 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2172 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2251 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2172 -> b
@@ -26889,11 +26889,11 @@
     1:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint buildPartial():2236:2239 -> build
     1:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint build():2227 -> build
     1:4:com.android.tools.r8.com.google.protobuf.MessageLite build():2172 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     5:6:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint build():2228:2229 -> build
     5:6:com.android.tools.r8.com.google.protobuf.MessageLite build():2172 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2312:2318 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/h80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/l80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2314 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2314:2320 -> c
@@ -26903,9 +26903,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2478 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2172 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():2217:2217 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint buildPartial():2236:2239 -> h
     1:4:com.android.tools.r8.com.android.aapt.Resources$ToolFingerprint build():2227 -> h
     1:4:com.android.tools.r8.com.google.protobuf.Message build():2172 -> h
@@ -26916,30 +26916,30 @@
     1:4:com.android.tools.r8.com.google.protobuf.Message buildPartial():2172 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2184:2185 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Type -> com.android.tools.r8.internal.l80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Type -> com.android.tools.r8.internal.p80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     com.android.tools.r8.com.android.aapt.Resources$TypeId typeId_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s80;"}
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List entry_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$Type DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n80;"}
     1:9:void <clinit>():9621:9629 -> <clinit>
     1:248:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):8394:8641 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o80;)V"}
     249:494:void <init>():8396:8641 -> <init>
     495:496:void <init>():8397:8398 -> <init>
     1:5:boolean isInitialized():8644:8648 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):8655:8664 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$Type$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8821:8821 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Type getDefaultInstanceForType():9650:9650 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():8387 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -26956,16 +26956,16 @@
     15:15:int com.android.tools.r8.internal.Resources$Type.getSerializedSize():0 -> c
     16:16:int getSerializedSize():0:0 -> c
     16:16:int com.android.tools.r8.internal.Resources$Type.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8702},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8702},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     8700:8701:int getSerializedSize():8684:8685 -> c
     8700:8701:int com.android.tools.r8.internal.Resources$Type.getSerializedSize():0 -> c
     8702:8702:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     8702:8702:int getSerializedSize():8682 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$Type$Builder toBuilder():8814:8815 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():8387 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():8411:8411 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):8694:8697 -> equals
     5:5:boolean hasTypeId():8507:8507 -> equals
     5:5:boolean equals(java.lang.Object):8699 -> equals
@@ -27008,17 +27008,17 @@
     20:20:int hashCode():8727 -> hashCode
     21:24:int hashCode():8727:8730 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8490:8491 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$TypeId getTypeId():8519:8519 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/s80;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$TypeId com.android.tools.r8.com.android.aapt.Resources$TypeId.getDefaultInstance():8252:8252 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$TypeId getTypeId():8519 -> k
-com.android.tools.r8.com.android.aapt.Resources$Type$1 -> com.android.tools.r8.internal.j80:
+com.android.tools.r8.com.android.aapt.Resources$Type$1 -> com.android.tools.r8.internal.n80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():9629:9629 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Type parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9635:9635 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9629 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Type.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8417:8419 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Type parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9635 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9629 -> a
@@ -27085,32 +27085,32 @@
     74:76:void com.android.tools.r8.com.android.aapt.Resources$Type.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8476:8478 -> a
     74:76:com.android.tools.r8.com.android.aapt.Resources$Type parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9635 -> a
     74:76:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9629 -> a
-com.android.tools.r8.com.android.aapt.Resources$Type$Builder -> com.android.tools.r8.internal.k80:
+com.android.tools.r8.com.android.aapt.Resources$Type$Builder -> com.android.tools.r8.internal.o80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.android.aapt.Resources$TypeId typeId_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s80;"}
     java.lang.Object name_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List entry_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 entryBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():8850 -> <init>
     2:104:void <init>():9190:9292 -> <init>
     105:105:void maybeForceBuilderInitialization():8861:8861 -> <init>
     105:105:void <init>():8851 -> <init>
     106:542:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8856:9292 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     543:543:void maybeForceBuilderInitialization():8861:8861 -> <init>
     543:543:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8857 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8832:8832 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8844:8845 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Type$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8958 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8832 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Type$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8958 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8832 -> a
@@ -27119,10 +27119,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):9611:9611 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8832 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Type com.android.tools.r8.com.android.aapt.Resources$Type.getDefaultInstance():9625:9625 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Type):8971 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l80;)Lcom/android/tools/r8/internal/k80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p80;)Lcom/android/tools/r8/internal/o80;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Type.hasTypeId():8507:8507 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Type):8972 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27164,14 +27164,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Type$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):9605 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8832 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8832:8832 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8844:8845 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Type$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8936 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8832 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Type$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8936 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8832 -> b
@@ -27184,9 +27184,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Type build():8898:8900 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():8832 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9022:9028 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/k80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/o80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9024 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Type$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9024:9030 -> c
@@ -27196,33 +27196,33 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Type$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):9605 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8832 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():8888:8888 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Type build():8898:8900 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():8832 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():8832:8832 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8844:8845 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:18:com.android.tools.r8.com.android.aapt.Resources$Type buildPartial():8907:8924 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l80;"}
-com.android.tools.r8.com.android.aapt.Resources$TypeId -> com.android.tools.r8.internal.o80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p80;"}
+com.android.tools.r8.com.android.aapt.Resources$TypeId -> com.android.tools.r8.internal.s80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.android.aapt.Resources$TypeId DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q80;"}
     1:9:void <clinit>():8248:8256 -> <clinit>
     1:84:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):7810:7893 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r80;)V"}
     85:166:void <init>():7812:7893 -> <init>
     167:248:void <init>():7812:7893 -> <init>
     167:248:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7831 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     249:249:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7833:7833 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     250:250:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -27241,7 +27241,7 @@
     280:280:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7865:7865 -> <init>
     1:5:boolean isInitialized():7896:7900 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):7907:7908 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):7908 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27250,7 +27250,7 @@
     10:10:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):7910:7910 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8045:8045 -> a
     11:11:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):7803 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$TypeId getDefaultInstanceForType():8277:8277 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():7803 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -27259,9 +27259,9 @@
     6:6:int getSerializedSize():7921 -> c
     7:8:int getSerializedSize():7923:7924 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():7803:7803 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():7825:7825 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):7933:7936 -> equals
     5:5:int getId():7890:7890 -> equals
     5:5:boolean equals(java.lang.Object):7938 -> equals
@@ -27281,7 +27281,7 @@
     2:2:int com.android.tools.r8.internal.Resources$TypeId.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$TypeId.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:int getId():7890:7890 -> hashCode
     4:4:int hashCode():7952 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$TypeId.hashCode():0 -> hashCode
@@ -27289,16 +27289,16 @@
     5:6:int com.android.tools.r8.internal.Resources$TypeId.hashCode():0 -> hashCode
     7:7:int hashCode():7950:7950 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():7877:7878 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder toBuilder():8038:8039 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n80;"}
-com.android.tools.r8.com.android.aapt.Resources$TypeId$1 -> com.android.tools.r8.internal.m80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r80;"}
+com.android.tools.r8.com.android.aapt.Resources$TypeId$1 -> com.android.tools.r8.internal.q80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():8256:8256 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$TypeId parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8262:8262 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder -> com.android.tools.r8.internal.n80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder -> com.android.tools.r8.internal.r80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int id_ -> f
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -27306,16 +27306,16 @@
     2:2:void maybeForceBuilderInitialization():8084:8084 -> <init>
     2:2:void <init>():8074 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8079:8079 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():8084:8084 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):8080 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8055:8055 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8067:8068 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8153 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8055 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8153 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8055 -> a
@@ -27324,10 +27324,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8238:8238 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8055 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$TypeId com.android.tools.r8.com.android.aapt.Resources$TypeId.getDefaultInstance():8252:8252 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$TypeId):8166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o80;)Lcom/android/tools/r8/internal/n80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s80;)Lcom/android/tools/r8/internal/r80;"}
     11:11:int com.android.tools.r8.com.android.aapt.Resources$TypeId.getId():7890:7890 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$TypeId):8167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27342,14 +27342,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8232 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8055 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8055:8055 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8067:8068 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8131 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8055 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8131 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):8055 -> b
@@ -27363,11 +27363,11 @@
     1:3:com.android.tools.r8.com.android.aapt.Resources$TypeId buildPartial():8117:8119 -> build
     1:3:com.android.tools.r8.com.android.aapt.Resources$TypeId build():8108 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():8055 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     4:5:com.android.tools.r8.com.android.aapt.Resources$TypeId build():8109:8110 -> build
     4:5:com.android.tools.r8.com.google.protobuf.MessageLite build():8055 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8187:8187 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/n80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/r80;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$TypeId com.android.tools.r8.com.android.aapt.Resources$TypeId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8262:8262 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$TypeId$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8256 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8187 -> c
@@ -27381,9 +27381,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$TypeId$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8232 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):8055 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():8098:8098 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$TypeId buildPartial():8117:8119 -> h
     1:3:com.android.tools.r8.com.android.aapt.Resources$TypeId build():8108 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():8055 -> h
@@ -27394,23 +27394,23 @@
     1:3:com.android.tools.r8.com.google.protobuf.Message buildPartial():8055 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():8067:8068 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection -> com.android.tools.r8.internal.r80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection -> com.android.tools.r8.internal.v80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     long startIndex_ -> e
     long endIndex_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t80;"}
     1:9:void <clinit>():56436:56444 -> <clinit>
     1:100:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):55936:56035 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/q80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u80;)V"}
     101:198:void <init>():55938:56035 -> <init>
     199:296:void <init>():55938:56035 -> <init>
     199:296:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55957 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     297:297:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55959:55959 -> <init>
     298:298:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
     298:298:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> <init>
@@ -27430,7 +27430,7 @@
     334:334:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):55996:55996 -> <init>
     1:5:boolean isInitialized():56038:56042 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):56049:56050 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt64(int,long):1197:1197 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):56050 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27445,7 +27445,7 @@
     14:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):56055:56055 -> a
     15:15:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):56200:56200 -> a
     15:15:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):55929 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection getDefaultInstanceForType():56465:56465 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():55929 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -27458,9 +27458,9 @@
     9:10:int getSerializedSize():56072:56073 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder toBuilder():56193:56194 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():55929 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():55951:55951 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):56082:56085 -> equals
     5:5:long getStartIndex():56021:56021 -> equals
     5:5:boolean equals(java.lang.Object):56087 -> equals
@@ -27488,7 +27488,7 @@
     2:2:int com.android.tools.r8.internal.Resources$UntranslatableSection.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$UntranslatableSection.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":12},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":12},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:4:long getStartIndex():56021:56021 -> hashCode
     4:4:int hashCode():56104 -> hashCode
     4:4:int com.android.tools.r8.internal.Resources$UntranslatableSection.hashCode():0 -> hashCode
@@ -27501,14 +27501,14 @@
     10:11:int com.android.tools.r8.internal.Resources$UntranslatableSection.hashCode():0 -> hashCode
     12:12:int hashCode():56101:56101 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():56008:56009 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$1 -> com.android.tools.r8.internal.p80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$1 -> com.android.tools.r8.internal.t80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():56444:56444 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56450:56450 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56444 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder -> com.android.tools.r8.internal.q80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder -> com.android.tools.r8.internal.u80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     long startIndex_ -> f
     long endIndex_ -> g
@@ -27517,16 +27517,16 @@
     2:2:void maybeForceBuilderInitialization():56235:56235 -> <init>
     2:2:void <init>():56225 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):56230:56230 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     4:4:void maybeForceBuilderInitialization():56235:56235 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):56231 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56206:56206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():56218:56219 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56307 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56307 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56206 -> a
@@ -27535,10 +27535,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56426:56426 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection.getDefaultInstance():56440:56440 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection):56320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r80;)Lcom/android/tools/r8/internal/q80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v80;)Lcom/android/tools/r8/internal/u80;"}
     11:11:long com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection.getStartIndex():56021:56021 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection):56321 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27557,14 +27557,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56420 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56206:56206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():56218:56219 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56285 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56285 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):56206 -> b
@@ -27578,11 +27578,11 @@
     1:4:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection buildPartial():56270:56273 -> build
     1:4:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection build():56261 -> build
     1:4:com.android.tools.r8.com.google.protobuf.MessageLite build():56206 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     5:6:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection build():56262:56263 -> build
     5:6:com.android.tools.r8.com.google.protobuf.MessageLite build():56206 -> build
     1:1:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56344:56344 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/q80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/u80;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56450:56450 -> c
     2:2:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56444 -> c
     2:2:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):56344 -> c
@@ -27596,9 +27596,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56420 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56206 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():56251:56251 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:4:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection buildPartial():56270:56273 -> h
     1:4:com.android.tools.r8.com.android.aapt.Resources$UntranslatableSection build():56261 -> h
     1:4:com.android.tools.r8.com.google.protobuf.Message build():56206 -> h
@@ -27609,33 +27609,33 @@
     1:4:com.android.tools.r8.com.google.protobuf.Message buildPartial():56206 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():56218:56219 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$Value -> com.android.tools.r8.internal.u80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$Value -> com.android.tools.r8.internal.y80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> e
     java.lang.Object value_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BN;"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean weak_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.android.aapt.Resources$Value DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w80;"}
     1:9:void <clinit>():20375:20383 -> <clinit>
     1:323:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):19021:19343 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x80;)V"}
     324:644:void <init>():19023:19343 -> <init>
     645:645:void <init>():19024:19024 -> <init>
     1:5:boolean isInitialized():19346:19350 -> a
     6:21:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):19357:19372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     22:22:com.android.tools.r8.com.android.aapt.Resources$Value$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19561:19561 -> a
     22:22:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19014 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Value getDefaultInstanceForType():20404:20404 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():19014 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -27649,7 +27649,7 @@
     9:12:int com.android.tools.r8.internal.Resources$Value.getSerializedSize():0 -> c
     13:13:int getSerializedSize():0:0 -> c
     13:13:int com.android.tools.r8.internal.Resources$Value.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19413},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19413},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     19405:19406:int getSerializedSize():19392:19393 -> c
     19405:19406:int com.android.tools.r8.internal.Resources$Value.getSerializedSize():0 -> c
     19407:19407:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -27665,9 +27665,9 @@
     19413:19413:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
     19413:19413:int getSerializedSize():19390 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():19014:19014 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():19037:19037 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):19410:19413 -> equals
     5:5:boolean hasSource():19194:19194 -> equals
     5:5:boolean equals(java.lang.Object):19415 -> equals
@@ -27722,25 +27722,25 @@
     31:31:int hashCode():19464:19464 -> hashCode
     32:42:int hashCode():19460:19470 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19136:19137 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Item getItem():19296:19297 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
     3:3:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> k
     3:3:com.android.tools.r8.com.android.aapt.Resources$Item getItem():19299 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():19206:19206 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():19206 -> l
     1:1:com.android.tools.r8.com.android.aapt.Resources$Value$ValueCase getValueCase():19178:19178 -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$Value$Builder toBuilder():19554:19555 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t80;"}
-com.android.tools.r8.com.android.aapt.Resources$Value$1 -> com.android.tools.r8.internal.s80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x80;"}
+com.android.tools.r8.com.android.aapt.Resources$Value$1 -> com.android.tools.r8.internal.w80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():20383:20383 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Value parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20389:20389 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20383 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Value.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19043:19045 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Value parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20389 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20383 -> a
@@ -27810,13 +27810,13 @@
     104:104:void com.android.tools.r8.com.android.aapt.Resources$Value.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19124:19124 -> a
     104:104:com.android.tools.r8.com.android.aapt.Resources$Value parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20389 -> a
     104:104:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20383 -> a
-com.android.tools.r8.com.android.aapt.Resources$Value$Builder -> com.android.tools.r8.internal.t80:
+com.android.tools.r8.com.android.aapt.Resources$Value$Builder -> com.android.tools.r8.internal.x80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int valueCase_ -> f
     java.lang.Object value_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/as;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cs;"}
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean weak_ -> j
@@ -27826,16 +27826,16 @@
     174:174:void maybeForceBuilderInitialization():19600:19600 -> <init>
     174:174:void <init>():19590 -> <init>
     175:516:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19595:19936 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     517:517:void maybeForceBuilderInitialization():19600:19600 -> <init>
     517:517:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19596 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19571:19571 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19583:19584 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Value$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19700 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19571 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Value$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19700 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19571 -> a
@@ -27844,10 +27844,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20365:20365 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19571 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Value com.android.tools.r8.com.android.aapt.Resources$Value.getDefaultInstance():20379:20379 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Value):19713 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u80;)Lcom/android/tools/r8/internal/t80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y80;)Lcom/android/tools/r8/internal/x80;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$Value.hasSource():19194:19194 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Value):19714 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -27906,14 +27906,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Value$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20359 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19571 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19571:19571 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19583:19584 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Value$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19678 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19571 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Value$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19678 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19571 -> b
@@ -27926,9 +27926,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Value build():19634:19636 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():19571 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19754:19760 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/t80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/x80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19756 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Value$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19756:19762 -> c
@@ -27938,45 +27938,45 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Value$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20359 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19571 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():19624:19624 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Value build():19634:19636 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():19571 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():19571:19571 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19583:19584 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:24:com.android.tools.r8.com.android.aapt.Resources$Value buildPartial():19643:19666 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u80;"}
-com.android.tools.r8.com.android.aapt.Resources$Visibility -> com.android.tools.r8.internal.y80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y80;"}
+com.android.tools.r8.com.android.aapt.Resources$Visibility -> com.android.tools.r8.internal.C80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int level_ -> e
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean stagedApi_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.android.aapt.Resources$Visibility DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z80;"}
     1:9:void <clinit>():10863:10871 -> <clinit>
     1:379:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):9743:10121 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A80;)V"}
     380:756:void <init>():9745:10121 -> <init>
     757:758:void <init>():9746:9747 -> <init>
     1:5:boolean isInitialized():10124:10128 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):10135:10135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:int com.android.tools.r8.com.android.aapt.Resources$Visibility$Level.getNumber():9923:9923 -> a
     7:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):10135 -> a
     8:19:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):10136:10147 -> a
     20:20:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10310:10310 -> a
     20:20:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):9736 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Visibility getDefaultInstanceForType():10892:10892 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():9736 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -28000,15 +28000,15 @@
     13:16:int com.android.tools.r8.internal.Resources$Visibility.getSerializedSize():0 -> c
     17:17:int getSerializedSize():0:0 -> c
     17:17:int com.android.tools.r8.internal.Resources$Visibility.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10190},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10190},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     10188:10189:int getSerializedSize():10171:10172 -> c
     10188:10189:int com.android.tools.r8.internal.Resources$Visibility.getSerializedSize():0 -> c
     10190:10190:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
     10190:10190:int getSerializedSize():10169 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():9736:9736 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():9760:9760 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:6:boolean equals(java.lang.Object):10181:10186 -> equals
     7:7:boolean hasSource():10032:10032 -> equals
     7:7:boolean equals(java.lang.Object):10187 -> equals
@@ -28035,7 +28035,7 @@
     2:2:int com.android.tools.r8.internal.Resources$Visibility.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$Visibility.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10231},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10231},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     10211:10211:int hashCode():10208:10208 -> hashCode
     10211:10211:int com.android.tools.r8.internal.Resources$Visibility.hashCode():0 -> hashCode
     10212:10212:boolean hasSource():10032:10032 -> hashCode
@@ -28055,19 +28055,19 @@
     10227:10230:int com.android.tools.r8.internal.Resources$Visibility.hashCode():0 -> hashCode
     10231:10231:int hashCode():10206:10206 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():9837:9838 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Source getSource():10044:10044 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source com.android.tools.r8.com.android.aapt.Resources$Source.getDefaultInstance():1772:1772 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Source getSource():10044 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder toBuilder():10303:10304 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/w80;"}
-com.android.tools.r8.com.android.aapt.Resources$Visibility$1 -> com.android.tools.r8.internal.v80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A80;"}
+com.android.tools.r8.com.android.aapt.Resources$Visibility$1 -> com.android.tools.r8.internal.z80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():10871:10871 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$Visibility parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10877:10877 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10871 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$Visibility.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9766:9768 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$Visibility parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10877 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10871 -> a
@@ -28120,11 +28120,11 @@
     72:72:void com.android.tools.r8.com.android.aapt.Resources$Visibility.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):9825:9825 -> a
     72:72:com.android.tools.r8.com.android.aapt.Resources$Visibility parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10877 -> a
     72:72:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10871 -> a
-com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder -> com.android.tools.r8.internal.w80:
+com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder -> com.android.tools.r8.internal.A80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int level_ -> f
     com.android.tools.r8.com.android.aapt.Resources$Source source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z70;"}
     java.lang.Object comment_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     boolean stagedApi_ -> i
@@ -28134,16 +28134,16 @@
     212:212:void maybeForceBuilderInitialization():10349:10349 -> <init>
     212:212:void <init>():10339 -> <init>
     213:569:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10344:10700 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     570:570:void maybeForceBuilderInitialization():10349:10349 -> <init>
     570:570:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10345 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10320:10320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10332:10333 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10435 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10435 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10320 -> a
@@ -28152,10 +28152,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10853:10853 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$Visibility com.android.tools.r8.com.android.aapt.Resources$Visibility.getDefaultInstance():10867:10867 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Visibility):10448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y80;)Lcom/android/tools/r8/internal/w80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C80;)Lcom/android/tools/r8/internal/A80;"}
     11:11:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Visibility):10449:10449 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder setLevelValue(int):10506:10507 -> a
     12:13:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$Visibility):10450 -> a
@@ -28185,14 +28185,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10847 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10320 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10320:10320 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10332:10333 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10413 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10320 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10413 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10320 -> b
@@ -28205,9 +28205,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Visibility build():10383:10385 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():10320 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10479:10485 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/w80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/A80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10481 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10481:10487 -> c
@@ -28217,26 +28217,26 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$Visibility$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10847 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10320 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():10373:10373 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$Visibility build():10383:10385 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():10320 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():10320:10320 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10332:10333 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:10:com.android.tools.r8.com.android.aapt.Resources$Visibility buildPartial():10392:10401 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C80;"}
 com.android.tools.r8.com.android.aapt.Resources$Visibility$Level -> R8$$REMOVED$$CLASS$$20:
 # {"id":"sourceFile","fileName":"Resources.java"}
-com.android.tools.r8.com.android.aapt.Resources$Visibility$Level$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.x80:
+com.android.tools.r8.com.android.aapt.Resources$Visibility$Level$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.B80:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.Resources$Visibility$Level$EnumUnboxingLocalUtility.getValue(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.android.aapt.Resources$XmlAttribute -> com.android.tools.r8.internal.B80:
+com.android.tools.r8.com.android.aapt.Resources$XmlAttribute -> com.android.tools.r8.internal.F80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object namespaceUri_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -28245,23 +28245,23 @@
     java.lang.Object value_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     int resourceId_ -> i
     com.android.tools.r8.com.android.aapt.Resources$Item compiledItem_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     byte memoizedIsInitialized -> k
     com.android.tools.r8.com.android.aapt.Resources$XmlAttribute DEFAULT_INSTANCE -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D80;"}
     1:9:void <clinit>():51715:51723 -> <clinit>
     1:325:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):50375:50699 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E80;)V"}
     326:648:void <init>():50377:50699 -> <init>
     649:651:void <init>():50378:50380 -> <init>
     1:5:boolean isInitialized():50702:50706 -> a
     6:19:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):50713:50726 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     20:20:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt32(int,int):1185:1185 -> a
     20:20:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):50726 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -28270,7 +28270,7 @@
     22:25:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):50728:50731 -> a
     26:26:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):50913:50913 -> a
     26:26:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):50368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute getDefaultInstanceForType():51744:51744 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():50368 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -28287,7 +28287,7 @@
     19:19:int com.android.tools.r8.internal.Resources$XmlAttribute.getSerializedSize():0 -> c
     20:20:int getSerializedSize():0:0 -> c
     20:20:int com.android.tools.r8.internal.Resources$XmlAttribute.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":50783},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":50783},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     50777:50779:int getSerializedSize():50757:50759 -> c
     50777:50779:int com.android.tools.r8.internal.Resources$XmlAttribute.getSerializedSize():0 -> c
     50780:50780:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -28299,9 +28299,9 @@
     50783:50783:int getSerializedSize():50755 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder toBuilder():50906:50907 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():50368 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():50393:50393 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):50771:50774 -> equals
     5:12:java.lang.String getNamespaceUri():50502:50509 -> equals
     5:12:boolean equals(java.lang.Object):50776 -> equals
@@ -28340,7 +28340,7 @@
     2:2:int com.android.tools.r8.internal.Resources$XmlAttribute.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$XmlAttribute.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":36},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":36},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getNamespaceUri():50502:50509 -> hashCode
     4:11:int hashCode():50806 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$XmlAttribute.hashCode():0 -> hashCode
@@ -28363,23 +28363,23 @@
     30:35:int com.android.tools.r8.internal.Resources$XmlAttribute.hashCode():0 -> hashCode
     36:36:int hashCode():50804:50804 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():50489:50490 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$Item getCompiledItem():50685:50685 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B60;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item.getDefaultInstance():22483:22483 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item getCompiledItem():50685 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():50632:50632 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> l
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():50632 -> l
     1:8:java.lang.String getValue():50578:50585 -> m
     1:1:boolean hasCompiledItem():50673:50673 -> n
-com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$1 -> com.android.tools.r8.internal.z80:
+com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$1 -> com.android.tools.r8.internal.D80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():51723:51723 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51729:51729 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51723 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$XmlAttribute.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50399:50401 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51729 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51723 -> a
@@ -28445,7 +28445,7 @@
     101:101:void com.android.tools.r8.com.android.aapt.Resources$XmlAttribute.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50477:50477 -> a
     101:101:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51729 -> a
     101:101:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51723 -> a
-com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder -> com.android.tools.r8.internal.A80:
+com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder -> com.android.tools.r8.internal.E80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object namespaceUri_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -28454,26 +28454,26 @@
     java.lang.Object value_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     int resourceId_ -> j
     com.android.tools.r8.com.android.aapt.Resources$Item compiledItem_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B60;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():50941 -> <init>
     2:154:void <init>():51116:51268 -> <init>
     155:155:void maybeForceBuilderInitialization():50952:50952 -> <init>
     155:155:void <init>():50942 -> <init>
     156:477:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):50947:51268 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     478:478:void maybeForceBuilderInitialization():50952:50952 -> <init>
     478:478:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):50948 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50923:50923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():50935:50936 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):51052 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):50923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):51052 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):50923 -> a
@@ -28482,10 +28482,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):51705:51705 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute com.android.tools.r8.com.android.aapt.Resources$XmlAttribute.getDefaultInstance():51719:51719 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):51065 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B80;)Lcom/android/tools/r8/internal/A80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F80;)Lcom/android/tools/r8/internal/E80;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$XmlAttribute.getNamespaceUri():50502:50502 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):51066 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -28526,14 +28526,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):51699 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50923 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50923:50923 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():50935:50936 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):51030 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):50923 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):51030 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):50923 -> b
@@ -28547,11 +28547,11 @@
     1:16:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute buildPartial():51003:51018 -> build
     1:16:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute build():50994 -> build
     1:16:com.android.tools.r8.com.google.protobuf.MessageLite build():50923 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     17:18:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute build():50995:50996 -> build
     17:18:com.android.tools.r8.com.google.protobuf.MessageLite build():50923 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51104:51110 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/A80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/E80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51106 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):51106:51112 -> c
@@ -28561,9 +28561,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):51699 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50923 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():50984:50984 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:16:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute buildPartial():51003:51018 -> h
     1:16:com.android.tools.r8.com.android.aapt.Resources$XmlAttribute build():50994 -> h
     1:16:com.android.tools.r8.com.google.protobuf.Message build():50923 -> h
@@ -28574,8 +28574,8 @@
     1:16:com.android.tools.r8.com.google.protobuf.Message buildPartial():50923 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():50935:50936 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$XmlElement -> com.android.tools.r8.internal.E80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$XmlElement -> com.android.tools.r8.internal.I80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.util.List namespaceDeclaration_ -> e
     java.lang.Object namespaceUri_ -> f
@@ -28586,20 +28586,20 @@
     java.util.List child_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.android.aapt.Resources$XmlElement DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G80;"}
     1:9:void <clinit>():49234:49242 -> <clinit>
     1:394:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):47205:47598 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H80;)V"}
     395:786:void <init>():47207:47598 -> <init>
     787:791:void <init>():47208:47212 -> <init>
     1:5:boolean isInitialized():47601:47605 -> a
     6:21:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):47612:47627 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     22:22:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):47798:47798 -> a
     22:22:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):47198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlElement getDefaultInstanceForType():49263:49263 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():47198 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -28611,7 +28611,7 @@
     8:8:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142969},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142969},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     47649:47657:int getSerializedSize():47640:47648 -> c
     47649:47657:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     47658:47658:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -28619,7 +28619,7 @@
     47658:47658:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     47659:47659:int getSerializedSize():0:0 -> c
     47659:47659:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142970},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142970},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     95309:95311:int getSerializedSize():47650:47652 -> c
     95309:95311:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     95312:95312:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -28627,7 +28627,7 @@
     95312:95312:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     95313:95313:int getSerializedSize():0:0 -> c
     95313:95313:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142971},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142971},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     142967:142968:int getSerializedSize():47654:47655 -> c
     142967:142968:int com.android.tools.r8.internal.Resources$XmlElement.getSerializedSize():0 -> c
     142969:142969:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -28637,9 +28637,9 @@
     142971:142971:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     142971:142971:int getSerializedSize():47652 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():47198:47198 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():47225:47225 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):47664:47667 -> equals
     5:5:java.util.List getNamespaceDeclarationList():47337:47337 -> equals
     5:5:boolean equals(java.lang.Object):47669 -> equals
@@ -28692,16 +28692,16 @@
     28:28:int hashCode():47704 -> hashCode
     29:32:int hashCode():47704:47707 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():47321:47322 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:8:java.lang.String getName():47444:47451 -> k
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder toBuilder():47791:47792 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D80;"}
-com.android.tools.r8.com.android.aapt.Resources$XmlElement$1 -> com.android.tools.r8.internal.C80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H80;"}
+com.android.tools.r8.com.android.aapt.Resources$XmlElement$1 -> com.android.tools.r8.internal.G80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():49242:49242 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlElement parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49248:49248 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$XmlElement.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):47231:47233 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$XmlElement parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49248 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49242 -> a
@@ -28780,38 +28780,38 @@
     101:109:void com.android.tools.r8.com.android.aapt.Resources$XmlElement.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):47301:47309 -> a
     101:109:com.android.tools.r8.com.android.aapt.Resources$XmlElement parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49248 -> a
     101:109:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49242 -> a
-com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder -> com.android.tools.r8.internal.D80:
+com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder -> com.android.tools.r8.internal.H80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int bitField0_ -> f
     java.util.List namespaceDeclaration_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 namespaceDeclarationBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.lang.Object namespaceUri_ -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.lang.Object name_ -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.util.List attribute_ -> k
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 attributeBuilder_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List child_ -> m
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 childBuilder_ -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():47826 -> <init>
     2:818:void <init>():48089:48905 -> <init>
     819:819:void maybeForceBuilderInitialization():47837:47837 -> <init>
     819:819:void <init>():47827 -> <init>
     820:1893:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):47832:48905 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1894:1894:void maybeForceBuilderInitialization():47837:47837 -> <init>
     1894:1894:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):47833 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):47808:47808 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():47820:47821 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47958 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47808 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47958 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47808 -> a
@@ -28820,10 +28820,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49224:49224 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):47808 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlElement com.android.tools.r8.com.android.aapt.Resources$XmlElement.getDefaultInstance():49238:49238 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlElement):47971 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E80;)Lcom/android/tools/r8/internal/D80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I80;)Lcom/android/tools/r8/internal/H80;"}
     11:15:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlElement):47972:47976 -> a
     16:18:void ensureNamespaceDeclarationIsMutable():48091:48093 -> a
     16:18:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlElement):47978 -> a
@@ -28879,14 +28879,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49218 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):47808 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):47808:47808 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():47820:47821 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47936 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47808 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47936 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):47808 -> b
@@ -28899,9 +28899,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$XmlElement build():47884:47886 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():47808 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):48075:48081 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/D80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):48077 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):48077:48083 -> c
@@ -28911,42 +28911,42 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlElement$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49218 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):47808 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():47874:47874 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.android.aapt.Resources$XmlElement build():47884:47886 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():47808 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():47808:47808 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():47820:47821 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:32:com.android.tools.r8.com.android.aapt.Resources$XmlElement buildPartial():47893:47924 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E80;"}
-com.android.tools.r8.com.android.aapt.Resources$XmlNamespace -> com.android.tools.r8.internal.H80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I80;"}
+com.android.tools.r8.com.android.aapt.Resources$XmlNamespace -> com.android.tools.r8.internal.L80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object prefix_ -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.lang.Object uri_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$XmlNamespace DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J80;"}
     1:9:void <clinit>():50223:50231 -> <clinit>
     1:209:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):49337:49545 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K80;)V"}
     210:416:void <init>():49339:49545 -> <init>
     417:418:void <init>():49340:49341 -> <init>
     1:5:boolean isInitialized():49548:49552 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):49559:49568 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):49722:49722 -> a
     16:16:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):49330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace getDefaultInstanceForType():50252:50252 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():49330 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -28956,9 +28956,9 @@
     15:16:int getSerializedSize():49587:49588 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder toBuilder():49715:49716 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():49330 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():49354:49354 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):49597:49600 -> equals
     5:12:java.lang.String getPrefix():49439:49446 -> equals
     5:12:boolean equals(java.lang.Object):49602 -> equals
@@ -28992,7 +28992,7 @@
     2:2:int com.android.tools.r8.internal.Resources$XmlNamespace.hashCode():0 -> hashCode
     3:3:int hashCode():0:0 -> hashCode
     3:3:int com.android.tools.r8.internal.Resources$XmlNamespace.hashCode():0 -> hashCode
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":27},"outline":"Lcom/android/tools/r8/internal/Ef;a(Lcom/android/tools/r8/internal/Xj;IIII)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":27},"outline":"Lcom/android/tools/r8/internal/Gf;a(Lcom/android/tools/r8/internal/Zj;IIII)I"}
     4:11:java.lang.String getPrefix():49439:49446 -> hashCode
     4:11:int hashCode():49623 -> hashCode
     4:11:int com.android.tools.r8.internal.Resources$XmlNamespace.hashCode():0 -> hashCode
@@ -29010,17 +29010,17 @@
     23:26:int com.android.tools.r8.internal.Resources$XmlNamespace.hashCode():0 -> hashCode
     27:27:int hashCode():49621:49621 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():49426:49427 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():49531:49531 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> k
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():49531 -> k
-com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$1 -> com.android.tools.r8.internal.F80:
+com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$1 -> com.android.tools.r8.internal.J80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():50231:50231 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50237:50237 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$XmlNamespace.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49360:49362 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50237 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50231 -> a
@@ -29070,30 +29070,30 @@
     66:66:void com.android.tools.r8.com.android.aapt.Resources$XmlNamespace.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49414:49414 -> a
     66:66:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50237 -> a
     66:66:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):50231 -> a
-com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder -> com.android.tools.r8.internal.G80:
+com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder -> com.android.tools.r8.internal.K80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     java.lang.Object prefix_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     java.lang.Object uri_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():49750 -> <init>
     2:78:void <init>():49898:49974 -> <init>
     79:79:void maybeForceBuilderInitialization():49761:49761 -> <init>
     79:79:void <init>():49751 -> <init>
     80:298:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):49756:49974 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     299:299:void maybeForceBuilderInitialization():49761:49761 -> <init>
     299:299:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):49757 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49732:49732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():49744:49745 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49844 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49844 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49732 -> a
@@ -29102,10 +29102,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50213:50213 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace com.android.tools.r8.com.android.aapt.Resources$XmlNamespace.getDefaultInstance():50227:50227 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlNamespace):49857 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H80;)Lcom/android/tools/r8/internal/G80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L80;)Lcom/android/tools/r8/internal/K80;"}
     11:11:java.lang.String com.android.tools.r8.com.android.aapt.Resources$XmlNamespace.getPrefix():49439:49439 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlNamespace):49858 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -29134,14 +29134,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50207 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49732 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49732:49732 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():49744:49745 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49822 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49732 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49822 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):49732 -> b
@@ -29155,11 +29155,11 @@
     1:9:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace buildPartial():49802:49810 -> build
     1:9:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace build():49793 -> build
     1:9:com.android.tools.r8.com.google.protobuf.MessageLite build():49732 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     10:11:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace build():49794:49795 -> build
     10:11:com.android.tools.r8.com.google.protobuf.MessageLite build():49732 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49886:49892 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/G80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/K80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49888 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):49888:49894 -> c
@@ -29169,9 +29169,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):50207 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):49732 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():49783:49783 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:9:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace buildPartial():49802:49810 -> h
     1:9:com.android.tools.r8.com.android.aapt.Resources$XmlNamespace build():49793 -> h
     1:9:com.android.tools.r8.com.google.protobuf.Message build():49732 -> h
@@ -29182,30 +29182,30 @@
     1:9:com.android.tools.r8.com.google.protobuf.Message buildPartial():49732 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():49744:49745 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.aapt.Resources$XmlNode -> com.android.tools.r8.internal.K80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.aapt.Resources$XmlNode -> com.android.tools.r8.internal.O80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int nodeCase_ -> e
     java.lang.Object node_ -> f
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.android.aapt.Resources$XmlNode DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O80;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M80;"}
     1:9:void <clinit>():46981:46989 -> <clinit>
     1:263:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):45907:46169 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N80;)V"}
     264:524:void <init>():45909:46169 -> <init>
     1:5:boolean isInitialized():46172:46176 -> a
     6:15:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):46183:46192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     16:16:com.android.tools.r8.com.android.aapt.Resources$XmlNode parseFrom(byte[]):46301:46301 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/K80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/O80;"}
     17:17:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):46364:46364 -> a
     17:17:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):45900 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlNode getDefaultInstanceForType():47010:47010 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():45900 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -29218,9 +29218,9 @@
     15:16:int getSerializedSize():46212:46213 -> c
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder toBuilder():46357:46358 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():45900 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():45922:45922 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):46222:46225 -> equals
     5:5:boolean hasSource():46143:46143 -> equals
     5:5:boolean equals(java.lang.Object):46227 -> equals
@@ -29246,24 +29246,24 @@
     5:14:int hashCode():46258:46267 -> hashCode
     15:25:int hashCode():46263:46273 -> hashCode
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():46002:46003 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlElement getElement():46063:46064 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I80;"}
     3:3:com.android.tools.r8.com.android.aapt.Resources$XmlElement com.android.tools.r8.com.android.aapt.Resources$XmlElement.getDefaultInstance():49238:49238 -> k
     3:3:com.android.tools.r8.com.android.aapt.Resources$XmlElement getElement():46066 -> k
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlNode$NodeCase getNodeCase():46044:46044 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():46155:46155 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition com.android.tools.r8.com.android.aapt.Resources$SourcePosition.getDefaultInstance():1053:1053 -> m
     2:2:com.android.tools.r8.com.android.aapt.Resources$SourcePosition getSource():46155 -> m
     1:12:java.lang.String getText():46092:46103 -> n
-com.android.tools.r8.com.android.aapt.Resources$XmlNode$1 -> com.android.tools.r8.internal.I80:
+com.android.tools.r8.com.android.aapt.Resources$XmlNode$1 -> com.android.tools.r8.internal.M80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     1:1:void <init>():46989:46989 -> <init>
     1:1:com.android.tools.r8.com.android.aapt.Resources$XmlNode parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46995:46995 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46989 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.android.aapt.Resources$XmlNode.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45928:45930 -> a
     2:4:com.android.tools.r8.com.android.aapt.Resources$XmlNode parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46995 -> a
     2:4:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46989 -> a
@@ -29320,28 +29320,28 @@
     72:72:void com.android.tools.r8.com.android.aapt.Resources$XmlNode.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):45990:45990 -> a
     72:72:com.android.tools.r8.com.android.aapt.Resources$XmlNode parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46995 -> a
     72:72:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46989 -> a
-com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder -> com.android.tools.r8.internal.J80:
+com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder -> com.android.tools.r8.internal.N80:
 # {"id":"sourceFile","fileName":"Resources.java"}
     int nodeCase_ -> f
     java.lang.Object node_ -> g
     com.android.tools.r8.com.android.aapt.Resources$SourcePosition source_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C70;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():46393 -> <init>
     2:2:void <init>():46554:46554 -> <init>
     3:3:void maybeForceBuilderInitialization():46404:46404 -> <init>
     3:3:void <init>():46394 -> <init>
     4:159:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):46399:46554 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     160:160:void maybeForceBuilderInitialization():46404:46404 -> <init>
     160:160:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):46400 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46375:46375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():46387:46388 -> a
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755 -> a
     2:3:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46494 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     4:4:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46494 -> a
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46375 -> a
@@ -29350,10 +29350,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     9:9:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46971:46971 -> a
     9:9:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlNode com.android.tools.r8.com.android.aapt.Resources$XmlNode.getDefaultInstance():46985:46985 -> a
     10:10:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlNode):46507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K80;)Lcom/android/tools/r8/internal/J80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O80;)Lcom/android/tools/r8/internal/N80;"}
     11:11:boolean com.android.tools.r8.com.android.aapt.Resources$XmlNode.hasSource():46143:46143 -> a
     11:11:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeFrom(com.android.tools.r8.com.android.aapt.Resources$XmlNode):46508 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -29388,14 +29388,14 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46965 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46375 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46375:46375 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():46387:46388 -> b
     4:5:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717 -> b
     4:5:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46472 -> b
     4:5:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46375 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     6:6:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     6:6:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46472 -> b
     6:6:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):46375 -> b
@@ -29409,11 +29409,11 @@
     1:18:com.android.tools.r8.com.android.aapt.Resources$XmlNode buildPartial():46443:46460 -> build
     1:18:com.android.tools.r8.com.android.aapt.Resources$XmlNode build():46434 -> build
     1:18:com.android.tools.r8.com.google.protobuf.MessageLite build():46375 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     19:20:com.android.tools.r8.com.android.aapt.Resources$XmlNode build():46435:46436 -> build
     19:20:com.android.tools.r8.com.google.protobuf.MessageLite build():46375 -> build
     1:7:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46543:46549 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/J80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/N80;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46545 -> c
     9:15:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):46545:46551 -> c
@@ -29423,9 +29423,9 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.android.aapt.Resources$XmlNode$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46965 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):46375 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():46424:46424 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:18:com.android.tools.r8.com.android.aapt.Resources$XmlNode buildPartial():46443:46460 -> h
     1:18:com.android.tools.r8.com.android.aapt.Resources$XmlNode build():46434 -> h
     1:18:com.android.tools.r8.com.google.protobuf.Message build():46375 -> h
@@ -29436,8 +29436,8 @@
     1:18:com.android.tools.r8.com.google.protobuf.Message buildPartial():46375 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():46387:46388 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil -> com.android.tools.r8.internal.S80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil -> com.android.tools.r8.internal.W80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     1:13:java.lang.String resourceNameToFieldName(java.lang.String):52:64 -> a
     14:14:java.util.List findUnusedResources(java.util.List,java.util.function.Consumer):107:107 -> a
@@ -29481,7 +29481,7 @@
     278:278:java.util.List findUnusedResources(java.util.List,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):143:143 -> a
     278:278:java.util.List findUnusedResources(java.util.List,java.util.function.Consumer):107 -> a
     279:280:void findUnusedResources$visit(java.util.Set,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):121:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/C50;Lcom/android/tools/r8/internal/C50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/G50;Lcom/android/tools/r8/internal/G50;)V"}
     281:281:void com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource.addReachableParent(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$ReachableOrigin):467:467 -> a
     281:281:void findUnusedResources$visit(java.util.Set,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -29492,7 +29492,7 @@
     283:285:void findUnusedResources$visit(java.util.Set,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):122 -> a
     286:415:void findUnusedResources$visit(java.util.Set,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):124:253 -> a
     416:416:void findUnusedResources$visit(java.util.Set,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):129:129 -> a
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$1 -> com.android.tools.r8.internal.N80:
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$1 -> com.android.tools.r8.internal.R80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     java.util.function.Consumer $rootsConsumer -> b
     1:1:void <init>(java.util.function.Consumer):0:0 -> <init>
@@ -29500,37 +29500,37 @@
     2:109:void invoke(java.util.List):0:107 -> a
     2:109:java.lang.Object invoke(java.lang.Object):107 -> a
     110:110:java.lang.Object invoke(java.lang.Object):107:107 -> a
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$3 -> com.android.tools.r8.internal.O80:
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$3 -> com.android.tools.r8.internal.S80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$3 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S80;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):137:137 -> a
     2:139:java.lang.Boolean invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:137 -> a
     2:139:java.lang.Object invoke(java.lang.Object):137 -> a
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$4 -> com.android.tools.r8.internal.P80:
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$4 -> com.android.tools.r8.internal.T80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$4 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T80;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):138:138 -> a
     2:140:java.lang.Boolean invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:138 -> a
     2:140:java.lang.Object invoke(java.lang.Object):138 -> a
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$5 -> com.android.tools.r8.internal.Q80:
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$5 -> com.android.tools.r8.internal.U80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$5 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U80;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):140:140 -> a
     2:142:java.lang.Boolean invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:140 -> a
     2:142:java.lang.Object invoke(java.lang.Object):140 -> a
-com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$6 -> com.android.tools.r8.internal.R80:
+com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$6 -> com.android.tools.r8.internal.V80:
 # {"id":"sourceFile","fileName":"ResourcesUtil.kt"}
     com.android.tools.r8.com.android.ide.common.resources.ResourcesUtil$findUnusedResources$6 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V80;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):142:142 -> a
@@ -29541,18 +29541,18 @@
     145:145:java.lang.Object invoke(java.lang.Object):142 -> a
     146:146:java.lang.Boolean invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):142:142 -> a
     146:146:java.lang.Object invoke(java.lang.Object):142 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceId -> com.android.tools.r8.internal.l50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceId -> com.android.tools.r8.internal.p50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.resources.ResourceType type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     java.lang.String name -> b
     java.lang.String packageName -> c
     1:4:void <init>(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String,java.lang.String):628:631 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A50;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E50;Ljava/lang/String;Ljava/lang/String;)V"}
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore -> com.android.tools.r8.internal.x50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore -> com.android.tools.r8.internal.B50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     java.util.Map resourceById -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
@@ -29593,7 +29593,7 @@
     19:19:void <init>(boolean):90 -> <init>
     20:27:void <init>(boolean):90:97 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getResourcesForKeepOrDiscardPattern(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x50;Ljava/lang/String;)Lcom/android/tools/r8/internal/za0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B50;Ljava/lang/String;)Lcom/android/tools/r8/internal/Da0;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence getResourcesForKeepOrDiscardPattern(java.lang.String):299:299 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getResourcesForKeepOrDiscardPattern(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):53 -> a
     3:3:boolean com.android.tools.r8.com.android.resources.ResourceUrl.isFramework():53:53 -> a
@@ -29635,9 +29635,9 @@
     19:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getResourcesForKeepOrDiscardPattern(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):53 -> a
     20:20:java.util.List getResources():61:61 -> a
     21:21:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource getResource(int):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/C50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/G50;"}
     22:23:java.util.List getResources(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String):122:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A50;Ljava/lang/String;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E50;Ljava/lang/String;)Ljava/util/List;"}
     24:24:java.util.List com.android.tools.r8.com.google.common.collect.LinkedListMultimap.get(java.lang.Object):717:717 -> a
     24:24:java.util.List getResources(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String):123 -> a
     25:25:java.util.List getResources(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String):123:123 -> a
@@ -29647,7 +29647,7 @@
     28:28:java.util.List getResourcesFromUrl(java.lang.String):136:136 -> a
     29:29:java.util.List getResourcesFromUrl(java.lang.String):134:134 -> a
     30:37:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource addResource(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):173:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Lcom/android/tools/r8/internal/C50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Lcom/android/tools/r8/internal/G50;"}
     38:38:boolean com.android.tools.r8.com.google.common.collect.LinkedListMultimap.put(java.lang.Object,java.lang.Object):630:630 -> a
     38:38:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource addResource(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -29695,10 +29695,10 @@
     518:1192:java.util.List processToolsAttributes():255 -> b
     1193:1864:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.minus(java.lang.Iterable,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):3174:3845 -> b
     1193:1864:java.util.List processToolsAttributes():255 -> b
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$addResource$updated$1 -> com.android.tools.r8.internal.q50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$addResource$updated$1 -> com.android.tools.r8.internal.u50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$addResource$updated$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u50;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):179:179 -> apply
@@ -29707,12 +29707,12 @@
     3:3:com.android.tools.r8.com.google.common.collect.LinkedListMultimap com.android.tools.r8.com.google.common.collect.LinkedListMultimap.create():174:174 -> apply
     3:3:com.android.tools.r8.com.google.common.collect.LinkedListMultimap apply(com.android.tools.r8.com.android.resources.ResourceType):179 -> apply
     3:3:java.lang.Object apply(java.lang.Object):179 -> apply
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$getResourcesForKeepOrDiscardPattern$1 -> com.android.tools.r8.internal.r50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$getResourcesForKeepOrDiscardPattern$1 -> com.android.tools.r8.internal.v50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.jetbrains.kotlin.text.Regex $regexp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s40;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.text.Regex):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s40;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):310:310 -> a
     2:2:java.lang.Boolean invoke(java.util.Map$Entry):310:310 -> a
     2:2:java.lang.Object invoke(java.lang.Object):310 -> a
@@ -29721,30 +29721,30 @@
     3:3:java.lang.Object invoke(java.lang.Object):310 -> a
     4:4:java.lang.Boolean invoke(java.util.Map$Entry):310:310 -> a
     4:4:java.lang.Object invoke(java.lang.Object):310 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$getResourcesForKeepOrDiscardPattern$2 -> com.android.tools.r8.internal.s50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$getResourcesForKeepOrDiscardPattern$2 -> com.android.tools.r8.internal.w50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$getResourcesForKeepOrDiscardPattern$2 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w50;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):311:311 -> a
     2:2:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource invoke(java.util.Map$Entry):311:311 -> a
     2:2:java.lang.Object invoke(java.lang.Object):311 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$1 -> com.android.tools.r8.internal.t50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$1 -> com.android.tools.r8.internal.x50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B50;"}
     1:1:void <init>(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B50;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):249:249 -> a
     2:251:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(java.lang.String):0:249 -> a
     2:251:java.lang.Object invoke(java.lang.Object):249 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$2 -> com.android.tools.r8.internal.u50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$2 -> com.android.tools.r8.internal.y50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B50;"}
     1:1:void <init>(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B50;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):250:250 -> a
     2:254:void invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:252 -> a
     2:254:java.lang.Object invoke(java.lang.Object):250 -> a
@@ -29754,34 +29754,34 @@
     256:256:void invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):252:252 -> a
     256:256:java.lang.Object invoke(java.lang.Object):250 -> a
     257:257:java.lang.Object invoke(java.lang.Object):250:250 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$3 -> com.android.tools.r8.internal.v50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$3 -> com.android.tools.r8.internal.z50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B50;"}
     1:1:void <init>(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B50;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):257:257 -> a
     2:259:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(java.lang.String):0:257 -> a
     2:259:java.lang.Object invoke(java.lang.Object):257 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$4 -> com.android.tools.r8.internal.w50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$4 -> com.android.tools.r8.internal.A50:
 # {"id":"sourceFile","fileName":"ResourceStore.kt"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore$processToolsAttributes$4 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):258:258 -> a
     2:260:void invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:258 -> a
     2:260:java.lang.Object invoke(java.lang.Object):258 -> a
     261:261:java.lang.Object invoke(java.lang.Object):258:258 -> a
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel -> com.android.tools.r8.internal.E50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel -> com.android.tools.r8.internal.I50:
 # {"id":"sourceFile","fileName":"ResourceUsageModel.java"}
     1:2:boolean markReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):199:200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Z"}
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource -> com.android.tools.r8.internal.C50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Z"}
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource -> com.android.tools.r8.internal.G50:
 # {"id":"sourceFile","fileName":"ResourceUsageModel.java"}
     int mFlags -> b
     com.android.tools.r8.com.android.resources.ResourceType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     java.lang.String name -> d
     java.lang.String packageName -> e
     int value -> f
@@ -29790,11 +29790,11 @@
     java.util.Set reachableParents -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     1:5:void <init>(java.lang.String,com.android.tools.r8.com.android.resources.ResourceType,java.lang.String,int):427:431 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/A50;Ljava/lang/String;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/E50;Ljava/lang/String;I)V"}
     1:1:boolean isReachable():416:416 -> a
     2:2:void setReachable(boolean):420:420 -> a
     3:3:void addReference(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):482:482 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)V"}
     4:4:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():85:85 -> a
     4:4:void addReference(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):483 -> a
     5:9:void addReference(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):483:487 -> a
@@ -29804,21 +29804,21 @@
     1:7:boolean equals(java.lang.Object):445:451 -> equals
     1:2:int hashCode():457:458 -> hashCode
     1:1:java.lang.String toString():436:436 -> toString
-com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$ResourceReachableOrigin -> com.android.tools.r8.internal.D50:
+com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$ResourceReachableOrigin -> com.android.tools.r8.internal.H50:
 # {"id":"sourceFile","fileName":"ResourceUsageModel.java"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource resource -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G50;"}
     1:2:void <init>(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):230:231 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)V"}
     1:1:java.lang.String toString():241:241 -> toString
-com.android.tools.r8.com.android.ide.common.resources.usage.WebTokenizers -> com.android.tools.r8.internal.am0:
+com.android.tools.r8.com.android.ide.common.resources.usage.WebTokenizers -> com.android.tools.r8.internal.em0:
 # {"id":"sourceFile","fileName":"WebTokenizers.java"}
     com.android.tools.r8.com.android.ide.common.resources.usage.WebTokenizers$WebTokensCallback callback -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z30;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.android.ide.common.resources.usage.WebTokenizers$WebTokensCallback):31:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z30;)V"}
     1:13:void endHtmlTag(java.lang.String,int,java.lang.String):287:299 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)V"}
     14:14:void recordHtmlAttributeValue(java.lang.String,java.lang.String,java.lang.String):306:306 -> a
@@ -29838,7 +29838,7 @@
     220:338:void com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$webTokenizers$2$1.referencedJsString(java.lang.String):0:118 -> b
     220:338:void tokenizeJs(java.lang.String):381 -> b
     339:349:void tokenizeJs(java.lang.String):355:365 -> b
-com.android.tools.r8.com.android.resources.FolderTypeRelationship -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.com.android.resources.FolderTypeRelationship -> com.android.tools.r8.internal.Jq:
 # {"id":"sourceFile","fileName":"FolderTypeRelationship.java"}
     java.util.Map mTypeToFolderMap -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/EnumMap;"}
@@ -29850,42 +29850,42 @@
     56:71:void <clinit>():89 -> <clinit>
     72:73:void <clinit>():96:97 -> <clinit>
     1:17:void add(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.resources.ResourceFolderType):230:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A50;Lcom/android/tools/r8/internal/k50;)V"}
-com.android.tools.r8.com.android.resources.ResourceFolderType -> com.android.tools.r8.internal.k50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E50;Lcom/android/tools/r8/internal/o50;)V"}
+com.android.tools.r8.com.android.resources.ResourceFolderType -> com.android.tools.r8.internal.o50:
 # {"id":"sourceFile","fileName":"ResourceFolderType.java"}
     java.lang.String name -> b
     com.android.tools.r8.com.android.resources.ResourceFolderType ANIM -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType ANIMATOR -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType COLOR -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType DRAWABLE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType FONT -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType INTERPOLATOR -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType LAYOUT -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType MENU -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType MIPMAP -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType NAVIGATION -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType RAW -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType TRANSITION -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType VALUES -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType XML -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o50;"}
     java.util.Map nameToType -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.com.android.resources.ResourceFolderType[] $VALUES -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/k50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/o50;"}
     boolean $assertionsDisabled -> s
     1:15:void <clinit>():27:41 -> <clinit>
     16:16:com.android.tools.r8.com.android.resources.ResourceFolderType[] $values():27:27 -> <clinit>
@@ -29898,77 +29898,77 @@
     1:2:void <init>(java.lang.String,int,java.lang.String):56:57 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)V"}
     1:1:com.android.tools.r8.com.android.resources.ResourceFolderType[] values():27:27 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/k50;"}
-com.android.tools.r8.com.android.resources.ResourceType -> com.android.tools.r8.internal.A50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/o50;"}
+com.android.tools.r8.com.android.resources.ResourceType -> com.android.tools.r8.internal.E50:
 # {"id":"sourceFile","fileName":"ResourceType.java"}
     com.android.tools.r8.com.android.resources.ResourceType TRANSITION -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType XML -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType PUBLIC -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType AAPT -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType OVERLAYABLE -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType STYLE_ITEM -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType SAMPLE_DATA -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType MACRO -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap CLASS_NAMES -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.android.resources.ResourceType[] $VALUES -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/E50;"}
     java.lang.String mName -> b
     java.lang.String[] mAlternateXmlNames -> c
     com.android.tools.r8.com.android.resources.ResourceType$Kind mKind -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.com.android.resources.ResourceType ANIM -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType ANIMATOR -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType ARRAY -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType ATTR -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType BOOL -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType COLOR -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType DIMEN -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType DRAWABLE -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType FONT -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType FRACTION -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType ID -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType INTEGER -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType INTERPOLATOR -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType LAYOUT -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType MENU -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType MIPMAP -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType NAVIGATION -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType PLURALS -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType RAW -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType STRING -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType STYLE -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     com.android.tools.r8.com.android.resources.ResourceType STYLEABLE -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     1:61:void <clinit>():40:100 -> <clinit>
     62:62:com.android.tools.r8.com.android.resources.ResourceType[] $values():39:39 -> <clinit>
     62:62:void <clinit>():39 -> <clinit>
@@ -29998,21 +29998,21 @@
     1:1:java.lang.String getName():183:183 -> toString
     1:1:java.lang.String toString():319 -> toString
     1:1:com.android.tools.r8.com.android.resources.ResourceType[] values():39:39 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/A50;"}
-com.android.tools.r8.com.android.resources.ResourceUrl -> com.android.tools.r8.internal.B50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/E50;"}
+com.android.tools.r8.com.android.resources.ResourceUrl -> com.android.tools.r8.internal.F50:
 # {"id":"sourceFile","fileName":"ResourceUrl.java"}
     com.android.tools.r8.com.android.resources.ResourceType type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E50;"}
     java.lang.String name -> c
     java.lang.String namespace -> d
     com.android.tools.r8.com.android.resources.ResourceUrl$UrlType urlType -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     boolean privateAccessOverride -> f
     1:6:void <init>(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String,java.lang.String,com.android.tools.r8.com.android.resources.ResourceUrl$UrlType,boolean):90:95 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A50;Ljava/lang/String;Ljava/lang/String;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E50;Ljava/lang/String;Ljava/lang/String;IZ)V"}
     1:106:com.android.tools.r8.com.android.resources.ResourceUrl parse(java.lang.String,boolean):200:305 -> a
     1:106:com.android.tools.r8.com.android.resources.ResourceUrl parse(java.lang.String):172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/B50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/F50;"}
     107:127:com.android.tools.r8.com.android.resources.ResourceType com.android.tools.r8.com.android.resources.ResourceType.fromXmlValue(java.lang.String):232:252 -> a
     107:127:com.android.tools.r8.com.android.resources.ResourceUrl parse(java.lang.String,boolean):305 -> a
     107:127:com.android.tools.r8.com.android.resources.ResourceUrl parse(java.lang.String):172 -> a
@@ -30027,10 +30027,10 @@
     34:34:java.lang.String toString():513 -> toString
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:40:java.lang.String toString():513:518 -> toString
-com.android.tools.r8.com.android.utils.SdkUtils -> com.android.tools.r8.internal.va0:
+com.android.tools.r8.com.android.utils.SdkUtils -> com.android.tools.r8.internal.za0:
 # {"id":"sourceFile","fileName":"SdkUtils.java"}
     java.util.List IMAGE_EXTENSIONS -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <clinit>():422:422 -> <clinit>
     1:20:java.lang.String globToRegexp(java.lang.String):488:507 -> a
     21:33:int appendQuoted(java.lang.StringBuilder,java.lang.String,int,int):514:526 -> a
@@ -30039,70 +30039,70 @@
 # {"id":"sourceFile","fileName":"AbstractIterator.java"}
 com.android.tools.r8.com.google.common.base.Ascii -> R8$$REMOVED$$CLASS$$22:
 # {"id":"sourceFile","fileName":"Ascii.java"}
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.rb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     1:1:void <init>():361:361 -> <init>
     1:7:java.lang.String showCharacter(char):933:939 -> a
     1:7:java.lang.String access$100(char):66 -> a
     boolean matches(char) -> b
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.jb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jb;"}
     1:1:void <clinit>():1018:1018 -> <clinit>
     1:1:void <init>():1021:1021 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():129:129 -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb;"}
     1:1:boolean matches(char):1026:1026 -> b
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():129:129 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1108 -> negate
     1:1:java.util.function.Predicate negate():1016 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher -> com.android.tools.r8.internal.kb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     1:1:void <init>():945:945 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():954:954 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb;"}
     1:1:boolean apply(java.lang.Object):945:945 -> apply
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):916:916 -> apply
     2:2:boolean apply(java.lang.Object):945 -> apply
     1:1:java.util.function.Predicate negate():945:945 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Is -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.com.google.common.base.CharMatcher$Is -> com.android.tools.r8.internal.lb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     char match -> b
     1:2:void <init>(char):1621:1622 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1647:1647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb;"}
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.isNot(char):306:306 -> a
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1647 -> a
     1:1:boolean matches(char):1627:1627 -> b
     1:1:java.util.function.Predicate negate():1617:1617 -> negate
     1:1:java.lang.String toString():1659:1659 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$IsNot -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.com.google.common.base.CharMatcher$IsNot -> com.android.tools.r8.internal.mb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     char match -> b
     1:2:void <init>(char):1668:1669 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1697:1697 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb;"}
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.is(char):297:297 -> a
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1697 -> a
     1:1:boolean matches(char):1674:1674 -> b
     1:1:java.util.function.Predicate negate():1664:1664 -> negate
     1:1:java.lang.String toString():1702:1702 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.nb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     java.lang.String description -> b
     1:2:void <init>(java.lang.String):963:964 -> <init>
     1:1:java.lang.String toString():969:969 -> toString
 com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> R8$$REMOVED$$CLASS$$23:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.ob:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Negated.original -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ib;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kb;"}
     1:2:void com.android.tools.r8.com.google.common.base.CharMatcher$Negated.<init>(com.android.tools.r8.com.google.common.base.CharMatcher):1505:1506 -> <init>
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):977 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ib;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kb;)V"}
     1:1:boolean com.android.tools.r8.com.google.common.base.CharMatcher$Negated.apply(java.lang.Object):1501:1501 -> apply
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):916:916 -> apply
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher$Negated.apply(java.lang.Object):1501 -> apply
@@ -30110,53 +30110,53 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Negated.negate():1541:1541 -> negate
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$Negated.negate():1501 -> negate
     1:1:java.lang.String com.android.tools.r8.com.google.common.base.CharMatcher$Negated.toString():1546:1546 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.pb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pb;"}
     1:1:void <clinit>():1115:1115 -> <clinit>
     1:1:void <init>():1118:1118 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():120:120 -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb;"}
     1:1:boolean matches(char):1123:1123 -> b
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():120:120 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1211 -> negate
     1:1:java.util.function.Predicate negate():1113 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.qb:
 # {"id":"sourceFile","fileName":"CharMatcher.java"}
     int SHIFT -> c
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ob;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qb;"}
     1:3:void <clinit>():1229:1231 -> <clinit>
     1:1:void <init>():1234:1234 -> <init>
     1:1:boolean matches(char):1239:1239 -> b
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.zb:
 # {"id":"sourceFile","fileName":"Charsets.java"}
     java.nio.charset.Charset UTF_8 -> a
     1:53:void <clinit>():48:100 -> <clinit>
 com.android.tools.r8.com.google.common.base.CommonMatcher -> R8$$REMOVED$$CLASS$$24:
 # {"id":"sourceFile","fileName":"CommonMatcher.java"}
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.te:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.ve:
 # {"id":"sourceFile","fileName":"CommonPattern.java"}
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.no:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.qo:
 # {"id":"sourceFile","fileName":"Equivalence.java"}
     1:1:void <init>():46:46 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/po;"}
     1:1:boolean equivalent(java.lang.Object,java.lang.Object):72:72 -> b
     1:1:boolean test(java.lang.Object,java.lang.Object):83:83 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.po:
 # {"id":"sourceFile","fileName":"Equivalence.java"}
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/no;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qo;"}
     java.lang.Object reference -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):208:208 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):195 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/no;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qo;Ljava/lang/Object;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):209 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):195 -> <init>
@@ -30169,10 +30169,10 @@
     2:2:int hashCode():248 -> hashCode
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String toString():257:257 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.ur:
 # {"id":"sourceFile","fileName":"Function.java"}
     boolean equals(java.lang.Object) -> equals
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.MC:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.OC:
 # {"id":"sourceFile","fileName":"JdkPattern.java"}
     java.util.regex.Pattern pattern -> b
     1:1:void <init>(java.util.regex.Pattern):30:30 -> <init>
@@ -30180,7 +30180,7 @@
     2:2:void <init>(java.util.regex.Pattern):31 -> <init>
     3:3:void <init>(java.util.regex.Pattern):31:31 -> <init>
     1:1:java.lang.String toString():51:51 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.NC:
 # {"id":"sourceFile","fileName":"JdkPattern.java"}
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():26:26 -> <init>
@@ -30188,25 +30188,25 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(java.util.regex.Matcher):58 -> <init>
     3:3:void <init>(java.util.regex.Matcher):58:58 -> <init>
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.zU:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.DU:
 # {"id":"sourceFile","fileName":"Objects.java"}
     1:1:boolean equal(java.lang.Object,java.lang.Object):54:54 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.FW:
 # {"id":"sourceFile","fileName":"Platform.java"}
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DW;"}
     1:1:void <clinit>():34:34 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.PatternCompiler loadPatternCompiler():87:87 -> <clinit>
     2:2:void <clinit>():35 -> <clinit>
     3:3:void <clinit>():35:35 -> <clinit>
     1:1:boolean stringIsNullOrEmpty(java.lang.String):53:53 -> a
     1:1:java.lang.String emptyToNull(java.lang.String):74 -> a
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.zW:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.DW:
 # {"id":"sourceFile","fileName":"Platform.java"}
     1:1:void <init>():94:94 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):94 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.hX:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.lX:
 # {"id":"sourceFile","fileName":"Preconditions.java"}
     1:1:void checkArgument(boolean,java.lang.String,java.lang.Object):218:218 -> a
     2:2:java.lang.Object checkNotNull(java.lang.Object):903:903 -> a
@@ -30244,7 +30244,7 @@
     16:16:java.lang.String com.android.tools.r8.internal.Preconditions.badPositionIndex(int,int,java.lang.String):0 -> a
     17:17:java.lang.String badPositionIndex(int,int,java.lang.String):0:0 -> a
     17:17:java.lang.String com.android.tools.r8.internal.Preconditions.badPositionIndex(int,int,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1443,"2":1444,"3":1445,"4":1446},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1443,"2":1444,"3":1445,"4":1446},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1442:1442:java.lang.String badPositionIndex(int,int,java.lang.String):1425:1425 -> a
     1442:1442:java.lang.String com.android.tools.r8.internal.Preconditions.badPositionIndex(int,int,java.lang.String):0 -> a
     1443:1443:java.lang.String badPositionIndex(int,int,java.lang.String):1425:1425 -> a
@@ -30263,27 +30263,27 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     2:2:int checkPositionIndex(int,int,java.lang.String):1416:1416 -> b
     2:2:int checkPositionIndex(int,int):1398 -> b
-com.android.tools.r8.com.google.common.base.Preconditions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.gX:
+com.android.tools.r8.com.google.common.base.Preconditions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.kX:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.lang.String com.android.tools.r8.internal.Preconditions$$ExternalSyntheticOutline0.m(int,java.lang.String):0:3 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.iX:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.mX:
 # {"id":"sourceFile","fileName":"Predicate.java"}
     boolean apply(java.lang.Object) -> apply
     boolean equals(java.lang.Object) -> equals
     1:1:boolean test(java.lang.Object):79:79 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.rX:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.vX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.lX:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.pX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     com.android.tools.r8.com.google.common.base.Predicate predicate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mX;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Predicate):321:321 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mX;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):322 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Predicate):322:322 -> <init>
@@ -30291,57 +30291,57 @@
     1:3:boolean equals(java.lang.Object):337:339 -> equals
     1:1:int hashCode():332:332 -> hashCode
     1:1:java.lang.String toString():346:346 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.qX:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.uX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qX;"}
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rX;"}
     1:37:void <clinit>():262:298 -> <clinit>
     1:1:void <init>(java.lang.String,int):260:260 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):260 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.mX:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.qX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     1:1:void <init>(java.lang.String,int):262:262 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean apply(java.lang.Object):265:265 -> apply
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.nX:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.rX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     1:1:void <init>(java.lang.String,int):274:274 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean apply(java.lang.Object):277:277 -> apply
     1:1:java.lang.String toString():282:282 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.oX:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.sX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     1:1:void <init>(java.lang.String,int):286:286 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean apply(java.lang.Object):289:289 -> apply
     1:1:java.lang.String toString():294:294 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.pX:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.tX:
 # {"id":"sourceFile","fileName":"Predicates.java"}
     1:1:void <init>(java.lang.String,int):298:298 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean apply(java.lang.Object):301:301 -> apply
     1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.Oc0:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.Sc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.CharMatcher trimmer -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nb;"}
     boolean omitEmptyStrings -> b
     com.android.tools.r8.com.google.common.base.Splitter$Strategy strategy -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc0;"}
     int limit -> d
     1:5:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):114:118 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc0;ZLcom/android/tools/r8/internal/lb;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc0;ZLcom/android/tools/r8/internal/nb;I)V"}
     6:6:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():129:129 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):111 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc0;)V"}
     7:7:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):111:111 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform.compilePattern(java.lang.String):79:79 -> a
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Oc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Sc0;"}
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):97:97 -> a
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform.compilePattern(java.lang.String):79 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):264 -> a
@@ -30364,34 +30364,34 @@
     7:7:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):264 -> a
     8:13:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):224:229 -> a
     8:13:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):264 -> a
-com.android.tools.r8.com.google.common.base.Splitter$1 -> com.android.tools.r8.internal.Jc0:
+com.android.tools.r8.com.google.common.base.Splitter$1 -> com.android.tools.r8.internal.Nc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.CharMatcher val$separatorMatcher -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lb;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):146:146 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lb;)V"}
     1:1:com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):149:149 -> a
     1:1:java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;)Ljava/util/Iterator;"}
-com.android.tools.r8.com.google.common.base.Splitter$1$1 -> com.android.tools.r8.internal.Ic0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;)Ljava/util/Iterator;"}
+com.android.tools.r8.com.google.common.base.Splitter$1$1 -> com.android.tools.r8.internal.Mc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.Splitter$1 this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$1,com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):149:149 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc0;Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc0;Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;)V"}
     1:1:int separatorEnd(int):157:157 -> a
     1:1:int separatorStart(int):152:152 -> b
     2:5:int com.android.tools.r8.com.google.common.base.CharMatcher.indexIn(java.lang.CharSequence,int):567:570 -> b
     2:5:int separatorStart(int):152 -> b
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.Lc0:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.Pc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.CommonPattern val$separatorPattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OC;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):230:230 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OC;)V"}
     1:1:com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):233:233 -> a
     1:1:java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;)Ljava/util/Iterator;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;)Ljava/util/Iterator;"}
     2:2:com.android.tools.r8.com.google.common.base.CommonMatcher com.android.tools.r8.com.google.common.base.JdkPattern.matcher(java.lang.CharSequence):36:36 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):233 -> a
     2:2:java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):230 -> a
@@ -30404,12 +30404,12 @@
     4:4:java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):230 -> a
     5:5:com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):234:234 -> a
     5:5:java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):230 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3$1 -> com.android.tools.r8.internal.Kc0:
+com.android.tools.r8.com.google.common.base.Splitter$3$1 -> com.android.tools.r8.internal.Oc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.CommonMatcher val$matcher -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NC;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$3,com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence,com.android.tools.r8.com.google.common.base.CommonMatcher):234:234 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;Lcom/android/tools/r8/internal/LC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;Lcom/android/tools/r8/internal/NC;)V"}
     1:1:int separatorEnd(int):242:242 -> a
     2:2:int com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher.end():83:83 -> a
     2:2:int separatorEnd(int):242 -> a
@@ -30430,7 +30430,7 @@
     6:6:int separatorStart(int):237 -> b
 com.android.tools.r8.com.google.common.base.Splitter$5 -> R8$$REMOVED$$CLASS$$25:
 # {"id":"sourceFile","fileName":"Splitter.java"}
-com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator -> com.android.tools.r8.internal.Mc0:
+com.android.tools.r8.com.google.common.base.Splitter$SplittingIterator -> com.android.tools.r8.internal.Qc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     com.android.tools.r8.com.google.common.base.AbstractIterator$State com.android.tools.r8.com.google.common.base.AbstractIterator.state -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
@@ -30439,13 +30439,13 @@
     java.lang.CharSequence toSplit -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     com.android.tools.r8.com.google.common.base.CharMatcher trimmer -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nb;"}
     boolean omitEmptyStrings -> f
     int offset -> g
     int limit -> h
     1:1:void com.android.tools.r8.com.google.common.base.AbstractIterator.<init>():36:36 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):559 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;)V"}
     2:2:void com.android.tools.r8.com.google.common.base.AbstractIterator.<init>():34:34 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):559 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence):556:556 -> <init>
@@ -30479,11 +30479,11 @@
     1:7:java.lang.Object com.android.tools.r8.com.google.common.base.AbstractIterator.next():83:89 -> next
     8:8:java.lang.Object com.android.tools.r8.com.google.common.base.AbstractIterator.next():84:84 -> next
     1:1:void com.android.tools.r8.com.google.common.base.AbstractIterator.remove():95:95 -> remove
-com.android.tools.r8.com.google.common.base.Splitter$Strategy -> com.android.tools.r8.internal.Nc0:
+com.android.tools.r8.com.google.common.base.Splitter$Strategy -> com.android.tools.r8.internal.Rc0:
 # {"id":"sourceFile","fileName":"Splitter.java"}
     java.util.Iterator iterator(com.android.tools.r8.com.google.common.base.Splitter,java.lang.CharSequence) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc0;Ljava/lang/String;)Ljava/util/Iterator;"}
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.Ff0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc0;Ljava/lang/String;)Ljava/util/Iterator;"}
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.Jf0:
 # {"id":"sourceFile","fileName":"Strings.java"}
     1:2:java.lang.String repeat(java.lang.String,int):156:157 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Ljava/lang/String;"}
@@ -30495,40 +30495,40 @@
     15:26:java.lang.String lenientToString(java.lang.Object):311:322 -> a
     15:26:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):276 -> a
     27:57:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):276:306 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Uf0:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Yf0:
 # {"id":"sourceFile","fileName":"Supplier.java"}
 com.android.tools.r8.com.google.common.base.Suppliers -> R8$$REMOVED$$CLASS$$26:
 # {"id":"sourceFile","fileName":"Suppliers.java"}
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Wf0:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.ag0:
 # {"id":"sourceFile","fileName":"Suppliers.java"}
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf0;"}
     boolean initialized -> c
     java.lang.Object value -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Supplier):125:125 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yf0;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):126 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):126:126 -> <init>
     1:12:java.lang.Object get():133:144 -> get
     1:2:java.lang.String toString():149:150 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Xf0:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.bg0:
 # {"id":"sourceFile","fileName":"Suppliers.java"}
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf0;"}
     java.lang.Object value -> c
     com.android.tools.r8.com.google.common.base.Supplier SUCCESSFULLY_COMPUTED -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yf0;"}
     1:1:void <clinit>():160:160 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Supplier):169:169 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yf0;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):170 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.base.Supplier):170:170 -> <init>
     1:1:java.lang.Void lambda$static$0():162:162 -> a
     1:12:java.lang.Object get():178:189 -> get
     1:5:java.lang.String toString():194:198 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$SupplierOfInstance -> com.android.tools.r8.internal.Yf0:
+com.android.tools.r8.com.google.common.base.Suppliers$SupplierOfInstance -> com.android.tools.r8.internal.cg0:
 # {"id":"sourceFile","fileName":"Suppliers.java"}
     java.lang.Object instance -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -30540,7 +30540,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):79:79 -> hashCode
     2:2:int hashCode():316 -> hashCode
     1:1:java.lang.String toString():321:321 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.Pg0:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.Tg0:
 # {"id":"sourceFile","fileName":"Throwables.java"}
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():509:511 -> <clinit>
@@ -30624,7 +30624,7 @@
     1:1:boolean containsKey(java.lang.Object):181:181 -> containsKey
     1:1:java.util.Set createKeySet():931:931 -> d
     1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():1261:1261 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:2:java.util.Spliterator entrySpliterator():1307:1308 -> g
     3:3:int size():176:176 -> g
     3:3:java.util.Spliterator entrySpliterator():1316 -> g
@@ -31056,7 +31056,7 @@
     1:1:int com.android.tools.r8.com.google.common.collect.Count.get():36:36 -> a
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,java.lang.Object,com.android.tools.r8.com.google.common.collect.Count):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Ljava/lang/Object;Lcom/android/tools/r8/internal/ch;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Ljava/lang/Object;Lcom/android/tools/r8/internal/eh;)V"}
     2:2:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,java.lang.Object,com.android.tools.r8.com.google.common.collect.Count):167:167 -> a
     3:10:int add(java.lang.Object,int):269:276 -> a
     11:11:int com.android.tools.r8.com.google.common.collect.Count.get():36:36 -> a
@@ -31217,18 +31217,18 @@
     java.util.Collection entries -> b
     java.util.Set keySet -> c
     com.android.tools.r8.com.google.common.collect.Multiset keys -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KP;"}
     java.util.Map asMap -> e
     1:1:void <init>():43:43 -> <init>
     1:2:java.util.Map asMap():232:233 -> b
     java.util.Map createAsMap() -> c
     java.util.Set createKeySet() -> d
     com.android.tools.r8.com.google.common.collect.Multiset createKeys() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:3:boolean com.android.tools.r8.com.google.common.collect.Multimaps.equalsImpl(com.android.tools.r8.com.google.common.collect.Multimap,java.lang.Object):2243:2245 -> equals
     1:3:boolean equals(java.lang.Object):242 -> equals
     1:2:com.android.tools.r8.com.google.common.collect.Multiset keys():176:177 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:int hashCode():255:255 -> hashCode
     1:2:java.util.Set keySet():166:167 -> keySet
     1:1:java.lang.String toString():266:266 -> toString
@@ -31342,7 +31342,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.Multisets$EntrySet.<init>():1021:1021 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):176 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:void com.android.tools.r8.com.google.common.collect.Multisets$EntrySet.clear():1063:1063 -> clear
     1:11:boolean com.android.tools.r8.com.google.common.collect.Multisets$EntrySet.contains(java.lang.Object):1027:1037 -> contains
     1:1:java.util.Iterator iterator():184:184 -> iterator
@@ -31352,7 +31352,7 @@
 # {"id":"sourceFile","fileName":"AbstractRangeSet.java"}
     1:1:void <init>():28:28 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.RangeSet.asRanges() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zu;"}
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():100:100 -> toString
@@ -31387,35 +31387,35 @@
     4:6:java.util.List com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):79 -> get
 com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> R8$$REMOVED$$CLASS$$27:
 # {"id":"sourceFile","fileName":"ArrayListMultimapGwtSerializationDependencies.java"}
-com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.z5:
+com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.B5:
 # {"id":"sourceFile","fileName":"BaseImmutableMultimap.java"}
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.S5:
 # {"id":"sourceFile","fileName":"BiMap.java"}
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q5;"}
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.C7:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S5;"}
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.E7:
 # {"id":"sourceFile","fileName":"ByFunctionOrdering.java"}
     com.android.tools.r8.com.google.common.base.Function function -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JM;"}
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dV;"}
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.collect.Ordering):39:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FM;Lcom/android/tools/r8/internal/ZU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JM;Lcom/android/tools/r8/internal/dV;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):46:46 -> compare
     1:3:boolean equals(java.lang.Object):54:56 -> equals
     1:1:int hashCode():63:63 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):79:79 -> hashCode
     2:2:int hashCode():63 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.Wd:
 # {"id":"sourceFile","fileName":"CollectCollectors.java"}
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:18:void <clinit>():48:65 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.collect.CollectCollectors$EnumSetAccumulator lambda$toImmutableEnumSetGeneric$1():103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Td;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vd;"}
     1:1:java.util.stream.Collector toImmutableEnumSetGeneric():102:102 -> b
-com.android.tools.r8.com.google.common.collect.CollectCollectors$EnumSetAccumulator -> com.android.tools.r8.internal.Td:
+com.android.tools.r8.com.google.common.collect.CollectCollectors$EnumSetAccumulator -> com.android.tools.r8.internal.Vd:
 # {"id":"sourceFile","fileName":"CollectCollectors.java"}
     java.util.EnumSet set -> a
     java.util.stream.Collector TO_IMMUTABLE_ENUM_SET -> b
@@ -31427,9 +31427,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:4:void add(java.lang.Enum):118:121 -> a
     5:10:com.android.tools.r8.com.google.common.collect.CollectCollectors$EnumSetAccumulator combine(com.android.tools.r8.com.google.common.collect.CollectCollectors$EnumSetAccumulator):126:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)Lcom/android/tools/r8/internal/Td;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vd;)Lcom/android/tools/r8/internal/Vd;"}
     11:12:com.android.tools.r8.com.google.common.collect.ImmutableSet toImmutableSet():137:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableSet toImmutableSet():138 -> a
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableSet toImmutableSet():140:140 -> a
@@ -31444,20 +31444,20 @@
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableEnumSet.asImmutable(java.util.EnumSet):43 -> a
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableSet toImmutableSet():140 -> a
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableSet toImmutableSet():141:141 -> a
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Xd:
 # {"id":"sourceFile","fileName":"CollectPreconditions.java"}
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):33:33 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):31:31 -> a
     3:3:int checkNonnegative(int,java.lang.String):40:40 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.ee:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     1:1:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):129:129 -> a
     1:1:java.util.Spliterator indexed(int,int,java.util.function.IntFunction,java.util.Comparator):56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/function/IntFunction;Ljava/util/Comparator;)Lcom/android/tools/r8/internal/Yd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/function/IntFunction;Ljava/util/Comparator;)Lcom/android/tools/r8/internal/ae;"}
     2:2:java.util.Spliterator indexed(int,int,java.util.function.IntFunction,java.util.Comparator):105:105 -> a
     3:6:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):221:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/function/Function;IJ)Lcom/android/tools/r8/internal/be;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/function/Function;IJ)Lcom/android/tools/r8/internal/de;"}
     7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     7:7:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):227 -> a
     8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
@@ -31469,11 +31469,11 @@
     11:11:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):221 -> a
     12:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     12:12:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Wd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Yd;"}
     13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     13:13:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):117 -> a
     14:14:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):118:118 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Yd:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
@@ -31490,7 +31490,7 @@
     3:3:java.util.Spliterator trySplit():135 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):118:118 -> trySplit
     4:4:java.util.Spliterator trySplit():135 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Zd:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -31507,7 +31507,7 @@
     3:3:java.util.Spliterator trySplit():185 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):208:208 -> trySplit
     4:4:java.util.Spliterator trySplit():185 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.ae:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     java.util.Spliterator$OfInt delegate -> a
     java.util.function.IntFunction val$function -> b
@@ -31522,17 +31522,17 @@
     1:4:java.util.Comparator getComparator():98:101 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):67:67 -> tryAdvance
     1:2:java.util.Spliterator trySplit():78:79 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.ce:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     java.util.Spliterator prefix -> a
     java.util.Spliterator from -> b
     java.util.function.Function function -> c
     com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory factory -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/be;"}
     int characteristics -> e
     long estimatedSize -> f
     1:7:void <init>(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory,int,long):335:341 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/Spliterator;Ljava/util/function/Function;Lcom/android/tools/r8/internal/Zd;IJ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;Ljava/util/Spliterator;Ljava/util/function/Function;Lcom/android/tools/r8/internal/be;IJ)V"}
     1:1:void lambda$tryAdvance$0(java.lang.Object):362:362 -> a
     2:4:void lambda$forEachRemaining$1(java.util.function.Consumer,java.lang.Object):376:378 -> a
     1:1:int characteristics():420:420 -> characteristics
@@ -31540,15 +31540,15 @@
     1:12:void forEachRemaining(java.util.function.Consumer):370:381 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):354:362 -> tryAdvance
     1:17:java.util.Spliterator trySplit():387:403 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.be:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     java.util.Spliterator newFlatMapSpliterator(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long) -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.be:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.de:
 # {"id":"sourceFile","fileName":"CollectSpliterators.java"}
     1:1:void <init>(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long):444:444 -> <init>
 com.android.tools.r8.com.google.common.collect.Collections2 -> R8$$REMOVED$$CLASS$$28:
 # {"id":"sourceFile","fileName":"Collections2.java"}
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.we:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.ye:
 # {"id":"sourceFile","fileName":"ComparatorOrdering.java"}
     java.util.Comparator comparator -> b
     1:1:void <init>(java.util.Comparator):34:34 -> <init>
@@ -31559,37 +31559,37 @@
     1:3:boolean equals(java.lang.Object):48:50 -> equals
     1:1:int hashCode():57:57 -> hashCode
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.com.google.common.collect.ComparisonChain -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.com.google.common.collect.ComparisonChain -> com.android.tools.r8.internal.De:
 # {"id":"sourceFile","fileName":"ComparisonChain.java"}
     com.android.tools.r8.com.google.common.collect.ComparisonChain ACTIVE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ze;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Be;"}
     com.android.tools.r8.com.google.common.collect.ComparisonChain LESS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ae;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ce;"}
     com.android.tools.r8.com.google.common.collect.ComparisonChain GREATER -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ae;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ce;"}
     1:57:void <clinit>():103:159 -> <clinit>
     1:1:void <init>():96:96 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ComparisonChain$1):95 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     com.android.tools.r8.com.google.common.collect.ComparisonChain compare(java.lang.Comparable,java.lang.Comparable) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;Lcom/android/tools/r8/internal/mh;)Lcom/android/tools/r8/internal/Be;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;Lcom/android/tools/r8/internal/oh;)Lcom/android/tools/r8/internal/De;"}
     int result() -> a
-com.android.tools.r8.com.google.common.collect.ComparisonChain$1 -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.com.google.common.collect.ComparisonChain$1 -> com.android.tools.r8.internal.Be:
 # {"id":"sourceFile","fileName":"ComparisonChain.java"}
     1:1:void <init>():104:104 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ComparisonChain compare(java.lang.Comparable,java.lang.Comparable):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;Lcom/android/tools/r8/internal/mh;)Lcom/android/tools/r8/internal/Be;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;Lcom/android/tools/r8/internal/oh;)Lcom/android/tools/r8/internal/De;"}
     2:2:com.android.tools.r8.com.google.common.collect.ComparisonChain classify(int):148:148 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ComparisonChain compare(java.lang.Comparable,java.lang.Comparable):108 -> a
     3:3:int result():153:153 -> a
-com.android.tools.r8.com.google.common.collect.ComparisonChain$InactiveComparisonChain -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.com.google.common.collect.ComparisonChain$InactiveComparisonChain -> com.android.tools.r8.internal.Ce:
 # {"id":"sourceFile","fileName":"ComparisonChain.java"}
     int result -> d
     1:2:void <init>(int):164:165 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ComparisonChain compare(java.lang.Comparable,java.lang.Comparable):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;Lcom/android/tools/r8/internal/mh;)Lcom/android/tools/r8/internal/Be;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;Lcom/android/tools/r8/internal/oh;)Lcom/android/tools/r8/internal/De;"}
     2:2:int result():211:211 -> a
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.zf:
 # {"id":"sourceFile","fileName":"ConcurrentHashMultiset.java"}
     java.util.concurrent.ConcurrentMap countMap -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -31613,7 +31613,7 @@
     35:35:int com.android.tools.r8.internal.ConcurrentHashMultiset.add(java.lang.Object,int):0 -> a
     36:36:int add(java.lang.Object,int):0:0 -> a
     36:36:int com.android.tools.r8.internal.ConcurrentHashMultiset.add(java.lang.Object,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40,"4":41},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40,"4":41},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     37:37:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):55:55 -> a
     37:37:int add(java.lang.Object,int):210 -> a
     37:37:int com.android.tools.r8.internal.ConcurrentHashMultiset.add(java.lang.Object,int):0 -> a
@@ -31642,7 +31642,7 @@
     20:20:int com.android.tools.r8.internal.ConcurrentHashMultiset.remove(int,java.lang.Object):0 -> b
     21:21:int remove(java.lang.Object,int):0:0 -> b
     21:21:int com.android.tools.r8.internal.ConcurrentHashMultiset.remove(int,java.lang.Object):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25,"4":26},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25,"4":26},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     22:22:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):55:55 -> b
     22:22:int remove(java.lang.Object,int):276 -> b
     22:22:int com.android.tools.r8.internal.ConcurrentHashMultiset.remove(int,java.lang.Object):0 -> b
@@ -31679,7 +31679,7 @@
     10:13:java.util.List snapshot():183:186 -> toArray
     10:13:java.lang.Object[] toArray(java.lang.Object[]):174 -> toArray
     14:14:java.lang.Object[] toArray(java.lang.Object[]):174:174 -> toArray
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.vf:
 # {"id":"sourceFile","fileName":"ConcurrentHashMultiset.java"}
     java.util.Set val$delegate -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Set):452:452 -> <init>
@@ -31751,11 +31751,11 @@
     3:3:java.util.Collection delegate():452 -> toArray
     3:3:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):130 -> toArray
     4:4:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):130:130 -> toArray
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.wf:
 # {"id":"sourceFile","fileName":"ConcurrentHashMultiset.java"}
     java.util.Iterator mapEntries -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):507:507 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zf;)V"}
     2:2:java.util.concurrent.ConcurrentMap com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset.access$100(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):61:61 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):509 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):509:509 -> <init>
@@ -31769,16 +31769,16 @@
     7:7:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):248:248 -> a
     7:7:com.android.tools.r8.com.google.common.collect.Multiset$Entry computeNext():521 -> a
     7:7:java.lang.Object computeNext():507 -> a
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.xf:
 # {"id":"sourceFile","fileName":"ConcurrentHashMultiset.java"}
     com.android.tools.r8.com.google.common.collect.Multiset$Entry last -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LP;"}
     java.util.Iterator val$readOnlyIterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wf;"}
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zf;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Iterator):527:527 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xf;Lcom/android/tools/r8/internal/uf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zf;Lcom/android/tools/r8/internal/wf;)V"}
     2:2:void com.android.tools.r8.com.google.common.collect.ForwardingIterator.<init>():45:45 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Iterator):527 -> <init>
     1:1:java.util.Iterator delegate():532:532 -> a
@@ -31798,16 +31798,16 @@
     1:3:void remove():543:545 -> remove
     4:4:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> remove
     4:4:void remove():543 -> remove
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.yf:
 # {"id":"sourceFile","fileName":"ConcurrentHashMultiset.java"}
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zf;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):561:561 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1):561 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zf;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset multiset():564:564 -> a
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():560 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:int com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet.size():189:189 -> toArray
     1:1:java.util.List snapshot():584 -> toArray
     1:1:java.lang.Object[] toArray():574 -> toArray
@@ -31832,19 +31832,19 @@
     9:9:java.util.List snapshot():586:586 -> toArray
     9:9:java.lang.Object[] toArray(java.lang.Object[]):580 -> toArray
     10:10:java.lang.Object[] toArray(java.lang.Object[]):580:580 -> toArray
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.eh:
 # {"id":"sourceFile","fileName":"Count.java"}
     int value -> b
     1:2:void <init>(int):31:32 -> <init>
     1:1:boolean equals(java.lang.Object):64:64 -> equals
     1:1:int hashCode():59:59 -> hashCode
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.com.google.common.collect.Cut -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.com.google.common.collect.Cut -> com.android.tools.r8.internal.oh:
 # {"id":"sourceFile","fileName":"Cut.java"}
     1:1:void <init>(java.lang.Comparable):39:39 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     int compareTo(com.android.tools.r8.com.google.common.collect.Cut) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;)I"}
     void describeAsLowerBound(java.lang.StringBuilder) -> a
     boolean isLessThan(java.lang.Comparable) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
@@ -31852,38 +31852,38 @@
     1:1:int com.android.tools.r8.com.google.common.collect.Cut$AboveAll.compareTo(java.lang.Object):228:228 -> compareTo
     1:5:boolean equals(java.lang.Object):95:99 -> equals
     int hashCode() -> hashCode
-com.android.tools.r8.com.google.common.collect.Cut$AboveAll -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.com.google.common.collect.Cut$AboveAll -> com.android.tools.r8.internal.mh:
 # {"id":"sourceFile","fileName":"Cut.java"}
     com.android.tools.r8.com.google.common.collect.Cut$AboveAll INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mh;"}
     1:1:void <clinit>():229:229 -> <clinit>
     1:1:void <init>():233:233 -> <init>
     1:1:boolean isLessThan(java.lang.Comparable):243:243 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     2:2:void describeAsLowerBound(java.lang.StringBuilder):270:270 -> a
     3:3:int compareTo(com.android.tools.r8.com.google.common.collect.Cut):290:290 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;)I"}
     1:1:void describeAsUpperBound(java.lang.StringBuilder):275:275 -> b
     1:1:int hashCode():295:295 -> hashCode
     1:1:java.lang.String toString():300:300 -> toString
-com.android.tools.r8.com.google.common.collect.Cut$BelowAll -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.com.google.common.collect.Cut$BelowAll -> com.android.tools.r8.internal.nh:
 # {"id":"sourceFile","fileName":"Cut.java"}
     com.android.tools.r8.com.google.common.collect.Cut$BelowAll INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nh;"}
     1:1:void <clinit>():124:124 -> <clinit>
     1:1:void <init>():133:133 -> <init>
     1:1:boolean isLessThan(java.lang.Comparable):143:143 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     2:2:void describeAsLowerBound(java.lang.StringBuilder):170:170 -> a
     3:3:int compareTo(com.android.tools.r8.com.google.common.collect.Cut):199:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;)I"}
     1:1:void describeAsUpperBound(java.lang.StringBuilder):175:175 -> b
     1:1:int hashCode():204:204 -> hashCode
     1:1:java.lang.String toString():209:209 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.Vm:
 # {"id":"sourceFile","fileName":"EmptyImmutableListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vm;"}
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():33:33 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.asMap():531:531 -> b
@@ -31891,12 +31891,12 @@
     1:1:java.util.Map asMap():27 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.asMap():531:531 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap asMap():44 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.Gq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.Iq:
 # {"id":"sourceFile","fileName":"FluentIterable.java"}
     1:1:void <init>():122:122 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concatNoDefensiveCopy(java.lang.Iterable[]):287:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/Fq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/Hq;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     2:2:com.android.tools.r8.com.google.common.collect.FluentIterable concatNoDefensiveCopy(java.lang.Iterable[]):288 -> a
     3:3:com.android.tools.r8.com.google.common.collect.FluentIterable concatNoDefensiveCopy(java.lang.Iterable[]):290:290 -> a
@@ -31905,59 +31905,59 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):288:297 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):249 -> toString
     2:11:java.lang.String toString():338 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Fq:
 # {"id":"sourceFile","fileName":"FluentIterable.java"}
     java.lang.Iterable val$inputs -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jC;"}
     1:1:void <init>(java.lang.Iterable):276:276 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;)V"}
     1:1:java.util.Iterator iterator():279:279 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> iterator
     2:2:java.util.Iterator iterator():279 -> iterator
     3:3:java.util.Iterator iterator():279:279 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):568:568 -> iterator
     4:4:java.util.Iterator iterator():279 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Hq:
 # {"id":"sourceFile","fileName":"FluentIterable.java"}
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):290:290 -> <init>
     1:1:java.util.Iterator iterator():293:293 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):568:568 -> iterator
     2:2:java.util.Iterator iterator():293 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Eq:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Gq:
 # {"id":"sourceFile","fileName":"FluentIterable.java"}
     com.android.tools.r8.com.google.common.collect.FluentIterable$3 this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hq;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$3,int):295:295 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fq;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hq;I)V"}
     2:2:void com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator.<init>(int):52:52 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$3,int):295 -> <init>
     1:1:java.util.Iterator get(int):298:298 -> a
     1:1:java.lang.Object get(int):295 -> a
 com.android.tools.r8.com.google.common.collect.ForwardingIterator -> R8$$REMOVED$$CLASS$$29:
 # {"id":"sourceFile","fileName":"ForwardingIterator.java"}
-com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Pq:
 # {"id":"sourceFile","fileName":"ForwardingObject.java"}
     1:1:void <init>():51:51 -> <init>
     java.lang.Object delegate() -> a
     1:1:java.lang.String toString():64:64 -> toString
 com.android.tools.r8.com.google.common.collect.ForwardingSet -> R8$$REMOVED$$CLASS$$30:
 # {"id":"sourceFile","fileName":"ForwardingSet.java"}
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Gs:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Is:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableKToV -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     int size -> f
     int mask -> g
     int modCount -> h
     com.android.tools.r8.com.google.common.collect.BiMap inverse -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Es;"}
     int $r8$clinit -> j
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(int):136:136 -> <init>
@@ -31974,28 +31974,28 @@
     7:12:void init(int):144:149 -> <init>
     7:12:void <init>(int):137 -> <init>
     1:1:java.lang.Object access$800(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,java.lang.Object,boolean):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;Ljava/lang/Object;Ljava/lang/Object;Z)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;Ljava/lang/Object;Ljava/lang/Object;Z)Ljava/lang/Object;"}
     2:42:java.lang.Object putInverse(java.lang.Object,java.lang.Object,boolean):344:384 -> a
     2:42:java.lang.Object access$800(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,java.lang.Object,boolean):63 -> a
     43:88:void delete(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):157:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)V"}
     89:89:void delete(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):177:177 -> a
     90:90:void delete(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):161:161 -> a
     91:124:void insert(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):206:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;Lcom/android/tools/r8/internal/xs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;Lcom/android/tools/r8/internal/zs;)V"}
     125:128:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByKey(java.lang.Object,int):244:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Lcom/android/tools/r8/internal/zs;"}
     129:129:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByKey(java.lang.Object,int):246:246 -> a
     130:158:java.lang.Object put(java.lang.Object,java.lang.Object,boolean):301:329 -> a
     1:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByValue(java.lang.Object,int):256:259 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Lcom/android/tools/r8/internal/zs;"}
     5:5:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry seekByValue(java.lang.Object,int):258:258 -> b
     1:6:void clear():428:433 -> clear
     1:1:boolean containsKey(java.lang.Object):268:268 -> containsKey
     1:1:boolean containsValue(java.lang.Object):283:283 -> containsValue
     1:1:java.util.Iterator entryIterator():527:527 -> e
     1:2:com.android.tools.r8.com.google.common.collect.BiMap inverse():601:602 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S5;"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):579 -> forEach
     2:5:void forEach(java.util.function.BiConsumer):580:583 -> forEach
@@ -32005,7 +32005,7 @@
     2:2:java.lang.Object get(java.lang.Object):289 -> get
     1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create(int):79:79 -> j
     1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():68 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Is;"}
     1:3:void rehashIfNecessary():388:390 -> k
     4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] createTable(int):408:408 -> k
     4:4:void rehashIfNecessary():392 -> k
@@ -32032,23 +32032,23 @@
     2:2:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.keySet():666:666 -> values
     2:2:java.util.Set values():522 -> values
     2:2:java.util.Collection values():61 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.ys:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):527:527 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)V"}
     1:1:java.util.Map$Entry output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):530:530 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):527 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.vs:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.xs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ws;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ys;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):536:537 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ws;Lcom/android/tools/r8/internal/xs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ys;Lcom/android/tools/r8/internal/zs;)V"}
     1:1:java.lang.Object getKey():543:543 -> getKey
     1:1:java.lang.Object getValue():549:549 -> getValue
     1:6:java.lang.Object setValue(java.lang.Object):555:560 -> setValue
@@ -32064,26 +32064,26 @@
     17:17:int com.android.tools.r8.com.google.common.collect.HashBiMap.access$100(com.android.tools.r8.com.google.common.collect.HashBiMap):63:63 -> setValue
     17:17:java.lang.Object setValue(java.lang.Object):566 -> setValue
     18:22:java.lang.Object setValue(java.lang.Object):566:570 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.zs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     int keyHash -> d
     int valueHash -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKeyInsertionOrder -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):111:113 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Es:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):605:605 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):605 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)V"}
     1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):753:753 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap forward():608:608 -> clear
     1:1:void clear():618 -> clear
@@ -32094,7 +32094,7 @@
     1:1:java.util.Iterator entryIterator():704:704 -> e
     1:1:com.android.tools.r8.com.google.common.collect.BiMap forward():608:608 -> f
     1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():661 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S5;"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):752 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):753:753 -> forEach
@@ -32133,23 +32133,23 @@
     3:3:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.keySet():487:487 -> values
     3:3:java.util.Set values():699 -> values
     3:3:java.util.Collection values():605 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Bs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Es;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):704:704 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Es;)V"}
     1:1:java.util.Map$Entry output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):707:707 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):704 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.ys:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.As:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
-    com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
+    com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bs;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):713:714 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;Lcom/android/tools/r8/internal/xs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bs;Lcom/android/tools/r8/internal/zs;)V"}
     1:1:java.lang.Object getKey():720:720 -> getKey
     1:1:java.lang.Object getValue():726:726 -> getValue
     1:6:java.lang.Object setValue(java.lang.Object):732:737 -> setValue
@@ -32165,12 +32165,12 @@
     17:17:int com.android.tools.r8.com.google.common.collect.HashBiMap.access$100(com.android.tools.r8.com.google.common.collect.HashBiMap):63:63 -> setValue
     17:17:java.lang.Object setValue(java.lang.Object):743 -> setValue
     18:18:java.lang.Object setValue(java.lang.Object):743:743 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Ds:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Es;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):670:671 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Es;)V"}
     1:1:java.util.Iterator iterator():687:687 -> iterator
     1:1:boolean remove(java.lang.Object):676:676 -> remove
     2:2:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry com.android.tools.r8.com.google.common.collect.HashBiMap.access$400(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,int):63:63 -> remove
@@ -32178,24 +32178,24 @@
     3:3:boolean remove(java.lang.Object):680:680 -> remove
     4:4:void com.android.tools.r8.com.google.common.collect.HashBiMap.access$200(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):63:63 -> remove
     4:4:boolean remove(java.lang.Object):680 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.As:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Cs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):687:687 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ds;)V"}
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):691:691 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Ds:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Fs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zs;"}
     int expectedModCount -> d
     int remaining -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):441:441 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)V"}
     2:2:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry com.android.tools.r8.com.google.common.collect.HashBiMap.access$000(com.android.tools.r8.com.google.common.collect.HashBiMap):63:63 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):442 -> <init>
     3:4:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):442:443 -> <init>
@@ -32207,7 +32207,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):445:445 -> <init>
     java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)Ljava/lang/Object;"}
     1:1:boolean hasNext():449:449 -> hasNext
     2:2:int com.android.tools.r8.com.google.common.collect.HashBiMap.access$100(com.android.tools.r8.com.google.common.collect.HashBiMap):63:63 -> hasNext
     2:2:boolean hasNext():449 -> hasNext
@@ -32227,12 +32227,12 @@
     10:11:void remove():478:479 -> remove
     12:12:void remove():475:475 -> remove
     13:13:void remove():472:472 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Hs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):491:492 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)V"}
     1:1:java.util.Iterator iterator():497:497 -> iterator
     1:1:boolean remove(java.lang.Object):508:508 -> remove
     2:2:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry com.android.tools.r8.com.google.common.collect.HashBiMap.access$300(com.android.tools.r8.com.google.common.collect.HashBiMap,java.lang.Object,int):63:63 -> remove
@@ -32241,13 +32241,13 @@
     4:4:void com.android.tools.r8.com.google.common.collect.HashBiMap.access$200(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):63:63 -> remove
     4:4:boolean remove(java.lang.Object):512 -> remove
     5:6:boolean remove(java.lang.Object):513:514 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Es:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Gs:
 # {"id":"sourceFile","fileName":"HashBiMap.java"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):497:497 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hs;)V"}
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):501:501 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xs;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Ks:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zs;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Ms:
 # {"id":"sourceFile","fileName":"HashMultiset.java"}
     int $r8$clinit -> f
       # {"id":"com.android.tools.r8.synthesized"}
@@ -32255,51 +32255,51 @@
     2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):279:279 -> <init>
     2:2:void <init>(int):74 -> <init>
     3:3:void <init>(int):74:74 -> <init>
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Qs:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     1:1:int smear(int):51:51 -> a
     2:2:int smearedHash(java.lang.Object):55:55 -> a
     3:4:int closedTableSize(int,double):63:64 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.hu:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.ju:
 # {"id":"sourceFile","fileName":"ImmutableAsList.java"}
     1:1:void <init>():37:37 -> <init>
     1:1:boolean contains(java.lang.Object):44:44 -> contains
     1:1:boolean isPartialView():59:59 -> e
     1:1:boolean isEmpty():54:54 -> isEmpty
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:int size():49:49 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.lu:
 # {"id":"sourceFile","fileName":"ImmutableBiMap.java"}
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim.<init>():35:35 -> <init>
     1:1:void <init>():574 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap.inverse():33:33 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S5;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createValues():595:595 -> k
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():46 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet values():590:590 -> r
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():46 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet values():590:590 -> values
     1:1:java.util.Collection values():46 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.iu:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.ku:
 # {"id":"sourceFile","fileName":"ImmutableBiMap.java"}
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():423:423 -> <init>
     1:1:void <init>():344 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder put(java.lang.Object,java.lang.Object):357:357 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Au;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder put(java.lang.Object,java.lang.Object):357:357 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder putAll(java.lang.Iterable):397:397 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Au;"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():438:438 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap build():338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.put(java.util.Map$Entry):465:465 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder put(java.util.Map$Entry):370 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.util.Map$Entry):338 -> a
@@ -32312,16 +32312,16 @@
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.putAll(java.util.Map):477:477 -> a
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder putAll(java.util.Map):383 -> a
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.util.Map):338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Au;"}
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder putAll(java.lang.Iterable):397:397 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):338 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.putAll(java.util.Map):477 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder putAll(java.util.Map):383 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.util.Map):338 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap buildOrThrow():338:338 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:20:com.android.tools.r8.com.google.common.collect.ImmutableBiMap buildOrThrow():452:471 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     21:23:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.from(java.util.Comparator):187:189 -> c
     21:23:com.android.tools.r8.com.google.common.collect.ImmutableBiMap buildOrThrow():475 -> c
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableBiMap buildOrThrow():475:475 -> c
@@ -32367,13 +32367,13 @@
     82:82:com.android.tools.r8.com.google.common.collect.ImmutableBiMap buildOrThrow():454:454 -> c
 com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> R8$$REMOVED$$CLASS$$31:
 # {"id":"sourceFile","fileName":"ImmutableBiMapFauxverideShim.java"}
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.lu:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.nu:
 # {"id":"sourceFile","fileName":"ImmutableCollection.java"}
     java.lang.Object[] EMPTY_ARRAY -> b
     1:1:void <clinit>():192:192 -> <clinit>
     1:1:void <init>():181:181 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableList asList():364:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     8:8:java.lang.Object[] toArray():197:197 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList asList():370 -> a
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableList asList():370:370 -> a
@@ -32393,7 +32393,7 @@
     1:1:int internalArrayStart():243:243 -> d
     boolean isPartialView() -> e
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.ImmutableList.iterator():63:63 -> iterator
     1:1:boolean remove(java.lang.Object):282:282 -> remove
     1:1:boolean removeAll(java.util.Collection):310:310 -> removeAll
@@ -32407,16 +32407,16 @@
     9:9:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):62:62 -> toArray
     9:9:java.lang.Object[] toArray(java.lang.Object[]):224 -> toArray
     10:13:java.lang.Object[] toArray(java.lang.Object[]):225:228 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.ku:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.mu:
 # {"id":"sourceFile","fileName":"ImmutableCollection.java"}
     1:1:void <init>():430:430 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/ku;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/mu;"}
     1:1:int expandedCapacity(int,int):421:421 -> a
     2:2:int expandedCapacity(int,int):416:416 -> a
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder addAll(java.lang.Iterable):474:475 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)V"}
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.pu:
 # {"id":"sourceFile","fileName":"ImmutableEntry.java"}
     java.lang.Object key -> b
     java.lang.Object value -> c
@@ -32424,7 +32424,7 @@
     1:1:java.lang.Object getKey():43:43 -> getKey
     1:1:java.lang.Object getValue():49:49 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):55:55 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.qu:
 # {"id":"sourceFile","fileName":"ImmutableEnumMap.java"}
     java.util.EnumMap delegate -> f
     1:3:void <init>(java.util.EnumMap):55:57 -> <init>
@@ -32436,7 +32436,7 @@
     1:1:java.lang.Object get(java.lang.Object):83:83 -> get
     1:1:boolean isPartialView():114:114 -> m
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():62:62 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> n
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> n
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():62 -> n
@@ -32444,7 +32444,7 @@
     3:8:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():62 -> n
     1:1:java.util.Spliterator keySpliterator():67:67 -> p
     1:1:int size():72:72 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.ru:
 # {"id":"sourceFile","fileName":"ImmutableEnumSet.java"}
     java.util.EnumSet delegate -> d
     int hashCode -> e
@@ -32459,7 +32459,7 @@
     1:2:int hashCode():128:129 -> hashCode
     1:1:boolean isEmpty():105:105 -> isEmpty
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():72:72 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):131 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():72 -> iterator
@@ -32477,13 +32477,13 @@
     1:1:int size():87:87 -> size
     1:1:java.util.Spliterator spliterator():77:77 -> spliterator
     1:1:java.lang.String toString():134:134 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.xu:
 # {"id":"sourceFile","fileName":"ImmutableList.java"}
     int $r8$clinit -> c
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>():393:393 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object):109 -> a
@@ -32491,7 +32491,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object):109 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     5:5:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object):118 -> a
@@ -32499,7 +32499,7 @@
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object):118 -> a
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     8:8:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):127 -> a
@@ -32507,7 +32507,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):127 -> a
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     11:11:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):136 -> a
@@ -32515,7 +32515,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):136 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):145:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     14:14:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):145 -> a
@@ -32523,7 +32523,7 @@
     15:15:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     15:15:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):145 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     17:17:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):154 -> a
@@ -32531,7 +32531,7 @@
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):154 -> a
     19:19:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     20:20:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):163 -> a
@@ -32539,7 +32539,7 @@
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):163 -> a
     22:22:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     23:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):182 -> a
@@ -32547,7 +32547,7 @@
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):182 -> a
     25:40:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):209:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     41:41:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[]):216:216 -> a
     41:41:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     41:41:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):225 -> a
@@ -32557,7 +32557,7 @@
     43:43:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.Object):143:143 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):209 -> a
     44:47:com.android.tools.r8.com.google.common.collect.ImmutableList copyOf(java.util.Collection):260:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/xu;"}
     48:48:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ImmutableCollection.toArray():197:197 -> a
     48:48:com.android.tools.r8.com.google.common.collect.ImmutableList copyOf(java.util.Collection):263 -> a
     49:49:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[]):362:362 -> a
@@ -32570,23 +32570,23 @@
     52:52:com.android.tools.r8.com.google.common.collect.ImmutableList construct(java.lang.Object[]):353 -> a
     52:52:com.android.tools.r8.com.google.common.collect.ImmutableList copyOf(java.util.Collection):265 -> a
     53:53:com.android.tools.r8.com.google.common.collect.ImmutableList asList():594:594 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     54:56:int copyIntoArray(java.lang.Object[],int):605:607 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)I"}
     1:1:void add(int,java.lang.Object):541:541 -> add
     1:1:boolean addAll(int,java.util.Collection):514:514 -> addAll
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):388:389 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)Lcom/android/tools/r8/internal/xu;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):379:379 -> b
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):100:100 -> b
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):380 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList of():89:89 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList asImmutableList(java.lang.Object[],int):372 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):100:100 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/jc0;"}
     1:1:boolean contains(java.lang.Object):438:438 -> contains
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):450:452 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList of():89:89 -> e
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):455 -> e
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):457:457 -> e
@@ -32599,23 +32599,23 @@
     19:29:boolean com.android.tools.r8.com.google.common.collect.Lists.equalsImpl(java.util.List,java.lang.Object):1016 -> equals
     19:29:boolean equals(java.lang.Object):685 -> equals
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):468:468 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder():736:736 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uu;"}
     3:3:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> f
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder():736 -> f
     1:4:void forEach(java.util.function.Consumer):419:422 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of():89:89 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y40;"}
     1:3:int hashCode():691:693 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():620:620 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfRandomAccess(java.util.List,java.lang.Object):1048:1057 -> indexOf
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfImpl(java.util.List,java.lang.Object):1035 -> indexOf
     1:10:int indexOf(java.lang.Object):428 -> indexOf
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator():404:404 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():399 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):409:409 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/F;"}
     1:2:int com.android.tools.r8.com.google.common.collect.Lists.lastIndexOfRandomAccess(java.util.List,java.lang.Object):1088:1089 -> lastIndexOf
@@ -32632,14 +32632,14 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):47:47 -> spliterator
     2:2:java.util.Spliterator spliterator():599 -> spliterator
     1:1:java.util.List subList(int,int):63:63 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.tu:
 # {"id":"sourceFile","fileName":"ImmutableList.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):409:409 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;II)V"}
     1:1:java.lang.Object get(int):412:412 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.su:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.uu:
 # {"id":"sourceFile","fileName":"ImmutableList.java"}
     java.lang.Object[] contents -> a
     int size -> b
@@ -32647,36 +32647,36 @@
     1:1:void <init>():787:787 -> <init>
     2:4:void <init>(int):790:792 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):776:776 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/ku;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/mu;"}
     2:7:void getReadyToExpandTo(int):796:801 -> a
     8:18:void add(java.lang.Object[],int):837:847 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)V"}
     19:20:com.android.tools.r8.com.google.common.collect.ImmutableList build():900:901 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):890 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;)Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;)Lcom/android/tools/r8/internal/uu;"}
     22:22:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):891:891 -> a
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):815 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/uu;"}
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):816:817 -> b
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> b
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):860 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/uu;"}
     5:10:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):861:866 -> b
     11:12:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder.addAll(java.lang.Iterable):474:475 -> b
     11:12:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder addAll(java.lang.Iterable):870 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.tu:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.vu:
 # {"id":"sourceFile","fileName":"ImmutableList.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):626:627 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     1:1:int size():674:674 -> e
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):662 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):662:663 -> e
     4:4:int size():674:674 -> e
     4:4:int reversePosition(int):635 -> e
@@ -32691,7 +32691,7 @@
     4:4:java.lang.Object get(int):669 -> get
     5:5:java.lang.Object get(int):669:669 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList reverse():640:640 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:int indexOf(java.lang.Object):650:650 -> indexOf
     2:2:int size():674:674 -> indexOf
     2:2:int reverseIndex(int):631 -> indexOf
@@ -32711,16 +32711,16 @@
     2:2:java.util.ListIterator listIterator(int):623 -> listIterator
     1:1:int size():674:674 -> size
     1:1:java.util.List subList(int,int):623:623 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.wu:
 # {"id":"sourceFile","fileName":"ImmutableList.java"}
     int offset -> d
     int length -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):475:477 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;II)V"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):493:494 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     3:3:boolean isPartialView():499:499 -> e
     1:2:java.lang.Object get(int):487:488 -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.ImmutableList.listIterator(int):409:409 -> iterator
@@ -32734,14 +32734,14 @@
     2:2:java.util.ListIterator listIterator(int):471 -> listIterator
     1:1:int size():482:482 -> size
     1:1:java.util.List subList(int,int):471:471 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.yu:
 # {"id":"sourceFile","fileName":"ImmutableListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.map -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size -> g
     1:3:void com.android.tools.r8.com.google.common.collect.ImmutableMultimap.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):355:357 -> <init>
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):381 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Du;)V"}
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMultimap.entries():118:118 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMultimap.entries():542 -> a
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMultimap.entries():74 -> a
@@ -32762,12 +32762,12 @@
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMultimap.createKeySet():521:521 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultimap.createKeys():647:647 -> e
     1:1:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.ImmutableMultimap.createKeys():74 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keys():642:642 -> f
     1:1:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keys():74 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.asMap():531:531 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):394:395 -> get
     1:2:java.util.List get(java.lang.Object):50 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> get
@@ -32778,20 +32778,20 @@
     1:1:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():505:505 -> size
 com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> R8$$REMOVED$$CLASS$$32:
 # {"id":"sourceFile","fileName":"ImmutableListMultimap.java"}
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Du:
 # {"id":"sourceFile","fileName":"ImmutableMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nu;"}
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> e
     1:1:void <clinit>():728:728 -> <clinit>
     1:1:void <init>():767:767 -> <init>
     1:1:java.lang.IllegalArgumentException conflictException(java.lang.String,java.lang.Object,java.lang.Object):378:378 -> a
     2:10:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):674:682 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Du;"}
     11:13:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):721:723 -> a
     11:13:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):684 -> a
     14:21:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableEnumMap.asImmutable(java.util.EnumMap):42:49 -> a
@@ -32853,7 +32853,7 @@
     1:1:boolean containsKey(java.lang.Object):955:955 -> containsKey
     1:1:boolean containsValue(java.lang.Object):960:960 -> containsValue
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():349:349 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Au;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():423:423 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():349 -> e
     1:1:java.util.Set entrySet():69:69 -> entrySet
@@ -32863,29 +32863,29 @@
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):1001:1001 -> getOrDefault
     1:1:int hashCode():1179:1179 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:boolean isEmpty():950:950 -> isEmpty
     com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:java.util.Set keySet():69:69 -> keySet
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():1018:1019 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     boolean isPartialView() -> m
     1:1:java.lang.Object merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction):879:879 -> merge
     1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():1044:1045 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():1032:1033 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:java.util.Spliterator keySpliterator():1059:1059 -> p
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):781:781 -> put
     1:1:void putAll(java.util.Map):892:892 -> putAll
     1:1:java.lang.Object putIfAbsent(java.lang.Object,java.lang.Object):796:796 -> putIfAbsent
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():121:121 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():1070:1071 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:java.lang.Object remove(java.lang.Object):919:919 -> remove
     2:2:boolean remove(java.lang.Object,java.lang.Object):932:932 -> remove
     1:1:boolean replace(java.lang.Object,java.lang.Object,java.lang.Object):809:809 -> replace
@@ -32899,15 +32899,15 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3980:3989 -> toString
     4:13:java.lang.String toString():1188 -> toString
     1:1:java.util.Collection values():69:69 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.xu:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.zu:
 # {"id":"sourceFile","fileName":"ImmutableMap.java"}
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):1045:1045 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ik0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk0;)V"}
     1:1:boolean hasNext():1048:1048 -> hasNext
     1:1:java.lang.Object next():1053:1053 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Au:
 # {"id":"sourceFile","fileName":"ImmutableMap.java"}
     java.util.Comparator valueComparator -> a
     java.util.Map$Entry[] entries -> b
@@ -32916,7 +32916,7 @@
     1:1:void <init>():423:423 -> <init>
     2:5:void <init>(int):427:430 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):449:449 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Au;"}
     2:5:void ensureCapacity(int):434:437 -> a
     2:5:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.lang.Object,java.lang.Object):449 -> a
     6:8:void ensureCapacity(int):436:438 -> a
@@ -32927,19 +32927,19 @@
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder put(java.util.Map$Entry):465:465 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;)V"}
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.util.Map):477:477 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Au;"}
     13:14:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):490:491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Au;"}
     15:18:void ensureCapacity(int):434:437 -> a
     15:18:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):491 -> a
     19:21:void ensureCapacity(int):436:438 -> a
     19:21:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):491 -> a
     22:23:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder putAll(java.lang.Iterable):493:494 -> a
     24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap build():587:587 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:32:com.android.tools.r8.com.google.common.collect.ImmutableMap build(boolean):533:564 -> b
     1:32:com.android.tools.r8.com.google.common.collect.ImmutableMap buildOrThrow():600 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     33:35:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.from(java.util.Comparator):187:189 -> b
     33:35:com.android.tools.r8.com.google.common.collect.ImmutableMap build(boolean):568 -> b
     33:35:com.android.tools.r8.com.google.common.collect.ImmutableMap buildOrThrow():600 -> b
@@ -32961,26 +32961,26 @@
     61:61:com.android.tools.r8.com.google.common.collect.ImmutableMap buildOrThrow():600 -> b
     62:62:com.android.tools.r8.com.google.common.collect.ImmutableMap build(boolean):535:535 -> b
     62:62:com.android.tools.r8.com.google.common.collect.ImmutableMap buildOrThrow():600 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.Cu:
 # {"id":"sourceFile","fileName":"ImmutableMap.java"}
     1:1:void <init>():730:730 -> <init>
     1:1:java.util.Set entrySet():730:730 -> entrySet
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():758:758 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():742:742 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():763:763 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:java.util.Set keySet():730:730 -> keySet
     1:1:java.util.Collection values():730:730 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Bu:
 # {"id":"sourceFile","fileName":"ImmutableMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cu;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):747:747 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cu;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():755:755 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableEnumMap.entryIterator():99:99 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():755 -> iterator
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -32990,33 +32990,33 @@
     4:4:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableEnumMap.entryIterator():99 -> iterator
     4:4:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():755 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():750:750 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Eu:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Gu:
 # {"id":"sourceFile","fileName":"ImmutableMapEntry.java"}
     1:2:void <init>(java.lang.Object,java.lang.Object):53:54 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():69:69 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gu;"}
     1:1:boolean isReusable():77:77 -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Eu:
 # {"id":"sourceFile","fileName":"ImmutableMapEntry.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gu;"}
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):116:117 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Eu;Lcom/android/tools/r8/internal/Eu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Gu;Lcom/android/tools/r8/internal/Gu;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():123:123 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eu;"}
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Du:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gu;"}
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Fu:
 # {"id":"sourceFile","fileName":"ImmutableMapEntry.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gu;"}
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):91:92 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Eu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Gu;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():98:98 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gu;"}
     1:1:boolean isReusable():103:103 -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Iu:
 # {"id":"sourceFile","fileName":"ImmutableMapEntrySet.java"}
     1:1:void <init>():85:85 -> <init>
     1:4:boolean contains(java.lang.Object):96:99 -> contains
@@ -33026,39 +33026,39 @@
     2:2:boolean isHashCodeFast():112 -> h
     1:1:int hashCode():117:117 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:1:int size():91:91 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Fu:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Hu:
 # {"id":"sourceFile","fileName":"ImmutableMapEntrySet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):48:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/xu;)V"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.asImmutableList(java.lang.Object[]):362:362 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;[Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;[Ljava/util/Map$Entry;)V"}
     5:7:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):48:50 -> <init>
     5:7:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):45 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)I"}
     1:1:void forEach(java.util.function.Consumer):76:76 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66:66 -> iterator
     2:2:java.util.Iterator iterator():40 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():81:81 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():55:55 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:1:java.util.Spliterator spliterator():71:71 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Ju:
 # {"id":"sourceFile","fileName":"ImmutableMapKeySet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)V"}
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):72:72 -> a
     1:1:boolean contains(java.lang.Object):61:61 -> contains
     1:1:boolean isPartialView():77:77 -> e
@@ -33067,19 +33067,19 @@
     2:2:void forEach(java.util.function.Consumer):72:72 -> forEach
     1:1:java.lang.Object get(int):66:66 -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():51:51 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():51:51 -> iterator
     2:2:java.util.Iterator iterator():35 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():56:56 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.Mu:
 # {"id":"sourceFile","fileName":"ImmutableMapValues.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):41:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)V"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():84:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     3:3:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):102:102 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):38:38 -> contains
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):53 -> contains
@@ -33101,42 +33101,42 @@
     1:1:void forEach(java.util.function.Consumer):101 -> forEach
     2:2:void forEach(java.util.function.Consumer):102:102 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():52:52 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():52:52 -> iterator
     2:2:java.util.Iterator iterator():36 -> iterator
     1:1:int size():47:47 -> size
     1:1:java.util.Spliterator spliterator():69:69 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.Ku:
 # {"id":"sourceFile","fileName":"ImmutableMapValues.java"}
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ku;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mu;)V"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMapValues.access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):38:38 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):53 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):53:53 -> <init>
     1:1:boolean hasNext():57:57 -> hasNext
     1:1:java.lang.Object next():62:62 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.Lu:
 # {"id":"sourceFile","fileName":"ImmutableMapValues.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ku;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mu;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):85:85 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ku;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mu;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:java.lang.Object get(int):88:88 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():93:93 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.Lu:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.Nu:
 # {"id":"sourceFile","fileName":"ImmutableMultimap.java"}
     java.util.Iterator asMapItr -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk0;"}
     java.lang.Object currentKey -> c
     java.util.Iterator valueItr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk0;"}
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):586:589 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;)V"}
     5:5:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():92:92 -> <init>
     5:5:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyIterator():81 -> <init>
     5:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):590 -> <init>
@@ -33149,12 +33149,12 @@
     11:11:java.lang.Object next():586 -> next
 com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> R8$$REMOVED$$CLASS$$33:
 # {"id":"sourceFile","fileName":"ImmutableMultimap.java"}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.Ou:
 # {"id":"sourceFile","fileName":"ImmutableMultimap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):553:554 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;)V"}
     1:3:boolean contains(java.lang.Object):574:576 -> contains
     4:4:boolean com.android.tools.r8.com.google.common.collect.AbstractMultimap.containsEntry(java.lang.Object,java.lang.Object):63:63 -> contains
     4:4:boolean contains(java.lang.Object):576 -> contains
@@ -33168,19 +33168,19 @@
     3:3:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():488:488 -> e
     3:3:boolean isPartialView():564 -> e
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():559:559 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMultimap.entryIterator():586:586 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():559 -> iterator
     1:1:int size():569:569 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():505:505 -> size
     2:2:int size():569 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Nu:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Pu:
 # {"id":"sourceFile","fileName":"ImmutableMultimap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):652:652 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;)V"}
     1:2:int count(java.lang.Object):660:661 -> b
     1:1:boolean contains(java.lang.Object):655:655 -> contains
     2:2:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.containsKey(java.lang.Object):495:495 -> contains
@@ -33190,33 +33190,33 @@
     3:3:boolean contains(java.lang.Object):655 -> contains
     1:1:boolean isPartialView():682:682 -> e
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():666:666 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():516:516 -> f
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():666 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():516:516 -> f
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():666 -> f
     1:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):676:677 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/LP;"}
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):248:248 -> j
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):677 -> j
     1:1:int size():671:671 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():505:505 -> size
     2:2:int size():671 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Uu:
 # {"id":"sourceFile","fileName":"ImmutableMultiset.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zu;"}
     int $r8$clinit -> e
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies.<init>():41:41 -> <init>
     1:1:void <init>():229 -> <init>
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():650:650 -> C
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():264:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     3:3:int add(java.lang.Object,int):284:284 -> a
     4:4:boolean setCount(java.lang.Object,int,int):326:326 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Z"}
@@ -33226,9 +33226,9 @@
     1:1:java.util.Set entrySet():59:59 -> entrySet
     1:1:boolean equals(java.lang.Object):341:341 -> equals
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():362:362 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():367:367 -> h
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():363 -> h
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> h
@@ -33239,33 +33239,33 @@
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():363:363 -> h
     1:1:int hashCode():346:346 -> hashCode
     1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():233:234 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     3:4:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():233:234 -> iterator
     3:4:java.util.Iterator iterator():59 -> iterator
     com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/LP;"}
     1:1:java.lang.String toString():351:351 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Qu:
 # {"id":"sourceFile","fileName":"ImmutableMultiset.java"}
     int remaining -> b
     java.lang.Object element -> c
     java.util.Iterator val$entryIterator -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):234:234 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ik0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk0;)V"}
     1:1:boolean hasNext():240:240 -> hasNext
     1:11:java.lang.Object next():245:255 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Ru:
 # {"id":"sourceFile","fileName":"ImmutableMultiset.java"}
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SJ;"}
     1:1:com.android.tools.r8.com.google.common.collect.LinkedHashMultiset com.android.tools.r8.com.google.common.collect.LinkedHashMultiset.create():49:49 -> <init>
     1:1:void <init>():485 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):488:489 -> <init>
     2:3:void <init>():485 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):502:502 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):477 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/ku;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/mu;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):502 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):477 -> a
@@ -33278,28 +33278,28 @@
     5:5:void lambda$addAll$0(java.lang.Object,int):565 -> a
     6:6:void lambda$addAll$0(java.lang.Object,int):565:565 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder addAll(java.lang.Iterable):563:563 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/Pu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/Ru;"}
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.Multisets.cast(java.lang.Iterable):1153:1153 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder addAll(java.lang.Iterable):564 -> b
     3:5:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder addAll(java.lang.Iterable):565:567 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Su:
 # {"id":"sourceFile","fileName":"ImmutableMultiset.java"}
     java.util.List entries -> e
     com.android.tools.r8.com.google.common.collect.Multiset delegate -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
     1:3:void <init>(java.util.List,com.android.tools.r8.com.google.common.collect.Multiset):609:611 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Uu;)V"}
     1:1:boolean contains(java.lang.Object):621:621 -> contains
     1:1:boolean isPartialView():626:626 -> e
     1:1:java.lang.Object get(int):616:616 -> get
     1:1:int size():631:631 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Tu:
 # {"id":"sourceFile","fileName":"ImmutableMultiset.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uu;)V"}
     1:7:boolean contains(java.lang.Object):391:397 -> contains
     1:1:boolean isPartialView():376:376 -> e
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry get(int):381:381 -> get
@@ -33308,14 +33308,14 @@
     1:1:int size():386:386 -> size
 com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> R8$$REMOVED$$CLASS$$34:
 # {"id":"sourceFile","fileName":"ImmutableMultisetGwtSerializationDependencies.java"}
-com.android.tools.r8.com.google.common.collect.ImmutableRangeSet -> com.android.tools.r8.internal.Uu:
+com.android.tools.r8.com.google.common.collect.ImmutableRangeSet -> com.android.tools.r8.internal.Wu:
 # {"id":"sourceFile","fileName":"ImmutableRangeSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList ranges -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableRangeSet EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableRangeSet ALL -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
     1:2:void <clinit>():56:57 -> <clinit>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     3:3:void <clinit>():57 -> <clinit>
@@ -33326,10 +33326,10 @@
     8:8:void <clinit>():60 -> <clinit>
     9:9:void <clinit>():60:60 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):147:148 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet asRanges():302:303 -> a
     1:2:java.util.Set asRanges():51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zu;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet asRanges():303 -> a
     3:3:java.util.Set asRanges():51 -> a
@@ -33341,8 +33341,8 @@
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet asRanges():305:305 -> a
     6:6:java.util.Set asRanges():51 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder builder():731:731 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tu;"}
-com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder -> com.android.tools.r8.internal.Tu:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vu;"}
+com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder -> com.android.tools.r8.internal.Vu:
 # {"id":"sourceFile","fileName":"ImmutableRangeSet.java"}
     java.util.List ranges -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -33353,16 +33353,16 @@
     1:1:boolean com.android.tools.r8.com.google.common.collect.Range.isEmpty():429:429 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder add(com.android.tools.r8.com.google.common.collect.Range):756 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o10;)Lcom/android/tools/r8/internal/Tu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s10;)Lcom/android/tools/r8/internal/Vu;"}
     2:2:boolean com.android.tools.r8.com.google.common.collect.Range.isEmpty():429:429 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder add(com.android.tools.r8.com.google.common.collect.Range):756 -> a
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder add(com.android.tools.r8.com.google.common.collect.Range):756:757 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder):788:788 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tu;)Lcom/android/tools/r8/internal/Tu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vu;)Lcom/android/tools/r8/internal/Vu;"}
     6:7:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder addAll(java.lang.Iterable):780:781 -> a
     6:7:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableRangeSet$Builder):788 -> a
     8:9:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet build():798:799 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Uu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wu;"}
     10:10:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>(int):791:791 -> a
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet build():799 -> a
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet build():800:800 -> a
@@ -33418,19 +33418,19 @@
     79:79:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet com.android.tools.r8.com.google.common.collect.ImmutableRangeSet.all():102:102 -> a
     79:79:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet build():824 -> a
     80:80:com.android.tools.r8.com.google.common.collect.ImmutableRangeSet build():826:826 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.gv:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     int $r8$clinit -> c
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>():309:309 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/gv;"}
     2:13:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):141:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/gv;"}
     14:14:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.Object):143:143 -> a
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[]):141 -> a
     15:18:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,int,java.lang.Object[]):203:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;)Lcom/android/tools/r8/internal/gv;"}
     19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     19:19:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,int,java.lang.Object[]):206 -> a
     20:22:com.android.tools.r8.com.google.common.collect.ImmutableSet construct(int,int,java.lang.Object[]):207:209 -> a
@@ -33442,7 +33442,7 @@
     26:33:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):231:238 -> a
     26:33:com.android.tools.r8.internal.ImmutableSet com.android.tools.r8.internal.ImmutableSet.copyOf(java.util.Collection):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/gv;"}
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOfEnumSet(java.util.EnumSet):306:306 -> a
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):238 -> a
     34:34:com.android.tools.r8.internal.ImmutableSet com.android.tools.r8.internal.ImmutableSet.copyOf(java.util.Collection):0 -> a
@@ -33496,7 +33496,7 @@
     83:83:com.android.tools.r8.internal.ImmutableSet com.android.tools.r8.internal.ImmutableSet.copyOf(java.util.Collection):0 -> a
     84:84:com.android.tools.r8.com.google.common.collect.ImmutableSet copyOf(java.util.Collection):0:0 -> a
     84:84:com.android.tools.r8.internal.ImmutableSet com.android.tools.r8.internal.ImmutableSet.copyOf(java.util.Collection):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":86,"2":87,"3":88,"4":89,"5":90},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":86,"2":87,"3":88,"4":89,"5":90},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     85:85:int com.android.tools.r8.com.google.common.math.MathPreconditions.checkNonNegative(java.lang.String,int):57:57 -> a
     85:85:int com.android.tools.r8.com.google.common.math.IntMath.sqrt(int,java.math.RoundingMode):271 -> a
     85:85:com.android.tools.r8.com.google.common.collect.ImmutableSet constructUnknownDuplication(int,java.lang.Object[]):176 -> a
@@ -33526,35 +33526,35 @@
     5:9:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1779:1783 -> equals
     5:9:boolean equals(java.lang.Object):327 -> equals
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder():440:440 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yu;"}
     1:1:boolean isHashCodeFast():0:0 -> h
     1:1:int hashCode():332:332 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):118:118 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():82:82 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F40;"}
     2:14:int chooseTableSize(int):703:715 -> j
     15:15:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.Object):143:143 -> j
     15:15:int chooseTableSize(int):715 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Xu:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.internal.ImmutableSet$$ExternalSyntheticOutline0.m(int,java.lang.String,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Yu:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl impl -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fv;"}
     boolean forceCopy -> b
     1:5:void <init>(int):491:495 -> <init>
     1:5:void <init>():488 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):478:478 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/ku;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/mu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):549:549 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Yu;"}
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):562:563 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wu;)Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yu;)Lcom/android/tools/r8/internal/Yu;"}
     5:5:void copyIfNecessary():510:510 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):572 -> a
     6:7:void copy():517:518 -> a
@@ -33567,9 +33567,9 @@
     10:15:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):573 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):573:573 -> a
     17:20:com.android.tools.r8.com.google.common.collect.ImmutableSet build():579:582 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):524:524 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Yu;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):525 -> b
     3:3:void copyIfNecessary():510:510 -> b
@@ -33580,33 +33580,33 @@
     6:6:void copyIfNecessary():512:512 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):526 -> b
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):527:527 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$CachingAsList -> com.android.tools.r8.internal.Xu:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$CachingAsList -> com.android.tools.r8.internal.Zu:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <init>():341:341 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList asList():346:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():355:355 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ImmutableCollection.toArray():197:197 -> k
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():355 -> k
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():355:355 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableSet$EmptySetBuilderImpl -> com.android.tools.r8.internal.Yu:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$EmptySetBuilderImpl -> com.android.tools.r8.internal.av:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$EmptySetBuilderImpl INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/av;"}
     1:1:void <clinit>():660:660 -> <clinit>
     1:1:void <init>():668:668 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):673:673 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet build():683:683 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet build():683 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():678:678 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.av:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.cv:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     1:1:void <init>():359:359 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):383:383 -> a
@@ -33621,23 +33621,23 @@
     5:5:void forEach(java.util.function.Consumer):377:377 -> forEach
     java.lang.Object get(int) -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():364:364 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():364:364 -> iterator
     2:2:java.util.Iterator iterator():359 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():388:388 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:java.util.Spliterator spliterator():369:369 -> spliterator
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet.size():631:631 -> spliterator
     2:2:java.util.Spliterator spliterator():369 -> spliterator
     3:3:java.util.Spliterator spliterator():369:369 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):47:47 -> spliterator
     4:4:java.util.Spliterator spliterator():369 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.bv:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/av;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cv;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):388:388 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/av;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cv;)V"}
     1:1:java.lang.Object get(int):391:391 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet.get(int):616:616 -> get
     2:2:java.lang.Object get(int):391 -> get
@@ -33646,22 +33646,22 @@
     3:3:java.lang.Object get(int):391 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed delegateCollection():396:396 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():388 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
-com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.bv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
+com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.dv:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     java.util.Set delegate -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):950:951 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fv;)V"}
     3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):261:261 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):951 -> <init>
     4:10:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):951:957 -> <init>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):963 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fv;"}
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):964:965 -> a
     4:15:com.android.tools.r8.com.google.common.collect.ImmutableSet build():977:988 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet build():985:985 -> a
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> a
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableSet build():985 -> a
@@ -33669,8 +33669,8 @@
     19:19:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     19:19:com.android.tools.r8.com.google.common.collect.ImmutableSet build():979 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():972:972 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
-com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.cv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
+com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.ev:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     java.lang.Object[] hashTable -> c
     int maxRunBeforeFallback -> d
@@ -33678,9 +33678,9 @@
     int hashCode -> f
     1:4:void <init>(int):735:738 -> <init>
     5:9:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl):742:746 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;)V"}
     1:21:com.android.tools.r8.com.google.common.collect.ImmutableSet build():809:829 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     22:22:com.android.tools.r8.com.google.common.collect.ImmutableSet build():817:817 -> a
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> a
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableSet build():817 -> a
@@ -33696,14 +33696,14 @@
     44:45:void ensureTableCapacity(int):863:864 -> a
     46:46:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     46:46:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):751 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fv;"}
     47:58:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):752:763 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():790:790 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
     1:19:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl insertInHashTable(java.lang.Object):767:785 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fv;"}
     20:25:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():795:800 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
     26:35:java.lang.Object[] rebuildHashTable(int,java.lang.Object[],int):835:844 -> c
     26:35:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():800 -> c
     36:36:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():800:800 -> c
@@ -33718,29 +33718,29 @@
     44:68:boolean hashFloodingDetected(java.lang.Object[]):897:921 -> c
     44:68:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():804 -> c
     69:69:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():804:804 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.fv:
 # {"id":"sourceFile","fileName":"ImmutableSet.java"}
     java.lang.Object[] dedupedElements -> a
     int distinct -> b
     1:3:void <init>(int):594:596 -> <init>
     4:6:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):600:602 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fv;)V"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/fv;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet build() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
     1:1:void addDedupedElement(java.lang.Object):619:619 -> b
     2:5:void ensureCapacity(int):610:613 -> b
     2:5:void addDedupedElement(java.lang.Object):619 -> b
     6:6:void addDedupedElement(java.lang.Object):620:620 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():653:653 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dv;"}
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.fv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fv;"}
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.hv:
 # {"id":"sourceFile","fileName":"ImmutableSortedAsList.java"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):35:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C40;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G40;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.delegateCollection():49:49 -> comparator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():40 -> comparator
     1:1:java.util.Comparator comparator():45 -> comparator
@@ -33752,7 +33752,7 @@
     1:1:boolean contains(java.lang.Object):73:73 -> contains
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):468:468 -> f
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):84 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):85:85 -> f
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.delegateCollection():49:49 -> f
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():40 -> f
@@ -33775,7 +33775,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.delegateCollection():49:49 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():40 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():29 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():40:40 -> j
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():29 -> j
     1:1:int lastIndexOf(java.lang.Object):67:67 -> lastIndexOf
@@ -33803,18 +33803,18 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:java.util.Spliterator spliterator():94 -> spliterator
     9:9:java.util.Spliterator spliterator():90:90 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.internal.iv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.internal.kv:
 # {"id":"sourceFile","fileName":"ImmutableSortedMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet keySet -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G40;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList valueList -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap descendingMap -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     java.util.Comparator NATURAL_ORDER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bQ;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap NATURAL_EMPTY_MAP -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     1:1:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.natural():165:165 -> <clinit>
     1:1:void <clinit>():114 -> <clinit>
     2:6:void <clinit>():114:118 -> <clinit>
@@ -33823,13 +33823,13 @@
     8:8:void <clinit>():118:118 -> <clinit>
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):772:775 -> <init>
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):766 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C40;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G40;Lcom/android/tools/r8/internal/xu;)V"}
     5:8:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):772:775 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C40;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/iv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G40;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/kv;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet access$200(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iv;)Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kv;)Lcom/android/tools/r8/internal/G40;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap copyOf(java.util.Map):377:377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/internal/kv;"}
     3:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap copyOfInternal(java.util.Map,java.util.Comparator):464:480 -> a
     3:19:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap copyOf(java.util.Map):378 -> a
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.lang.Iterable):500:500 -> a
@@ -33861,7 +33861,7 @@
     27:28:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap copyOfInternal(java.util.Map,java.util.Comparator):480 -> a
     27:28:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap copyOf(java.util.Map):378 -> a
     29:71:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):517:559 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XP;Z[Ljava/util/Map$Entry;I)Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bQ;Z[Ljava/util/Map$Entry;I)Lcom/android/tools/r8/internal/kv;"}
     72:72:void com.android.tools.r8.com.google.common.collect.ImmutableMap.checkNoConflict(boolean,java.lang.String,java.lang.Object,java.lang.Object):372:372 -> a
     72:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):559 -> a
     73:73:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):563:563 -> a
@@ -33898,13 +33898,13 @@
     88:88:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap fromEntries(java.util.Comparator,boolean,java.util.Map$Entry[],int):511 -> a
     89:91:int lambda$fromEntries$0(java.util.Comparator,java.util.Map$Entry,java.util.Map$Entry):540:542 -> a
     92:92:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap headMap(java.lang.Object,boolean):941:941 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/kv;"}
     93:93:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     93:93:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap headMap(java.lang.Object,boolean):941 -> a
     94:94:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap headMap(java.lang.Object,boolean):941:941 -> a
     1:1:int size():780:780 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap getSubMap(int,int):904 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/kv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap getSubMap(int,int):907:907 -> b
     3:3:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.natural():165:165 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap emptyMap(java.util.Comparator):121 -> b
@@ -33923,7 +33923,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap getSubMap(int,int):907 -> b
     10:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap getSubMap(int,int):909:910 -> b
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap tailMap(java.lang.Object,boolean):1012:1012 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/kv;"}
     13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> b
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap tailMap(java.lang.Object,boolean):1012 -> b
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap tailMap(java.lang.Object,boolean):1012:1012 -> b
@@ -33997,14 +33997,14 @@
     1:1:java.lang.Object higherKey(java.lang.Object):1060 -> higherKey
     2:2:java.lang.Object higherKey(java.lang.Object):1060:1060 -> higherKey
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():855:855 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> i
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():855 -> i
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():855:855 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():866:866 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():880:880 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet keySet():861:861 -> keySet
     1:1:java.util.Set keySet():65 -> keySet
     1:1:java.util.Map$Entry lastEntry():1072:1072 -> lastEntry
@@ -34032,11 +34032,11 @@
     1:1:java.util.NavigableSet navigableKeySet():65 -> navigableKeySet
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet keySet():861:861 -> o
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():65 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:java.util.Map$Entry pollFirstEntry():1087:1087 -> pollFirstEntry
     1:1:java.util.Map$Entry pollLastEntry():1102:1102 -> pollLastEntry
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():875:875 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:int size():780:780 -> size
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> subMap
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap subMap(java.lang.Object,boolean,java.lang.Object,boolean):975 -> subMap
@@ -34081,31 +34081,31 @@
     2:2:java.util.SortedMap tailMap(java.lang.Object):65 -> tailMap
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():875:875 -> values
     1:1:java.util.Collection values():65 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.internal.jv:
 # {"id":"sourceFile","fileName":"ImmutableSortedMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):812:812 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kv;)V"}
     1:1:void forEach(java.util.function.Consumer):825:825 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():815:815 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():815:815 -> iterator
     2:2:java.util.Iterator iterator():812 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():830:830 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():852:852 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     1:1:java.util.Spliterator spliterator():820:820 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.internal.iv:
 # {"id":"sourceFile","fileName":"ImmutableSortedMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jv;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet):830:830 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jv;)V"}
     1:1:java.lang.Object get(int):830:830 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():845:845 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:2:java.util.Map$Entry get(int):833:834 -> k
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableSortedMap.access$300(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):67:67 -> k
     3:3:java.util.Map$Entry get(int):834 -> k
@@ -34123,20 +34123,20 @@
     4:4:java.util.Spliterator spliterator():840:840 -> spliterator
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):47:47 -> spliterator
     5:5:java.util.Spliterator spliterator():839 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.internal.lv:
 # {"id":"sourceFile","fileName":"ImmutableSortedMapFauxverideShim.java"}
     1:1:void <init>():35:35 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.mv:
 # {"id":"sourceFile","fileName":"ImmutableSortedSet.java"}
     java.util.Comparator comparator -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mv;"}
     int $r8$clinit -> g
       # {"id":"com.android.tools.r8.synthesized"}
     1:2:void <init>(java.util.Comparator):596:597 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.natural():165:165 -> a
     1:1:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Comparator;)Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Comparator;)Lcom/android/tools/r8/internal/G40;"}
     2:5:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):87:90 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> a
     6:6:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):90 -> a
@@ -34164,7 +34164,7 @@
     6:6:java.util.SortedSet headSet(java.lang.Object):64 -> headSet
     int indexOf(java.lang.Object) -> indexOf
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet():778:780 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mv;"}
     4:7:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet.createDescendingSet():327:330 -> m
     4:7:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet():780 -> m
     8:9:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet():780:781 -> m
@@ -34280,10 +34280,10 @@
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):680 -> tailSet
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object):674 -> tailSet
     10:10:java.util.SortedSet tailSet(java.lang.Object):64 -> tailSet
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.lv:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.nv:
 # {"id":"sourceFile","fileName":"ImmutableSortedSetFauxverideShim.java"}
     1:1:void <init>():42:42 -> <init>
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.Bv:
 # {"id":"sourceFile","fileName":"IndexedImmutableSet.java"}
     1:1:void <init>():29:29 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):54:54 -> a
@@ -34293,28 +34293,28 @@
     2:4:void forEach(java.util.function.Consumer):45:47 -> forEach
     java.lang.Object get(int) -> get
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():34:34 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():59:59 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:java.util.Spliterator spliterator():39:39 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):47:47 -> spliterator
     2:2:java.util.Spliterator spliterator():39 -> spliterator
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.yv:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Av:
 # {"id":"sourceFile","fileName":"IndexedImmutableSet.java"}
     com.android.tools.r8.com.google.common.collect.IndexedImmutableSet this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bv;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.IndexedImmutableSet):59:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bv;)V"}
     1:1:boolean isPartialView():67:67 -> e
     1:1:java.lang.Object get(int):62:62 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():77:77 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:int size():72:72 -> size
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.mC:
 # {"id":"sourceFile","fileName":"Iterables.java"}
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
     1:1:java.lang.Iterable concat(java.lang.Iterable,java.lang.Iterable):432 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;)Lcom/android/tools/r8/internal/Fq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;)Lcom/android/tools/r8/internal/Hq;"}
     2:2:java.lang.Object getOnlyElement(java.lang.Iterable):263:263 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Ljava/lang/Object;"}
     3:17:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):309:323 -> a
@@ -34325,14 +34325,14 @@
     21:21:boolean addAll(java.util.Collection,java.lang.Iterable):333 -> a
     22:22:boolean addAll(java.util.Collection,java.lang.Iterable):333:333 -> a
     23:23:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):641:641 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/iX;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/mX;)Z"}
     24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     24:24:boolean com.android.tools.r8.com.google.common.collect.Iterators.all(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):707 -> a
     24:24:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):641 -> a
     25:27:boolean com.android.tools.r8.com.google.common.collect.Iterators.all(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):708:710 -> a
     25:27:boolean all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):641 -> a
     28:28:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):689:689 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iX;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/mX;)Ljava/lang/Object;"}
     29:29:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     29:29:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):754 -> a
     29:29:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):689 -> a
@@ -34343,11 +34343,11 @@
     31:33:java.lang.Object find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):689 -> a
     34:34:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     34:34:java.lang.Iterable skip(java.lang.Iterable,int):905 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/jC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/lC;"}
     35:35:java.lang.Iterable skip(java.lang.Iterable,int):908:908 -> a
     36:36:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     36:36:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):737 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/sr;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/ur;)Lcom/android/tools/r8/internal/jC;"}
     37:37:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     37:37:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):738 -> a
     38:38:java.lang.Iterable transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):739:739 -> a
@@ -34356,7 +34356,7 @@
     4:8:int com.android.tools.r8.com.google.common.collect.Iterators.size(java.util.Iterator):169:173 -> b
     4:8:int size(java.lang.Iterable):130 -> b
     9:9:boolean any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):630:630 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/iX;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/mX;)Z"}
     10:13:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):804:807 -> b
     10:13:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):698 -> b
     10:13:boolean any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):630 -> b
@@ -34366,19 +34366,19 @@
     14:14:boolean any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):630 -> b
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> c
     1:1:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/iX;)Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/mX;)Lcom/android/tools/r8/internal/iC;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> c
     2:2:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):576 -> c
     3:3:java.lang.Iterable filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):577:577 -> c
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.iC:
 # {"id":"sourceFile","fileName":"Iterables.java"}
     java.lang.Iterable val$unfiltered -> b
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mX;"}
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):577:577 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/iX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/mX;)V"}
     1:2:void lambda$forEach$0(com.android.tools.r8.com.google.common.base.Predicate,java.util.function.Consumer,java.lang.Object):588:589 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iX;Ljava/util/function/Consumer;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mX;Ljava/util/function/Consumer;Ljava/lang/Object;)V"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.Consumer):585 -> forEach
     2:2:void forEach(java.util.function.Consumer):586:586 -> forEach
@@ -34400,21 +34400,21 @@
     3:3:java.util.Spliterator spliterator():596 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):208:208 -> spliterator
     4:4:java.util.Spliterator spliterator():596 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.jC:
 # {"id":"sourceFile","fileName":"Iterables.java"}
     java.lang.Iterable val$fromIterable -> b
     com.android.tools.r8.com.google.common.base.Function val$function -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ur;"}
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):739:739 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/sr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/ur;)V"}
     1:1:void lambda$forEach$0(java.util.function.Consumer,com.android.tools.r8.com.google.common.base.Function,java.lang.Object):748:748 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/sr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/ur;Ljava/lang/Object;)V"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.Consumer):747 -> forEach
     2:2:void forEach(java.util.function.Consumer):748:748 -> forEach
     1:1:java.util.Iterator iterator():742:742 -> iterator
     1:1:java.util.Spliterator spliterator():753:753 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.jC:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.lC:
 # {"id":"sourceFile","fileName":"Iterables.java"}
     java.lang.Iterable val$iterable -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/List;"}
@@ -34428,7 +34428,7 @@
     8:9:java.util.Iterator iterator():918 -> iterator
     10:10:java.util.Iterator iterator():925:925 -> iterator
     1:6:java.util.Spliterator spliterator():951:956 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.kC:
 # {"id":"sourceFile","fileName":"Iterables.java"}
     boolean atStart -> b
     java.util.Iterator val$iterator -> c
@@ -34443,7 +34443,7 @@
     4:4:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> remove
     4:4:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):64 -> remove
     4:4:void remove():943 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.AC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     1:1:boolean addAll(java.util.Collection,java.util.Iterator):363 -> a
@@ -34452,26 +34452,26 @@
     3:4:boolean addAll(java.util.Collection,java.util.Iterator):366:367 -> a
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     5:5:java.util.Iterator cycle(java.lang.Iterable):401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/oC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/qC;"}
     6:6:java.util.Iterator cycle(java.lang.Iterable):402:402 -> a
     7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     7:7:java.util.Iterator transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):824 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/sr;)Lcom/android/tools/r8/internal/rC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/ur;)Lcom/android/tools/r8/internal/tC;"}
     8:8:java.util.Iterator transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):825:825 -> a
     9:10:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1075:1076 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;)Lcom/android/tools/r8/internal/uC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;)Lcom/android/tools/r8/internal/wC;"}
     11:11:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator emptyListIterator():92:92 -> a
     11:11:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1078 -> a
     12:12:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1080:1080 -> a
     13:13:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):129:129 -> a
     13:13:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator forArray(java.lang.Object[],int,int,int):1071 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.nC:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.pC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.util.Iterator val$iterator -> b
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():146:146 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.oC:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.qC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
@@ -34481,7 +34481,7 @@
     1:1:boolean hasNext():416:416 -> hasNext
     1:7:java.lang.Object next():422:428 -> next
     1:1:void remove():433:433 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.rC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     int index -> b
     java.util.Iterator[] val$elements -> c
@@ -34491,31 +34491,31 @@
     1:10:java.lang.Object next():466 -> next
     11:11:java.util.Iterator next():477:477 -> next
     11:11:java.lang.Object next():466 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.sC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.util.Iterator val$unfiltered -> d
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mX;"}
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):667:667 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/iX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/mX;)V"}
     1:3:java.lang.Object computeNext():671:673 -> a
     4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractIterator.endOfData():126:126 -> a
     4:4:java.lang.Object computeNext():677 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.tC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     com.android.tools.r8.com.google.common.base.Function val$function -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ur;"}
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):825:825 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/sr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/ur;)V"}
     1:1:java.lang.Object transform(java.lang.Object):829:829 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.sC:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.uC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     int count -> b
     int val$limitSize -> c
     java.util.Iterator val$iterator -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qC;"}
     1:1:void <init>(int,java.util.Iterator):961:961 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/oC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/qC;)V"}
     1:1:boolean hasNext():966:966 -> hasNext
     1:5:java.lang.Object next():972:976 -> next
     6:6:java.lang.Object next():973:973 -> next
@@ -34525,7 +34525,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.com.google.common.collect.Iterators$2.remove():433:433 -> remove
     3:3:void remove():981 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.tC:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.vC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     boolean done -> b
     java.lang.Object val$value -> c
@@ -34533,16 +34533,16 @@
     1:1:boolean hasNext():1115:1115 -> hasNext
     1:5:java.lang.Object next():1121:1125 -> next
     6:6:java.lang.Object next():1122:1122 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.wC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wC;"}
     1:1:void <clinit>():1085:1085 -> <clinit>
     1:2:void <init>(java.lang.Object[],int,int,int):1091:1092 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;)V"}
     1:1:java.lang.Object get(int):1099:1099 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.xC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.util.Iterator toRemove -> b
     java.util.Iterator iterator -> c
@@ -34566,10 +34566,10 @@
     1:5:java.lang.Object next():1430:1434 -> next
     1:5:void remove():1440:1444 -> remove
     6:6:void remove():1441:1441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.yC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yC;"}
     1:1:void <clinit>():100:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):99:99 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -34580,7 +34580,7 @@
     2:2:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> remove
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):64 -> remove
     2:2:void remove():114 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$PeekingImpl -> com.android.tools.r8.internal.xC:
+com.android.tools.r8.com.google.common.collect.Iterators$PeekingImpl -> com.android.tools.r8.internal.zC:
 # {"id":"sourceFile","fileName":"Iterators.java"}
     java.util.Iterator iterator -> b
     boolean hasPeeked -> c
@@ -34594,21 +34594,21 @@
     1:2:void remove():1210:1211 -> remove
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> remove
     3:3:void remove():1210 -> remove
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.JC:
 # {"id":"sourceFile","fileName":"JdkBackedImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Map forwardDelegate -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map backwardDelegate -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap inverse -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JC;"}
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Map,java.util.Map):62:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
     1:1:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):279:279 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/HC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/JC;"}
     2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):279:279 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):39 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):42:42 -> a
@@ -34635,20 +34635,20 @@
     18:26:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):46:54 -> a
     1:1:java.lang.Object get(java.lang.Object):110:110 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():115:115 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():120:120 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:boolean isPartialView():125:125 -> m
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():77:83 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     1:1:int size():70:70 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.IC:
 # {"id":"sourceFile","fileName":"JdkBackedImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JC;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap):89:89 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap,com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$1):89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JC;)V"}
     1:1:boolean isPartialView():98:98 -> e
     1:1:java.util.Map$Entry get(int):92:92 -> get
     1:1:java.lang.Object get(int):88 -> get
@@ -34664,18 +34664,18 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap.access$100(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap):35:35 -> size
     2:2:int size():103 -> size
     3:3:int size():103:103 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.KC:
 # {"id":"sourceFile","fileName":"JdkBackedImmutableMap.java"}
     java.util.Map delegateMap -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList):92:94 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.util.Map$Entry):116:116 -> a
     2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):279:279 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap create(int,java.util.Map$Entry[],boolean):44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/IC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/KC;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap create(int,java.util.Map$Entry[],boolean):53:53 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry com.android.tools.r8.com.google.common.collect.RegularImmutableMap.makeImmutable(java.util.Map$Entry):213:213 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap create(int,java.util.Map$Entry[],boolean):53 -> a
@@ -34688,55 +34688,55 @@
     2:2:void forEach(java.util.function.BiConsumer):116:116 -> forEach
     1:1:java.lang.Object get(java.lang.Object):105:105 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():110:110 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():121:121 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():126:126 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:boolean isPartialView():131:131 -> m
     1:1:int size():99:99 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.JC:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.LC:
 # {"id":"sourceFile","fileName":"JdkBackedImmutableMultiset.java"}
     java.util.Map delegateMap -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     long size -> h
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
     1:4:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList,long):59:62 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/vu;J)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/xu;J)V"}
     1:1:int count(java.lang.Object):67:67 -> b
     1:1:boolean isPartialView():85:85 -> e
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():74:75 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):80:80 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/LP;"}
     1:1:int size():90:90 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.KC:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.MC:
 # {"id":"sourceFile","fileName":"JdkBackedImmutableSet.java"}
     java.util.Set delegate -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:3:void <init>(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:boolean contains(java.lang.Object):46:46 -> contains
     1:1:boolean isPartialView():51:51 -> e
     1:1:java.lang.Object get(int):41:41 -> get
     1:1:int size():56:56 -> size
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.SJ:
 # {"id":"sourceFile","fileName":"LinkedHashMultiset.java"}
     1:1:void <init>():78:78 -> <init>
     2:2:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMapWithExpectedSize(int):357:357 -> <init>
     2:2:void <init>(int):82 -> <init>
     3:3:void <init>(int):82:82 -> <init>
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap -> com.android.tools.r8.internal.YJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap -> com.android.tools.r8.internal.cK:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node head -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node tail -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     java.util.Map keyToKeyList -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     int size -> i
@@ -34750,7 +34750,7 @@
     4:4:void <init>(int):206:206 -> <init>
     4:4:void <init>():202 -> <init>
     1:1:void access$300(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;Lcom/android/tools/r8/internal/VJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;Lcom/android/tools/r8/internal/ZJ;)V"}
     2:40:void removeNode(com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node):279:317 -> a
     2:40:void access$300(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node):101 -> a
     41:42:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractMultimap.entries():118:119 -> a
@@ -34759,35 +34759,35 @@
     43:43:java.util.List entries():823:823 -> a
     43:43:java.util.Collection entries():99 -> a
     44:90:com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node addNode(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node):224:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/VJ;)Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/ZJ;)Lcom/android/tools/r8/internal/ZJ;"}
     1:1:java.util.Map createAsMap():858:858 -> c
     1:5:void clear():697:701 -> clear
     1:1:boolean containsKey(java.lang.Object):610:610 -> containsKey
     1:1:java.util.Set createKeySet():755:755 -> d
     1:1:com.android.tools.r8.com.google.common.collect.Multiset createKeys():760:760 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KP;"}
     1:1:java.util.List createEntries():848:848 -> g
     1:1:java.util.Collection createEntries():99 -> g
     1:1:java.util.List get(java.lang.Object):717:717 -> get
     1:1:int size():600:600 -> size
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1 -> com.android.tools.r8.internal.QJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1 -> com.android.tools.r8.internal.UJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     java.lang.Object val$key -> b
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object):717:717 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;Ljava/lang/Object;)V"}
     1:1:java.util.ListIterator listIterator(int):726:726 -> listIterator
     1:1:int size():720:720 -> size
     2:2:java.util.Map com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$500(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> size
     2:2:int size():720 -> size
     3:4:int size():720:721 -> size
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1EntriesImpl -> com.android.tools.r8.internal.RJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1EntriesImpl -> com.android.tools.r8.internal.VJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):829:829 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;)V"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.Consumer):842 -> forEach
     2:2:void forEach(java.util.function.Consumer):843:843 -> forEach
@@ -34799,12 +34799,12 @@
     1:1:int size():832:832 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$800(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> size
     2:2:int size():832 -> size
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1KeySetImpl -> com.android.tools.r8.internal.SJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1KeySetImpl -> com.android.tools.r8.internal.WJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):734:734 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;)V"}
     1:1:boolean contains(java.lang.Object):747:747 -> contains
     2:2:boolean com.android.tools.r8.com.google.common.collect.LinkedListMultimap.containsKey(java.lang.Object):610:610 -> contains
     2:2:boolean contains(java.lang.Object):747 -> contains
@@ -34857,20 +34857,20 @@
     2:2:java.util.Map com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$500(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> size
     2:2:int size():737 -> size
     3:3:int size():737:737 -> size
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$DistinctKeyIterator -> com.android.tools.r8.internal.TJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$DistinctKeyIterator -> com.android.tools.r8.internal.XJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     java.util.Set seenKeys -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node current -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     int expectedModCount -> e
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):437:438 -> <init>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1):437 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;)V"}
     3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):261:261 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):438 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,com.android.tools.r8.com.google.common.collect.LinkedListMultimap$1):437 -> <init>
@@ -34932,45 +34932,45 @@
     15:15:void remove():473 -> remove
     16:16:void checkForConcurrentModification():445:445 -> remove
     16:16:void remove():472 -> remove
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$KeyList -> com.android.tools.r8.internal.UJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$KeyList -> com.android.tools.r8.internal.YJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node head -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node tail -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     int count -> c
     1:6:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node):150:155 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VJ;)V"}
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node -> com.android.tools.r8.internal.VJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZJ;)V"}
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node -> com.android.tools.r8.internal.ZJ:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     java.lang.Object key -> b
     java.lang.Object value -> c
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node next -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node previous -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node nextSibling -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node previousSibling -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     1:3:void <init>(java.lang.Object,java.lang.Object):119:121 -> <init>
     1:1:java.lang.Object getKey():127:127 -> getKey
     1:1:java.lang.Object getValue():133:133 -> getValue
     1:2:java.lang.Object setValue(java.lang.Object):139:140 -> setValue
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$NodeIterator -> com.android.tools.r8.internal.WJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$NodeIterator -> com.android.tools.r8.internal.aK:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     int nextIndex -> b
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node current -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node previous -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     int expectedModCount -> f
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,int):333:333 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;I)V"}
     2:2:int com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$000(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,int):331 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,int):331:331 -> <init>
@@ -35096,25 +35096,25 @@
     1:1:void set(java.lang.Object):326:326 -> set
     2:2:void set(java.util.Map$Entry):422:422 -> set
     2:2:void set(java.lang.Object):326 -> set
-com.android.tools.r8.com.google.common.collect.LinkedListMultimap$ValueForKeyIterator -> com.android.tools.r8.internal.XJ:
+com.android.tools.r8.com.google.common.collect.LinkedListMultimap$ValueForKeyIterator -> com.android.tools.r8.internal.bK:
 # {"id":"sourceFile","fileName":"LinkedListMultimap.java"}
     java.lang.Object key -> b
     int nextIndex -> c
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node next -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node current -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap$Node previous -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
     com.android.tools.r8.com.google.common.collect.LinkedListMultimap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object):489:490 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;Ljava/lang/Object;)V"}
     3:3:java.util.Map com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$500(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object):491 -> <init>
     4:5:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object):491:492 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object,int):503:503 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;Ljava/lang/Object;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;Ljava/lang/Object;I)V"}
     7:7:java.util.Map com.android.tools.r8.com.google.common.collect.LinkedListMultimap.access$500(com.android.tools.r8.com.google.common.collect.LinkedListMultimap):101:101 -> <init>
     7:7:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object,int):504 -> <init>
     8:24:void <init>(com.android.tools.r8.com.google.common.collect.LinkedListMultimap,java.lang.Object,int):504:520 -> <init>
@@ -35136,10 +35136,10 @@
     1:2:void set(java.lang.Object):584:585 -> set
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):496:496 -> set
     3:3:void set(java.lang.Object):584 -> set
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.ZK:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.dL:
 # {"id":"sourceFile","fileName":"ListMultimap.java"}
     java.util.List get(java.lang.Object) -> get
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.fL:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.jL:
 # {"id":"sourceFile","fileName":"Lists.java"}
     1:4:int computeArrayListCapacity(int):152:155 -> a
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
@@ -35150,10 +35150,10 @@
     9:9:java.util.ArrayList newArrayList(java.lang.Iterable):132 -> a
     10:10:java.util.ArrayList newArrayList(java.util.Iterator):146:146 -> a
     10:10:java.util.ArrayList newArrayList(java.lang.Iterable):132 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.cL:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.gL:
 # {"id":"sourceFile","fileName":"Lists.java"}
     1:1:void <init>(java.util.List):977:977 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.eL:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.iL:
 # {"id":"sourceFile","fileName":"Lists.java"}
     java.util.List forwardList -> b
     1:1:void <init>(java.util.List):834:834 -> <init>
@@ -35220,14 +35220,14 @@
     17:17:java.util.List subList(int,int):895 -> subList
     18:21:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):824:827 -> subList
     18:21:java.util.List subList(int,int):895 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.dL:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.hL:
 # {"id":"sourceFile","fileName":"Lists.java"}
     boolean canRemoveOrSet -> b
     java.util.ListIterator val$forwardIterator -> c
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iL;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Lists$ReverseList,java.util.ListIterator):907:907 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eL;Ljava/util/ListIterator;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iL;Ljava/util/ListIterator;)V"}
     1:3:void add(java.lang.Object):913:915 -> add
     1:1:boolean hasNext():920:920 -> hasNext
     1:1:boolean hasPrevious():925:925 -> hasPrevious
@@ -35263,43 +35263,43 @@
     1:2:void set(java.lang.Object):967:968 -> set
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):496:496 -> set
     3:3:void set(java.lang.Object):967 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.MM:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.QM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:17:int capacity(int):288:304 -> a
     18:18:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     18:18:java.lang.Object safeGet(java.util.Map,java.lang.Object):3883 -> a
     19:19:java.lang.Object safeGet(java.util.Map,java.lang.Object):3885:3885 -> a
     20:20:java.lang.Object keyOrNull(java.util.Map$Entry):4056:4056 -> a
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.yM:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.CM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>(java.util.Iterator):127:127 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):127:127 -> a
     2:2:java.lang.Object transform(java.util.Map$Entry):131:131 -> a
     2:2:java.lang.Object transform(java.lang.Object):127 -> a
-com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.zM:
+com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.DM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>(java.util.Iterator):138:138 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):138:138 -> a
     2:2:java.lang.Object transform(java.util.Map$Entry):142:142 -> a
     2:2:java.lang.Object transform(java.lang.Object):138 -> a
-com.android.tools.r8.com.google.common.collect.Maps$3 -> com.android.tools.r8.internal.AM:
+com.android.tools.r8.com.google.common.collect.Maps$3 -> com.android.tools.r8.internal.EM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     com.android.tools.r8.com.google.common.base.Function val$function -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ur;"}
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):962:962 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/sr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;Lcom/android/tools/r8/internal/ur;)V"}
     1:1:java.util.Map$Entry transform(java.lang.Object):965:965 -> a
     1:1:java.lang.Object transform(java.lang.Object):962 -> a
     2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1452:1452 -> a
     2:2:java.util.Map$Entry transform(java.lang.Object):965 -> a
     2:2:java.lang.Object transform(java.lang.Object):962 -> a
-com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.BM:
+com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.FM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     java.util.Map$Entry val$entry -> b
     1:1:void <init>(java.util.Map$Entry):1480:1480 -> <init>
     1:1:java.lang.Object getKey():1484:1484 -> getKey
     1:1:java.lang.Object getValue():1490:1490 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.CM:
+com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.GM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     java.util.Iterator val$entryIterator -> b
     1:1:void <init>(java.util.Iterator):1498:1498 -> <init>
@@ -35313,29 +35313,29 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1480:1480 -> next
     3:3:java.util.Map$Entry next():1506 -> next
     3:3:java.lang.Object next():1498 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.FM:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.JM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IM;"}
     1:8:void <clinit>():99:106 -> <clinit>
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):98 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.DM:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.HM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>(java.lang.String,int):99:99 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Object apply(java.lang.Object):99:99 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):103:103 -> apply
     2:2:java.lang.Object apply(java.lang.Object):99 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.EM:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.IM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>(java.lang.String,int):106:106 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Object apply(java.lang.Object):106:106 -> apply
     2:2:java.lang.Object apply(java.util.Map$Entry):110:110 -> apply
     2:2:java.lang.Object apply(java.lang.Object):106 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.GM:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.KM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>():4292:4292 -> <init>
     java.util.Map map() -> a
@@ -35357,7 +35357,7 @@
     6:6:boolean retainAll(java.util.Collection):4351 -> retainAll
     7:17:boolean retainAll(java.util.Collection):4352:4362 -> retainAll
     1:1:int size():4298:4298 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.IM:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.MM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     1:1:void <init>():3829:3829 -> <init>
     1:1:void forEachEntry(java.util.function.Consumer):3868:3868 -> a
@@ -35366,17 +35366,17 @@
     1:1:java.util.Spliterator entrySpliterator():3839:3839 -> i
     2:2:java.util.Spliterator entrySpliterator():3838:3838 -> i
     int size() -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.HM:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.LM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MM;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3844:3844 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MM;)V"}
     1:1:java.util.Map map():3847:3847 -> a
     1:1:void forEach(java.util.function.Consumer):3862:3862 -> forEach
     1:1:java.util.Iterator iterator():3852:3852 -> iterator
     1:1:java.util.Spliterator spliterator():3857:3857 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.JM:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.NM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     java.util.Map map -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
@@ -35401,12 +35401,12 @@
     1:1:java.util.Map map():4009:4009 -> size
     1:1:int size():4026 -> size
     2:2:int size():4026:4026 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.KM:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.OM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     java.util.Map map -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PM;"}
     1:2:void <init>(java.util.Map):4206:4207 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PM;)V"}
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4223:4223 -> a
     1:1:java.util.Map map():4211:4211 -> clear
     1:1:void clear():4288 -> clear
@@ -35457,11 +35457,11 @@
     1:1:java.util.Map map():4211:4211 -> size
     1:1:int size():4273 -> size
     2:2:int size():4273:4273 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.LM:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.PM:
 # {"id":"sourceFile","fileName":"Maps.java"}
     java.util.Set entrySet -> b
     java.util.Collection values -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OM;"}
     1:1:void <init>():3787:3787 -> <init>
     java.util.Set createEntrySet() -> e
     1:2:java.util.Set entrySet():3800:3801 -> entrySet
@@ -35469,7 +35469,7 @@
     2:2:java.util.Collection createValues():3825:3825 -> values
     2:2:java.util.Collection values():3821 -> values
     3:3:java.util.Collection values():3821:3821 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.AP:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.EP:
 # {"id":"sourceFile","fileName":"Multimap.java"}
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
@@ -35479,12 +35479,12 @@
     int size() -> size
 com.android.tools.r8.com.google.common.collect.Multimaps -> R8$$REMOVED$$CLASS$$36:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
-com.android.tools.r8.com.google.common.collect.Multimaps$AsMap -> com.android.tools.r8.internal.CP:
+com.android.tools.r8.com.google.common.collect.Multimaps$AsMap -> com.android.tools.r8.internal.GP:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1872:1873 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;)V"}
     1:1:void clear():1944:1944 -> clear
     1:1:boolean containsKey(java.lang.Object):1939:1939 -> containsKey
     2:2:boolean com.android.tools.r8.com.google.common.collect.LinkedListMultimap.containsKey(java.lang.Object):610:610 -> containsKey
@@ -35581,12 +35581,12 @@
     13:13:java.util.Collection remove(java.lang.Object):1924 -> remove
     13:13:java.lang.Object remove(java.lang.Object):1868 -> remove
     1:1:int size():1878:1878 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$AsMap$EntrySet -> com.android.tools.r8.internal.BP:
+com.android.tools.r8.com.google.common.collect.Multimaps$AsMap$EntrySet -> com.android.tools.r8.internal.FP:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
     com.android.tools.r8.com.google.common.collect.Multimaps$AsMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GP;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$AsMap):1891:1891 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GP;)V"}
     1:1:java.util.Map map():1894:1894 -> a
     1:1:java.util.Collection lambda$iterator$0(java.lang.Object):1899:1899 -> c
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.Multimaps$AsMap.access$200(com.android.tools.r8.com.google.common.collect.Multimaps$AsMap):1868:1868 -> c
@@ -35609,7 +35609,7 @@
     8:8:boolean remove(java.lang.Object):1909 -> remove
 com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> R8$$REMOVED$$CLASS$$35:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.FP:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.JP:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O0;"}
@@ -35633,21 +35633,21 @@
     2:2:java.util.Iterator iterator():1782 -> iterator
     1:1:int size():1772:1772 -> size
     1:1:java.util.Spliterator spliterator():1756:1756 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.EP:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.IP:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1735:1735 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;)V"}
     1:1:java.lang.Object transform(java.lang.Object):1735:1735 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry transform(java.util.Map$Entry):1738:1738 -> a
     2:2:java.lang.Object transform(java.lang.Object):1735 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.DP:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.HP:
 # {"id":"sourceFile","fileName":"Multimaps.java"}
     java.util.Map$Entry val$backingEntry -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1738:1738 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;)V"}
     1:1:int getCount():1747:1747 -> a
     1:1:java.lang.Object getElement():1742:1742 -> b
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.GP:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.KP:
 # {"id":"sourceFile","fileName":"Multiset.java"}
     java.util.Set elementSet() -> C
     int add(java.lang.Object,int) -> a
@@ -35656,9 +35656,9 @@
     boolean setCount(java.lang.Object,int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)Z"}
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):352:352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Lcom/android/tools/r8/internal/HP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Lcom/android/tools/r8/internal/LP;)V"}
     2:5:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):476:479 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/HP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/LP;)V"}
     6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     6:6:void forEachEntry(java.util.function.ObjIntConsumer):351 -> a
     7:7:void forEachEntry(java.util.function.ObjIntConsumer):352:352 -> a
@@ -35671,18 +35671,18 @@
     2:3:void forEach(java.util.function.Consumer):473:474 -> forEach
     int hashCode() -> hashCode
     1:1:java.util.Spliterator spliterator():486:486 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.LP:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.PP:
 # {"id":"sourceFile","fileName":"Multisets.java"}
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):876:888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GP;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KP;Ljava/lang/Object;)Z"}
     14:17:boolean addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,com.android.tools.r8.com.google.common.collect.Multiset):914:917 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R0;Lcom/android/tools/r8/internal/GP;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R0;Lcom/android/tools/r8/internal/KP;)Z"}
     18:25:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1132:1139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GP;)Lcom/android/tools/r8/internal/be;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KP;)Lcom/android/tools/r8/internal/de;"}
     26:26:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1133:1133 -> a
     27:27:java.util.Spliterator lambda$spliteratorImpl$0(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1135:1135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HP;)Ljava/util/Spliterator;"}
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.HP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LP;)Ljava/util/Spliterator;"}
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.LP:
 # {"id":"sourceFile","fileName":"Multisets.java"}
     1:1:void <init>():832:832 -> <init>
     int com.android.tools.r8.com.google.common.collect.Multiset$Entry.getCount() -> a
@@ -35690,10 +35690,10 @@
     1:4:boolean equals(java.lang.Object):839:842 -> equals
     1:2:int hashCode():853:854 -> hashCode
     1:3:java.lang.String toString():865:867 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.IP:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.MP:
 # {"id":"sourceFile","fileName":"Multisets.java"}
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MP;"}
     1:1:void <clinit>():1169:1169 -> <clinit>
     1:1:void <init>():1168:1168 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1168:1168 -> compare
@@ -35703,7 +35703,7 @@
 # {"id":"sourceFile","fileName":"Multisets.java"}
 com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> R8$$REMOVED$$CLASS$$38:
 # {"id":"sourceFile","fileName":"Multisets.java"}
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.JP:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.NP:
 # {"id":"sourceFile","fileName":"Multisets.java"}
     java.lang.Object element -> b
     int count -> c
@@ -35712,19 +35712,19 @@
     1:1:int getCount():270:270 -> a
     1:1:java.lang.Object getElement():265:265 -> b
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():275:275 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JP;"}
-com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.KP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NP;"}
+com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.OP:
 # {"id":"sourceFile","fileName":"Multisets.java"}
     com.android.tools.r8.com.google.common.collect.Multiset multiset -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zf;"}
     java.util.Iterator entryIterator -> c
     com.android.tools.r8.com.google.common.collect.Multiset$Entry currentEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LP;"}
     int laterCount -> e
     int totalCount -> f
     boolean canRemove -> g
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Iterator):1085:1087 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xf;Ljava/util/Iterator;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zf;Ljava/util/Iterator;)V"}
     1:1:boolean hasNext():1092:1092 -> hasNext
     1:14:java.lang.Object next():1098:1111 -> next
     15:15:java.lang.Object next():1099:1099 -> next
@@ -35735,14 +35735,14 @@
     14:14:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> remove
     14:14:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):64 -> remove
     14:14:void remove():1116 -> remove
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.XP:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.bQ:
 # {"id":"sourceFile","fileName":"NaturalOrdering.java"}
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bQ;"}
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():78:78 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dV;"}
     1:1:int compare(java.lang.Object,java.lang.Object):28:28 -> compare
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> compare
     2:2:int compare(java.lang.Comparable,java.lang.Comparable):40 -> compare
@@ -35753,7 +35753,7 @@
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):42:42 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):28 -> compare
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.YT:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.cU:
 # {"id":"sourceFile","fileName":"ObjectArrays.java"}
     1:1:java.lang.Object[] checkElementsNotNull(java.lang.Object[],int):222:222 -> a
     1:1:java.lang.Object[] com.android.tools.r8.internal.ObjectArrays.checkElementsNotNull(int,java.lang.Object[]):0 -> a
@@ -35763,7 +35763,7 @@
     2:2:java.lang.Object[] com.android.tools.r8.internal.ObjectArrays.checkElementsNotNull(int,java.lang.Object[]):0 -> a
     3:3:java.lang.Object[] checkElementsNotNull(java.lang.Object[],int):0:0 -> a
     3:3:java.lang.Object[] com.android.tools.r8.internal.ObjectArrays.checkElementsNotNull(int,java.lang.Object[]):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7,"4":8},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7,"4":8},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     4:4:java.lang.Object checkElementNotNull(java.lang.Object,int):232:232 -> a
     4:4:java.lang.Object[] checkElementsNotNull(java.lang.Object[],int):222 -> a
     4:4:java.lang.Object[] com.android.tools.r8.internal.ObjectArrays.checkElementsNotNull(int,java.lang.Object[]):0 -> a
@@ -35775,12 +35775,12 @@
     7:7:java.lang.Object[] checkElementsNotNull(java.lang.Object[],int):222 -> a
     8:8:java.lang.Object checkElementNotNull(java.lang.Object,int):232:232 -> a
     8:8:java.lang.Object[] checkElementsNotNull(java.lang.Object[],int):222 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.ZU:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.dV:
 # {"id":"sourceFile","fileName":"Ordering.java"}
     1:1:void <init>():399:399 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():413:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZU;"}
-com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.AW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dV;"}
+com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.EW:
 # {"id":"sourceFile","fileName":"Platform.java"}
     int $r8$clinit -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -35790,17 +35790,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)[Ljava/lang/Object;"}
     4:4:java.lang.Object[] copy(java.lang.Object[],int,int,java.lang.Object[]):116:116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;[Ljava/lang/Object;)[Ljava/lang/Object;"}
-com.android.tools.r8.com.google.common.collect.Range -> com.android.tools.r8.internal.o10:
+com.android.tools.r8.com.google.common.collect.Range -> com.android.tools.r8.internal.s10:
 # {"id":"sourceFile","fileName":"Range.java"}
     com.android.tools.r8.com.google.common.collect.Cut lowerBound -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oh;"}
     com.android.tools.r8.com.google.common.collect.Cut upperBound -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oh;"}
     com.android.tools.r8.com.google.common.collect.Range ALL -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s10;"}
     1:1:void <clinit>():303:303 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Cut,com.android.tools.r8.com.google.common.collect.Cut):357:357 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh;Lcom/android/tools/r8/internal/mh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh;Lcom/android/tools/r8/internal/oh;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.Cut,com.android.tools.r8.com.google.common.collect.Cut):358 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.collect.Cut,com.android.tools.r8.com.google.common.collect.Cut):358:358 -> <init>
@@ -35823,29 +35823,29 @@
     1:1:java.lang.String toString():700:700 -> toString
     2:6:java.lang.String toString(com.android.tools.r8.com.google.common.collect.Cut,com.android.tools.r8.com.google.common.collect.Cut):704:708 -> toString
     2:6:java.lang.String toString():700 -> toString
-com.android.tools.r8.com.google.common.collect.Range$RangeLexOrdering -> com.android.tools.r8.internal.n10:
+com.android.tools.r8.com.google.common.collect.Range$RangeLexOrdering -> com.android.tools.r8.internal.r10:
 # {"id":"sourceFile","fileName":"Range.java"}
     com.android.tools.r8.com.google.common.collect.Ordering INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r10;"}
     1:1:void <clinit>():726:726 -> <clinit>
     1:1:void <init>():725:725 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):725:725 -> compare
     2:5:int compare(com.android.tools.r8.com.google.common.collect.Range,com.android.tools.r8.com.google.common.collect.Range):730:733 -> compare
     2:5:int compare(java.lang.Object,java.lang.Object):725 -> compare
-com.android.tools.r8.com.google.common.collect.RangeGwtSerializationDependencies -> com.android.tools.r8.internal.p10:
+com.android.tools.r8.com.google.common.collect.RangeGwtSerializationDependencies -> com.android.tools.r8.internal.t10:
 # {"id":"sourceFile","fileName":"RangeGwtSerializationDependencies.java"}
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.p40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.t40:
 # {"id":"sourceFile","fileName":"RegularImmutableAsList.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):38:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xu;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zu;Lcom/android/tools/r8/internal/xu;)V"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.asImmutableList(java.lang.Object[]):362:362 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.lang.Object[]):44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lu;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nu;[Ljava/lang/Object;)V"}
     5:7:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):38:40 -> <init>
     5:7:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,java.lang.Object[]):44 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):71:71 -> a
@@ -35856,27 +35856,27 @@
     1:1:void forEach(java.util.function.Consumer):65:65 -> forEach
     1:1:java.lang.Object get(int):92:92 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():49:49 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):59:59 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/F;"}
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):59:59 -> listIterator
     1:1:java.util.ListIterator listIterator(int):31 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.t40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.x40:
 # {"id":"sourceFile","fileName":"RegularImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Gu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Gu;"}
     java.util.Map$Entry[] entries -> h
     int mask -> i
     int hashCode -> j
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w40;"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap EMPTY -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x40;"}
     1:1:void <clinit>():51:51 -> <clinit>
     1:6:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],java.util.Map$Entry[],int,int):120:125 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Eu;[Lcom/android/tools/r8/internal/Eu;[Ljava/util/Map$Entry;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Gu;[Lcom/android/tools/r8/internal/Gu;[Ljava/util/Map$Entry;II)V"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):167 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):168:169 -> forEach
@@ -35895,27 +35895,27 @@
     7:7:java.lang.Object get(java.lang.Object):150 -> get
     1:1:int hashCode():180:180 -> hashCode
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():155:156 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> i
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():156 -> i
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():157:157 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():162:162 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:boolean isPartialView():185:185 -> m
     1:5:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():197:201 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     1:1:int size():190:190 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.s40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.w40:
 # {"id":"sourceFile","fileName":"RegularImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x40;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):204:204 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):204 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x40;)V"}
     1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):219:219 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():213:213 -> f
     1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():204 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S5;"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):218 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):219:219 -> forEach
@@ -35935,12 +35935,12 @@
     9:9:java.lang.Object get(java.lang.Object):233 -> get
     10:10:java.lang.Object get(java.lang.Object):231:231 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():246:246 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():241:241 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:boolean isPartialView():294:294 -> m
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():213:213 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():213:213 -> size
     1:1:int size():208 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():190:190 -> size
@@ -35948,43 +35948,43 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():190:190 -> size
     3:3:int size():208 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.r40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.v40:
 # {"id":"sourceFile","fileName":"RegularImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w40;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):249:249 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w40;)V"}
     1:1:void forEach(java.util.function.Consumer):272:272 -> forEach
     1:1:boolean isHashCodeFast():257:257 -> h
     1:1:int hashCode():262:262 -> hashCode
     2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.access$300(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):50:50 -> hashCode
     2:2:int hashCode():262 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():267:267 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():267:267 -> iterator
     2:2:java.util.Iterator iterator():249 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():277:277 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():252:252 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.q40:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.u40:
 # {"id":"sourceFile","fileName":"RegularImmutableBiMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v40;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):277:277 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v40;)V"}
     1:2:java.util.Map$Entry get(int):280:281 -> get
     1:2:java.lang.Object get(int):277 -> get
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1452:1452 -> get
     3:3:java.util.Map$Entry get(int):281 -> get
     3:3:java.lang.Object get(int):277 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():286:286 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.u40:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.y40:
 # {"id":"sourceFile","fileName":"RegularImmutableList.java"}
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y40;"}
     1:1:void <clinit>():34:34 -> <clinit>
     1:2:void <init>(java.lang.Object[]):38:39 -> <init>
     1:2:int copyIntoArray(java.lang.Object[],int):69:70 -> a
@@ -36000,27 +36000,27 @@
     1:1:java.util.ListIterator listIterator(int):30 -> listIterator
     1:1:int size():44:44 -> size
     1:1:java.util.Spliterator spliterator():90:90 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.y40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.C40:
 # {"id":"sourceFile","fileName":"RegularImmutableMap.java"}
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Gu;"}
     int mask -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
     1:1:void <clinit>():48:48 -> <clinit>
     1:4:void <init>(java.util.Map$Entry[],com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):217:220 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/util/Map$Entry;[Lcom/android/tools/r8/internal/Eu;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/util/Map$Entry;[Lcom/android/tools/r8/internal/Gu;I)V"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():43:43 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry checkNoConflictInKeyBucket(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,boolean):244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Eu;)Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/Gu;)Lcom/android/tools/r8/internal/Gu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry checkNoConflictInKeyBucket(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,boolean):244:244 -> a
     3:12:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry checkNoConflictInKeyBucket(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,boolean):243:252 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry checkNoConflictInKeyBucket(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,boolean):246:246 -> a
     14:14:void com.android.tools.r8.com.google.common.collect.ImmutableMap.checkNoConflict(boolean,java.lang.String,java.lang.Object,java.lang.Object):372:372 -> a
     14:14:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry checkNoConflictInKeyBucket(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,boolean):246 -> a
     15:15:com.android.tools.r8.com.google.common.collect.ImmutableMap fromEntryArrayCheckingBucketOverflow(int,java.util.Map$Entry[],boolean):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/Du;"}
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] com.android.tools.r8.com.google.common.collect.ImmutableMapEntry.createEntryArray(int):49:49 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableMap fromEntryArrayCheckingBucketOverflow(int,java.util.Map$Entry[],boolean):113 -> a
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableMap fromEntryArrayCheckingBucketOverflow(int,java.util.Map$Entry[],boolean):114:114 -> a
@@ -36028,7 +36028,7 @@
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap fromEntryArrayCheckingBucketOverflow(int,java.util.Map$Entry[],boolean):115 -> a
     19:63:com.android.tools.r8.com.google.common.collect.ImmutableMap fromEntryArrayCheckingBucketOverflow(int,java.util.Map$Entry[],boolean):126:170 -> a
     64:66:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry makeImmutable(java.util.Map$Entry,java.lang.Object,java.lang.Object):206:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Eu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Gu;"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):295 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):296:297 -> forEach
@@ -36046,22 +36046,22 @@
     7:7:java.lang.Object get(java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):277:277 -> get
     7:7:java.lang.Object get(java.lang.Object):263 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():313:313 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():318:318 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():371:371 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nu;"}
     1:1:boolean isPartialView():308:308 -> m
     1:1:int size():303:303 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$BucketOverflowException -> com.android.tools.r8.internal.v40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$BucketOverflowException -> com.android.tools.r8.internal.z40:
 # {"id":"sourceFile","fileName":"RegularImmutableMap.java"}
     1:1:void <init>():258:258 -> <init>
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.w40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.A40:
 # {"id":"sourceFile","fileName":"RegularImmutableMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):325:326 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C40;)V"}
     1:1:boolean contains(java.lang.Object):336:336 -> contains
     1:1:boolean isPartialView():341:341 -> e
     1:1:java.lang.Object get(int):331:331 -> get
@@ -36071,12 +36071,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():303:303 -> size
     3:3:int size():346 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.x40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.B40:
 # {"id":"sourceFile","fileName":"RegularImmutableMap.java"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):378:379 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C40;)V"}
     1:1:boolean isPartialView():394:394 -> e
     1:1:java.lang.Object get(int):384:384 -> get
     1:1:int size():389:389 -> size
@@ -36085,28 +36085,28 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():303:303 -> size
     3:3:int size():389 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.A40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.E40:
 # {"id":"sourceFile","fileName":"RegularImmutableMultiset.java"}
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/JP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/NP;"}
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/JP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/NP;"}
     int size -> h
     int hashCode -> i
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zu;"}
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] EMPTY_ARRAY -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/JP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/NP;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset EMPTY -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
     1:1:void <clinit>():40:40 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     2:2:void <clinit>():41 -> <clinit>
     3:3:void <clinit>():41:41 -> <clinit>
     1:6:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[],com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[],int,int,com.android.tools.r8.com.google.common.collect.ImmutableSet):132:137 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/JP;[Lcom/android/tools/r8/internal/JP;IILcom/android/tools/r8/internal/B40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/NP;[Lcom/android/tools/r8/internal/NP;IILcom/android/tools/r8/internal/F40;)V"}
     1:5:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):44:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/Uu;"}
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):48 -> a
     7:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):48:62 -> a
@@ -36151,20 +36151,20 @@
     11:11:int count(java.lang.Object):169:169 -> b
     1:1:boolean isPartialView():156:156 -> e
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():184:185 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     1:1:int hashCode():195:195 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):190:190 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/HP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/LP;"}
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.z40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.D40:
 # {"id":"sourceFile","fileName":"RegularImmutableMultiset.java"}
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NP;"}
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):144:145 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;ILcom/android/tools/r8/internal/JP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;ILcom/android/tools/r8/internal/NP;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():150:150 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JP;"}
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.B40:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NP;"}
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.F40:
 # {"id":"sourceFile","fileName":"RegularImmutableSet.java"}
     java.lang.Object[] elements -> e
     int hashCode -> f
@@ -36172,7 +36172,7 @@
     int mask -> h
     java.lang.Object[] EMPTY_ARRAY -> i
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F40;"}
     1:2:void <clinit>():35:36 -> <clinit>
     1:5:void <init>(java.lang.Object[],int,java.lang.Object[],int):46:50 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II[Ljava/lang/Object;[Ljava/lang/Object;)V"}
@@ -36186,22 +36186,22 @@
     1:1:boolean isHashCodeFast():125:125 -> h
     1:1:int hashCode():120:120 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():77:77 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1059:1059 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():77 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():108:108 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> k
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():109 -> k
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():110:110 -> k
     1:1:int size():72:72 -> size
     1:1:java.util.Spliterator spliterator():82:82 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.C40:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.G40:
 # {"id":"sourceFile","fileName":"RegularImmutableSortedSet.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G40;"}
     1:1:void <clinit>():45:45 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     2:2:void <clinit>():46 -> <clinit>
@@ -36209,7 +36209,7 @@
     3:3:void <clinit>():46 -> <clinit>
     4:4:void <clinit>():46:46 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Comparator):51:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Ljava/util/Comparator;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Ljava/util/Comparator;)V"}
     1:1:int copyIntoArray(java.lang.Object[],int):169:169 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;)I"}
     2:2:int headIndex(java.lang.Object,boolean):259:259 -> a
@@ -36273,7 +36273,7 @@
     1:1:java.util.Iterator descendingIterator():41 -> descendingIterator
     1:1:int size():94:94 -> e
     1:1:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet getSubSet(int,int):296 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/G40;"}
     2:5:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet getSubSet(int,int):299:302 -> e
     6:6:boolean isPartialView():164:164 -> e
     1:5:boolean equals(java.lang.Object):177:181 -> equals
@@ -36317,12 +36317,12 @@
     2:2:int indexOf(java.lang.Object):313 -> indexOf
     3:3:int indexOf(java.lang.Object):313:313 -> indexOf
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():73:73 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():73:73 -> iterator
     2:2:java.util.Iterator iterator():41 -> iterator
     1:1:int size():94:94 -> k
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():322 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():322:322 -> k
     1:4:java.lang.Object last():219:222 -> last
     5:5:int size():94:94 -> last
@@ -36332,15 +36332,15 @@
     1:2:java.lang.Object lower(java.lang.Object):228:229 -> lower
     1:1:int size():94:94 -> size
     1:1:java.util.Spliterator spliterator():84:84 -> spliterator
-com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.internal.P90:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.internal.T90:
 # {"id":"sourceFile","fileName":"ReverseNaturalOrdering.java"}
     com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T90;"}
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():99:99 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering com.android.tools.r8.com.google.common.collect.Ordering.natural():165:165 -> a
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dV;"}
     1:1:int compare(java.lang.Object,java.lang.Object):26:26 -> compare
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> compare
     2:2:int compare(java.lang.Comparable,java.lang.Comparable):34 -> compare
@@ -36348,19 +36348,19 @@
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):39:39 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.internal.R90:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.internal.V90:
 # {"id":"sourceFile","fileName":"ReverseOrdering.java"}
     com.android.tools.r8.com.google.common.collect.Ordering forwardOrder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dV;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Ordering):34:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dV;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dV;"}
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     1:3:boolean equals(java.lang.Object):103:105 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():112:112 -> toString
-com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.Za0:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.db0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     1:3:java.util.HashSet newHashSet(java.lang.Iterable):224:226 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Ljava/util/HashSet;"}
@@ -36371,7 +36371,7 @@
     5:5:java.util.HashSet newHashSet(java.lang.Iterable):226 -> a
     6:6:java.util.Set newConcurrentHashSet():275:275 -> a
     7:10:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):821:824 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;)Lcom/android/tools/r8/internal/Pa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;)Lcom/android/tools/r8/internal/Ta0;"}
     11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):921:921 -> a
     11:11:com.android.tools.r8.com.google.common.collect.Sets$SetView intersection(java.util.Set,java.util.Set):822 -> a
     12:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):921:921 -> a
@@ -36392,7 +36392,7 @@
     1:1:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():468:468 -> c
     1:1:java.util.Set newIdentityHashSet():432 -> c
     2:2:java.util.Set newIdentityHashSet():432:432 -> c
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Pa0:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Ta0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.Set val$set1 -> b
     java.util.Set val$set2 -> c
@@ -36405,17 +36405,17 @@
     1:1:java.util.stream.Stream parallelStream():851:851 -> parallelStream
     1:2:int size():857:858 -> size
     1:1:java.util.stream.Stream stream():846:846 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Oa0:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Sa0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ta0;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):827:828 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pa0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ta0;)V"}
     1:3:java.lang.Object computeNext():833:835 -> a
     4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractIterator.endOfData():126:126 -> a
     4:4:java.lang.Object computeNext():839 -> a
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Ra0:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Va0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.Set val$set1 -> b
     java.util.Set val$set2 -> c
@@ -36429,23 +36429,23 @@
     1:1:java.util.stream.Stream parallelStream():924:924 -> parallelStream
     1:2:int size():930:931 -> size
     1:1:java.util.stream.Stream stream():919:919 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Qa0:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Ua0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ra0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Va0;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):900:901 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ra0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Va0;)V"}
     1:3:java.lang.Object computeNext():906:908 -> a
     4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractIterator.endOfData():126:126 -> a
     4:4:java.lang.Object computeNext():912 -> a
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Wa0:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.ab0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     int val$size -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1671:1671 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Du;)V"}
     1:3:boolean contains(java.lang.Object):1674:1676 -> contains
     1:1:java.util.Iterator iterator():1683:1683 -> iterator
     1:1:int size():1752:1752 -> size
@@ -36464,7 +36464,7 @@
     20:20:int com.android.tools.r8.internal.Sets$5.size():0 -> size
     21:21:int size():0:0 -> size
     21:21:int com.android.tools.r8.internal.Sets$5.size():0 -> size
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28,"4":29,"5":30},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28,"4":29,"5":30},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     22:22:int com.android.tools.r8.com.google.common.math.MathPreconditions.checkNonNegative(java.lang.String,int):57:57 -> size
     22:22:int com.android.tools.r8.com.google.common.math.IntMath.binomial(int,int):648 -> size
     22:22:int size():1752 -> size
@@ -36475,7 +36475,7 @@
     23:23:int com.android.tools.r8.internal.Sets$5.size():0 -> size
     24:24:int size():0:0 -> size
     24:24:int com.android.tools.r8.internal.Sets$5.size():0 -> size
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34,"5":35},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34,"5":35},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     25:25:int com.android.tools.r8.com.google.common.math.MathPreconditions.checkNonNegative(java.lang.String,int):57:57 -> size
     25:25:int com.android.tools.r8.com.google.common.math.IntMath.binomial(int,int):647 -> size
     25:25:int size():1752 -> size
@@ -36515,23 +36515,23 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String com.android.tools.r8.internal.Sets$5.toString():0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1759,"2":1760,"3":1761},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1759,"2":1760,"3":1761},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     1759:1759:java.lang.String toString():1757:1757 -> toString
     1760:1760:java.lang.String toString():1757:1757 -> toString
     1761:1761:java.lang.String toString():1757:1757 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Sa0:
+com.android.tools.r8.com.google.common.collect.Sets$5$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Wa0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.internal.Sets$5$$ExternalSyntheticOutline0.m(int,java.lang.String,java.lang.StringBuilder):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Va0:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Za0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.BitSet bits -> d
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ab0;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1683:1684 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wa0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ab0;)V"}
     1:7:java.util.Set computeNext():1689:1695 -> a
     1:7:java.lang.Object computeNext():1683 -> a
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractIterator.endOfData():126:126 -> a
@@ -36539,35 +36539,35 @@
     8:8:java.lang.Object computeNext():1683 -> a
     9:14:java.util.Set computeNext():1712:1717 -> a
     9:14:java.lang.Object computeNext():1683 -> a
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Ua0:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Ya0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     java.util.BitSet val$copy -> b
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Va0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Za0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1717:1717 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Va0;Ljava/util/BitSet;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Za0;Ljava/util/BitSet;)V"}
     1:2:boolean contains(java.lang.Object):1720:1721 -> contains
     1:1:java.util.Iterator iterator():1726:1726 -> iterator
     1:1:int size():1743:1743 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Ta0:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Xa0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     int i -> d
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ua0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ya0;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1726:1727 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ua0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ya0;)V"}
     1:1:java.lang.Object computeNext():1732:1732 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractIterator.endOfData():126:126 -> a
     2:2:java.lang.Object computeNext():1734 -> a
     3:3:java.lang.Object computeNext():1736:1736 -> a
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Xa0:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.bb0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     1:1:void <init>():81:81 -> <init>
     1:1:boolean removeAll(java.util.Collection):84:84 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> retainAll
     1:1:boolean retainAll(java.util.Collection):89 -> retainAll
     2:2:boolean retainAll(java.util.Collection):89:89 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Ya0:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.cb0:
 # {"id":"sourceFile","fileName":"Sets.java"}
     1:1:void <init>():567:567 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):566 -> <init>
@@ -36579,17 +36579,17 @@
     1:1:boolean removeAll(java.util.Collection):650:650 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):664:664 -> removeIf
     1:1:boolean retainAll(java.util.Collection):678:678 -> retainAll
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.ec0:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.ic0:
 # {"id":"sourceFile","fileName":"SingletonImmutableBiMap.java"}
     java.lang.Object singleKey -> f
     java.lang.Object singleValue -> g
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ec0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ic0;"}
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap lazyInverse -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ec0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ic0;"}
     1:5:void <init>(java.lang.Object,java.lang.Object):42:46 -> <init>
     6:9:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableBiMap):49:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/ec0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/ic0;)V"}
     1:1:boolean containsKey(java.lang.Object):73:73 -> containsKey
     1:1:boolean containsValue(java.lang.Object):78:78 -> containsValue
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> forEach
@@ -36597,21 +36597,21 @@
     2:2:void forEach(java.util.function.BiConsumer):68:68 -> forEach
     1:1:java.lang.Object get(java.lang.Object):58:58 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():88:88 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1452:1452 -> i
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():88 -> i
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():88:88 -> i
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> i
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():88 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():93:93 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):91:91 -> j
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():93 -> j
     1:1:boolean isPartialView():83:83 -> m
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():101:107 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lu;"}
     1:1:int size():63:63 -> size
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.fc0:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.jc0:
 # {"id":"sourceFile","fileName":"SingletonImmutableList.java"}
     java.lang.Object element -> d
     1:1:void <init>(java.lang.Object):38:38 -> <init>
@@ -36619,21 +36619,21 @@
     2:2:void <init>(java.lang.Object):39 -> <init>
     3:3:void <init>(java.lang.Object):39:39 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65:65 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> e
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):66 -> e
     3:3:boolean isPartialView():76:76 -> e
     1:2:java.lang.Object get(int):44:45 -> get
     1:1:java.util.Iterator iterator():31:31 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():50:50 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1110:1110 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():50 -> iterator
     1:1:int size():60:60 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
     1:1:java.util.List subList(int,int):31:31 -> subList
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.gc0:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.kc0:
 # {"id":"sourceFile","fileName":"SingletonImmutableSet.java"}
     java.lang.Object element -> d
     1:1:void <init>(java.lang.Object):39:39 -> <init>
@@ -36641,7 +36641,7 @@
     2:2:void <init>(java.lang.Object):40 -> <init>
     3:3:void <init>(java.lang.Object):40:40 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList asList():60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():60 -> a
     3:3:int copyIntoArray(java.lang.Object[],int):70:70 -> a
@@ -36650,17 +36650,17 @@
     1:1:boolean isPartialView():65:65 -> e
     1:1:int hashCode():76:76 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55:55 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ik0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk0;"}
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1110:1110 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():55 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.wc0:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.Ac0:
 # {"id":"sourceFile","fileName":"SortedIterable.java"}
     java.util.Comparator comparator() -> comparator
 com.android.tools.r8.com.google.common.collect.SortedIterables -> R8$$REMOVED$$CLASS$$39:
 # {"id":"sourceFile","fileName":"SortedIterables.java"}
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.ge0:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.ke0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     1:3:java.util.stream.Stream stream(java.lang.Iterable):67:69 -> a
     4:4:java.util.stream.Stream concat(java.util.stream.Stream[]):173:173 -> a
@@ -36684,7 +36684,7 @@
     26:26:java.util.Spliterator lambda$concat$0(java.util.Spliterator):185:185 -> a
     27:27:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     27:27:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):427 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/stream/Stream;Lcom/android/tools/r8/internal/ee0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/stream/Stream;Lcom/android/tools/r8/internal/ie0;)Ljava/util/stream/Stream;"}
     28:28:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     28:28:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):428 -> a
     29:37:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):429:437 -> a
@@ -36699,22 +36699,22 @@
     103:117:java.util.stream.Stream zip(java.util.stream.Stream,java.util.stream.Stream,java.util.function.BiFunction):329:343 -> a
     1:3:void closeAll(java.util.stream.BaseStream[]):152:154 -> b
     1:3:void lambda$concat$1(java.util.stream.Stream[]):189 -> b
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.be0:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.fe0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     java.util.Iterator val$itrA -> a
     java.util.Iterator val$itrB -> b
     java.util.function.BiFunction val$function -> c
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):331:331 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):334:335 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.ce0:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.ge0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.fromSpliterator -> a
     long com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.index -> b
     java.lang.Object holder -> c
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ee0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ie0;"}
     1:1:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):455:455 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;JLcom/android/tools/r8/internal/ee0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Spliterator;JLcom/android/tools/r8/internal/ie0;)V"}
     2:4:void com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.<init>(java.util.Spliterator,long):745:747 -> <init>
     2:4:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):456 -> <init>
     1:1:void accept(java.lang.Object):461:461 -> accept
@@ -36729,21 +36729,21 @@
     8:8:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():737 -> trySplit
     9:9:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():762:762 -> trySplit
     9:9:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():737 -> trySplit
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.de0:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.he0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     long index -> a
     java.util.Iterator val$fromIterator -> b
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ee0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ie0;"}
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):437:438 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JILjava/util/Iterator;Lcom/android/tools/r8/internal/ee0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JILjava/util/Iterator;Lcom/android/tools/r8/internal/ie0;)V"}
     1:2:boolean tryAdvance(java.util.function.Consumer):442:443 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.ee0:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.ie0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     java.lang.Object apply(java.lang.Object,long) -> a
 com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> R8$$REMOVED$$CLASS$$40:
 # {"id":"sourceFile","fileName":"Streams.java"}
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.Ah0:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.Eh0:
 # {"id":"sourceFile","fileName":"TransformedIterator.java"}
     java.util.Iterator backingIterator -> b
     1:1:void <init>(java.util.Iterator):37:37 -> <init>
@@ -36754,7 +36754,7 @@
     1:1:boolean hasNext():46:46 -> hasNext
     1:1:java.lang.Object next():52:52 -> next
     1:1:void remove():57:57 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.ik0:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.mk0:
 # {"id":"sourceFile","fileName":"UnmodifiableIterator.java"}
     1:1:void <init>():38:38 -> <init>
     1:1:void remove():50:50 -> remove
@@ -36765,20 +36765,20 @@
     java.nio.ByteBuffer scratch -> a
     1:2:void <init>():35:36 -> <init>
     1:1:com.android.tools.r8.com.google.common.hash.Hasher putByte(byte):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ns;"}
     2:3:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.update(byte):142:143 -> a
     2:3:com.android.tools.r8.com.google.common.hash.Hasher putByte(byte):79 -> a
     4:5:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int):94:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ns;"}
     6:7:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.update(byte[],int,int):148:149 -> a
     6:7:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int):95 -> a
     8:9:com.android.tools.r8.com.google.common.hash.Hasher putInt(int):116:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ns;"}
     10:11:com.android.tools.r8.com.google.common.hash.Hasher putLong(long):123:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ns;"}
     12:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     12:12:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ns;"}
     13:13:void update(byte[]):43:43 -> a
     13:13:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):87 -> a
     14:15:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.update(byte[],int,int):148:149 -> a
@@ -36802,14 +36802,14 @@
 # {"id":"sourceFile","fileName":"AbstractHasher.java"}
     1:1:void <init>():30:30 -> <init>
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ns;"}
     1:1:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/nio/charset/Charset;)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/nio/charset/Charset;)Lcom/android/tools/r8/internal/Ns;"}
     2:2:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ns;"}
 com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher -> R8$$REMOVED$$CLASS$$42:
 # {"id":"sourceFile","fileName":"AbstractStreamingHasher.java"}
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Ks:
 # {"id":"sourceFile","fileName":"HashCode.java"}
     char[] hexDigits -> b
     1:1:void <clinit>():421:421 -> <clinit>
@@ -36849,39 +36849,39 @@
     2:2:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():305:305 -> toString
     2:2:java.lang.String toString():413 -> toString
     3:7:java.lang.String toString():414:418 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Js:
 # {"id":"sourceFile","fileName":"HashCode.java"}
     byte[] bytes -> c
     1:1:void <init>(byte[]):254:254 -> <init>
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(byte[]):255 -> <init>
     3:3:void <init>(byte[]):255:255 -> <init>
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.Ns:
 # {"id":"sourceFile","fileName":"Hasher.java"}
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Js;"}
     com.android.tools.r8.com.google.common.hash.Hasher putByte(byte) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ns;"}
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/Ns;"}
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ns;"}
     com.android.tools.r8.com.google.common.hash.Hasher putLong(long) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ls;"}
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.Ns:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ns;"}
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.Ps:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vN;"}
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Ms:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zN;"}
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Os:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zN;"}
     1:1:void <clinit>():257:257 -> <clinit>
 com.android.tools.r8.com.google.common.hash.Java8Compatibility -> R8$$REMOVED$$CLASS$$43:
 # {"id":"sourceFile","fileName":"Java8Compatibility.java"}
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.vN:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.zN:
 # {"id":"sourceFile","fileName":"MessageDigestHashFunction.java"}
     java.security.MessageDigest prototype -> b
     int bytes -> c
@@ -36898,14 +36898,14 @@
     8:8:java.security.MessageDigest getMessageDigest(java.lang.String):87:87 -> <init>
     8:8:void <init>(java.lang.String,java.lang.String):48 -> <init>
     1:8:com.android.tools.r8.com.google.common.hash.Hasher newHasher():93:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ns;"}
     9:9:java.security.MessageDigest getMessageDigest(java.lang.String):85:85 -> a
     9:9:com.android.tools.r8.com.google.common.hash.Hasher newHasher():100 -> a
     10:10:com.android.tools.r8.com.google.common.hash.Hasher newHasher():100:100 -> a
     11:11:java.security.MessageDigest getMessageDigest(java.lang.String):87:87 -> a
     11:11:com.android.tools.r8.com.google.common.hash.Hasher newHasher():100 -> a
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.uN:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.yN:
 # {"id":"sourceFile","fileName":"MessageDigestHashFunction.java"}
     java.security.MessageDigest digest -> b
     int bytes -> c
@@ -36914,7 +36914,7 @@
     1:3:void <init>(java.security.MessageDigest,int,com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1):130 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/security/MessageDigest;I)V"}
     1:4:com.android.tools.r8.com.google.common.hash.HashCode hash():164:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Js;"}
     5:5:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.HashCode.fromBytesNoCopy(byte[]):248:248 -> a
     5:5:com.android.tools.r8.com.google.common.hash.HashCode hash():167 -> a
     6:6:com.android.tools.r8.com.google.common.hash.HashCode hash():168:168 -> a
@@ -36923,11 +36923,11 @@
     1:1:void checkNotDone():159:159 -> b
     2:2:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):512:512 -> b
     2:2:void checkNotDone():159 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.NP:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.RP:
 # {"id":"sourceFile","fileName":"Murmur3_128HashFunction.java"}
     int seed -> b
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RP;"}
     1:3:void <clinit>():46:48 -> <clinit>
     1:2:void <init>(int):54:55 -> <init>
     1:3:boolean equals(java.lang.Object):75:77 -> equals
@@ -36937,11 +36937,11 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String com.android.tools.r8.internal.Murmur3_128HashFunction.toString():0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":72,"2":73,"3":74},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":72,"2":73,"3":74},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     72:72:java.lang.String toString():70:70 -> toString
     73:73:java.lang.String toString():70:70 -> toString
     74:74:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.MP:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.QP:
 # {"id":"sourceFile","fileName":"Murmur3_128HashFunction.java"}
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.buffer -> a
     int com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.bufferSize -> b
@@ -36954,7 +36954,7 @@
     1:9:void <init>(int):96 -> <init>
     10:12:void <init>(int):97:99 -> <init>
     1:1:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytes(byte[],int,int):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)Lcom/android/tools/r8/internal/Ns;"}
     2:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytesInternal(java.nio.ByteBuffer):114:115 -> a
     2:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putBytes(byte[],int,int):96 -> a
     4:4:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():207:207 -> a
@@ -37002,7 +37002,7 @@
     40:44:void process(java.nio.ByteBuffer):106 -> a
     45:45:void process(java.nio.ByteBuffer):107:107 -> a
     46:46:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putByte(byte):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(B)Lcom/android/tools/r8/internal/Ns;"}
     47:47:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():207:207 -> a
     47:47:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putByte(byte):151 -> a
     48:48:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():214:214 -> a
@@ -37016,7 +37016,7 @@
     50:55:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():209 -> a
     50:55:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putByte(byte):151 -> a
     56:56:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putInt(int):174:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ns;"}
     57:57:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():207:207 -> a
     57:57:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putInt(int):175 -> a
     58:58:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():214:214 -> a
@@ -37030,7 +37030,7 @@
     60:65:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():209 -> a
     60:65:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putInt(int):175 -> a
     66:66:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putLong(long):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Ns;"}
     67:67:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():207:207 -> a
     67:67:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putLong(long):183 -> a
     68:68:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():214:214 -> a
@@ -37045,7 +37045,7 @@
     70:75:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.putLong(long):183 -> a
     76:76:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():214:214 -> a
     76:76:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Js;"}
     77:77:void com.android.tools.r8.com.google.common.hash.Java8Compatibility.flip(java.nio.Buffer):32:32 -> a
     77:77:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():214 -> a
     77:77:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():189 -> a
@@ -37079,10 +37079,10 @@
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.HashCode.fromBytesNoCopy(byte[]):248:248 -> a
     185:185:com.android.tools.r8.com.google.common.hash.HashCode makeHash():183 -> a
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():195 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.x5:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.z5:
 # {"id":"sourceFile","fileName":"BaseEncoding.java"}
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x5;"}
     1:3:void <clinit>():336:338 -> <clinit>
     4:4:void com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding.<init>(java.lang.String,java.lang.String,java.lang.Character):1003:1003 -> <clinit>
     4:4:void <clinit>():338 -> <clinit>
@@ -37111,7 +37111,7 @@
     5:11:java.lang.String encode(byte[]):150 -> a
     12:12:java.lang.String encode(byte[],int,int):163:163 -> a
     12:12:java.lang.String encode(byte[]):150 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.v5:
 # {"id":"sourceFile","fileName":"BaseEncoding.java"}
     java.lang.String name -> a
     char[] chars -> b
@@ -37135,11 +37135,11 @@
     1:3:boolean equals(java.lang.Object):604:606 -> equals
     1:1:int hashCode():613:613 -> hashCode
     1:1:java.lang.String toString():599:599 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.u5:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.w5:
 # {"id":"sourceFile","fileName":"BaseEncoding.java"}
     char[] encoding -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):962:962 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;)V"}
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):955:955 -> <init>
     3:3:char[] com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet.access$000(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):436:436 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):963 -> <init>
@@ -37155,11 +37155,11 @@
     1:5:void encodeTo(java.lang.Appendable,byte[],int,int):973:977 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;[BI)V"}
     6:6:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):997:997 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;)Lcom/android/tools/r8/internal/x5;"}
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.v5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;)Lcom/android/tools/r8/internal/z5;"}
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.x5:
 # {"id":"sourceFile","fileName":"BaseEncoding.java"}
     1:1:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):1007:1007 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;Ljava/lang/Character;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;Ljava/lang/Character;)V"}
     2:2:char[] com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet.access$000(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):436:436 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):1008 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):1008:1008 -> <init>
@@ -37192,14 +37192,14 @@
     19:19:void encodeTo(java.lang.Appendable,byte[],int,int):1021 -> a
     20:23:void encodeTo(java.lang.Appendable,byte[],int,int):1021:1024 -> a
     24:24:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):1054:1054 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;)Lcom/android/tools/r8/internal/x5;"}
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.w5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;)Lcom/android/tools/r8/internal/z5;"}
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.y5:
 # {"id":"sourceFile","fileName":"BaseEncoding.java"}
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v5;"}
     java.lang.Character paddingChar -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):626:626 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;Ljava/lang/Character;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;Ljava/lang/Character;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):627 -> <init>
     3:5:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):627:629 -> <init>
@@ -37220,11 +37220,11 @@
     26:26:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean):129:129 -> a
     26:26:void encodeChunkTo(java.lang.Appendable,byte[],int,int):698 -> a
     27:27:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):921:921 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t5;)Lcom/android/tools/r8/internal/x5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v5;)Lcom/android/tools/r8/internal/z5;"}
     1:4:boolean equals(java.lang.Object):940:943 -> equals
     1:1:int hashCode():950:950 -> hashCode
     1:10:java.lang.String toString():926:935 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.J7:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.L7:
 # {"id":"sourceFile","fileName":"ByteStreams.java"}
     1:1:void <clinit>():655:655 -> <clinit>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
@@ -37251,7 +37251,7 @@
     41:54:byte[] toByteArray(java.io.InputStream):242 -> a
     55:55:byte[] toByteArrayInternal(java.io.InputStream,java.util.Queue,int):209:209 -> a
     55:55:byte[] toByteArray(java.io.InputStream):242 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.K7:
 # {"id":"sourceFile","fileName":"ByteStreams.java"}
     1:1:void <init>():656:656 -> <init>
     1:1:java.lang.String toString():676:676 -> toString
@@ -37261,7 +37261,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> write
     3:3:void write(byte[],int,int):670 -> write
     4:4:void write(byte[],int,int):671:671 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.sb:
 # {"id":"sourceFile","fileName":"CharSequenceReader.java"}
     java.lang.CharSequence seq -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -37308,10 +37308,10 @@
     5:6:long skip(long):118:119 -> skip
     7:7:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):204:204 -> skip
     7:7:long skip(long):116 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.vb:
 # {"id":"sourceFile","fileName":"CharSource.java"}
     1:1:void <init>():90:90 -> <init>
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.tb:
 # {"id":"sourceFile","fileName":"CharSource.java"}
     java.lang.CharSequence seq -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
@@ -37329,29 +37329,29 @@
     3:15:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):564:576 -> toString
     3:15:java.lang.String toString():622 -> toString
     16:16:java.lang.String toString():622:622 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.ub:
 # {"id":"sourceFile","fileName":"CharSource.java"}
     1:1:void <init>(java.lang.String):643:643 -> <init>
     1:1:java.io.Reader openStream():648:648 -> a
 com.android.tools.r8.com.google.common.io.CharStreams -> R8$$REMOVED$$CLASS$$44:
 # {"id":"sourceFile","fileName":"CharStreams.java"}
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.yd:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.Ad:
 # {"id":"sourceFile","fileName":"Closeables.java"}
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():38:38 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.Ed:
 # {"id":"sourceFile","fileName":"Closer.java"}
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dd;"}
     java.util.Deque stack -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dd;"}
     1:5:com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor.tryCreate():269:273 -> <clinit>
     1:5:void <clinit>():99 -> <clinit>
     6:6:void <clinit>():100:100 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.io.Closer$Suppressor):115:115 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dd;)V"}
     2:2:void <init>(com.android.tools.r8.com.google.common.io.Closer$Suppressor):111:111 -> <init>
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.io.Closer$Suppressor):116 -> <init>
@@ -37379,29 +37379,29 @@
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):108 -> close
     24:24:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):190 -> close
     24:24:void close():229 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.Bd:
 # {"id":"sourceFile","fileName":"Closer.java"}
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bd;"}
     1:1:void <clinit>():249:249 -> <clinit>
     1:1:void <init>():247:247 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):254:254 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.Cd:
 # {"id":"sourceFile","fileName":"Closer.java"}
     java.lang.reflect.Method addSuppressed -> a
     1:2:void <init>(java.lang.reflect.Method):278:279 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):289:289 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):254:254 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):292 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.Dd:
 # {"id":"sourceFile","fileName":"Closer.java"}
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.io.Files -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.com.google.common.io.Files -> com.android.tools.r8.internal.Op:
 # {"id":"sourceFile","fileName":"Files.java"}
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     1:1:java.lang.String getFileExtension(java.lang.String):799 -> a
     2:4:java.lang.String getFileExtension(java.lang.String):800:802 -> a
-com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.hA:
 # {"id":"sourceFile","fileName":"IntMath.java"}
     int[] biggestBinomials -> a
     1:1:void <clinit>():673:673 -> <clinit>
@@ -37422,7 +37422,7 @@
     29:29:int com.android.tools.r8.internal.IntMath.log2(int,java.math.RoundingMode):0 -> a
     30:30:int log2(int,java.math.RoundingMode):0:0 -> a
     30:30:int com.android.tools.r8.internal.IntMath.log2(int,java.math.RoundingMode):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32,"2":33,"3":34,"4":35,"5":36},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32,"2":33,"3":34,"4":35,"5":36},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     31:31:int com.android.tools.r8.com.google.common.math.MathPreconditions.checkPositive(java.lang.String,int):33:33 -> a
     31:31:int log2(int,java.math.RoundingMode):118 -> a
     31:31:int com.android.tools.r8.internal.IntMath.log2(int,java.math.RoundingMode):0 -> a
@@ -37443,7 +37443,7 @@
     91:91:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):88:88 -> a
     91:91:int divide(int,int,java.math.RoundingMode):340 -> a
     92:92:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.gA:
 # {"id":"sourceFile","fileName":"IntMath.java"}
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():119:119 -> <clinit>
@@ -37451,13 +37451,13 @@
 # {"id":"sourceFile","fileName":"MathPreconditions.java"}
 com.android.tools.r8.com.google.common.primitives.Bytes -> R8$$REMOVED$$CLASS$$46:
 # {"id":"sourceFile","fileName":"Bytes.java"}
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.xB:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.zB:
 # {"id":"sourceFile","fileName":"Ints.java"}
     1:1:int saturatedCast(long):102:102 -> a
     2:2:int fromBytes(byte,byte,byte,byte):335:335 -> a
 com.android.tools.r8.com.google.common.primitives.Longs -> R8$$REMOVED$$CLASS$$47:
 # {"id":"sourceFile","fileName":"Longs.java"}
-com.android.tools.r8.com.google.common.primitives.Longs$AsciiDigits -> com.android.tools.r8.internal.TL:
+com.android.tools.r8.com.google.common.primitives.Longs$AsciiDigits -> com.android.tools.r8.internal.XL:
 # {"id":"sourceFile","fileName":"Longs.java"}
     byte[] asciiDigits -> a
     1:10:void <clinit>():340:349 -> <clinit>
@@ -37696,25 +37696,25 @@
 # {"id":"sourceFile","fileName":"AbstractListeningExecutorService.java"}
 com.android.tools.r8.com.google.common.util.concurrent.FluentFuture -> R8$$REMOVED$$CLASS$$49:
 # {"id":"sourceFile","fileName":"FluentFuture.java"}
-com.android.tools.r8.com.google.common.util.concurrent.FluentFuture$TrustedFuture -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.com.google.common.util.concurrent.FluentFuture$TrustedFuture -> com.android.tools.r8.internal.Eq:
 # {"id":"sourceFile","fileName":"FluentFuture.java"}
     1:1:void com.android.tools.r8.com.google.common.util.concurrent.GwtFluentFutureCatchingSpecialization.<init>():29:29 -> <init>
     1:1:void com.android.tools.r8.com.google.common.util.concurrent.FluentFuture.<init>():124 -> <init>
     1:1:void <init>():85 -> <init>
     1:2:boolean com.android.tools.r8.com.google.common.util.concurrent.AbstractFuture.isCancelled():614:615 -> isCancelled
     1:2:boolean isCancelled():109 -> isCancelled
-com.android.tools.r8.com.google.common.util.concurrent.Futures -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.com.google.common.util.concurrent.Futures -> com.android.tools.r8.internal.wr:
 # {"id":"sourceFile","fileName":"Futures.java"}
     1:1:java.lang.Object getDone(java.util.concurrent.Future):1175:1175 -> a
     2:11:java.lang.Object com.android.tools.r8.com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly(java.util.concurrent.Future):247:256 -> a
     2:11:java.lang.Object getDone(java.util.concurrent.Future):1176 -> a
     12:12:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.String,java.lang.Object):601:601 -> a
     12:12:java.lang.Object getDone(java.util.concurrent.Future):1175 -> a
-com.android.tools.r8.com.google.common.util.concurrent.ImmediateFuture -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.com.google.common.util.concurrent.ImmediateFuture -> com.android.tools.r8.internal.iu:
 # {"id":"sourceFile","fileName":"ImmediateFuture.java"}
     java.lang.Object value -> b
     com.android.tools.r8.com.google.common.util.concurrent.ListenableFuture NULL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iu;"}
     1:3:void <clinit>():34:36 -> <clinit>
     1:2:void <init>(java.lang.Object):40:41 -> <init>
     1:1:boolean cancel(boolean):62:62 -> cancel
@@ -37726,12 +37726,12 @@
     1:1:boolean isCancelled():81:81 -> isCancelled
     1:1:boolean isDone():86:86 -> isDone
     1:1:java.lang.String toString():92:92 -> toString
-com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask -> com.android.tools.r8.internal.uB:
 # {"id":"sourceFile","fileName":"InterruptibleTask.java"}
     java.lang.Runnable DONE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tB;"}
     java.lang.Runnable PARKED -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tB;"}
     1:2:void <clinit>():51:52 -> <clinit>
     1:1:void <init>():36:36 -> <init>
     1:37:void waitForInterrupt(java.lang.Thread):117:153 -> a
@@ -37767,30 +37767,30 @@
     14:14:java.lang.String com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.toPendingString():146:146 -> toString
     14:14:java.lang.String toString():261 -> toString
     15:15:java.lang.String toString():261:261 -> toString
-com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$Blocker -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$Blocker -> com.android.tools.r8.internal.sB:
 # {"id":"sourceFile","fileName":"InterruptibleTask.java"}
     com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask task -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zh0;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask):225:226 -> <init>
     1:2:void <init>(com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask,com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$1):222 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zh0;)V"}
     1:1:void setOwner(java.lang.Thread):233:233 -> a
     1:1:void access$200(com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$Blocker,java.lang.Thread):222 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qB;Ljava/lang/Thread;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sB;Ljava/lang/Thread;)V"}
     1:1:void run():230:230 -> run
     1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$DoNothingRunnable -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$DoNothingRunnable -> com.android.tools.r8.internal.tB:
 # {"id":"sourceFile","fileName":"InterruptibleTask.java"}
     1:1:void <init>():45:45 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask$1):45 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void run():47:47 -> run
-com.android.tools.r8.com.google.common.util.concurrent.ListenableFuture -> com.android.tools.r8.internal.bL:
+com.android.tools.r8.com.google.common.util.concurrent.ListenableFuture -> com.android.tools.r8.internal.fL:
 # {"id":"sourceFile","fileName":"ListenableFuture.java"}
 com.android.tools.r8.com.google.common.util.concurrent.MoreExecutors -> R8$$REMOVED$$CLASS$$50:
 # {"id":"sourceFile","fileName":"MoreExecutors.java"}
-com.android.tools.r8.com.google.common.util.concurrent.MoreExecutors$DirectExecutorService -> com.android.tools.r8.internal.WO:
+com.android.tools.r8.com.google.common.util.concurrent.MoreExecutors$DirectExecutorService -> com.android.tools.r8.internal.aP:
 # {"id":"sourceFile","fileName":"MoreExecutors.java"}
     java.lang.Object lock -> a
     int runningTasks -> b
@@ -37826,10 +37826,10 @@
 # {"id":"sourceFile","fileName":"OverflowAvoidingLockSupport.java"}
 com.android.tools.r8.com.google.common.util.concurrent.Platform -> R8$$REMOVED$$CLASS$$52:
 # {"id":"sourceFile","fileName":"Platform.java"}
-com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask -> com.android.tools.r8.internal.Wh0:
+com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask -> com.android.tools.r8.internal.ai0:
 # {"id":"sourceFile","fileName":"TrustedListenableFutureTask.java"}
     com.android.tools.r8.com.google.common.util.concurrent.InterruptibleTask task -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zh0;"}
     1:2:void <init>(java.util.concurrent.Callable):70:71 -> <init>
     1:2:boolean com.android.tools.r8.com.google.common.util.concurrent.AbstractFuture.wasInterrupted():723:724 -> a
     1:2:void afterDone():95 -> a
@@ -37841,37 +37841,37 @@
     24:24:void afterDone():102:102 -> a
     1:5:java.lang.String pendingToString():108:112 -> b
     1:9:void run():80:88 -> run
-com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask -> com.android.tools.r8.internal.Vh0:
+com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask -> com.android.tools.r8.internal.Zh0:
 # {"id":"sourceFile","fileName":"TrustedListenableFutureTask.java"}
     java.util.concurrent.Callable callable -> d
     com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ai0;"}
     1:1:void <init>(com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask,java.util.concurrent.Callable):119:119 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wh0;Ljava/util/concurrent/Callable;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai0;Ljava/util/concurrent/Callable;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask,java.util.concurrent.Callable):120 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.common.util.concurrent.TrustedListenableFutureTask,java.util.concurrent.Callable):120:120 -> <init>
 com.android.tools.r8.com.google.common.util.concurrent.Uninterruptibles -> R8$$REMOVED$$CLASS$$53:
 # {"id":"sourceFile","fileName":"Uninterruptibles.java"}
-com.android.tools.r8.com.google.common.util.concurrent.internal.InternalFutureFailureAccess -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.com.google.common.util.concurrent.internal.InternalFutureFailureAccess -> com.android.tools.r8.internal.XA:
 # {"id":"sourceFile","fileName":"InternalFutureFailureAccess.java"}
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.gson.FieldAttributes -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.com.google.gson.FieldAttributes -> com.android.tools.r8.internal.ep:
 # {"id":"sourceFile","fileName":"FieldAttributes.java"}
     java.lang.reflect.Field field -> a
     1:2:void <init>(java.lang.reflect.Field):44:45 -> <init>
     1:1:java.lang.String toString():139:139 -> toString
 com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> R8$$REMOVED$$CLASS$$54:
 # {"id":"sourceFile","fileName":"FieldNamingPolicy.java"}
-com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.ts:
 # {"id":"sourceFile","fileName":"Gson.java"}
     java.lang.ThreadLocal threadLocalAdapterResults -> a
     java.util.concurrent.ConcurrentMap typeTokenCache -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pg;"}
     com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SC;"}
     java.util.List factories -> e
     boolean htmlSafe -> f
     1:9:void <init>():234:242 -> <init>
@@ -37955,7 +37955,7 @@
     179:208:void <init>(com.android.tools.r8.com.google.gson.internal.Excluder,com.android.tools.r8.com.google.gson.FieldNamingStrategy,java.util.Map,boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.com.google.gson.LongSerializationPolicy,java.lang.String,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.com.google.gson.ToNumberStrategy,com.android.tools.r8.com.google.gson.ToNumberStrategy,java.util.List):314:343 -> <init>
     179:208:void <init>():234 -> <init>
     1:29:com.android.tools.r8.com.google.gson.TypeAdapter getAdapter(com.android.tools.r8.com.google.gson.reflect.TypeToken):528:556 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     30:33:void com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter.setDelegate(com.android.tools.r8.com.google.gson.TypeAdapter):1345:1348 -> a
     30:33:com.android.tools.r8.com.google.gson.TypeAdapter getAdapter(com.android.tools.r8.com.google.gson.reflect.TypeToken):558 -> a
     34:34:com.android.tools.r8.com.google.gson.TypeAdapter getAdapter(com.android.tools.r8.com.google.gson.reflect.TypeToken):560:560 -> a
@@ -37996,7 +37996,7 @@
     68:68:java.lang.String toJson(java.lang.Object,java.lang.reflect.Type):759 -> a
     68:68:java.lang.String toJson(java.lang.Object):736 -> a
     69:69:void toJson(java.lang.Object,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.stream.JsonWriter):834:834 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/lang/Class;Lcom/android/tools/r8/internal/dD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/lang/Class;Lcom/android/tools/r8/internal/fD;)V"}
     70:70:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.reflect.Type):314:314 -> a
     70:70:void toJson(java.lang.Object,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.stream.JsonWriter):834 -> a
     71:71:void toJson(java.lang.Object,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.stream.JsonWriter):834:834 -> a
@@ -38031,12 +38031,12 @@
     87:87:void toJson(java.lang.Object,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.stream.JsonWriter):850 -> a
     88:88:void toJson(java.lang.Object,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.stream.JsonWriter):851:851 -> a
     1:1:java.lang.String toString():1377:1377 -> toString
-com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.os:
 # {"id":"sourceFile","fileName":"Gson.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):399:399 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):399:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):409:412 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):399 -> a
     6:6:void com.android.tools.r8.com.google.gson.Gson.checkValidFloatingPoint(double):447:447 -> a
@@ -38047,12 +38047,12 @@
     8:8:void com.android.tools.r8.com.google.gson.Gson.checkValidFloatingPoint(double):448:448 -> a
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):413 -> a
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):399 -> a
-com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.ps:
 # {"id":"sourceFile","fileName":"Gson.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):423:423 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):423:423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):433:436 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):423 -> a
     6:6:void com.android.tools.r8.com.google.gson.Gson.checkValidFloatingPoint(double):447:447 -> a
@@ -38063,40 +38063,40 @@
     9:9:void com.android.tools.r8.com.google.gson.Gson.checkValidFloatingPoint(double):448:448 -> a
     9:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):437 -> a
     9:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):423 -> a
-com.android.tools.r8.com.google.gson.Gson$4 -> com.android.tools.r8.internal.os:
+com.android.tools.r8.com.google.gson.Gson$4 -> com.android.tools.r8.internal.qs:
 # {"id":"sourceFile","fileName":"Gson.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):477:477 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):477:477 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicLong):479:479 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):477 -> a
-com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.rs:
 # {"id":"sourceFile","fileName":"Gson.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):489:489 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):489:489 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicLongArray):491:495 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):489 -> a
-com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.qs:
+com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.ss:
 # {"id":"sourceFile","fileName":"Gson.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void com.android.tools.r8.com.google.gson.internal.bind.SerializationDelegatingTypeAdapter.<init>():8:8 -> <init>
     1:1:void <init>():1341 -> <init>
     2:2:void <init>():1342:1342 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter delegate():1352:1352 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):1371 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):1371:1371 -> a
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter delegate():1356:1356 -> a
     3:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):1371 -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.RC:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.TC:
 # {"id":"sourceFile","fileName":"JsonArray.java"}
     java.util.ArrayList elements -> b
     1:2:void <init>():45:46 -> <init>
@@ -38108,10 +38108,10 @@
     1:5:com.android.tools.r8.com.google.gson.JsonElement getAsSingleElement():232:236 -> h
     1:5:com.android.tools.r8.internal.JsonElement com.android.tools.r8.internal.JsonArray.getAsSingleElement():0 -> h
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UC;"}
     6:6:com.android.tools.r8.com.google.gson.JsonElement getAsSingleElement():0:0 -> h
     6:6:com.android.tools.r8.internal.JsonElement com.android.tools.r8.internal.JsonArray.getAsSingleElement():0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245,"4":246},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245,"4":246},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     242:242:com.android.tools.r8.com.google.gson.JsonElement getAsSingleElement():236:236 -> h
     242:242:com.android.tools.r8.internal.JsonElement com.android.tools.r8.internal.JsonArray.getAsSingleElement():0 -> h
     243:243:com.android.tools.r8.com.google.gson.JsonElement getAsSingleElement():236:236 -> h
@@ -38121,18 +38121,18 @@
     1:1:int hashCode():431:431 -> hashCode
     1:1:java.util.Iterator iterator():216:216 -> iterator
     1:1:int size():195:195 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.UC:
 # {"id":"sourceFile","fileName":"JsonElement.java"}
     1:1:void <init>():40:40 -> <init>
     1:1:boolean getAsBoolean():162:162 -> a
     1:1:int getAsInt():239:239 -> b
     1:1:boolean isJsonArray():57:57 -> c
     1:1:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray():114 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TC;"}
     2:4:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray():115:117 -> c
     1:1:boolean isJsonObject():66:66 -> d
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():98 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XC;"}
     2:4:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject():99:101 -> d
     1:1:long getAsLong():226:226 -> e
     1:1:java.lang.String getAsString():187:187 -> f
@@ -38145,53 +38145,53 @@
     5:5:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):73 -> toString
     5:5:java.lang.String toString():323 -> toString
     6:8:java.lang.String toString():324:326 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.VC:
 # {"id":"sourceFile","fileName":"JsonIOException.java"}
     1:1:void <init>(java.lang.String):29:29 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):33:33 -> <init>
     3:3:void <init>(java.lang.Throwable):43:43 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Exception;)V"}
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.UC:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.WC:
 # {"id":"sourceFile","fileName":"JsonNull.java"}
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WC;"}
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():40:40 -> <init>
     1:1:boolean equals(java.lang.Object):67:67 -> equals
     1:1:int hashCode():59:59 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.XC:
 # {"id":"sourceFile","fileName":"JsonObject.java"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lK;"}
     1:1:void <init>():43:43 -> <init>
     2:2:void <init>():37:37 -> <init>
     3:3:void com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.<init>(boolean):77:77 -> <init>
     3:3:void <init>():37 -> <init>
     4:4:void <init>():37:37 -> <init>
     1:1:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/SC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/UC;)V"}
     2:2:void addProperty(java.lang.String,java.lang.String):92:92 -> a
     3:3:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/UC;"}
     1:1:boolean has(java.lang.String):175:175 -> b
     1:2:boolean equals(java.lang.Object):247:248 -> equals
     1:1:java.util.Set entrySet():135:135 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gK;"}
     1:1:int hashCode():257:257 -> hashCode
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject(java.lang.String):221:221 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VC;"}
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.WC:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XC;"}
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.YC:
 # {"id":"sourceFile","fileName":"JsonParseException.java"}
     1:1:void <init>(java.lang.String):42:42 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):52:52 -> <init>
     3:3:void <init>(java.lang.Throwable):62:62 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Exception;)V"}
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.XC:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.ZC:
 # {"id":"sourceFile","fileName":"JsonParser.java"}
     1:1:void <init>():36:36 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parseString(java.lang.String):51:51 -> a
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/UC;"}
     2:4:com.android.tools.r8.com.google.gson.JsonElement parseReader(java.io.Reader):69:71 -> a
     2:4:com.android.tools.r8.com.google.gson.JsonElement parseString(java.lang.String):51 -> a
     2:4:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):115 -> a
@@ -38209,7 +38209,7 @@
     17:17:com.android.tools.r8.com.google.gson.JsonElement parseString(java.lang.String):51 -> a
     17:17:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):115 -> a
     18:18:com.android.tools.r8.com.google.gson.JsonElement parseReader(com.android.tools.r8.com.google.gson.stream.JsonReader):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aD;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cD;)Lcom/android/tools/r8/internal/UC;"}
     19:19:boolean com.android.tools.r8.com.google.gson.stream.JsonReader.isLenient():341:341 -> a
     19:19:com.android.tools.r8.com.google.gson.JsonElement parseReader(com.android.tools.r8.com.google.gson.stream.JsonReader):99 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -38223,7 +38223,7 @@
     25:25:void com.android.tools.r8.com.google.gson.stream.JsonReader.setLenient(boolean):334:334 -> a
     25:25:com.android.tools.r8.com.google.gson.JsonElement parseReader(com.android.tools.r8.com.google.gson.stream.JsonReader):108 -> a
     26:26:com.android.tools.r8.com.google.gson.JsonElement parseReader(com.android.tools.r8.com.google.gson.stream.JsonReader):109:109 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.aD:
 # {"id":"sourceFile","fileName":"JsonPrimitive.java"}
     java.lang.Object value -> b
     1:2:void <init>(java.lang.Boolean):42:43 -> <init>
@@ -38233,7 +38233,7 @@
     1:1:boolean getAsBoolean():106 -> a
     2:5:boolean getAsBoolean():107:110 -> a
     6:8:boolean isIntegral(com.android.tools.r8.com.google.gson.JsonPrimitive):302:304 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YC;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aD;)Z"}
     1:1:boolean isNumber():119:119 -> b
     1:1:int getAsInt():219 -> b
     2:2:int getAsInt():219:219 -> b
@@ -38250,33 +38250,33 @@
     6:8:java.lang.String getAsString():157:159 -> f
     1:6:java.lang.Number getAsNumber():132:137 -> h
     1:13:int hashCode():252:264 -> hashCode
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.bD:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.dD:
 # {"id":"sourceFile","fileName":"JsonSyntaxException.java"}
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Exception;)V"}
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.di0:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.hi0:
 # {"id":"sourceFile","fileName":"TypeAdapter.java"}
     1:1:void <init>():124:124 -> <init>
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.ci0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.gi0:
 # {"id":"sourceFile","fileName":"TypeAdapter.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):191:191 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hi0;)V"}
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):194:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
-com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.ei0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
+com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.ii0:
 # {"id":"sourceFile","fileName":"TypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
-com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.PC:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
+com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.RC:
 # {"id":"sourceFile","fileName":"JsonAdapter.java"}
     boolean nullSafe() -> nullSafe
     java.lang.Class value() -> value
-com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.Ma0:
+com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.Qa0:
 # {"id":"sourceFile","fileName":"SerializedName.java"}
     java.lang.String[] alternate() -> alternate
     java.lang.String value() -> value
@@ -38404,7 +38404,7 @@
     1:1:java.lang.reflect.Type[] getUpperBounds():611:611 -> getUpperBounds
     1:2:int hashCode():625:626 -> hashCode
     1:6:java.lang.String toString():630:635 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.Ng:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.Pg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.util.Map instanceCreators -> a
     java.util.List reflectionFilters -> b
@@ -38413,7 +38413,7 @@
     1:1:java.lang.reflect.Type com.android.tools.r8.com.google.gson.reflect.TypeToken.getType():119:119 -> a
     1:1:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/dU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hU;"}
     2:2:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     2:2:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):85 -> a
     3:15:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):90:102 -> a
@@ -38451,72 +38451,72 @@
     164:164:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):102:102 -> a
     165:165:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):90:90 -> a
     1:1:java.lang.String toString():392:392 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.Ag:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():300:300 -> <init>
     1:1:java.lang.Object construct():302:302 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.Bg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():306:306 -> <init>
     1:1:java.lang.Object construct():308:308 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.Ag:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.Cg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():312:312 -> <init>
     1:1:java.lang.Object construct():314:314 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.Dg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():318:318 -> <init>
     1:1:java.lang.Object construct():320:320 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.Eg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():328:328 -> <init>
     1:1:java.lang.Object construct():330:330 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$15 -> com.android.tools.r8.internal.Dg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$15 -> com.android.tools.r8.internal.Fg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():334:334 -> <init>
     1:1:java.lang.Object construct():336:336 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$16 -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$16 -> com.android.tools.r8.internal.Gg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():340:340 -> <init>
     1:1:java.lang.Object construct():342:342 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$17 -> com.android.tools.r8.internal.Fg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$17 -> com.android.tools.r8.internal.Hg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():347:347 -> <init>
     1:1:java.lang.Object construct():349:349 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$18 -> com.android.tools.r8.internal.Gg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$18 -> com.android.tools.r8.internal.Ig:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     1:1:void <init>():353:353 -> <init>
     1:1:java.lang.Object construct():355:355 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.<init>():66:66 -> a
     2:2:java.lang.Object construct():355 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$19 -> com.android.tools.r8.internal.Hg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$19 -> com.android.tools.r8.internal.Jg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.Class val$rawType -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.Class):366:366 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;)V"}
     1:4:java.lang.Object construct():370:373 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.Ig:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.Kg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.String val$exceptionMessage -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.String):134:134 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     1:1:java.lang.Object construct():136:136 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Jg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Lg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.reflect.Type val$type -> a
     1:1:void <init>(java.lang.reflect.Type):163:163 -> <init>
     1:11:java.lang.Object construct():165:175 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Mg:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.reflect.Type val$type -> a
     1:1:void <init>(java.lang.reflect.Type):183:183 -> <init>
     1:11:java.lang.Object construct():185:195 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.Lg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.Ng:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.String val$exceptionMessage -> a
     1:1:void <init>(java.lang.String):246:246 -> <init>
     1:1:java.lang.Object construct():252:252 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.Mg:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.Og:
 # {"id":"sourceFile","fileName":"ConstructorConstructor.java"}
     java.lang.reflect.Constructor val$constructor -> a
     1:1:void <init>(java.lang.reflect.Constructor):258:258 -> <init>
@@ -38525,18 +38525,18 @@
     16:16:java.lang.Object construct():276 -> a
     17:18:java.lang.Object construct():273:274 -> a
     19:19:java.lang.Object construct():268:268 -> a
-com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.zo:
 # {"id":"sourceFile","fileName":"Excluder.java"}
     java.util.List serializationStrategies -> b
     java.util.List deserializationStrategies -> c
     com.android.tools.r8.com.google.gson.internal.Excluder DEFAULT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zo;"}
     1:1:void <clinit>():52:52 -> <clinit>
     1:10:void <init>():50:59 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:boolean excludeClassChecks(java.lang.Class):201:201 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):112 -> a
     3:5:boolean excludeClassInStrategy(java.lang.Class,boolean):210:212 -> a
@@ -38554,21 +38554,21 @@
     14:14:boolean isAnonymousOrNonStaticLocal(java.lang.Class):221:221 -> a
     1:3:com.android.tools.r8.com.google.gson.internal.Excluder clone():63:65 -> clone
     1:3:java.lang.Object clone():50 -> clone
-com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.yo:
 # {"id":"sourceFile","fileName":"Excluder.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     boolean val$skipSerialize -> b
     com.android.tools.r8.com.google.gson.Gson val$gson -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
     com.android.tools.r8.com.google.gson.internal.Excluder this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zo;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.Excluder,boolean,boolean,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):121:121 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wo;ZZLcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zo;ZZLcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)V"}
     1:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):134:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     3:6:com.android.tools.r8.com.google.gson.TypeAdapter delegate():142:145 -> a
     3:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):138 -> a
     7:7:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getDelegateAdapter(com.android.tools.r8.com.google.gson.TypeAdapterFactory,com.android.tools.r8.com.google.gson.reflect.TypeToken):639:639 -> a
@@ -38584,7 +38584,7 @@
     24:24:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getDelegateAdapter(com.android.tools.r8.com.google.gson.TypeAdapterFactory,com.android.tools.r8.com.google.gson.reflect.TypeToken):657:657 -> a
     24:24:com.android.tools.r8.com.google.gson.TypeAdapter delegate():145 -> a
     24:24:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):138 -> a
-com.android.tools.r8.com.google.gson.internal.JavaVersion -> com.android.tools.r8.internal.FC:
+com.android.tools.r8.com.google.gson.internal.JavaVersion -> com.android.tools.r8.internal.HC:
 # {"id":"sourceFile","fileName":"JavaVersion.java"}
     int majorJavaVersion -> a
     1:1:int determineMajorJavaVersion():29:29 -> <clinit>
@@ -38600,7 +38600,7 @@
     16:16:void <clinit>():26:26 -> <clinit>
 com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> R8$$REMOVED$$CLASS$$56:
 # {"id":"sourceFile","fileName":"JsonReaderInternalAccess.java"}
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.YI:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.cJ:
 # {"id":"sourceFile","fileName":"LazilyParsedNumber.java"}
     java.lang.String value -> b
     1:2:void <init>(java.lang.String):34:35 -> <init>
@@ -38611,55 +38611,55 @@
     1:6:int intValue():41:46 -> intValue
     1:3:long longValue():54:56 -> longValue
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.hK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.lK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     java.util.Comparator comparator -> b
     boolean allowNullValues -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     int size -> e
     int modCount -> f
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet entrySet -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet keySet -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iK;"}
     java.util.Comparator NATURAL_ORDER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eK;"}
     boolean $assertionsDisabled -> k
     1:4:void <clinit>():42:45 -> <clinit>
     1:1:void <init>(java.util.Comparator,boolean):89:89 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)V"}
     2:42:void <init>(java.util.Comparator,boolean):54:94 -> <init>
     1:57:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node find(java.lang.Object,boolean):145:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Z)Lcom/android/tools/r8/internal/kK;"}
     58:58:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node findByObject(java.lang.Object):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/kK;"}
     59:60:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node findByEntry(java.util.Map$Entry):225:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;)Lcom/android/tools/r8/internal/kK;"}
     61:61:boolean equal(java.lang.Object,java.lang.Object):231:231 -> a
     61:61:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node findByEntry(java.util.Map$Entry):226 -> a
     62:76:void replaceInParent(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):308:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;Lcom/android/tools/r8/internal/gK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kK;Lcom/android/tools/r8/internal/kK;)V"}
     77:95:void rebalance(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):335:353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kK;Z)V"}
     96:118:void rebalance(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):349:371 -> a
     119:137:void rebalance(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):367:385 -> a
     138:138:void rebalance(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):334:334 -> a
     139:158:void rotateLeft(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):397:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kK;)V"}
     159:162:void rotateLeft(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):415:418 -> a
     163:163:void rotateLeft(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):417:417 -> a
     1:19:void removeInternal(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):242:260 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kK;Z)V"}
     20:23:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node.last():545:548 -> b
     20:23:void removeInternal(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):260 -> b
     24:27:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node.first():532:535 -> b
     24:27:void removeInternal(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):260 -> b
     28:63:void removeInternal(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,boolean):261:296 -> b
     64:83:void rotateRight(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):425:444 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kK;)V"}
     84:87:void rotateRight(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):443:446 -> b
     88:88:void rotateRight(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):445:445 -> b
     1:7:void clear():124:130 -> clear
@@ -38673,27 +38673,27 @@
     1:3:java.lang.Object remove(java.lang.Object):134 -> remove
     4:4:java.lang.Object remove(java.lang.Object):135:135 -> remove
     1:1:int size():98:98 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.aK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.eK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     1:1:void <init>():45:45 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):45:45 -> compare
     2:2:int compare(java.lang.Comparable,java.lang.Comparable):47:47 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):45 -> compare
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.cK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.gK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lK;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):588:588 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)V"}
     1:1:void clear():619:619 -> clear
     1:1:boolean contains(java.lang.Object):602:602 -> contains
     1:1:java.util.Iterator iterator():594:594 -> iterator
     1:9:boolean remove(java.lang.Object):606:614 -> remove
     1:1:int size():590:590 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.bK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.fK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):594:594 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gK;)V"}
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():567:575 -> next
     1:9:java.util.Map$Entry next():596 -> next
     1:9:java.lang.Object next():594 -> next
@@ -38703,12 +38703,12 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():569:569 -> next
     11:11:java.util.Map$Entry next():596 -> next
     11:11:java.lang.Object next():594 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.eK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.iK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lK;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):623:623 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)V"}
     1:1:void clear():645:645 -> clear
     1:1:boolean contains(java.lang.Object):637:637 -> contains
     1:1:java.util.Iterator iterator():629:629 -> iterator
@@ -38719,10 +38719,10 @@
     4:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):302:302 -> remove
     4:4:boolean remove(java.lang.Object):641 -> remove
     1:1:int size():625:625 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.dK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.hK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):629:629 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iK;)V"}
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():567:575 -> next
     1:9:java.lang.Object next():631 -> next
     10:10:java.lang.Object next():631:631 -> next
@@ -38730,47 +38730,47 @@
     11:11:java.lang.Object next():631 -> next
     12:12:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():569:569 -> next
     12:12:java.lang.Object next():631 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.fK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.jK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     int expectedModCount -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lK;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):559:559 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)V"}
     2:4:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):555:557 -> <init>
     1:1:boolean hasNext():563:563 -> hasNext
     1:6:void remove():579:584 -> remove
     7:7:void remove():580:580 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.gK:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.kK:
 # {"id":"sourceFile","fileName":"LinkedTreeMap.java"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node parent -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node left -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kK;"}
     java.lang.Object key -> g
     boolean allowNullValue -> h
     java.lang.Object value -> i
     int height -> j
     1:4:void <init>(boolean):474:477 -> <init>
     5:13:void <init>(boolean,com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,java.lang.Object,com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node,com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node):481:489 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/gK;Ljava/lang/Object;Lcom/android/tools/r8/internal/gK;Lcom/android/tools/r8/internal/gK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/kK;Ljava/lang/Object;Lcom/android/tools/r8/internal/kK;Lcom/android/tools/r8/internal/kK;)V"}
     1:4:boolean equals(java.lang.Object):510:513 -> equals
     1:1:java.lang.Object getKey():493:493 -> getKey
     1:1:java.lang.Object getValue():497:497 -> getValue
     1:2:int hashCode():519:520 -> hashCode
     1:5:java.lang.Object setValue(java.lang.Object):501:505 -> setValue
     1:1:java.lang.String toString():524:524 -> toString
-com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.dU:
+com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.hU:
 # {"id":"sourceFile","fileName":"ObjectConstructor.java"}
     java.lang.Object construct() -> a
 com.android.tools.r8.com.google.gson.internal.PreJava9DateFormatProvider -> R8$$REMOVED$$CLASS$$57:
@@ -38779,10 +38779,10 @@
 # {"id":"sourceFile","fileName":"Primitives.java"}
 com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper -> R8$$REMOVED$$CLASS$$59:
 # {"id":"sourceFile","fileName":"ReflectionAccessFilterHelper.java"}
-com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker -> com.android.tools.r8.internal.b40:
+com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker -> com.android.tools.r8.internal.f40:
 # {"id":"sourceFile","fileName":"ReflectionAccessFilterHelper.java"}
     com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f40;"}
     1:1:boolean com.android.tools.r8.com.google.gson.internal.JavaVersion.isJava9OrLater():88:88 -> <clinit>
     1:1:void <clinit>():72 -> <clinit>
     2:24:void <clinit>():74:96 -> <clinit>
@@ -38791,34 +38791,34 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     boolean canAccess(java.lang.reflect.AccessibleObject,java.lang.Object) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/reflect/AccessibleObject;)Z"}
-com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker$1 -> com.android.tools.r8.internal.Z30:
+com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker$1 -> com.android.tools.r8.internal.d40:
 # {"id":"sourceFile","fileName":"ReflectionAccessFilterHelper.java"}
     java.lang.reflect.Method val$canAccessMethod -> b
     1:1:void <init>(java.lang.reflect.Method):75:75 -> <init>
     1:3:boolean canAccess(java.lang.reflect.AccessibleObject,java.lang.Object):78:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/reflect/AccessibleObject;)Z"}
-com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker$2 -> com.android.tools.r8.internal.a40:
+com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper$AccessChecker$2 -> com.android.tools.r8.internal.e40:
 # {"id":"sourceFile","fileName":"ReflectionAccessFilterHelper.java"}
     1:1:void <init>():89:89 -> <init>
     1:1:boolean canAccess(java.lang.reflect.AccessibleObject,java.lang.Object):92:92 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/reflect/AccessibleObject;)Z"}
-com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.fe0:
+com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.je0:
 # {"id":"sourceFile","fileName":"Streams.java"}
     1:19:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):47:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aD;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cD;)Lcom/android/tools/r8/internal/UC;"}
     20:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):63:63 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):61:61 -> a
     22:25:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):56:59 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.Ck0:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.Gk0:
 # {"id":"sourceFile","fileName":"UnsafeAllocator.java"}
     com.android.tools.r8.com.google.gson.internal.UnsafeAllocator INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ck0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gk0;"}
     1:62:com.android.tools.r8.com.google.gson.internal.UnsafeAllocator create():53:114 -> <clinit>
     1:62:void <clinit>():45 -> <clinit>
     63:63:void <clinit>():45:45 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     java.lang.Object newInstance(java.lang.Class) -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.yk0:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.Ck0:
 # {"id":"sourceFile","fileName":"UnsafeAllocator.java"}
     java.lang.reflect.Method val$allocateInstance -> b
     java.lang.Object val$unsafe -> c
@@ -38831,7 +38831,7 @@
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):41:41 -> a
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.access$000(java.lang.Class):30 -> a
     10:10:java.lang.Object newInstance(java.lang.Class):62 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.zk0:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.Dk0:
 # {"id":"sourceFile","fileName":"UnsafeAllocator.java"}
     java.lang.reflect.Method val$newInstance -> b
     int val$constructorId -> c
@@ -38844,7 +38844,7 @@
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):41:41 -> a
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.access$000(java.lang.Class):30 -> a
     10:10:java.lang.Object newInstance(java.lang.Class):86 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.Ak0:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.Ek0:
 # {"id":"sourceFile","fileName":"UnsafeAllocator.java"}
     java.lang.reflect.Method val$newInstance -> b
     1:1:void <init>(java.lang.reflect.Method):102:102 -> <init>
@@ -38856,44 +38856,44 @@
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):41:41 -> a
     10:10:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.access$000(java.lang.Class):30 -> a
     10:10:java.lang.Object newInstance(java.lang.Class):106 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.Bk0:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.Fk0:
 # {"id":"sourceFile","fileName":"UnsafeAllocator.java"}
     1:1:void <init>():114:114 -> <init>
     1:1:java.lang.Object newInstance(java.lang.Class):117:117 -> a
 com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.P3:
 # {"id":"sourceFile","fileName":"ArrayTypeAdapter.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter componentTypeAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ji0;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O3;"}
     1:1:void <clinit>():37:37 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.TypeAdapter,java.lang.Class):57:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/di0;Ljava/lang/Class;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/hi0;Ljava/lang/Class;)V"}
     1:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):96:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
 com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter$1 -> com.android.tools.r8.internal.O3:
 # {"id":"sourceFile","fileName":"ArrayTypeAdapter.java"}
     1:1:void <init>():37:37 -> <init>
     1:1:java.lang.reflect.Type com.android.tools.r8.com.google.gson.reflect.TypeToken.getType():119:119 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):40:40 -> a
     3:4:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.$Gson$Types.getArrayComponentType(java.lang.reflect.Type):301:302 -> a
     3:4:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44 -> a
     5:5:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.reflect.Type):314:314 -> a
     5:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45 -> a
     6:10:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:49 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.he:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.je:
 # {"id":"sourceFile","fileName":"CollectionTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pg;"}
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):39:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ng;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pg;)V"}
     1:1:java.lang.reflect.Type com.android.tools.r8.com.google.gson.reflect.TypeToken.getType():119:119 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):47 -> a
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):48:48 -> a
@@ -38902,22 +38902,22 @@
     10:10:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.reflect.Type):314:314 -> a
     10:10:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):53 -> a
     11:15:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):53:57 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.ie:
 # {"id":"sourceFile","fileName":"CollectionTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter elementTypeAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ji0;"}
     1:2:void <init>(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.ObjectConstructor):67:68 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/di0;Lcom/android/tools/r8/internal/dU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/hi0;Lcom/android/tools/r8/internal/hU;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Collection):91:99 -> a
     2:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.Jh:
 # {"id":"sourceFile","fileName":"DateTypeAdapter.java"}
     java.util.List dateFormats -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ih;"}
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>():60:60 -> <init>
     2:7:void <init>():58:63 -> <init>
@@ -38927,27 +38927,27 @@
     9:9:void <init>():66 -> <init>
     10:10:void <init>():66:66 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Date):96:105 -> a
     2:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):46 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Date):104:104 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):46 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.Ih:
 # {"id":"sourceFile","fileName":"DateTypeAdapter.java"}
     1:1:void <init>():47:47 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):50 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):50:50 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.SC:
 # {"id":"sourceFile","fileName":"JsonAdapterAnnotationTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pg;"}
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):37:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ng;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pg;)V"}
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ng;Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;Lcom/android/tools/r8/internal/PC;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pg;Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;Lcom/android/tools/r8/internal/RC;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.Class):321:321 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):54 -> a
     3:10:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):54:61 -> a
@@ -38963,18 +38963,18 @@
     17:17:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     17:17:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     18:22:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:49 -> a
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.lM:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.pM:
 # {"id":"sourceFile","fileName":"MapTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pg;"}
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,boolean):110:111 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ng;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pg;)V"}
     1:1:java.lang.reflect.Type com.android.tools.r8.com.google.gson.reflect.TypeToken.getType():119:119 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):116 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):118 -> a
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):119:119 -> a
@@ -38994,80 +38994,80 @@
     21:21:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.reflect.Type):314:314 -> a
     21:21:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):125 -> a
     22:27:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):125:130 -> a
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.kM:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.oM:
 # {"id":"sourceFile","fileName":"MapTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter valueTypeAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ji0;"}
     com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pM;"}
     1:4:void <init>(com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory,com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.ObjectConstructor):151:154 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lM;Lcom/android/tools/r8/internal/rs;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/di0;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/di0;Lcom/android/tools/r8/internal/dU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pM;Lcom/android/tools/r8/internal/ts;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/hi0;Ljava/lang/reflect/Type;Lcom/android/tools/r8/internal/hi0;Lcom/android/tools/r8/internal/hU;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Map):199:209 -> a
     2:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):144 -> a
-com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter -> com.android.tools.r8.internal.gS:
+com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter -> com.android.tools.r8.internal.kS:
 # {"id":"sourceFile","fileName":"NumberTypeAdapter.java"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory LAZILY_PARSED_NUMBER_FACTORY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jS;"}
     1:2:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(com.android.tools.r8.com.google.gson.ToNumberStrategy):48:49 -> <clinit>
     1:2:void <clinit>():39 -> <clinit>
     3:3:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.gson.ToNumberStrategy):43:43 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):80:80 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):35 -> a
-com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter$1 -> com.android.tools.r8.internal.fS:
+com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter$1 -> com.android.tools.r8.internal.jS:
 # {"id":"sourceFile","fileName":"NumberTypeAdapter.java"}
     com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter val$adapter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kS;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.NumberTypeAdapter):49:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kS;)V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):52:52 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.xU:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.BU:
 # {"id":"sourceFile","fileName":"ObjectTypeAdapter.java"}
     com.android.tools.r8.com.google.gson.Gson gson -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory DOUBLE_FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AU;"}
     1:1:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(com.android.tools.r8.com.google.gson.ToNumberStrategy):55:55 -> <clinit>
     1:1:void <clinit>():44 -> <clinit>
     2:2:void <clinit>():44:44 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.ToNumberStrategy):49:50 -> <init>
     1:2:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.ToNumberStrategy,com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1):40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;)V"}
     1:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):171:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     7:7:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.Class):321:321 -> a
     7:7:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):667 -> a
     7:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):176 -> a
     8:8:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):667:667 -> a
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):176 -> a
     9:15:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):177:183 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.wU:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.AU:
 # {"id":"sourceFile","fileName":"ObjectTypeAdapter.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.ToNumberStrategy):55:55 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:3:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):58:59 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.n40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.r40:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pg;"}
     com.android.tools.r8.com.google.gson.internal.Excluder excluder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zo;"}
     java.util.List reflectionFilters -> d
     1:6:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.FieldNamingStrategy,com.android.tools.r8.com.google.gson.internal.Excluder,com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory,java.util.List):71:76 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ng;Lcom/android/tools/r8/internal/wo;Lcom/android/tools/r8/internal/QC;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pg;Lcom/android/tools/r8/internal/zo;Lcom/android/tools/r8/internal/SC;Ljava/util/List;)V"}
     1:1:boolean includeField(java.lang.reflect.Field,boolean):80:80 -> a
     2:2:boolean com.android.tools.r8.com.google.gson.internal.Excluder.excludeClassChecks(java.lang.Class):201:201 -> a
     2:2:boolean com.android.tools.r8.com.google.gson.internal.Excluder.excludeClass(java.lang.Class,boolean):205 -> a
@@ -39089,7 +39089,7 @@
     43:43:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     43:43:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):105 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     44:48:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):107:111 -> a
     49:49:com.android.tools.r8.com.google.gson.ReflectionAccessFilter$FilterResult com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper.getFilterResult(java.util.List,java.lang.Class):51:51 -> a
     49:49:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):112 -> a
@@ -39110,7 +39110,7 @@
     65:76:java.util.Map getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class,boolean,boolean):230:241 -> a
     65:76:java.util.LinkedHashMap com.android.tools.r8.internal.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.internal.Gson,com.android.tools.r8.internal.TypeToken,java.lang.Class,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;Ljava/lang/Class;Z)Ljava/util/LinkedHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;Ljava/lang/Class;Z)Ljava/util/LinkedHashMap;"}
     77:78:com.android.tools.r8.com.google.gson.ReflectionAccessFilter$FilterResult com.android.tools.r8.com.google.gson.internal.ReflectionAccessFilterHelper.getFilterResult(java.util.List,java.lang.Class):51:52 -> a
     77:78:java.util.Map getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class,boolean,boolean):241 -> a
     77:78:java.util.LinkedHashMap com.android.tools.r8.internal.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.internal.Gson,com.android.tools.r8.internal.TypeToken,java.lang.Class,boolean):0 -> a
@@ -39189,7 +39189,7 @@
     168:168:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     168:168:java.util.Map getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class,boolean,boolean):306 -> a
     168:168:java.util.LinkedHashMap com.android.tools.r8.internal.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.internal.Gson,com.android.tools.r8.internal.TypeToken,java.lang.Class,boolean):0 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.i40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.m40:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
     java.lang.String com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.name -> a
     java.lang.reflect.Field com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.field -> b
@@ -39198,22 +39198,22 @@
     java.lang.reflect.Method val$accessor -> e
     boolean val$jsonAdapterPresent -> f
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     com.android.tools.r8.com.google.gson.Gson val$context -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$fieldType -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj0;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,java.lang.reflect.Field,boolean,boolean,boolean,java.lang.reflect.Method,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean,boolean):164:164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/reflect/Field;ZZZLjava/lang/reflect/Method;ZLcom/android/tools/r8/internal/di0;Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;ZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/reflect/Field;ZZZLjava/lang/reflect/Method;ZLcom/android/tools/r8/internal/hi0;Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;ZZ)V"}
     2:6:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.<init>(java.lang.String,java.lang.reflect.Field,boolean,boolean):319:323 -> <init>
     2:6:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,java.lang.reflect.Field,boolean,boolean,boolean,java.lang.reflect.Method,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean,boolean):164 -> <init>
     1:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):167:184 -> a
     1:18:void com.android.tools.r8.internal.ReflectiveTypeAdapterFactory$1.write(com.android.tools.r8.internal.JsonWriter,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     19:19:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):0:0 -> a
     19:19:void com.android.tools.r8.internal.ReflectiveTypeAdapterFactory$1.write(com.android.tools.r8.internal.JsonWriter,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":218,"2":219,"3":220,"4":221,"5":222},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":218,"2":219,"3":220,"4":221,"5":222},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     203:214:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):184:195 -> a
     203:214:void com.android.tools.r8.internal.ReflectiveTypeAdapterFactory$1.write(com.android.tools.r8.internal.JsonWriter,java.lang.Object):0 -> a
     215:215:java.lang.reflect.Type com.android.tools.r8.com.google.gson.reflect.TypeToken.getType():119:119 -> a
@@ -39227,36 +39227,36 @@
     220:220:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):184:184 -> a
     221:221:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):184:184 -> a
     222:222:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):184:184 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.h40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.l40:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.internal.ReflectiveTypeAdapterFactory$1$$ExternalSyntheticOutline0.m(java.lang.String,java.lang.String,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.j40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.n40:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
     java.util.Map boundFields -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     1:2:void <init>(java.util.Map):354:355 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;)V"}
     1:13:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):361:373 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     14:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):371:371 -> a
     15:15:java.lang.RuntimeException com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper.createExceptionForUnexpectedIllegalAccess(java.lang.IllegalAccessException):153:153 -> a
     15:15:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):371 -> a
 com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField -> R8$$REMOVED$$CLASS$$60:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter -> com.android.tools.r8.internal.l40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter -> com.android.tools.r8.internal.p40:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ObjectConstructor,java.util.Map):421:421 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dU;Ljava/util/LinkedHashMap;)V"}
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.k40:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hU;Ljava/util/LinkedHashMap;)V"}
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.o40:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.lang.String com.android.tools.r8.internal.ReflectiveTypeAdapterFactory$FieldReflectionAdapter$$ExternalSyntheticOutline0.m(java.lang.String,java.lang.String):0:3 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$RecordAdapter -> com.android.tools.r8.internal.m40:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$RecordAdapter -> com.android.tools.r8.internal.q40:
 # {"id":"sourceFile","fileName":"ReflectiveTypeAdapterFactory.java"}
     java.lang.reflect.Constructor constructor -> b
     java.lang.Object[] constructorArgsDefaults -> c
@@ -39276,17 +39276,17 @@
     11:11:java.lang.String[] com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper.getRecordComponentNames(java.lang.Class):139:139 -> <init>
     11:11:void <init>(java.lang.Class,java.util.Map,boolean):463 -> <init>
     12:22:void <init>(java.lang.Class,java.util.Map,boolean):464:474 -> <init>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.fi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.ji0:
 # {"id":"sourceFile","fileName":"TypeAdapterRuntimeTypeWrapper.java"}
     com.android.tools.r8.com.google.gson.Gson context -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     java.lang.reflect.Type type -> c
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.TypeAdapter,java.lang.reflect.Type):32:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/di0;Ljava/lang/reflect/Type;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/hi0;Ljava/lang/reflect/Type;)V"}
     1:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):51:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     3:4:java.lang.reflect.Type getRuntimeTypeIfMoreSpecific(java.lang.reflect.Type,java.lang.Object):96:97 -> a
     3:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):52 -> a
     5:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):53:55 -> a
@@ -39309,64 +39309,64 @@
     23:23:boolean isReflective(com.android.tools.r8.com.google.gson.TypeAdapter):89:89 -> a
     23:23:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61 -> a
     24:30:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):64:70 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.Ri0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.Vi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory JSON_ELEMENT_FACTORY -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Li0;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory ENUM_FACTORY -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bi0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory CLASS_FACTORY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory BIT_SET_FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapter BOOLEAN_AS_STRING -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ji0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory BOOLEAN_FACTORY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory BYTE_FACTORY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory SHORT_FACTORY -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory INTEGER_FACTORY -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_INTEGER_FACTORY -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_BOOLEAN_FACTORY -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_INTEGER_ARRAY_FACTORY -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapter LONG -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory CHARACTER_FACTORY -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapter BIG_DECIMAL -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mi0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapter BIG_INTEGER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ni0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapter LAZILY_PARSED_NUMBER -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oi0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_FACTORY -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUILDER_FACTORY -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUFFER_FACTORY -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory URL_FACTORY -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory URI_FACTORY -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory INET_ADDRESS_FACTORY -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory UUID_FACTORY -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory CURRENCY_FACTORY -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory CALENDAR_FACTORY -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory CLASS_FACTORY -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory BIT_SET_FACTORY -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapter BOOLEAN_AS_STRING -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ni0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory BOOLEAN_FACTORY -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory BYTE_FACTORY -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory SHORT_FACTORY -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory INTEGER_FACTORY -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_INTEGER_FACTORY -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_BOOLEAN_FACTORY -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory ATOMIC_INTEGER_ARRAY_FACTORY -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapter LONG -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/li0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory CHARACTER_FACTORY -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapter BIG_DECIMAL -> m
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapter BIG_INTEGER -> n
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ri0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapter LAZILY_PARSED_NUMBER -> o
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/si0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_FACTORY -> p
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUILDER_FACTORY -> q
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUFFER_FACTORY -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory URL_FACTORY -> s
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory URI_FACTORY -> t
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory INET_ADDRESS_FACTORY -> u
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Li0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory UUID_FACTORY -> v
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory CURRENCY_FACTORY -> w
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory CALENDAR_FACTORY -> x
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ji0;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory LOCALE_FACTORY -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ai0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei0;"}
     1:1:void <clinit>():72:72 -> <clinit>
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.TypeAdapter.nullSafe():191:191 -> <clinit>
     2:2:void <clinit>():83 -> <clinit>
@@ -39449,158 +39449,158 @@
     639:639:com.android.tools.r8.com.google.gson.TypeAdapterFactory newTypeHierarchyFactory(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):994:994 -> <clinit>
     639:639:void <clinit>():857 -> <clinit>
     640:703:void <clinit>():857:920 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.qi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.ui0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():72:72 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):75:76 -> a
     2:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):72 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.gi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.ki0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():292:292 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):313:317 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):292 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.hi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.li0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():323:323 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):323:323 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):339:341 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):323 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.ii0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.mi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():346:346 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):346:346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):358:363 -> a
     2:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):346 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.ji0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.ni0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():368:368 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):368:368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):380:382 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):368 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.ki0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.oi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():387:387 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):387:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):402:402 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):387 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.li0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.pi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():409:409 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):409:409 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):425:425 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):409 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.mi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.qi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():429:429 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):429:429 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigDecimal):444:444 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):429 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.ni0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.ri0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():448:448 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):448:448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigInteger):463:463 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):448 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.oi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.si0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():467:467 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):467:467 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber):480:480 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):467 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.pi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.ti0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():486:486 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):486:486 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):497:497 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):486 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.Ci0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.Gi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():87:87 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):124:129 -> a
     2:7:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):87 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.ri0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.vi0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.lang.StringBuilder com.android.tools.r8.internal.TypeAdapters$2$$ExternalSyntheticOutline0.m(int,java.lang.String,java.lang.String):0:3 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.si0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.wi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():504:504 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):504:504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):515:515 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):504 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.ti0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.xi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():522:522 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):522:522 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):522 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.ui0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.yi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():540:540 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540:540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):556:556 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.vi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.zi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():562:562 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):562:562 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):574:574 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):562 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.wi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.Ai0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():581:581 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):581:581 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):597:597 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):581 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.xi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.Bi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():603:603 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):603:603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):615:615 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):603 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.yi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.Ci0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():620:620 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):620:620 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):665:681 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):620 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.zi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.Di0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():688:688 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):688:688 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):719:719 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):688 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.Ai0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.Ei0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():725:725 -> <init>
     1:1:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonNull():85:85 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):823 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Lcom/android/tools/r8/internal/SC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Lcom/android/tools/r8/internal/UC;)V"}
     2:2:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonPrimitive():75:75 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):825 -> a
     3:3:com.android.tools.r8.com.google.gson.JsonPrimitive com.android.tools.r8.com.google.gson.JsonElement.getAsJsonPrimitive():131:131 -> a
@@ -39655,10 +39655,10 @@
     39:42:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):848:851 -> a
     43:43:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):824:824 -> a
     44:44:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):725:725 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     45:45:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):769:769 -> a
     45:45:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):725 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aD;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cD;)Ljava/lang/Object;"}
     46:52:com.android.tools.r8.com.google.gson.JsonElement tryBeginNesting(com.android.tools.r8.com.google.gson.stream.JsonReader,com.android.tools.r8.com.google.gson.stream.JsonToken):731:737 -> a
     46:52:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):771 -> a
     46:52:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):725 -> a
@@ -39741,128 +39741,128 @@
     166:166:void com.android.tools.r8.com.google.gson.stream.JsonReader.endObject():412:412 -> a
     166:166:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):810 -> a
     166:166:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):725 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.Bi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.Fi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():920:920 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):922 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:9:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):923:930 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.Ii0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.Mi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():135:135 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:com.android.tools.r8.com.google.gson.stream.JsonWriter com.android.tools.r8.com.google.gson.stream.JsonWriter.value(java.lang.Boolean):483:485 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):150 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):135 -> a
     5:6:com.android.tools.r8.com.google.gson.stream.JsonWriter com.android.tools.r8.com.google.gson.stream.JsonWriter.value(java.lang.Boolean):486:487 -> a
     5:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):150 -> a
     5:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):135 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$31 -> com.android.tools.r8.internal.Di0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$31 -> com.android.tools.r8.internal.Hi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     java.lang.Class val$type -> b
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):947:947 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):950 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):950:950 -> a
     1:1:java.lang.String toString():953:953 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.Ei0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.Ii0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     java.lang.Class val$unboxed -> b
     java.lang.Class val$boxed -> c
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(java.lang.Class,java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):960:960 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/Class;Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/Class;Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):963 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):964:964 -> a
     1:2:java.lang.String toString():967:968 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.Fi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.Ji0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ci0;"}
     1:1:void <init>(java.lang.Class,java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):975:975 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ci0;)V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):978 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):979:979 -> a
     1:2:java.lang.String toString():982:983 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.Hi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.Li0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     java.lang.Class val$clazz -> b
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):994:994 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):997 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):998:1001 -> a
     1:1:java.lang.String toString():1017:1017 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34$1 -> com.android.tools.r8.internal.Gi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34$1 -> com.android.tools.r8.internal.Ki0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 this$0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Li0;"}
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34,java.lang.Class):1001:1001 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hi0;Ljava/lang/Class;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Li0;Ljava/lang/Class;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):1003:1003 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.Ji0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.Ni0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():158:158 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):168:168 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):158 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.Ki0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.Oi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():175:175 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):198:200 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):175 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.Li0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.Pi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():208:208 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):231:233 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):208 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.Mi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.Qi0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():241:241 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):241:241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):257:259 -> a
     2:4:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):241 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.Ni0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.Ri0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():266:266 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):275:275 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):266 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.Oi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.Si0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     1:1:void <init>():281:281 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):281:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):286:286 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):281 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.Qi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.Ui0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     java.util.Map nameToConstant -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -39873,27 +39873,27 @@
     1:1:void <init>(java.lang.Class):864:864 -> <init>
     2:44:void <init>(java.lang.Class):860:902 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):859:859 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Enum):916:916 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):859 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter$1 -> com.android.tools.r8.internal.Pi0:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter$1 -> com.android.tools.r8.internal.Ti0:
 # {"id":"sourceFile","fileName":"TypeAdapters.java"}
     java.lang.Class val$classOfT -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter,java.lang.Class):869:869 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;)V"}
     1:10:java.lang.reflect.Field[] run():871:880 -> run
     1:10:java.lang.Object run():869 -> run
-com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper -> com.android.tools.r8.internal.g40:
+com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper -> com.android.tools.r8.internal.k40:
 # {"id":"sourceFile","fileName":"ReflectionHelper.java"}
     com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordHelper RECORD_HELPER -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h40;"}
     1:5:void <clinit>():18:22 -> <clinit>
     1:4:void makeAccessible(java.lang.reflect.AccessibleObject):35:38 -> a
     1:4:void com.android.tools.r8.internal.ReflectionHelper.makeAccessible(java.lang.reflect.AccessibleObject):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     5:5:void makeAccessible(java.lang.reflect.AccessibleObject):0:0 -> a
     5:5:void com.android.tools.r8.internal.ReflectionHelper.makeAccessible(java.lang.reflect.AccessibleObject):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46,"4":47,"5":48},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46,"4":47,"5":48},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     43:43:void makeAccessible(java.lang.reflect.AccessibleObject):38:38 -> a
     43:43:void com.android.tools.r8.internal.ReflectionHelper.makeAccessible(java.lang.reflect.AccessibleObject):0 -> a
     44:44:void makeAccessible(java.lang.reflect.AccessibleObject):38:38 -> a
@@ -39907,7 +39907,7 @@
     52:68:java.lang.String getAccessibleObjectDescription(java.lang.reflect.AccessibleObject,boolean):56:72 -> a
     69:72:java.lang.String constructorToString(java.lang.reflect.Constructor):90:93 -> a
     73:85:void appendExecutableParameters(java.lang.reflect.AccessibleObject,java.lang.StringBuilder):98:110 -> a
-com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordHelper -> com.android.tools.r8.internal.d40:
+com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordHelper -> com.android.tools.r8.internal.h40:
 # {"id":"sourceFile","fileName":"ReflectionHelper.java"}
     1:1:void <init>():173:173 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$1):173 -> <init>
@@ -39916,7 +39916,7 @@
     java.lang.reflect.Constructor getCanonicalRecordConstructor(java.lang.Class) -> a
     java.lang.String[] getRecordComponentNames(java.lang.Class) -> b
     boolean isRecord(java.lang.Class) -> c
-com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordNotSupportedHelper -> com.android.tools.r8.internal.e40:
+com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordNotSupportedHelper -> com.android.tools.r8.internal.i40:
 # {"id":"sourceFile","fileName":"ReflectionHelper.java"}
     1:1:void <init>():252:252 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$1):252 -> <init>
@@ -39925,7 +39925,7 @@
     2:2:java.lang.reflect.Method getAccessor(java.lang.Class,java.lang.reflect.Field):273:273 -> a
     1:1:java.lang.String[] getRecordComponentNames(java.lang.Class):261:261 -> b
     1:1:boolean isRecord(java.lang.Class):256:256 -> c
-com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordSupportedHelper -> com.android.tools.r8.internal.f40:
+com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper$RecordSupportedHelper -> com.android.tools.r8.internal.j40:
 # {"id":"sourceFile","fileName":"ReflectionHelper.java"}
     java.lang.reflect.Method isRecord -> a
     java.lang.reflect.Method getRecordComponents -> b
@@ -39950,12 +39950,12 @@
     2:2:java.lang.RuntimeException com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper.createExceptionForRecordReflectionException(java.lang.ReflectiveOperationException):162:162 -> c
     2:2:java.lang.RuntimeException com.android.tools.r8.com.google.gson.internal.reflect.ReflectionHelper.access$300(java.lang.ReflectiveOperationException):10 -> c
     2:2:boolean isRecord(java.lang.Class):203 -> c
-com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter -> com.android.tools.r8.internal.Qc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter -> com.android.tools.r8.internal.Uc0:
 # {"id":"sourceFile","fileName":"SqlDateTypeAdapter.java"}
     java.text.DateFormat format -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/text/SimpleDateFormat;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc0;"}
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():50:50 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter$1):39 -> <init>
@@ -39963,25 +39963,25 @@
     2:2:void <init>():48:48 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter$1):39 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Date):74:81 -> a
     2:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):39 -> a
     10:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Date):80:80 -> a
     10:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):39 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.Pc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.Tc0:
 # {"id":"sourceFile","fileName":"SqlDateTypeAdapter.java"}
     1:1:void <init>():40:40 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:3:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):43:44 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter -> com.android.tools.r8.internal.Sc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter -> com.android.tools.r8.internal.Wc0:
 # {"id":"sourceFile","fileName":"SqlTimeTypeAdapter.java"}
     java.text.DateFormat format -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/text/SimpleDateFormat;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc0;"}
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>():50:50 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter$1):40 -> <init>
@@ -39989,40 +39989,40 @@
     2:2:void <init>():48:48 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter$1):40 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Time):71:78 -> a
     2:9:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40 -> a
     10:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Time):77:77 -> a
     10:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter$1 -> com.android.tools.r8.internal.Rc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlTimeTypeAdapter$1 -> com.android.tools.r8.internal.Vc0:
 # {"id":"sourceFile","fileName":"SqlTimeTypeAdapter.java"}
     1:1:void <init>():41:41 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:44 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlTimestampTypeAdapter -> com.android.tools.r8.internal.Uc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlTimestampTypeAdapter -> com.android.tools.r8.internal.Yc0:
 # {"id":"sourceFile","fileName":"SqlTimestampTypeAdapter.java"}
     com.android.tools.r8.com.google.gson.TypeAdapter dateTypeAdapter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hi0;"}
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xc0;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):29:30 -> <init>
     1:2:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.sql.SqlTimestampTypeAdapter$1):14 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/di0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hi0;)V"}
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dD;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Ljava/lang/Object;)V"}
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Timestamp):41:41 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):14 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlTimestampTypeAdapter$1 -> com.android.tools.r8.internal.Tc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlTimestampTypeAdapter$1 -> com.android.tools.r8.internal.Xc0:
 # {"id":"sourceFile","fileName":"SqlTimestampTypeAdapter.java"}
     1:1:void <init>():15:15 -> <init>
     1:1:java.lang.Class com.android.tools.r8.com.google.gson.reflect.TypeToken.getRawType():112:112 -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):18 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rs;Lcom/android/tools/r8/internal/lj0;)Lcom/android/tools/r8/internal/di0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/pj0;)Lcom/android/tools/r8/internal/hi0;"}
     2:3:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):18:19 -> a
     4:4:com.android.tools.r8.com.google.gson.reflect.TypeToken com.android.tools.r8.com.google.gson.reflect.TypeToken.get(java.lang.Class):321:321 -> a
     4:4:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):667 -> a
@@ -40030,17 +40030,17 @@
     5:5:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):667:667 -> a
     5:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):19 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):20:20 -> a
-com.android.tools.r8.com.google.gson.internal.sql.SqlTypesSupport -> com.android.tools.r8.internal.Vc0:
+com.android.tools.r8.com.google.gson.internal.sql.SqlTypesSupport -> com.android.tools.r8.internal.Zc0:
 # {"id":"sourceFile","fileName":"SqlTypesSupport.java"}
     boolean SUPPORTS_SQL_TYPES -> a
     com.android.tools.r8.com.google.gson.TypeAdapterFactory DATE_FACTORY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory TIME_FACTORY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc0;"}
-    com.android.tools.r8.com.google.gson.TypeAdapterFactory TIMESTAMP_FACTORY -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory TIME_FACTORY -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc0;"}
+    com.android.tools.r8.com.google.gson.TypeAdapterFactory TIMESTAMP_FACTORY -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xc0;"}
     1:29:void <clinit>():37:65 -> <clinit>
-com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.lj0:
+com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.pj0:
 # {"id":"sourceFile","fileName":"TypeToken.java"}
     java.lang.Class rawType -> a
     java.lang.reflect.Type type -> b
@@ -40049,7 +40049,7 @@
     1:2:boolean equals(java.lang.Object):302:303 -> equals
     1:1:int hashCode():298:298 -> hashCode
     1:1:java.lang.String toString():307:307 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.cD:
 # {"id":"sourceFile","fileName":"JsonReader.java"}
     java.io.Reader in -> a
     boolean lenient -> b
@@ -40152,16 +40152,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:5:void skipToEndOfLine():1475:1479 -> m
     1:1:java.lang.String toString():1510:1510 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.ZC:
+com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.bD:
 # {"id":"sourceFile","fileName":"JsonReader.java"}
     1:1:void com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess.<init>():25:25 -> <init>
     1:1:void <init>():1685 -> <init>
-com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.eD:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String com.android.tools.r8.internal.JsonToken$EnumUnboxingLocalUtility.stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.fD:
 # {"id":"sourceFile","fileName":"JsonWriter.java"}
     java.io.Writer out -> a
     int[] stack -> b
@@ -40180,7 +40180,7 @@
     1:4:void push(int):358:361 -> a
     5:8:int peek():368:371 -> a
     5:8:com.android.tools.r8.com.google.gson.stream.JsonWriter close(int,int,char):341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIC)Lcom/android/tools/r8/internal/dD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIC)Lcom/android/tools/r8/internal/fD;"}
     9:19:com.android.tools.r8.com.google.gson.stream.JsonWriter close(int,int,char):343:353 -> a
     20:20:com.android.tools.r8.com.google.gson.stream.JsonWriter close(int,int,char):346:346 -> a
     21:21:int peek():369:369 -> a
@@ -40238,7 +40238,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void newline():648:648 -> h
     1:10:com.android.tools.r8.com.google.gson.stream.JsonWriter nullValue():450:459 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fD;"}
     1:1:void writeDeferredName():400:400 -> j
     2:5:int peek():368:371 -> j
     2:5:void beforeName():663 -> j
@@ -40254,7 +40254,7 @@
     15:15:int peek():369:369 -> j
     15:15:void beforeName():663 -> j
     15:15:void writeDeferredName():401 -> j
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.fM:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.jM:
 # {"id":"sourceFile","fileName":"MalformedJsonException.java"}
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.com.google.protobuf.AbstractMessage -> com.android.tools.r8.internal.J0:
@@ -40265,7 +40265,7 @@
     1:5:void <init>():52 -> <init>
     6:6:void <init>():119:119 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rb0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vb0;)Lcom/android/tools/r8/internal/H0;"}
     2:8:java.util.Map convertMapEntryListToMap(java.util.List):193:199 -> a
     9:9:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.findFieldByName(java.lang.String):795:795 -> a
     9:9:java.util.Map convertMapEntryListToMap(java.util.List):200 -> a
@@ -40501,11 +40501,11 @@
     1:1:void com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder.<init>():163:163 -> <init>
     1:1:void <init>():318 -> <init>
     com.android.tools.r8.com.google.protobuf.Message$Builder com.android.tools.r8.com.google.protobuf.Message$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.ByteString):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.CodedInputStream com.android.tools.r8.com.google.protobuf.ByteString$LiteralByteString.newCodedInput():1525:1526 -> a
     2:3:com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.ByteString):185 -> a
     4:11:com.android.tools.r8.com.google.protobuf.CodedInputStream com.android.tools.r8.com.google.protobuf.CodedInputStream.newInstance(byte[],int,int,boolean):146:153 -> a
@@ -40528,7 +40528,7 @@
     19:19:com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.ByteString):192:192 -> a
     20:20:com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder com.android.tools.r8.com.google.protobuf.AbstractMessageLite$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.ByteString):190:190 -> a
     21:21:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):317:317 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     22:22:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):371:371 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     23:41:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message,java.util.Map):375:393 -> a
@@ -40550,11 +40550,11 @@
     com.android.tools.r8.com.google.protobuf.Message$Builder com.android.tools.r8.com.google.protobuf.Message$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.Message) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     com.android.tools.r8.com.google.protobuf.Message$Builder com.android.tools.r8.com.google.protobuf.Message$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     com.android.tools.r8.com.google.protobuf.Message$Builder com.android.tools.r8.com.google.protobuf.Message$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):429:429 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> b
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> b
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet.newBuilder():71 -> b
@@ -40565,14 +40565,14 @@
     4:12:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):431:439 -> b
     13:20:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):438:445 -> b
     com.android.tools.r8.com.google.protobuf.Message$Builder com.android.tools.r8.com.google.protobuf.Message$Builder.newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.UninitializedMessageException newUninitializedMessageException(com.android.tools.r8.com.google.protobuf.Message):477:477 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/Mj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/Qj0;"}
     2:3:java.util.List com.android.tools.r8.com.google.protobuf.MessageReflection.findMissingFields(com.android.tools.r8.com.google.protobuf.MessageOrBuilder):206:207 -> c
     2:3:com.android.tools.r8.com.google.protobuf.UninitializedMessageException newUninitializedMessageException(com.android.tools.r8.com.google.protobuf.Message):477 -> c
     4:4:com.android.tools.r8.com.google.protobuf.UninitializedMessageException newUninitializedMessageException(com.android.tools.r8.com.google.protobuf.Message):477:477 -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Message$Builder.getDescriptorForType() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Message com.android.tools.r8.com.google.protobuf.Message$Builder.build() -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     com.android.tools.r8.com.google.protobuf.Message com.android.tools.r8.com.google.protobuf.Message$Builder.buildPartial() -> i
@@ -40593,11 +40593,11 @@
 com.android.tools.r8.com.google.protobuf.AbstractParser -> com.android.tools.r8.internal.g1:
 # {"id":"sourceFile","fileName":"AbstractParser.java"}
     com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite EMPTY_REGISTRY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Co;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Go;"}
     1:1:void <clinit>():75:75 -> <clinit>
     1:1:void <init>():48:48 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.com.google.protobuf.MessageLite):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xN;)Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BN;)Lcom/android/tools/r8/internal/BN;"}
     2:3:com.android.tools.r8.com.google.protobuf.UninitializedMessageException newUninitializedMessageException(com.android.tools.r8.com.google.protobuf.MessageLite):52:53 -> a
     2:3:com.android.tools.r8.com.google.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.com.google.protobuf.MessageLite):67 -> a
     4:4:com.android.tools.r8.com.google.protobuf.UninitializedMessageException com.android.tools.r8.com.google.protobuf.AbstractMessage.newUninitializedMessageException():308:308 -> a
@@ -40612,7 +40612,7 @@
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.com.google.protobuf.MessageLite):69:69 -> a
     9:9:com.android.tools.r8.com.google.protobuf.MessageLite parseFrom(byte[]):208:208 -> a
     9:9:java.lang.Object parseFrom(byte[]):48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/BN;"}
     10:10:com.android.tools.r8.com.google.protobuf.MessageLite parseFrom(byte[],com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):203:203 -> a
     10:10:com.android.tools.r8.com.google.protobuf.MessageLite parseFrom(byte[]):208 -> a
     10:10:java.lang.Object parseFrom(byte[]):48 -> a
@@ -40678,22 +40678,22 @@
     7:7:void <clinit>():44:44 -> <clinit>
     1:1:java.lang.Class getMemoryClass():53:53 -> a
     1:1:boolean isOnAndroidDevice():48:48 -> b
-com.android.tools.r8.com.google.protobuf.ByteOutput -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.com.google.protobuf.ByteOutput -> com.android.tools.r8.internal.J7:
 # {"id":"sourceFile","fileName":"ByteOutput.java"}
     1:1:void <init>():50:50 -> <init>
-com.android.tools.r8.com.google.protobuf.ByteString -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.com.google.protobuf.ByteString -> com.android.tools.r8.internal.V7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     int hash -> b
     com.android.tools.r8.com.google.protobuf.ByteString EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R7;"}
     com.android.tools.r8.com.google.protobuf.ByteString$ByteArrayCopier byteArrayCopier -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P7;"}
     1:41:void <clinit>():95:135 -> <clinit>
     1:1:void <init>():146:146 -> <init>
     2:2:void <init>():143:143 -> <init>
     boolean isValidUtf8() -> a
     1:1:com.android.tools.r8.com.google.protobuf.ByteString copyFromUtf8(java.lang.String):463:463 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/R7;"}
     2:6:int checkRange(int,int,int):1287:1291 -> a
     2:6:int com.android.tools.r8.internal.ByteString.checkRange(int,int,int):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -40701,7 +40701,7 @@
     7:7:int com.android.tools.r8.internal.ByteString.checkRange(int,int,int):0 -> a
     8:8:int checkRange(int,int,int):0:0 -> a
     8:8:int com.android.tools.r8.internal.ByteString.checkRange(int,int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1293,"2":1294,"3":1295,"4":1296,"5":1297},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1293,"2":1294,"3":1295,"4":1296,"5":1297},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     1292:1292:int checkRange(int,int,int):1284:1284 -> a
     1292:1292:int com.android.tools.r8.internal.ByteString.checkRange(int,int,int):0 -> a
     1293:1293:int checkRange(int,int,int):1284:1284 -> a
@@ -40742,14 +40742,14 @@
     17:17:java.lang.String truncateAndEscapeForDisplay():1309:1309 -> toString
     17:17:java.lang.String toString():1303 -> toString
     18:18:java.lang.String toString():1298:1298 -> toString
-com.android.tools.r8.com.google.protobuf.ByteString$1 -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.com.google.protobuf.ByteString$1 -> com.android.tools.r8.internal.M7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     int position -> b
     int limit -> c
     com.android.tools.r8.com.google.protobuf.ByteString this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q7;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.ByteString):176:176 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q7;)V"}
     2:2:void com.android.tools.r8.com.google.protobuf.ByteString$AbstractByteIterator.<init>():210:210 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.ByteString):176 -> <init>
     3:4:void <init>(com.android.tools.r8.com.google.protobuf.ByteString):177:178 -> <init>
@@ -40765,13 +40765,13 @@
     1:1:void com.android.tools.r8.com.google.protobuf.ByteString$AbstractByteIterator.remove():219:219 -> remove
 com.android.tools.r8.com.google.protobuf.ByteString$AbstractByteIterator -> R8$$REMOVED$$CLASS$$63:
 # {"id":"sourceFile","fileName":"ByteString.java"}
-com.android.tools.r8.com.google.protobuf.ByteString$ArraysByteArrayCopier -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.com.google.protobuf.ByteString$ArraysByteArrayCopier -> com.android.tools.r8.internal.N7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     1:1:void <init>():124:124 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.ByteString$1):124 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:byte[] copyFrom(byte[],int,int):127:127 -> a
-com.android.tools.r8.com.google.protobuf.ByteString$BoundedByteString -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.com.google.protobuf.ByteString$BoundedByteString -> com.android.tools.r8.internal.O7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     int bytesOffset -> f
     int bytesLength -> g
@@ -40786,7 +40786,7 @@
     2:2:byte com.android.tools.r8.internal.ByteString$BoundedByteString.byteAt(int):0 -> j
     3:3:byte byteAt(int):0:0 -> j
     3:3:byte com.android.tools.r8.internal.ByteString$BoundedByteString.byteAt(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8,"2":9,"3":10,"4":11},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8,"2":9,"3":10,"4":11},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     4:6:void com.android.tools.r8.com.google.protobuf.ByteString.checkIndex(int,int):1264:1266 -> j
     4:6:byte byteAt(int):1589 -> j
     4:6:byte com.android.tools.r8.internal.ByteString$BoundedByteString.byteAt(int):0 -> j
@@ -40802,15 +40802,15 @@
     11:11:byte byteAt(int):1589 -> j
     1:1:byte internalByteAt(int):1595:1595 -> k
     1:1:int size():1600:1600 -> size
-com.android.tools.r8.com.google.protobuf.ByteString$ByteArrayCopier -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.com.google.protobuf.ByteString$ByteArrayCopier -> com.android.tools.r8.internal.P7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     byte[] copyFrom(byte[],int,int) -> a
-com.android.tools.r8.com.google.protobuf.ByteString$LeafByteString -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.com.google.protobuf.ByteString$LeafByteString -> com.android.tools.r8.internal.Q7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     1:1:void <init>():889:889 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.ByteString$ByteIterator com.android.tools.r8.com.google.protobuf.ByteString.iterator():176:176 -> iterator
     1:1:java.util.Iterator iterator():889 -> iterator
-com.android.tools.r8.com.google.protobuf.ByteString$LiteralByteString -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.com.google.protobuf.ByteString$LiteralByteString -> com.android.tools.r8.internal.R7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     byte[] bytes -> e
     1:5:void <init>(byte[]):1332:1336 -> <init>
@@ -40844,7 +40844,7 @@
     35:35:boolean com.android.tools.r8.internal.ByteString$LiteralByteString.equals(java.lang.Object):0 -> equals
     36:36:boolean equals(java.lang.Object):0:0 -> equals
     36:36:boolean com.android.tools.r8.internal.ByteString$LiteralByteString.equals(java.lang.Object):0 -> equals
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":40,"2":41,"3":42,"4":43},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":40,"2":41,"3":42,"4":43},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     37:37:boolean equalsRange(com.android.tools.r8.com.google.protobuf.ByteString,int,int):1486:1486 -> equals
     37:37:boolean equals(java.lang.Object):1463 -> equals
     37:37:boolean com.android.tools.r8.internal.ByteString$LiteralByteString.equals(java.lang.Object):0 -> equals
@@ -40864,13 +40864,13 @@
     1:1:byte byteAt(int):1344:1344 -> j
     1:1:byte internalByteAt(int):1349:1349 -> k
     1:1:int size():1354:1354 -> size
-com.android.tools.r8.com.google.protobuf.ByteString$SystemByteArrayCopier -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.com.google.protobuf.ByteString$SystemByteArrayCopier -> com.android.tools.r8.internal.T7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     1:1:void <init>():114:114 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.ByteString$1):114 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:byte[] copyFrom(byte[],int,int):117:118 -> a
-com.android.tools.r8.com.google.protobuf.CodedInputStream -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.com.google.protobuf.CodedInputStream -> com.android.tools.r8.internal.Pd:
 # {"id":"sourceFile","fileName":"CodedInputStream.java"}
     int recursionDepth -> a
     1:1:void <init>():204:204 -> <init>
@@ -40878,11 +40878,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     void checkLastTagWas(int) -> a
     void readGroup(int,com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wN;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/AN;Lcom/android/tools/r8/internal/Go;)V"}
     com.android.tools.r8.com.google.protobuf.MessageLite readMessage(com.android.tools.r8.com.google.protobuf.Parser,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TV;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XV;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/BN;"}
     void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Go;)V"}
     1:1:void checkRecursionLimit():199:199 -> a
     2:2:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.recursionLimitExceeded():148:148 -> a
     2:2:void checkRecursionLimit():200 -> a
@@ -40892,7 +40892,7 @@
     int pushLimit(int) -> c
     boolean readBool() -> c
     com.android.tools.r8.com.google.protobuf.ByteString readBytes() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R7;"}
     boolean skipField(int) -> d
     double readDouble() -> e
     int readEnum() -> f
@@ -40911,7 +40911,7 @@
     int readTag() -> s
     int readUInt32() -> t
     long readUInt64() -> u
-com.android.tools.r8.com.google.protobuf.CodedInputStream$ArrayDecoder -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.com.google.protobuf.CodedInputStream$ArrayDecoder -> com.android.tools.r8.internal.Md:
 # {"id":"sourceFile","fileName":"CodedInputStream.java"}
     byte[] buffer -> b
     int limit -> c
@@ -40930,16 +40930,16 @@
     2:2:void checkLastTagWas(int):641 -> a
     3:3:void checkLastTagWas(int):641:641 -> a
     4:8:void readGroup(int,com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):835:839 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wN;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/AN;Lcom/android/tools/r8/internal/Go;)V"}
     9:16:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):868:875 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Go;)V"}
     17:18:void popLimit(int):1219:1220 -> a
     17:18:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):878 -> a
     19:19:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.truncatedMessage():107:107 -> a
     19:19:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):876 -> a
     20:20:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):876:876 -> a
     21:28:com.android.tools.r8.com.google.protobuf.MessageLite readMessage(com.android.tools.r8.com.google.protobuf.Parser,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):885:892 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TV;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XV;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/BN;"}
     29:30:void popLimit(int):1219:1220 -> a
     29:30:com.android.tools.r8.com.google.protobuf.MessageLite readMessage(com.android.tools.r8.com.google.protobuf.Parser,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):895 -> a
     31:31:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.truncatedMessage():107:107 -> a
@@ -41005,7 +41005,7 @@
     21:21:void skipRawVarint():1031 -> d
     21:21:boolean skipField(int):654 -> d
     22:29:com.android.tools.r8.com.google.protobuf.ByteString readBytes():901:908 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R7;"}
     30:31:com.android.tools.r8.com.google.protobuf.ByteString com.android.tools.r8.com.google.protobuf.ByteString.copyFrom(byte[],int,int):362:363 -> d
     30:31:com.android.tools.r8.com.google.protobuf.ByteString readBytes():908 -> d
     32:36:com.android.tools.r8.com.google.protobuf.ByteString readBytes():909:913 -> d
@@ -41110,7 +41110,7 @@
     56:56:long readRawVarint64():1123 -> x
     57:57:long readRawVarint64():1120:1120 -> x
     1:8:void recomputeBufferSizeAfterLimit():1206:1213 -> y
-com.android.tools.r8.com.google.protobuf.CodedInputStream$StreamDecoder -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.com.google.protobuf.CodedInputStream$StreamDecoder -> com.android.tools.r8.internal.Nd:
 # {"id":"sourceFile","fileName":"CodedInputStream.java"}
     java.io.InputStream input -> b
     byte[] buffer -> c
@@ -41133,16 +41133,16 @@
     2:2:void checkLastTagWas(int):2124 -> a
     3:3:void checkLastTagWas(int):2124:2124 -> a
     4:8:void readGroup(int,com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2355:2359 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wN;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/AN;Lcom/android/tools/r8/internal/Go;)V"}
     9:16:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2388:2395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;Lcom/android/tools/r8/internal/Go;)V"}
     17:18:void popLimit(int):2738:2739 -> a
     17:18:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2398 -> a
     19:19:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.truncatedMessage():107:107 -> a
     19:19:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2396 -> a
     20:20:void readMessage(com.android.tools.r8.com.google.protobuf.MessageLite$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2396:2396 -> a
     21:28:com.android.tools.r8.com.google.protobuf.MessageLite readMessage(com.android.tools.r8.com.google.protobuf.Parser,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2405:2412 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TV;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XV;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/BN;"}
     29:30:void popLimit(int):2738:2739 -> a
     29:30:com.android.tools.r8.com.google.protobuf.MessageLite readMessage(com.android.tools.r8.com.google.protobuf.Parser,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2415 -> a
     31:31:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.truncatedMessage():107:107 -> a
@@ -41192,7 +41192,7 @@
     19:19:void skipRawVarint():2549 -> d
     19:19:boolean skipField(int):2137 -> d
     20:24:com.android.tools.r8.com.google.protobuf.ByteString readBytes():2421:2425 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R7;"}
     25:26:com.android.tools.r8.com.google.protobuf.ByteString com.android.tools.r8.com.google.protobuf.ByteString.copyFrom(byte[],int,int):362:363 -> d
     25:26:com.android.tools.r8.com.google.protobuf.ByteString readBytes():2425 -> d
     27:31:com.android.tools.r8.com.google.protobuf.ByteString readBytes():2426:2430 -> d
@@ -41286,7 +41286,7 @@
     55:55:boolean com.android.tools.r8.internal.CodedInputStream$StreamDecoder.tryRefillBuffer(int):0 -> j
     56:56:boolean tryRefillBuffer(int):0:0 -> j
     56:56:boolean com.android.tools.r8.internal.CodedInputStream$StreamDecoder.tryRefillBuffer(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2855,"2":2856,"3":2857,"4":2858,"5":2859},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2855,"2":2856,"3":2857,"4":2858,"5":2859},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2854:2854:boolean tryRefillBuffer(int):2798:2798 -> j
     2854:2854:boolean com.android.tools.r8.internal.CodedInputStream$StreamDecoder.tryRefillBuffer(int):0 -> j
     2855:2855:boolean tryRefillBuffer(int):2798:2798 -> j
@@ -41334,7 +41334,7 @@
     54:54:long readRawVarint64():2641 -> x
     55:55:long readRawVarint64():2638:2638 -> x
     1:8:void recomputeBufferSizeAfterLimit():2725:2732 -> y
-com.android.tools.r8.com.google.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.com.google.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Ud:
 # {"id":"sourceFile","fileName":"CodedOutputStream.java"}
     java.util.logging.Logger logger -> a
     boolean HAS_UNSAFE_ARRAY_OPERATIONS -> b
@@ -41348,7 +41348,7 @@
     void write(byte) -> a
     void writeBool(int,boolean) -> a
     void writeMessage(int,com.android.tools.r8.com.google.protobuf.MessageLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/xN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/BN;)V"}
     1:1:int computeInt32Size(int,int):509:509 -> a
     2:2:int computeInt32SizeNoTag(int):719:719 -> a
     2:2:int computeInt32Size(int,int):509 -> a
@@ -41359,21 +41359,21 @@
     10:10:int computeLengthDelimitedFieldSize(int):886:886 -> a
     10:10:int computeStringSizeNoTag(java.lang.String):849 -> a
     11:11:int computeBytesSizeNoTag(com.android.tools.r8.com.google.protobuf.ByteString):862:862 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)I"}
     12:12:int computeLengthDelimitedFieldSize(int):886:886 -> a
     12:12:int computeBytesSizeNoTag(com.android.tools.r8.com.google.protobuf.ByteString):862 -> a
     13:13:int computeMessageSizeNoTag(com.android.tools.r8.com.google.protobuf.MessageLite):877:877 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xN;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BN;)I"}
     14:14:int computeLengthDelimitedFieldSize(int):886:886 -> a
     14:14:int computeMessageSizeNoTag(com.android.tools.r8.com.google.protobuf.MessageLite):877 -> a
     15:27:void inefficientWriteStringNoTag(java.lang.String,com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException):984:996 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Qk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Uk0;)V"}
     28:28:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeLazy(byte[],int,int):1456:1456 -> a
     28:28:void inefficientWriteStringNoTag(java.lang.String,com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException):996 -> a
     29:29:void inefficientWriteStringNoTag(java.lang.String,com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException):1000:1000 -> a
     30:30:void inefficientWriteStringNoTag(java.lang.String,com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException):998:998 -> a
     void writeBytesNoTag(com.android.tools.r8.com.google.protobuf.ByteString) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     void writeFixed64NoTag(long) -> b
     void writeStringNoTag(java.lang.String) -> b
     1:1:void writeEnum(int,int):296:296 -> b
@@ -41386,7 +41386,7 @@
     void writeFixed32NoTag(int) -> d
     void writeInt32NoTag(int) -> e
     void writeUInt32NoTag(int) -> f
-com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder -> com.android.tools.r8.internal.Qd:
 # {"id":"sourceFile","fileName":"CodedOutputStream.java"}
     byte[] buffer -> c
     int limit -> d
@@ -41397,13 +41397,13 @@
     19:19:void <init>(byte[],int,int):1162:1162 -> <init>
     1:2:void writeBool(int,boolean):1209:1210 -> a
     3:3:void writeMessage(int,com.android.tools.r8.com.google.protobuf.MessageLite):1273:1273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/xN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/BN;)V"}
     4:5:void writeMessageNoTag(com.android.tools.r8.com.google.protobuf.MessageLite):1305:1306 -> a
     4:5:void writeMessage(int,com.android.tools.r8.com.google.protobuf.MessageLite):1274 -> a
     6:9:void write(byte):1318:1321 -> a
     10:14:void write(byte[],int,int):1446:1450 -> a
     1:2:void writeBytesNoTag(com.android.tools.r8.com.google.protobuf.ByteString):1248:1249 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     3:3:void com.android.tools.r8.com.google.protobuf.ByteString$LiteralByteString.writeTo(com.android.tools.r8.com.google.protobuf.ByteOutput):1411:1411 -> b
     3:3:void writeBytesNoTag(com.android.tools.r8.com.google.protobuf.ByteString):1249 -> b
     4:4:void writeLazy(byte[],int,int):1456:1456 -> b
@@ -41470,110 +41470,110 @@
     21:21:void com.android.tools.r8.com.google.protobuf.UnsafeUtil.putByte(byte[],long,byte):180:180 -> f
     21:21:void writeUInt32NoTag(int):1364 -> f
     22:31:void writeUInt32NoTag(int):1369:1378 -> f
-com.android.tools.r8.com.google.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.com.google.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Sd:
 # {"id":"sourceFile","fileName":"CodedOutputStream.java"}
     1:1:void <init>(java.lang.Throwable):962:962 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/IndexOutOfBoundsException;)V"}
     2:2:void <init>(java.lang.String,java.lang.Throwable):966:966 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/IndexOutOfBoundsException;)V"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos -> com.android.tools.r8.internal.Wj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_MessageOptions_descriptor -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_MessageOptions_fieldAccessorTable -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_FieldOptions_descriptor -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_FieldOptions_fieldAccessorTable -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_OneofOptions_descriptor -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_OneofOptions_fieldAccessorTable -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_EnumOptions_descriptor -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_EnumOptions_fieldAccessorTable -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_EnumValueOptions_descriptor -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_EnumValueOptions_fieldAccessorTable -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_ServiceOptions_descriptor -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_ServiceOptions_fieldAccessorTable -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_MethodOptions_descriptor -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_MethodOptions_fieldAccessorTable -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_UninterpretedOption_descriptor -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_UninterpretedOption_fieldAccessorTable -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_UninterpretedOption_NamePart_descriptor -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_UninterpretedOption_NamePart_fieldAccessorTable -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_SourceCodeInfo_descriptor -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_SourceCodeInfo_fieldAccessorTable -> T
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_SourceCodeInfo_Location_descriptor -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_SourceCodeInfo_Location_fieldAccessorTable -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_FileDescriptorProto_descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_DescriptorProto_descriptor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_DescriptorProto_fieldAccessorTable -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_DescriptorProto_ReservedRange_descriptor -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_DescriptorProto_ReservedRange_fieldAccessorTable -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_ExtensionRangeOptions_descriptor -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_ExtensionRangeOptions_fieldAccessorTable -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_FieldDescriptorProto_descriptor -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_OneofDescriptorProto_descriptor -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_OneofDescriptorProto_fieldAccessorTable -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_EnumDescriptorProto_descriptor -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_EnumDescriptorProto_fieldAccessorTable -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_EnumDescriptorProto_EnumReservedRange_descriptor -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_EnumDescriptorProto_EnumReservedRange_fieldAccessorTable -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_EnumValueDescriptorProto_descriptor -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_EnumValueDescriptorProto_fieldAccessorTable -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_ServiceDescriptorProto_descriptor -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_ServiceDescriptorProto_fieldAccessorTable -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_MethodDescriptorProto_descriptor -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_MethodDescriptorProto_fieldAccessorTable -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor internal_static_google_protobuf_FileOptions_descriptor -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internal_static_google_protobuf_FileOptions_fieldAccessorTable -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
     1:156:void <clinit>():45652:45807 -> <clinit>
     1:156:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
       # {"id":"com.android.tools.r8.synthesized"}
@@ -41583,7 +41583,7 @@
     157:157:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     158:158:void <clinit>():0:0 -> <clinit>
     158:158:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055629,"2":1055630,"3":1055631},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055629,"2":1055630,"3":1055631},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     45969:45969:void <clinit>():45811:45811 -> <clinit>
     45969:45969:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     45970:45970:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> <clinit>
@@ -41611,7 +41611,7 @@
     45975:45975:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     45976:45976:void <clinit>():0:0 -> <clinit>
     45976:45976:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055632,"2":1055633,"3":1055634},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055632,"2":1055633,"3":1055634},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     91793:91794:void <clinit>():45817:45818 -> <clinit>
     91793:91794:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     91795:91795:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41620,7 +41620,7 @@
     91795:91795:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     91796:91796:void <clinit>():0:0 -> <clinit>
     91796:91796:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055635,"2":1055636,"3":1055637},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055635,"2":1055636,"3":1055637},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     137619:137620:void <clinit>():45823:45824 -> <clinit>
     137619:137620:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     137621:137621:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -41629,7 +41629,7 @@
     137621:137621:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     137622:137622:void <clinit>():0:0 -> <clinit>
     137622:137622:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055638,"2":1055639,"3":1055640},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055638,"2":1055639,"3":1055640},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     183451:183452:void <clinit>():45829:45830 -> <clinit>
     183451:183452:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     183453:183453:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -41638,7 +41638,7 @@
     183453:183453:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     183454:183454:void <clinit>():0:0 -> <clinit>
     183454:183454:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055641,"2":1055642,"3":1055643},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055641,"2":1055642,"3":1055643},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     229289:229290:void <clinit>():45835:45836 -> <clinit>
     229289:229290:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     229291:229291:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41647,7 +41647,7 @@
     229291:229291:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     229292:229292:void <clinit>():0:0 -> <clinit>
     229292:229292:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055644,"2":1055645,"3":1055646},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055644,"2":1055645,"3":1055646},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     275133:275134:void <clinit>():45841:45842 -> <clinit>
     275133:275134:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     275135:275135:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41665,7 +41665,7 @@
     275139:275139:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     275140:275140:void <clinit>():0:0 -> <clinit>
     275140:275140:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055647,"2":1055648,"3":1055649},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055647,"2":1055648,"3":1055649},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     320993:320994:void <clinit>():45853:45854 -> <clinit>
     320993:320994:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     320995:320995:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41674,7 +41674,7 @@
     320995:320995:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     320996:320996:void <clinit>():0:0 -> <clinit>
     320996:320996:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055650,"2":1055651,"3":1055652},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055650,"2":1055651,"3":1055652},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     366855:366856:void <clinit>():45859:45860 -> <clinit>
     366855:366856:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     366857:366857:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -41683,7 +41683,7 @@
     366857:366857:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     366858:366858:void <clinit>():0:0 -> <clinit>
     366858:366858:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055653,"2":1055654,"3":1055655},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055653,"2":1055654,"3":1055655},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     412723:412724:void <clinit>():45865:45866 -> <clinit>
     412723:412724:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     412725:412725:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41692,7 +41692,7 @@
     412725:412725:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     412726:412726:void <clinit>():0:0 -> <clinit>
     412726:412726:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055656,"2":1055657,"3":1055658},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055656,"2":1055657,"3":1055658},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     458597:458598:void <clinit>():45871:45872 -> <clinit>
     458597:458598:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     458599:458599:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41701,7 +41701,7 @@
     458599:458599:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     458600:458600:void <clinit>():0:0 -> <clinit>
     458600:458600:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055659,"2":1055660,"3":1055661},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055659,"2":1055660,"3":1055661},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     504477:504478:void <clinit>():45877:45878 -> <clinit>
     504477:504478:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     504479:504479:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41710,7 +41710,7 @@
     504479:504479:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     504480:504480:void <clinit>():0:0 -> <clinit>
     504480:504480:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055662,"2":1055663,"3":1055664},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055662,"2":1055663,"3":1055664},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     550363:550364:void <clinit>():45883:45884 -> <clinit>
     550363:550364:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     550365:550365:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41728,7 +41728,7 @@
     550369:550369:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     550370:550370:void <clinit>():0:0 -> <clinit>
     550370:550370:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055665,"2":1055666,"3":1055667},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055665,"2":1055666,"3":1055667},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     596265:596266:void <clinit>():45895:45896 -> <clinit>
     596265:596266:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     596267:596267:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41737,7 +41737,7 @@
     596267:596267:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     596268:596268:void <clinit>():0:0 -> <clinit>
     596268:596268:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055668,"2":1055669,"3":1055670},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055668,"2":1055669,"3":1055670},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     642169:642170:void <clinit>():45901:45902 -> <clinit>
     642169:642170:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     642171:642171:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41746,7 +41746,7 @@
     642171:642171:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     642172:642172:void <clinit>():0:0 -> <clinit>
     642172:642172:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055671,"2":1055672,"3":1055673},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055671,"2":1055672,"3":1055673},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     688079:688080:void <clinit>():45907:45908 -> <clinit>
     688079:688080:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     688081:688081:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41755,7 +41755,7 @@
     688081:688081:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     688082:688082:void <clinit>():0:0 -> <clinit>
     688082:688082:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055674,"2":1055675,"3":1055676},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055674,"2":1055675,"3":1055676},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     733995:733996:void <clinit>():45913:45914 -> <clinit>
     733995:733996:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     733997:733997:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41764,7 +41764,7 @@
     733997:733997:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     733998:733998:void <clinit>():0:0 -> <clinit>
     733998:733998:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055677,"2":1055678,"3":1055679},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055677,"2":1055678,"3":1055679},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     779917:779918:void <clinit>():45919:45920 -> <clinit>
     779917:779918:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     779919:779919:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41782,7 +41782,7 @@
     779923:779923:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     779924:779924:void <clinit>():0:0 -> <clinit>
     779924:779924:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055680,"2":1055681,"3":1055682},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055680,"2":1055681,"3":1055682},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     825855:825856:void <clinit>():45931:45932 -> <clinit>
     825855:825856:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     825857:825857:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41791,7 +41791,7 @@
     825857:825857:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     825858:825858:void <clinit>():0:0 -> <clinit>
     825858:825858:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055683,"2":1055684,"3":1055685},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055683,"2":1055684,"3":1055685},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     871795:871796:void <clinit>():45937:45938 -> <clinit>
     871795:871796:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     871797:871797:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -41800,7 +41800,7 @@
     871797:871797:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     871798:871798:void <clinit>():0:0 -> <clinit>
     871798:871798:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055686,"2":1055687,"3":1055688},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055686,"2":1055687,"3":1055688},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     917741:917742:void <clinit>():45943:45944 -> <clinit>
     917741:917742:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     917743:917743:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41809,7 +41809,7 @@
     917743:917743:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     917744:917744:void <clinit>():0:0 -> <clinit>
     917744:917744:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055689,"2":1055690,"3":1055691},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055689,"2":1055690,"3":1055691},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     963693:963694:void <clinit>():45949:45950 -> <clinit>
     963693:963694:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     963695:963695:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getNestedTypes():736:736 -> <clinit>
@@ -41818,7 +41818,7 @@
     963695:963695:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     963696:963696:void <clinit>():0:0 -> <clinit>
     963696:963696:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055692,"2":1055693,"3":1055694},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055692,"2":1055693,"3":1055694},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1009651:1009652:void <clinit>():45955:45956 -> <clinit>
     1009651:1009652:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     1009653:1009653:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
@@ -41827,7 +41827,7 @@
     1009653:1009653:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     1009654:1009654:void <clinit>():0:0 -> <clinit>
     1009654:1009654:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055695,"2":1055696,"3":1055697},"outline":"Lcom/android/tools/r8/internal/Cf;a([Lcom/android/tools/r8/internal/Xj;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1055695,"2":1055696,"3":1055697},"outline":"Lcom/android/tools/r8/internal/Ef;a([Lcom/android/tools/r8/internal/Zj;I)Ljava/lang/Object;"}
     1055615:1055615:void <clinit>():45961:45961 -> <clinit>
     1055615:1055615:void com.android.tools.r8.internal.DescriptorProtos.<clinit>():0 -> <clinit>
     1055616:1055616:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> <clinit>
@@ -41992,7 +41992,7 @@
     1055696:1055696:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getMessageTypes():135:135 -> <clinit>
     1055696:1055696:void <clinit>():45961 -> <clinit>
     1055697:1055697:void <clinit>():45961:45961 -> <clinit>
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto -> com.android.tools.r8.internal.Hi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
@@ -42004,19 +42004,19 @@
     java.util.List extensionRange_ -> k
     java.util.List oneofDecl_ -> l
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions options_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rj;"}
     java.util.List reservedRange_ -> n
     com.android.tools.r8.com.google.protobuf.LazyStringList reservedName_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     byte memoizedIsInitialized -> p
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto DEFAULT_INSTANCE -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zi;"}
     1:9:void <clinit>():10281:10289 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):5171:5171 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ai;)V"}
     2206:2206:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):7376:7376 -> <init>
     2206:2206:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5164 -> <init>
     2207:2207:void <init>():5173:5173 -> <init>
@@ -42054,10 +42054,10 @@
     23:23:boolean isInitialized():7414 -> a
     24:35:boolean isInitialized():7414:7425 -> a
     36:66:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):7432:7462 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     67:67:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):7698:7698 -> a
     67:67:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):5164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto getDefaultInstanceForType():10310:10310 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():5164 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -42069,7 +42069,7 @@
     11:11:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52491},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52491},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     7490:7492:int getSerializedSize():7478:7480 -> c
     7490:7492:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     7493:7493:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42077,7 +42077,7 @@
     7493:7493:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     7494:7494:int getSerializedSize():0:0 -> c
     7494:7494:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52492},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52492},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     14976:14978:int getSerializedSize():7482:7484 -> c
     14976:14978:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     14979:14979:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42085,7 +42085,7 @@
     14979:14979:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     14980:14980:int getSerializedSize():0:0 -> c
     14980:14980:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52493},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52493},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     22466:22468:int getSerializedSize():7486:7488 -> c
     22466:22468:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     22469:22469:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42093,7 +42093,7 @@
     22469:22469:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     22470:22470:int getSerializedSize():0:0 -> c
     22470:22470:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52494},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52494},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     29960:29962:int getSerializedSize():7490:7492 -> c
     29960:29962:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     29963:29963:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42101,7 +42101,7 @@
     29963:29963:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     29964:29964:int getSerializedSize():0:0 -> c
     29964:29964:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52495},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52495},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     37458:37460:int getSerializedSize():7494:7496 -> c
     37458:37460:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     37461:37461:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42114,7 +42114,7 @@
     37465:37465:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     37466:37466:int getSerializedSize():0:0 -> c
     37466:37466:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52496},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52496},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     44968:44970:int getSerializedSize():7502:7504 -> c
     44968:44970:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     44971:44971:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -42122,7 +42122,7 @@
     44971:44971:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     44972:44972:int getSerializedSize():0:0 -> c
     44972:44972:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52497},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52497},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     52480:52481:int getSerializedSize():7508:7509 -> c
     52480:52481:int com.android.tools.r8.internal.DescriptorProtos$DescriptorProto.getSerializedSize():0 -> c
     52482:52485:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.computeStringSizeNoTag(java.lang.Object):3088:3091 -> c
@@ -42148,9 +42148,9 @@
     52497:52497:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     52497:52497:int getSerializedSize():7504 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():5164:5164 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():5195:5195 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):7524:7527 -> equals
     5:5:boolean hasName():6975:6975 -> equals
     5:5:boolean equals(java.lang.Object):7529 -> equals
@@ -42260,22 +42260,22 @@
     41:44:int hashCode():7604:7607 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2700():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5358 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5359:5359 -> j
     1:9:java.lang.String getName():6983:6991 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions getOptions():7271:7271 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.getDefaultInstance():28458:28458 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions getOptions():7271 -> l
     1:1:boolean hasOptions():7263:7263 -> m
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder toBuilder():7691:7692 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yi;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$1 -> com.android.tools.r8.internal.xi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ai;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$1 -> com.android.tools.r8.internal.zi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():10289:10289 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10295:10295 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5201:5203 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5164 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10295 -> a
@@ -42386,36 +42386,36 @@
     203:226:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5164 -> a
     203:226:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10295 -> a
     203:226:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10289 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder -> com.android.tools.r8.internal.Ai:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List field_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 fieldBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List extension_ -> j
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 extensionBuilder_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List nestedType_ -> l
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 nestedTypeBuilder_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List enumType_ -> n
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 enumTypeBuilder_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List extensionRange_ -> p
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 extensionRangeBuilder_ -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List oneofDecl_ -> r
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 oneofDeclBuilder_ -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions options_ -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rj;"}
     java.util.List reservedRange_ -> u
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 reservedRangeBuilder_ -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList reservedName_ -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():7726 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):7708 -> <init>
@@ -42424,22 +42424,22 @@
     2:1886:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):7708 -> <init>
     1887:4264:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):7732:10109 -> <init>
     1887:4264:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):7708 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7946 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7708 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7708:7708 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):7950:7953 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):7708 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10271:10271 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7708 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.getDefaultInstance():10285:10285 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto):7959 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fi;)Lcom/android/tools/r8/internal/yi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hi;)Lcom/android/tools/r8/internal/Ai;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.hasName():6975:6975 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto):7960 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -42686,14 +42686,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7924 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):7708 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10265 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7708 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):7708:7708 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):7950:7953 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):7708 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -42703,9 +42703,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto build():7819:7821 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():7708 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8212:8218 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/yi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Ai;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8214 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):8214:8220 -> c
@@ -42715,10 +42715,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10265 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):7708 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2600():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():7809 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto build():7819:7821 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():7708 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -42726,10 +42726,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2700():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():7720 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():7721:7721 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto buildPartial():7828:7834 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hi;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.access$5002(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,java.lang.Object):5164:5164 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto buildPartial():7834 -> q
     9:14:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto buildPartial():7835:7840 -> q
@@ -42783,27 +42783,27 @@
     80:80:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.access$6002(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,int):5164:5164 -> q
     80:80:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto buildPartial():7911 -> q
     81:81:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto buildPartial():7912:7912 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange -> com.android.tools.r8.internal.Di:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     int start_ -> f
     int end_ -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions options_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zi;"}
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Di;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bi;"}
     1:9:void <clinit>():6234:6242 -> <clinit>
     1:173:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):5430:5602 -> <init>
     1:173:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ai;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ci;)V"}
     174:344:void <init>():5432:5602 -> <init>
     345:515:void <init>():5432:5602 -> <init>
     345:515:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5451 -> <init>
     345:515:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     516:516:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5453:5453 -> <init>
     516:516:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5423 -> <init>
     517:517:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
@@ -42836,7 +42836,7 @@
     577:577:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5423 -> <init>
     1:11:boolean isInitialized():5605:5615 -> a
     12:13:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5622:5623 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     14:14:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeInt32(int,int):1179:1179 -> a
     14:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5623 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -42851,7 +42851,7 @@
     20:23:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):5628:5631 -> a
     24:24:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):5797:5797 -> a
     24:24:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):5423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange getDefaultInstanceForType():6263:6263 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():5423 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -42860,9 +42860,9 @@
     16:16:int getSerializedSize():5650 -> c
     17:18:int getSerializedSize():5652:5653 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():5423:5423 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():5445:5445 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):5662:5665 -> equals
     5:5:boolean hasStart():5534:5534 -> equals
     5:5:boolean equals(java.lang.Object):5667 -> equals
@@ -42898,50 +42898,50 @@
     9:14:int hashCode():5701:5706 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2900():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5516 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5517:5517 -> j
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions getOptions():5592:5592 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zi;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.getDefaultInstance():11247:11247 -> k
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions getOptions():5592 -> k
     1:1:boolean hasOptions():5584:5584 -> l
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder toBuilder():5790:5791 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ai;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$1 -> com.android.tools.r8.internal.zi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ci;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$1 -> com.android.tools.r8.internal.Bi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():6242:6242 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6248:6248 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder -> com.android.tools.r8.internal.Ai:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder -> com.android.tools.r8.internal.Ci:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     int start_ -> g
     int end_ -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions options_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zi;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():5821 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5803 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):5827:5827 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):5803 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):5928 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):5803 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5803:5803 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):5932:5935 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):5803 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6224:6224 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5803 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange.getDefaultInstance():6238:6238 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange):5941 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bi;)Lcom/android/tools/r8/internal/Ai;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Di;)Lcom/android/tools/r8/internal/Ci;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange.hasStart():5534:5534 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange):5942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -42973,14 +42973,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):5906 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):5803 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6218 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5803 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5803:5803 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):5932:5935 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):5803 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -42990,9 +42990,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange build():5865:5867 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():5803 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5973:5973 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Ai;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Ci;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6248:6248 -> c
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6242 -> c
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):5973 -> c
@@ -43006,10 +43006,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6218 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):5803 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2800():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():5855 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange build():5865:5867 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():5803 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -43017,10 +43017,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$2900():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5815 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():5816:5816 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange buildPartial():5874:5878 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Di;"}
     6:6:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange.access$3302(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange,int):5423:5423 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange buildPartial():5878 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange buildPartial():5882:5882 -> q
@@ -43032,25 +43032,25 @@
     11:11:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange.access$3602(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange,int):5423:5423 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange buildPartial():5893 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange buildPartial():5894:5894 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange -> com.android.tools.r8.internal.Gi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     int start_ -> f
     int end_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ci;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ei;"}
     1:9:void <clinit>():6932:6940 -> <clinit>
     1:134:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):6326:6459 -> <init>
     1:134:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):6319 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Di;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fi;)V"}
     135:266:void <init>():6328:6459 -> <init>
     267:398:void <init>():6328:6459 -> <init>
     267:398:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6347 -> <init>
     267:398:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):6319 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     399:399:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6349:6349 -> <init>
     399:399:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):6319 -> <init>
     400:400:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
@@ -43081,7 +43081,7 @@
     438:438:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):6319 -> <init>
     1:5:boolean isInitialized():6462:6466 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):6473:6474 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeInt32(int,int):1179:1179 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):6474 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -43096,16 +43096,16 @@
     14:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):6479:6479 -> a
     15:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6632:6632 -> a
     15:15:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange getDefaultInstanceForType():6961:6961 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():6319 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:14:int getSerializedSize():6484:6497 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder toBuilder():6625:6626 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():6319 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():6341:6341 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):6506:6509 -> equals
     5:5:boolean hasStart():6417:6417 -> equals
     5:5:boolean equals(java.lang.Object):6511 -> equals
@@ -43145,15 +43145,15 @@
     9:10:int hashCode():6540:6541 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$3900():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6399 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6400:6400 -> j
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$1 -> com.android.tools.r8.internal.Ci:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$1 -> com.android.tools.r8.internal.Ei:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():6940:6940 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6946:6946 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6940 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder -> com.android.tools.r8.internal.Di:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder -> com.android.tools.r8.internal.Fi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     int start_ -> g
@@ -43164,22 +43164,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):6668:6668 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):6644 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6754 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6644:6644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):6758:6761 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):6644 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6922:6922 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange.getDefaultInstance():6936:6936 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange):6767 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ei;)Lcom/android/tools/r8/internal/Di;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gi;)Lcom/android/tools/r8/internal/Fi;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange.hasStart():6417:6417 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange):6768 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -43200,14 +43200,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6732 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):6644 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6916 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6644 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6644:6644 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):6758:6761 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):6644 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -43217,9 +43217,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange build():6699:6701 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():6644 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6791:6791 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Di;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Fi;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6946:6946 -> c
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6940 -> c
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):6791 -> c
@@ -43233,10 +43233,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6916 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):6644 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$3800():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():6689 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange build():6699:6701 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():6644 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -43244,10 +43244,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$3900():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6656 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():6657:6657 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange buildPartial():6708:6712 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ei;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gi;"}
     6:6:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange.access$4302(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange,int):6319:6319 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange buildPartial():6712 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange buildPartial():6716:6716 -> q
@@ -43256,26 +43256,26 @@
     9:9:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange.access$4502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange,int):6319:6319 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange buildPartial():6719 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange buildPartial():6720:6720 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto -> com.android.tools.r8.internal.Ni:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List value_ -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions options_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qi;"}
     java.util.List reservedRange_ -> i
     com.android.tools.r8.com.google.protobuf.LazyStringList reservedName_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     byte memoizedIsInitialized -> k
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto DEFAULT_INSTANCE -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ni;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii;"}
     1:9:void <clinit>():17927:17935 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):15375:15375 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15368 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ji;)V"}
     1070:1070:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):16444:16444 -> <init>
     1070:1070:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15368 -> <init>
     1071:1071:void <init>():15377:15377 -> <init>
@@ -43288,10 +43288,10 @@
     3:3:boolean isInitialized():16452 -> a
     4:15:boolean isInitialized():16452:16463 -> a
     16:31:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):16470:16485 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     32:32:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):16671:16671 -> a
     32:32:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto getDefaultInstanceForType():17956:17956 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():15368 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -43303,7 +43303,7 @@
     11:11:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":33043},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":33043},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     16513:16515:int getSerializedSize():16501:16503 -> c
     16513:16515:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
     16516:16516:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -43316,7 +43316,7 @@
     16520:16520:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
     16521:16521:int getSerializedSize():0:0 -> c
     16521:16521:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":33044},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":33044},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     33032:33033:int getSerializedSize():16511:16512 -> c
     33032:33033:int com.android.tools.r8.internal.DescriptorProtos$EnumDescriptorProto.getSerializedSize():0 -> c
     33034:33037:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.computeStringSizeNoTag(java.lang.Object):3088:3091 -> c
@@ -43333,9 +43333,9 @@
     33044:33044:int getSerializedSize():16507 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder toBuilder():16664:16665 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():15368 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():15394:15394 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):16527:16530 -> equals
     5:5:boolean hasName():16213:16213 -> equals
     5:5:boolean equals(java.lang.Object):16532 -> equals
@@ -43394,20 +43394,20 @@
     21:24:int hashCode():16577:16580 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9700():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15497 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15498:15498 -> j
     1:9:java.lang.String getName():16221:16229 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions getOptions():16309:16309 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qi;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.getDefaultInstance():33036:33036 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions getOptions():16309 -> l
     1:1:boolean hasOptions():16301:16301 -> m
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$1 -> com.android.tools.r8.internal.Gi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$1 -> com.android.tools.r8.internal.Ii:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():17935:17935 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):17941:17941 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):17935 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15400:15402 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15368 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):17941 -> a
@@ -43478,21 +43478,21 @@
     113:121:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15368 -> a
     113:121:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):17941 -> a
     113:121:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):17935 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder -> com.android.tools.r8.internal.Ji:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List value_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 valueBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions options_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qi;"}
     java.util.List reservedRange_ -> k
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 reservedRangeBuilder_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList reservedName_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():16699 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):16681 -> <init>
@@ -43501,22 +43501,22 @@
     2:794:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):16681 -> <init>
     795:1845:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):16705:17755 -> <init>
     795:1845:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):16681 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16839 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16681:16681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):16843:16846 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):16681 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):17917:17917 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.getDefaultInstance():17931:17931 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto):16852 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Li;)Lcom/android/tools/r8/internal/Hi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ni;)Lcom/android/tools/r8/internal/Ji;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.hasName():16213:16213 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto):16853 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -43613,14 +43613,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16817 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):16681 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):17911 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16681 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16681:16681 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):16843:16846 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):16681 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -43630,9 +43630,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto build():16757:16759 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():16681 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16950:16956 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Hi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Ji;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16952 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16952:16958 -> c
@@ -43642,10 +43642,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):17911 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16681 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9600():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():16747 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto build():16757:16759 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():16681 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -43653,10 +43653,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9700():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():16693 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():16694:16694 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto buildPartial():16766:16772 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ni;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.access$11002(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,java.lang.Object):15368:15368 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto buildPartial():16772 -> q
     9:14:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto buildPartial():16773:16778 -> q
@@ -43680,25 +43680,25 @@
     35:35:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.access$11502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,int):15368:15368 -> q
     35:35:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto buildPartial():16804 -> q
     36:36:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto buildPartial():16805:16805 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange -> com.android.tools.r8.internal.Ki:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange -> com.android.tools.r8.internal.Mi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     int start_ -> f
     int end_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ki;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ii;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ki;"}
     1:9:void <clinit>():16170:16178 -> <clinit>
     1:134:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):15562:15695 -> <init>
     1:134:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15555 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ji;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Li;)V"}
     135:266:void <init>():15564:15695 -> <init>
     267:398:void <init>():15564:15695 -> <init>
     267:398:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15583 -> <init>
     267:398:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15555 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)V"}
     399:399:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15585:15585 -> <init>
     399:399:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15555 -> <init>
     400:400:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> <init>
@@ -43729,7 +43729,7 @@
     438:438:void <init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15555 -> <init>
     1:5:boolean isInitialized():15698:15702 -> a
     6:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15709:15710 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeInt32(int,int):1179:1179 -> a
     8:8:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15710 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -43744,16 +43744,16 @@
     14:14:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):15715:15715 -> a
     15:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15868:15868 -> a
     15:15:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15555 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange getDefaultInstanceForType():16199:16199 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():15555 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:14:int getSerializedSize():15720:15733 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder toBuilder():15861:15862 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():15555 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():15577:15577 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):15742:15745 -> equals
     5:5:boolean hasStart():15653:15653 -> equals
     5:5:boolean equals(java.lang.Object):15747 -> equals
@@ -43793,15 +43793,15 @@
     9:10:int hashCode():15776:15777 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9900():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15635 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15636:15636 -> j
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$1 -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$1 -> com.android.tools.r8.internal.Ki:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():16178:16178 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16184:16184 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder -> com.android.tools.r8.internal.Ji:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder -> com.android.tools.r8.internal.Li:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     int start_ -> g
@@ -43812,22 +43812,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):15906:15906 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):15882 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15992 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15882 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15882:15882 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):15996:15999 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):15882 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16160:16160 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15882 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange.getDefaultInstance():16174:16174 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange):16005 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ki;)Lcom/android/tools/r8/internal/Ji;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mi;)Lcom/android/tools/r8/internal/Li;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange.hasStart():15653:15653 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange):16006 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -43848,14 +43848,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15970 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):15882 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16154 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15882 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15882:15882 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):15996:15999 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):15882 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -43865,9 +43865,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange build():15937:15939 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():15882 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16029:16029 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Ji;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Li;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16184:16184 -> c
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$1.parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16178 -> c
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):16029 -> c
@@ -43881,10 +43881,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):16154 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15882 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9800():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():15927 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange build():15937:15939 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():15882 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -43892,10 +43892,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$9900():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15894 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():15895:15895 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange buildPartial():15946:15950 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ki;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mi;"}
     6:6:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange.access$10302(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange,int):15555:15555 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange buildPartial():15950 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange buildPartial():15954:15954 -> q
@@ -43904,7 +43904,7 @@
     9:9:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange.access$10502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange,int):15555:15555 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange buildPartial():15957 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange buildPartial():15958:15958 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions -> com.android.tools.r8.internal.Qi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     boolean allowAlias_ -> g
@@ -43912,13 +43912,13 @@
     java.util.List uninterpretedOption_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oi;"}
     1:9:void <clinit>():33032:33040 -> <clinit>
     1:215:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):31911:32125 -> <init>
     1:215:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):31903 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ni;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pi;)V"}
     216:428:void <init>():31913:32125 -> <init>
     429:429:void <init>():31914:31914 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -43926,7 +43926,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):32151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44011,7 +44011,7 @@
     56:59:boolean isInitialized():32139:32142 -> a
     60:60:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):32331:32331 -> a
     60:60:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31903 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions getDefaultInstanceForType():33061:33061 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():31903 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44025,7 +44025,7 @@
     7:7:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
     8:8:int getSerializedSize():0:0 -> c
     8:8:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32195},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32195},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     32187:32189:int getSerializedSize():32179:32181 -> c
     32187:32189:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
     32190:32190:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -44033,7 +44033,7 @@
     32190:32190:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
     32191:32191:int getSerializedSize():0:0 -> c
     32191:32191:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32196},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32196},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     32192:32192:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     32192:32192:int getSerializedSize():32183 -> c
     32192:32192:int com.android.tools.r8.internal.DescriptorProtos$EnumOptions.getSerializedSize():0 -> c
@@ -44044,9 +44044,9 @@
     32196:32196:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     32196:32196:int getSerializedSize():32181 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():31903:31903 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():31927:31927 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):32194:32197 -> equals
     5:5:boolean hasAllowAlias():32016:32016 -> equals
     5:5:boolean equals(java.lang.Object):32199 -> equals
@@ -44101,16 +44101,16 @@
     17:19:int hashCode():32238:32240 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$21200():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31997 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31998:31998 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder toBuilder():32324:32325 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ni;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$1 -> com.android.tools.r8.internal.Mi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pi;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$1 -> com.android.tools.r8.internal.Oi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():33040:33040 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33046:33046 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33040 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31933:31935 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):31903 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33046 -> a
@@ -44178,34 +44178,34 @@
     88:88:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):31903 -> a
     88:88:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33046 -> a
     88:88:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33040 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder -> com.android.tools.r8.internal.Pi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     boolean allowAlias_ -> h
     boolean deprecated_ -> i
     java.util.List uninterpretedOption_ -> j
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:348:void <init>():32356:32703 -> <init>
     1:348:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):32337 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     349:690:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):32362:32703 -> <init>
     349:690:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):32337 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32337:32337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32464:32464 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):32495:32498 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):32337 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33022:33022 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.getDefaultInstance():33036:33036 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions):32504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oi;)Lcom/android/tools/r8/internal/Ni;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qi;)Lcom/android/tools/r8/internal/Pi;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.hasAllowAlias():32016:32016 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions):32505 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44257,12 +44257,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33016 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32337 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32337:32337 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32442:32442 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):32337 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):32495:32498 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):32337 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -44272,9 +44272,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions build():32400:32402 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():32337 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32563:32569 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Ni;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Pi;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32565 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):32565:32571 -> c
@@ -44284,10 +44284,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33016 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):32337 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$21100():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():32390 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions build():32400:32402 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():32337 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44295,10 +44295,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$21200():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():32350 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():32351:32351 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions buildPartial():32409:32413 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qi;"}
     6:6:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.access$21602(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions,boolean):31903:31903 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions buildPartial():32413 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions buildPartial():32417:32417 -> q
@@ -44313,28 +44313,28 @@
     18:18:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions.access$21902(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions,int):31903:31903 -> q
     18:18:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions buildPartial():32429 -> q
     19:19:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumOptions buildPartial():32430:32430 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto -> com.android.tools.r8.internal.Ti:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     int number_ -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions options_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ui;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi;"}
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ri;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ti;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ri;"}
     1:9:void <clinit>():18859:18867 -> <clinit>
     1:188:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):18022:18209 -> <init>
     1:188:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18015 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Si;)V"}
     189:374:void <init>():18024:18209 -> <init>
     375:375:void <init>():18025:18025 -> <init>
     1:11:boolean isInitialized():18212:18222 -> a
     12:16:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):18229:18233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     17:17:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeInt32(int,int):1179:1179 -> a
     17:17:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):18233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44343,7 +44343,7 @@
     19:22:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):18235:18238 -> a
     23:23:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18403:18403 -> a
     23:23:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18015 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto getDefaultInstanceForType():18888:18888 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():18015 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44352,9 +44352,9 @@
     15:15:int getSerializedSize():18256 -> c
     16:17:int getSerializedSize():18258:18259 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():18015:18015 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():18038:18038 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):18268:18271 -> equals
     5:5:boolean hasName():18124:18124 -> equals
     5:5:boolean equals(java.lang.Object):18273 -> equals
@@ -44389,22 +44389,22 @@
     9:14:int hashCode():18307:18312 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$11800():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18110 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18111:18111 -> j
     1:9:java.lang.String getName():18132:18140 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions getOptions():18199:18199 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ui;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.getDefaultInstance():34157:34157 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions getOptions():18199 -> l
     1:1:boolean hasOptions():18191:18191 -> m
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder toBuilder():18396:18397 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qi;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$1 -> com.android.tools.r8.internal.Pi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Si;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$1 -> com.android.tools.r8.internal.Ri:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():18867:18867 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18873:18873 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18867 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18044:18046 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18015 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18873 -> a
@@ -44459,14 +44459,14 @@
     66:66:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18015 -> a
     66:66:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18873 -> a
     66:66:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18867 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder -> com.android.tools.r8.internal.Qi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder -> com.android.tools.r8.internal.Si:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     int number_ -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions options_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ui;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():18431 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18413 -> <init>
@@ -44475,22 +44475,22 @@
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18413 -> <init>
     3:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18437:18598 -> <init>
     3:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18413 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18538 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18413:18413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):18542:18545 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):18413 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18849:18849 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.getDefaultInstance():18863:18863 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto):18551 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ri;)Lcom/android/tools/r8/internal/Qi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ti;)Lcom/android/tools/r8/internal/Si;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.hasName():18124:18124 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto):18552 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44522,14 +44522,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18516 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):18413 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18843 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18413 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18413:18413 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):18542:18545 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):18413 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -44539,9 +44539,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto build():18475:18477 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():18413 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18585:18591 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Qi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Si;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18587 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18587:18593 -> c
@@ -44551,10 +44551,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18843 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):18413 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$11700():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():18465 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto build():18475:18477 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():18413 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44562,10 +44562,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$11800():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18425 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():18426:18426 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto buildPartial():18484:18490 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ri;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ti;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.access$12202(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,java.lang.Object):18015:18015 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto buildPartial():18490 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto buildPartial():18492:18492 -> q
@@ -44577,20 +44577,20 @@
     13:13:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto.access$12502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,int):18015:18015 -> q
     13:13:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto buildPartial():18503 -> q
     14:14:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto buildPartial():18504:18504 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions -> com.android.tools.r8.internal.Wi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     boolean deprecated_ -> g
     java.util.List uninterpretedOption_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ui;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Si;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ui;"}
     1:9:void <clinit>():34153:34161 -> <clinit>
     1:181:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):33151:33331 -> <init>
     1:181:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):33143 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ti;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vi;)V"}
     182:360:void <init>():33153:33331 -> <init>
     361:361:void <init>():33154:33154 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -44598,7 +44598,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):33357 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44683,7 +44683,7 @@
     53:56:boolean isInitialized():33345:33348 -> a
     57:57:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):33520:33520 -> a
     57:57:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):33143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions getDefaultInstanceForType():34182:34182 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():33143 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44700,7 +44700,7 @@
     10:10:int com.android.tools.r8.internal.DescriptorProtos$EnumValueOptions.getSerializedSize():0 -> c
     11:11:int getSerializedSize():0:0 -> c
     11:11:int com.android.tools.r8.internal.DescriptorProtos$EnumValueOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     12:12:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     12:12:int getSerializedSize():33382 -> c
     12:12:int com.android.tools.r8.internal.DescriptorProtos$EnumValueOptions.getSerializedSize():0 -> c
@@ -44709,9 +44709,9 @@
     15:15:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     15:15:int getSerializedSize():33380 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():33143:33143 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():33167:33167 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):33393:33396 -> equals
     5:5:boolean hasDeprecated():33253:33253 -> equals
     5:5:boolean equals(java.lang.Object):33398 -> equals
@@ -44756,16 +44756,16 @@
     13:15:int hashCode():33427:33429 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$22200():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():33232 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():33233:33233 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder toBuilder():33513:33514 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ti;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$1 -> com.android.tools.r8.internal.Si:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vi;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$1 -> com.android.tools.r8.internal.Ui:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():34161:34161 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34167:34167 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33173:33175 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):33143 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34167 -> a
@@ -44829,33 +44829,33 @@
     76:76:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):33143 -> a
     76:76:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34167 -> a
     76:76:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34161 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder -> com.android.tools.r8.internal.Vi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     boolean deprecated_ -> h
     java.util.List uninterpretedOption_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:280:void <init>():33545:33824 -> <init>
     1:280:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):33526 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     281:554:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):33551:33824 -> <init>
     281:554:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):33526 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33526:33526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):33647:33647 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):33526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):33678:33681 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):33526 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34143:34143 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.getDefaultInstance():34157:34157 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions):33687 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ui;)Lcom/android/tools/r8/internal/Ti;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi;)Lcom/android/tools/r8/internal/Vi;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.hasDeprecated():33253:33253 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions):33688 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -44901,12 +44901,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34137 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33526 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33526:33526 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):33625:33625 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):33526 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):33678:33681 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):33526 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -44916,9 +44916,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions build():33587:33589 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():33526 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33743:33749 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Ti;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Vi;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33745 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):33745:33751 -> c
@@ -44928,10 +44928,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34137 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):33526 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$22100():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():33577 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions build():33587:33589 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():33526 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -44939,10 +44939,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$22200():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():33539 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():33540:33540 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions buildPartial():33596:33600 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ui;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi;"}
     6:6:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.access$22602(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions,boolean):33143:33143 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions buildPartial():33600 -> q
     7:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions buildPartial():33603:33608 -> q
@@ -44954,18 +44954,18 @@
     16:16:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions.access$22802(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions,int):33143:33143 -> q
     16:16:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions buildPartial():33612 -> q
     17:17:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueOptions buildPartial():33613:33613 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions -> com.android.tools.r8.internal.Zi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     java.util.List uninterpretedOption_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zi;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xi;"}
     1:9:void <clinit>():11243:11251 -> <clinit>
     1:142:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):10375:10516 -> <init>
     1:142:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):10367 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yi;)V"}
     143:282:void <init>():10377:10516 -> <init>
     283:283:void <init>():10378:10378 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -44973,7 +44973,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):10542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -45058,7 +45058,7 @@
     50:53:boolean isInitialized():10530:10533 -> a
     54:54:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10688:10688 -> a
     54:54:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10367 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions getDefaultInstanceForType():11272:11272 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():10367 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -45070,7 +45070,7 @@
     8:8:int com.android.tools.r8.internal.DescriptorProtos$ExtensionRangeOptions.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$ExtensionRangeOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     10:10:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     10:10:int getSerializedSize():10560 -> c
     10:10:int com.android.tools.r8.internal.DescriptorProtos$ExtensionRangeOptions.getSerializedSize():0 -> c
@@ -45079,9 +45079,9 @@
     13:13:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     13:13:int getSerializedSize():10558 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():10367:10367 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():10391:10391 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):10571:10574 -> equals
     5:5:java.util.List getUninterpretedOptionList():10467:10467 -> equals
     5:5:boolean equals(java.lang.Object):10576 -> equals
@@ -45112,16 +45112,16 @@
     9:11:int hashCode():10595:10597 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$6300():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10451 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10452:10452 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder toBuilder():10681:10682 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$1 -> com.android.tools.r8.internal.Vi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yi;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$1 -> com.android.tools.r8.internal.Xi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():11251:11251 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11257:11257 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10397:10399 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):10367 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11257 -> a
@@ -45181,32 +45181,32 @@
     61:61:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):10367 -> a
     61:61:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11257 -> a
     61:61:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11251 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder -> com.android.tools.r8.internal.Yi:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     java.util.List uninterpretedOption_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:202:void <init>():10713:10914 -> <init>
     1:202:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):10694 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     203:398:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):10719:10914 -> <init>
     203:398:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):10694 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10694:10694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10807:10807 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):10838:10841 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):10694 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11233:11233 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.getDefaultInstance():11247:11247 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions):10847 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xi;)Lcom/android/tools/r8/internal/Wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zi;)Lcom/android/tools/r8/internal/Yi;"}
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions):10848:10848 -> a
     10:10:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.access$6700(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions):10367:10367 -> a
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions):10849 -> a
@@ -45245,12 +45245,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11227 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10694 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10694:10694 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10785:10785 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):10694 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):10838:10841 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):10694 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -45260,9 +45260,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions build():10753:10755 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():10694 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10900:10906 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Yi;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10902 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):10902:10908 -> c
@@ -45272,10 +45272,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):11227 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):10694 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$6200():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():10743 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions build():10753:10755 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():10694 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -45283,17 +45283,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$6300():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10707 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():10708:10708 -> n
     1:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions buildPartial():10762:10769 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zi;"}
     9:9:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.access$6702(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions,java.util.List):10367:10367 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions buildPartial():10769 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions buildPartial():10771:10771 -> q
     11:11:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions.access$6702(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions,java.util.List):10367:10367 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions buildPartial():10771 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ExtensionRangeOptions buildPartial():10773:10773 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto -> com.android.tools.r8.internal.ej:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
@@ -45311,17 +45311,17 @@
     java.lang.Object jsonName_ -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions options_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hj;"}
     boolean proto3Optional_ -> p
     byte memoizedIsInitialized -> q
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto DEFAULT_INSTANCE -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ej;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj;"}
     1:9:void <clinit>():14335:14343 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):11596:11596 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):11589 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bj;)V"}
     1095:1095:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):12690:12690 -> <init>
     1095:1095:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):11589 -> <init>
     1096:1096:void <init>():11598:11598 -> <init>
@@ -45329,7 +45329,7 @@
     2189:2195:void <init>():11599:11605 -> <init>
     1:11:boolean isInitialized():12693:12703 -> a
     12:19:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):12710:12717 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     20:20:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeInt32(int,int):1179:1179 -> a
     20:20:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):12717 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -45344,7 +45344,7 @@
     41:47:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):12737:12743 -> a
     48:48:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):13007:13007 -> a
     48:48:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):11589 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto getDefaultInstanceForType():14364:14364 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():11589 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -45356,7 +45356,7 @@
     17:17:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     18:18:int getSerializedSize():0:0 -> c
     18:18:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38368},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38368},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     12784:12785:int getSerializedSize():12766:12767 -> c
     12784:12785:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     12786:12786:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeEnumSize(int,int):613:613 -> c
@@ -45364,7 +45364,7 @@
     12786:12786:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     12787:12787:int getSerializedSize():0:0 -> c
     12787:12787:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38369},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38369},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     25557:25565:int getSerializedSize():12770:12778 -> c
     25557:25565:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     25566:25566:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -45374,7 +45374,7 @@
     25567:25574:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     25575:25575:int getSerializedSize():0:0 -> c
     25575:25575:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38370},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38370},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     38366:38367:int getSerializedSize():12791:12792 -> c
     38366:38367:int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto.getSerializedSize():0 -> c
     38368:38368:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeEnumSize(int,int):613:613 -> c
@@ -45385,9 +45385,9 @@
     38370:38370:int getSerializedSize():12789 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder toBuilder():13000:13001 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():11589 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():11618:11618 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):12801:12804 -> equals
     5:5:boolean hasName():12191:12191 -> equals
     5:5:boolean equals(java.lang.Object):12806 -> equals
@@ -45458,13 +45458,13 @@
     50:54:int hashCode():12912:12916 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$7000():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11748 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():11749:11749 -> j
     1:9:java.lang.String getDefaultValue():12465:12473 -> k
     1:9:java.lang.String getExtendee():12396:12404 -> l
     1:9:java.lang.String getName():12199:12207 -> m
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions getOptions():12619:12619 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.getDefaultInstance():30813:30813 -> n
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions getOptions():12619 -> n
     1:9:java.lang.String getTypeName():12330:12338 -> o
@@ -45474,12 +45474,12 @@
     1:1:boolean hasOptions():12611:12611 -> s
     1:1:boolean hasType():12281:12281 -> t
     1:1:boolean hasTypeName():12314:12314 -> u
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$1 -> com.android.tools.r8.internal.Yi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$1 -> com.android.tools.r8.internal.aj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():14343:14343 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14349:14349 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14343 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):11624:11626 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):11589 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14349 -> a
@@ -45566,7 +45566,7 @@
     156:156:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):11589 -> a
     156:156:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14349 -> a
     156:156:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14343 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder -> com.android.tools.r8.internal.bj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
@@ -45584,7 +45584,7 @@
     java.lang.Object jsonName_ -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions options_ -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hj;"}
     boolean proto3Optional_ -> q
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():13035 -> <init>
@@ -45594,22 +45594,22 @@
     2:668:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):13017 -> <init>
     669:1576:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):13041:13948 -> <init>
     669:1576:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):13017 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13190 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13017 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13017:13017 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):13194:13197 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):13017 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14325:14325 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13017 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.getDefaultInstance():14339:14339 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto):13203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cj;)Lcom/android/tools/r8/internal/Zi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ej;)Lcom/android/tools/r8/internal/bj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.hasName():12191:12191 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto):13204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -45687,14 +45687,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13168 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):13017 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14319 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13017 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13017:13017 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):13194:13197 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):13017 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -45704,9 +45704,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto build():13095:13097 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():13017 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13269:13275 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Zi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/bj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13271 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):13271:13277 -> c
@@ -45716,10 +45716,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14319 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):13017 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$6900():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():13085 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto build():13095:13097 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():13017 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -45727,10 +45727,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$7000():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13029 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():13030:13030 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto buildPartial():13104:13110 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ej;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.access$7402(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto,java.lang.Object):11589:11589 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto buildPartial():13110 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto buildPartial():13112:13112 -> q
@@ -45768,19 +45768,19 @@
     30:30:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto buildPartial():13156:13156 -> q
 com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label -> R8$$REMOVED$$CLASS$$64:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cj:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type -> R8$$REMOVED$$CLASS$$65:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.dj:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type.valueOf(int):11993:11993 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)I"}
     int com.android.tools.r8.internal.DescriptorProtos$FieldDescriptorProto$Type$EnumUnboxingLocalUtility.getValue(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions -> com.android.tools.r8.internal.fj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions -> com.android.tools.r8.internal.hj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     int ctype_ -> g
@@ -45792,13 +45792,13 @@
     java.util.List uninterpretedOption_ -> m
     byte memoizedIsInitialized -> n
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions DEFAULT_INSTANCE -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fj;"}
     1:9:void <clinit>():30809:30817 -> <clinit>
     1:677:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):28746:29422 -> <init>
     1:677:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):28738 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ej;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gj;)V"}
     678:1352:void <init>():28748:29422 -> <init>
     1353:1355:void <init>():28749:28751 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -45806,7 +45806,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):29448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -45891,7 +45891,7 @@
     68:71:boolean isInitialized():29436:29439 -> a
     72:72:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29692:29692 -> a
     72:72:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):28738 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions getDefaultInstanceForType():30838:30838 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():28738 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -45905,17 +45905,17 @@
     8:8:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147503},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147503},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     29497:29497:int getSerializedSize():29488:29488 -> c
     29497:29497:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     29498:29498:int getSerializedSize():0:0 -> c
     29498:29498:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147504},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147504},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     58990:58990:int getSerializedSize():29492:29492 -> c
     58990:58990:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     58991:58991:int getSerializedSize():0:0 -> c
     58991:58991:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147505},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147505},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     88487:88488:int getSerializedSize():29496:29497 -> c
     88487:88488:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     88489:88489:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeEnumSize(int,int):613:613 -> c
@@ -45923,12 +45923,12 @@
     88489:88489:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     88490:88490:int getSerializedSize():0:0 -> c
     88490:88490:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147506},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147506},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     117990:117990:int getSerializedSize():29500:29500 -> c
     117990:117990:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     117991:117991:int getSerializedSize():0:0 -> c
     117991:117991:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147507},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147507},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     147495:147497:int getSerializedSize():29504:29506 -> c
     147495:147497:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     147498:147498:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -45936,7 +45936,7 @@
     147498:147498:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
     147499:147499:int getSerializedSize():0:0 -> c
     147499:147499:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147508},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147508},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     147500:147500:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     147500:147500:int getSerializedSize():29508 -> c
     147500:147500:int com.android.tools.r8.internal.DescriptorProtos$FieldOptions.getSerializedSize():0 -> c
@@ -45955,9 +45955,9 @@
     147508:147508:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     147508:147508:int getSerializedSize():29506 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():28738:28738 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():28764:28764 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):29519:29522 -> equals
     5:5:boolean hasCtype():29130:29130 -> equals
     5:5:boolean equals(java.lang.Object):29524 -> equals
@@ -46036,17 +46036,17 @@
     33:35:int hashCode():29599:29601 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$19100():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28868 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():28869:28869 -> j
     1:1:boolean hasPacked():29165:29165 -> k
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder toBuilder():29685:29686 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ej;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$1 -> com.android.tools.r8.internal.dj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$1 -> com.android.tools.r8.internal.fj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():30817:30817 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30823:30823 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30817 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28770:28772 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):28738 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30823 -> a
@@ -46130,7 +46130,7 @@
     170:170:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):28738 -> a
     170:170:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30823 -> a
     170:170:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30817 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder -> com.android.tools.r8.internal.gj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     int ctype_ -> h
@@ -46141,27 +46141,27 @@
     boolean weak_ -> m
     java.util.List uninterpretedOption_ -> n
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:764:void <init>():29717:30480 -> <init>
     1:764:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):29698 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     765:1522:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):29723:30480 -> <init>
     765:1522:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):29698 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29698:29698 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29849:29849 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29698 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):29880:29883 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):29698 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30799:30799 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29698 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.getDefaultInstance():30813:30813 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions):29889 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fj;)Lcom/android/tools/r8/internal/ej;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hj;)Lcom/android/tools/r8/internal/gj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.hasCtype():29130:29130 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions):29890 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -46246,12 +46246,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30793 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29698 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29698:29698 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29827:29827 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):29698 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):29880:29883 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):29698 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -46261,9 +46261,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions build():29769:29771 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():29698 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29960:29966 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/ej;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/gj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29962 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):29962:29968 -> c
@@ -46273,10 +46273,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):30793 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):29698 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$19000():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():29759 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions build():29769:29771 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():29698 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -46284,10 +46284,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$19100():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29711 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():29712:29712 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions buildPartial():29778:29784 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hj;"}
     8:8:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions.access$19502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions,int):28738:28738 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions buildPartial():29784 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions buildPartial():29786:29786 -> q
@@ -46318,7 +46318,7 @@
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
 com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldOptions$JSType -> R8$$REMOVED$$CLASS$$67:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto -> com.android.tools.r8.internal.ij:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto -> com.android.tools.r8.internal.kj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
@@ -46326,30 +46326,30 @@
     java.lang.Object package_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList dependency_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     com.android.tools.r8.com.google.protobuf.Internal$IntList publicDependency_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     com.android.tools.r8.com.google.protobuf.Internal$IntList weakDependency_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     java.util.List messageType_ -> k
     java.util.List enumType_ -> l
     java.util.List service_ -> m
     java.util.List extension_ -> n
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions options_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oj;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo sourceCodeInfo_ -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pj;"}
     java.lang.Object syntax_ -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     byte memoizedIsInitialized -> r
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto DEFAULT_INSTANCE -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ij;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ij;"}
     1:9:void <clinit>():4874:4882 -> <clinit>
     1:800:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):1208:2007 -> <init>
     1:800:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):1201 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jj;)V"}
     801:1598:void <init>():1210:2007 -> <init>
     1599:1601:void <init>():1211:1213 -> <init>
     1602:1602:com.android.tools.r8.com.google.protobuf.IntArrayList com.android.tools.r8.com.google.protobuf.IntArrayList.emptyList():54:54 -> <init>
@@ -46378,7 +46378,7 @@
     15:15:boolean isInitialized():2033 -> a
     16:27:boolean isInitialized():2033:2044 -> a
     28:55:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):2051:2078 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     56:56:int com.android.tools.r8.com.google.protobuf.IntArrayList.size():164:164 -> a
     56:56:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):2078 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -46411,7 +46411,7 @@
     69:72:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):2084:2087 -> a
     73:73:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2360:2360 -> a
     73:73:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto getDefaultInstanceForType():4903:4903 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():1201 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -46431,7 +46431,7 @@
     25:25:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     26:26:int getSerializedSize():0:0 -> c
     26:26:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8553},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8553},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     2140:2142:int getSerializedSize():2114:2116 -> c
     2140:2142:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     2143:2143:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -46439,7 +46439,7 @@
     2143:2143:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     2144:2144:int getSerializedSize():0:0 -> c
     2144:2144:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8554},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8554},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     4262:4264:int getSerializedSize():2118:2120 -> c
     4262:4264:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     4265:4265:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -46447,7 +46447,7 @@
     4265:4265:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     4266:4266:int getSerializedSize():0:0 -> c
     4266:4266:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8555},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8555},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     6388:6390:int getSerializedSize():2122:2124 -> c
     6388:6390:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     6391:6391:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -46455,7 +46455,7 @@
     6391:6391:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     6392:6392:int getSerializedSize():0:0 -> c
     6392:6392:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8556},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8556},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     8518:8520:int getSerializedSize():2126:2128 -> c
     8518:8520:int com.android.tools.r8.internal.DescriptorProtos$FileDescriptorProto.getSerializedSize():0 -> c
     8521:8521:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -46509,9 +46509,9 @@
     8556:8556:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     8556:8556:int getSerializedSize():2124 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():1201:1201 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():1233:1233 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):2165:2168 -> equals
     5:5:boolean hasName():1451:1451 -> equals
     5:5:boolean equals(java.lang.Object):2170 -> equals
@@ -46630,28 +46630,28 @@
     41:44:int hashCode():2266:2269 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$800():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1433 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():1434:1434 -> j
     1:9:java.lang.String getName():1463:1471 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions getOptions():1887:1887 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.getDefaultInstance():26677:26677 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions getOptions():1887 -> l
     1:9:java.lang.String getPackage():1523:1531 -> m
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo getSourceCodeInfo():1927:1927 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.getDefaultInstance():43335:43335 -> n
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo getSourceCodeInfo():1927 -> n
     1:9:java.lang.String getSyntax():1970:1978 -> o
     1:1:boolean hasOptions():1879:1879 -> p
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder toBuilder():2353:2354 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$1 -> com.android.tools.r8.internal.gj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$1 -> com.android.tools.r8.internal.ij:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():4882:4882 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4888:4888 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4882 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1239:1241 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):1201 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4888 -> a
@@ -46834,7 +46834,7 @@
     287:287:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):1201 -> a
     287:287:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4888 -> a
     287:287:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):4882 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder -> com.android.tools.r8.internal.jj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
@@ -46842,27 +46842,27 @@
     java.lang.Object package_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList dependency_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     com.android.tools.r8.com.google.protobuf.Internal$IntList publicDependency_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     com.android.tools.r8.com.google.protobuf.Internal$IntList weakDependency_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     java.util.List messageType_ -> l
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 messageTypeBuilder_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List enumType_ -> n
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 enumTypeBuilder_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List service_ -> p
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 serviceBuilder_ -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.util.List extension_ -> r
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 extensionBuilder_ -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions options_ -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oj;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo sourceCodeInfo_ -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pj;"}
     java.lang.Object syntax_ -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -46879,7 +46879,7 @@
     220:1776:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):2370 -> <init>
     1777:2424:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):2394:3041 -> <init>
     1777:2424:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):2370 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     2425:2425:com.android.tools.r8.com.google.protobuf.IntArrayList com.android.tools.r8.com.google.protobuf.IntArrayList.emptyList():54:54 -> <init>
     2425:2425:com.android.tools.r8.com.google.protobuf.Internal$IntList com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.emptyIntList():395 -> <init>
     2425:2425:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):3186 -> <init>
@@ -46889,18 +46889,18 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2601 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2370:2370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):2605:2608 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):2370 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4864:4864 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.getDefaultInstance():4878:4878 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto):2614 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ij;)Lcom/android/tools/r8/internal/hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kj;)Lcom/android/tools/r8/internal/jj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.hasName():1451:1451 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto):2615 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -47105,14 +47105,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2579 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):2370 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4858 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2370 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2370:2370 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):2605:2608 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):2370 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -47122,9 +47122,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto build():2475:2477 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():2370 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2812:2818 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/jj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2814 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):2814:2820 -> c
@@ -47134,10 +47134,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):4858 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):2370 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$700():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():2465 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto build():2475:2477 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():2370 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -47145,10 +47145,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$800():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2382 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():2383:2383 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto buildPartial():2484:2490 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ij;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.access$1202(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,java.lang.Object):1201:1201 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto buildPartial():2490 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto buildPartial():2494:2494 -> q
@@ -47207,14 +47207,14 @@
     73:73:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.access$2402(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,int):1201:1201 -> q
     73:73:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto buildPartial():2566 -> q
     74:74:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto buildPartial():2567:2567 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions -> com.android.tools.r8.internal.oj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     java.util.List uninterpretedOption_ -> A
     byte memoizedIsInitialized -> B
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions DEFAULT_INSTANCE -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lj;"}
     int bitField0_ -> f
     java.lang.Object javaPackage_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
@@ -47249,7 +47249,7 @@
     1:9:void <clinit>():26673:26681 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):22255:22255 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):22247 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mj;)V"}
     1360:1360:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):23614:23614 -> <init>
     1360:1360:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):22247 -> <init>
     1361:1361:void <init>():22257:22257 -> <init>
@@ -47260,7 +47260,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):23640 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -47345,7 +47345,7 @@
     110:113:boolean isInitialized():23628:23631 -> a
     114:114:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24104:24104 -> a
     114:114:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):22247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions getDefaultInstanceForType():26702:26702 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():22247 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -47357,52 +47357,52 @@
     13:13:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     14:14:int getSerializedSize():0:0 -> c
     14:14:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237514},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237514},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     23738:23738:int getSerializedSize():23724:23724 -> c
     23738:23738:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     23739:23739:int getSerializedSize():0:0 -> c
     23739:23739:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237515},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237515},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     47467:47470:int getSerializedSize():23728:23731 -> c
     47467:47470:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     47471:47471:int getSerializedSize():0:0 -> c
     47471:47471:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237516},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237516},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     71206:71206:int getSerializedSize():23735:23735 -> c
     71206:71206:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     71207:71207:int getSerializedSize():0:0 -> c
     71207:71207:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237517},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237517},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     94946:94946:int getSerializedSize():23739:23739 -> c
     94946:94946:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     94947:94947:int getSerializedSize():0:0 -> c
     94947:94947:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237518},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237518},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     118690:118690:int getSerializedSize():23743:23743 -> c
     118690:118690:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     118691:118691:int getSerializedSize():0:0 -> c
     118691:118691:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237519},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237519},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     142438:142438:int getSerializedSize():23747:23747 -> c
     142438:142438:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     142439:142439:int getSerializedSize():0:0 -> c
     142439:142439:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237520},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237520},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     166190:166190:int getSerializedSize():23751:23751 -> c
     166190:166190:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     166191:166191:int getSerializedSize():0:0 -> c
     166191:166191:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237521},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237521},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     189946:189946:int getSerializedSize():23755:23755 -> c
     189946:189946:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     189947:189947:int getSerializedSize():0:0 -> c
     189947:189947:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237522},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237522},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     213706:213721:int getSerializedSize():23759:23774 -> c
     213706:213721:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     213722:213722:int getSerializedSize():0:0 -> c
     213722:213722:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237523},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237523},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     237500:237508:int getSerializedSize():23778:23786 -> c
     237500:237508:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     237509:237509:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -47410,7 +47410,7 @@
     237509:237509:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
     237510:237510:int getSerializedSize():0:0 -> c
     237510:237510:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237524},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":237524},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     237511:237511:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     237511:237511:int getSerializedSize():23788 -> c
     237511:237511:int com.android.tools.r8.internal.DescriptorProtos$FileOptions.getSerializedSize():0 -> c
@@ -47439,9 +47439,9 @@
     237524:237524:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     237524:237524:int getSerializedSize():23786 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():22247:22247 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():22283:22283 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):23799:23802 -> equals
     5:5:boolean hasJavaPackage():22614:22614 -> equals
     5:5:boolean equals(java.lang.Object):23804 -> equals
@@ -47695,16 +47695,16 @@
     169:171:int hashCode():24011:24013 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$15100():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():22460 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():22461:22461 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder toBuilder():24097:24098 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$1 -> com.android.tools.r8.internal.jj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$1 -> com.android.tools.r8.internal.lj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():26681:26681 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26687:26687 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):22289:22291 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):22247 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26687 -> a
@@ -47844,13 +47844,13 @@
     353:353:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):22247 -> a
     353:353:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26687 -> a
     353:353:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26681 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder -> com.android.tools.r8.internal.mj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     java.lang.Object rubyPackage_ -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List uninterpretedOption_ -> B
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     int bitField0_ -> g
     java.lang.Object javaPackage_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
@@ -47885,21 +47885,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2199:4390:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):24135:26326 -> <init>
     2199:4390:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):24110 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24110:24110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24345:24345 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):24376:24379 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):24110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26663:26663 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.getDefaultInstance():26677:26677 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions):24385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mj;)Lcom/android/tools/r8/internal/kj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oj;)Lcom/android/tools/r8/internal/mj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.hasJavaPackage():22614:22614 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions):24386 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -48063,12 +48063,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26657 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24110:24110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24323:24323 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):24110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):24376:24379 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):24110 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -48078,9 +48078,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions build():24209:24211 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():24110 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24518:24524 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/kj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/mj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24520 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):24520:24526 -> c
@@ -48090,10 +48090,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):26657 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):24110 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$15000():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():24199 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions build():24209:24211 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():24110 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -48101,10 +48101,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$15100():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24123 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():24124:24124 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions buildPartial():24218:24224 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions.access$15502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions,java.lang.Object):22247:22247 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions buildPartial():24224 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions buildPartial():24228:24228 -> q
@@ -48175,10 +48175,10 @@
     57:57:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions buildPartial():24311:24311 -> q
 com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode -> R8$$REMOVED$$CLASS$$68:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.nj:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions -> com.android.tools.r8.internal.rj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     boolean messageSetWireFormat_ -> g
@@ -48188,13 +48188,13 @@
     java.util.List uninterpretedOption_ -> k
     byte memoizedIsInitialized -> l
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions DEFAULT_INSTANCE -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pj;"}
     1:9:void <clinit>():28454:28462 -> <clinit>
     1:343:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):26915:27257 -> <init>
     1:343:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):26907 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qj;)V"}
     344:684:void <init>():26917:27257 -> <init>
     685:685:void <init>():26918:26918 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -48202,7 +48202,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):27283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -48287,7 +48287,7 @@
     62:65:boolean isInitialized():27271:27274 -> a
     66:66:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27497:27497 -> a
     66:66:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):26907 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions getDefaultInstanceForType():28483:28483 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():26907 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -48301,17 +48301,17 @@
     7:7:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
     8:8:int getSerializedSize():0:0 -> c
     8:8:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81981},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81981},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     27325:27325:int getSerializedSize():27317:27317 -> c
     27325:27325:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
     27326:27326:int getSerializedSize():0:0 -> c
     27326:27326:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81982},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81982},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     54647:54647:int getSerializedSize():27321:27321 -> c
     54647:54647:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
     54648:54648:int getSerializedSize():0:0 -> c
     54648:54648:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81983},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81983},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     81973:81975:int getSerializedSize():27325:27327 -> c
     81973:81975:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
     81976:81976:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -48319,7 +48319,7 @@
     81976:81976:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
     81977:81977:int getSerializedSize():0:0 -> c
     81977:81977:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81984},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81984},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     81978:81978:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     81978:81978:int getSerializedSize():27329 -> c
     81978:81978:int com.android.tools.r8.internal.DescriptorProtos$MessageOptions.getSerializedSize():0 -> c
@@ -48334,9 +48334,9 @@
     81984:81984:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     81984:81984:int getSerializedSize():27327 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():26907:26907 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():26931:26931 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):27340:27343 -> equals
     5:5:boolean hasMessageSetWireFormat():27043:27043 -> equals
     5:5:boolean equals(java.lang.Object):27345 -> equals
@@ -48411,16 +48411,16 @@
     25:27:int hashCode():27404:27406 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$17900():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27011 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27012:27012 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder toBuilder():27490:27491 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$1 -> com.android.tools.r8.internal.nj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$1 -> com.android.tools.r8.internal.pj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():28462:28462 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28468:28468 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28462 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):26937:26939 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):26907 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28468 -> a
@@ -48496,7 +48496,7 @@
     112:112:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):26907 -> a
     112:112:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28468 -> a
     112:112:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):28462 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder -> com.android.tools.r8.internal.qj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     boolean messageSetWireFormat_ -> h
@@ -48505,27 +48505,27 @@
     boolean mapEntry_ -> k
     java.util.List uninterpretedOption_ -> l
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:604:void <init>():27522:28125 -> <init>
     1:604:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):27503 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     605:1202:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):27528:28125 -> <init>
     605:1202:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):27503 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27503:27503 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27642:27642 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27503 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):27673:27676 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):27503 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28444:28444 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27503 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.getDefaultInstance():28458:28458 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions):27682 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pj;)Lcom/android/tools/r8/internal/oj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rj;)Lcom/android/tools/r8/internal/qj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.hasMessageSetWireFormat():27043:27043 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions):27683 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -48589,12 +48589,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28438 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27503 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27503:27503 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27620:27620 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):27503 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):27673:27676 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):27503 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -48604,9 +48604,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions build():27570:27572 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():27503 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27747:27753 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/oj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/qj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27749 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):27749:27755 -> c
@@ -48616,10 +48616,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):28438 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):27503 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$17800():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():27560 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions build():27570:27572 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():27503 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -48627,10 +48627,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$17900():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27516 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():27517:27517 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions buildPartial():27579:27583 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rj;"}
     6:6:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.access$18302(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions,boolean):26907:26907 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions buildPartial():27583 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions buildPartial():27587:27587 -> q
@@ -48651,7 +48651,7 @@
     22:22:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.access$18802(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions,int):26907:26907 -> q
     22:22:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions buildPartial():27607 -> q
     23:23:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions buildPartial():27608:27608 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto -> com.android.tools.r8.internal.uj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
@@ -48661,26 +48661,26 @@
     java.lang.Object outputType_ -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions options_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xj;"}
     boolean clientStreaming_ -> j
     boolean serverStreaming_ -> k
     byte memoizedIsInitialized -> l
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto DEFAULT_INSTANCE -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sj;"}
     1:9:void <clinit>():21596:21604 -> <clinit>
     1:353:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):20246:20598 -> <init>
     1:353:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):20239 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tj;)V"}
     354:704:void <init>():20248:20598 -> <init>
     705:707:void <init>():20249:20251 -> <init>
     1:11:boolean isInitialized():20601:20611 -> a
     12:30:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):20618:20636 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     31:31:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):20840:20840 -> a
     31:31:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):20239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto getDefaultInstanceForType():21625:21625 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():20239 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -48694,12 +48694,12 @@
     18:18:int com.android.tools.r8.internal.DescriptorProtos$MethodDescriptorProto.getSerializedSize():0 -> c
     19:19:int getSerializedSize():0:0 -> c
     19:19:int com.android.tools.r8.internal.DescriptorProtos$MethodDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41350},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41350},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     20681:20681:int getSerializedSize():20662:20662 -> c
     20681:20681:int com.android.tools.r8.internal.DescriptorProtos$MethodDescriptorProto.getSerializedSize():0 -> c
     20682:20682:int getSerializedSize():0:0 -> c
     20682:20682:int com.android.tools.r8.internal.DescriptorProtos$MethodDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41351},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41351},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     41348:41349:int getSerializedSize():20666:20667 -> c
     41348:41349:int com.android.tools.r8.internal.DescriptorProtos$MethodDescriptorProto.getSerializedSize():0 -> c
     41350:41350:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
@@ -48708,9 +48708,9 @@
     41351:41351:int getSerializedSize():20664 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder toBuilder():20833:20834 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():20239 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():20264:20264 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):20676:20679 -> equals
     5:5:boolean hasName():20367:20367 -> equals
     5:5:boolean equals(java.lang.Object):20681 -> equals
@@ -48771,22 +48771,22 @@
     21:25:int hashCode():20745:20749 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$13800():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():20353 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():20354:20354 -> j
     1:9:java.lang.String getInputType():20433:20441 -> k
     1:9:java.lang.String getName():20375:20383 -> l
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions getOptions():20534:20534 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.getDefaultInstance():36636:36636 -> m
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions getOptions():20534 -> m
     1:9:java.lang.String getOutputType():20486:20494 -> n
     1:1:boolean hasOptions():20526:20526 -> o
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$1 -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$1 -> com.android.tools.r8.internal.sj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():21604:21604 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21610:21610 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21604 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20270:20272 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):20239 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21610 -> a
@@ -48853,7 +48853,7 @@
     91:91:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):20239 -> a
     91:91:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21610 -> a
     91:91:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21604 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder -> com.android.tools.r8.internal.tj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
@@ -48863,7 +48863,7 @@
     java.lang.Object outputType_ -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions options_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xj;"}
     boolean clientStreaming_ -> k
     boolean serverStreaming_ -> l
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -48874,22 +48874,22 @@
     2:200:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):20850 -> <init>
     201:591:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):20874:21264 -> <init>
     201:591:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):20850 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):20993 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):20850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20850:20850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):20997:21000 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):20850 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21586:21586 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.getDefaultInstance():21600:21600 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto):21006 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sj;)Lcom/android/tools/r8/internal/rj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uj;)Lcom/android/tools/r8/internal/tj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.hasName():20367:20367 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto):21007 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -48938,14 +48938,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):20971 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):20850 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21580 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20850 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20850:20850 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):20997:21000 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):20850 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -48955,9 +48955,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto build():20918:20920 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():20850 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21053:21059 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/rj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/tj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21055 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):21055:21061 -> c
@@ -48967,10 +48967,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):21580 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20850 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$13700():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():20908 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto build():20918:20920 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():20850 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -48978,10 +48978,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$13800():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():20862 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():20863:20863 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto buildPartial():20927:20933 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.access$14202(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,java.lang.Object):20239:20239 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto buildPartial():20933 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto buildPartial():20937:20937 -> q
@@ -49002,7 +49002,7 @@
     19:19:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto.access$14802(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,int):20239:20239 -> q
     19:19:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto buildPartial():20958 -> q
     20:20:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto buildPartial():20959:20959 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions -> com.android.tools.r8.internal.xj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     boolean deprecated_ -> g
@@ -49010,13 +49010,13 @@
     java.util.List uninterpretedOption_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions DEFAULT_INSTANCE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vj;"}
     1:9:void <clinit>():36632:36640 -> <clinit>
     1:340:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):35404:35743 -> <init>
     1:340:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):35396 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wj;)V"}
     341:678:void <init>():35406:35743 -> <init>
     679:680:void <init>():35407:35408 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -49024,7 +49024,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):35769 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -49109,7 +49109,7 @@
     56:59:boolean isInitialized():35757:35760 -> a
     60:60:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35947:35947 -> a
     60:60:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions getDefaultInstanceForType():36661:36661 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():35396 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49126,7 +49126,7 @@
     9:9:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
     10:10:int getSerializedSize():0:0 -> c
     10:10:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35815},"outline":"Lcom/android/tools/r8/internal/Ff;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35815},"outline":"Lcom/android/tools/r8/internal/Hf;a(III)I"}
     35807:35809:int getSerializedSize():35797:35799 -> c
     35807:35809:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
     35810:35810:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -49134,7 +49134,7 @@
     35810:35810:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
     35811:35811:int getSerializedSize():0:0 -> c
     35811:35811:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35816},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35816},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     35812:35812:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     35812:35812:int getSerializedSize():35801 -> c
     35812:35812:int com.android.tools.r8.internal.DescriptorProtos$MethodOptions.getSerializedSize():0 -> c
@@ -49145,9 +49145,9 @@
     35816:35816:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     35816:35816:int getSerializedSize():35799 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():35396:35396 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():35421:35421 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):35812:35815 -> equals
     5:5:boolean hasDeprecated():35646:35646 -> equals
     5:5:boolean equals(java.lang.Object):35817 -> equals
@@ -49196,16 +49196,16 @@
     15:17:int hashCode():35854:35856 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$24000():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35498 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35499:35499 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder toBuilder():35940:35941 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$1 -> com.android.tools.r8.internal.tj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$1 -> com.android.tools.r8.internal.vj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():36640:36640 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36646:36646 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36640 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35427:35429 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):35396 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36646 -> a
@@ -49273,34 +49273,34 @@
     108:108:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):35396 -> a
     108:108:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36646 -> a
     108:108:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36640 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder -> com.android.tools.r8.internal.wj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     boolean deprecated_ -> h
     int idempotencyLevel_ -> i
     java.util.List uninterpretedOption_ -> j
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:332:void <init>():35972:36303 -> <init>
     1:332:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):35953 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     333:658:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):35978:36303 -> <init>
     333:658:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):35953 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35953:35953 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):36080:36080 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35953 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):36111:36114 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):35953 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36622:36622 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35953 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.getDefaultInstance():36636:36636 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions):36120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vj;)Lcom/android/tools/r8/internal/uj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xj;)Lcom/android/tools/r8/internal/wj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.hasDeprecated():35646:35646 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions):36121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -49357,12 +49357,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36616 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35953 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35953:35953 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):36058:36058 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):35953 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):36111:36114 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):35953 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -49372,9 +49372,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions build():36016:36018 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():35953 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36179:36185 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/uj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/wj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36181 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36181:36187 -> c
@@ -49384,10 +49384,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):36616 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35953 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$23900():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():36006 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions build():36016:36018 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():35953 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49395,10 +49395,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$24000():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35966 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():35967:35967 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions buildPartial():36025:36029 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xj;"}
     6:6:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions.access$24402(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions,boolean):35396:35396 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions buildPartial():36029 -> q
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions buildPartial():36035:36035 -> q
@@ -49415,30 +49415,30 @@
     19:19:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions buildPartial():36046:36046 -> q
 com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodOptions$IdempotencyLevel -> R8$$REMOVED$$CLASS$$69:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto -> com.android.tools.r8.internal.yj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto -> com.android.tools.r8.internal.Aj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions options_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dj;"}
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yj;"}
     1:9:void <clinit>():15168:15176 -> <clinit>
     1:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):14419:14582 -> <init>
     1:164:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14412 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zj;)V"}
     165:326:void <init>():14421:14582 -> <init>
     327:327:void <init>():14422:14422 -> <init>
     1:11:boolean isInitialized():14585:14595 -> a
     12:18:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):14602:14608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     19:19:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14760:14760 -> a
     19:19:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14412 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto getDefaultInstanceForType():15197:15197 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():14412 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49448,9 +49448,9 @@
     12:13:int getSerializedSize():14624:14625 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder toBuilder():14753:14754 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():14412 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():14435:14435 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):14634:14637 -> equals
     5:5:boolean hasName():14516:14516 -> equals
     5:5:boolean equals(java.lang.Object):14639 -> equals
@@ -49476,20 +49476,20 @@
     5:12:int hashCode():14662:14669 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$8800():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14502 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14503:14503 -> j
     1:9:java.lang.String getName():14524:14532 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions getOptions():14572:14572 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.getDefaultInstance():31775:31775 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions getOptions():14572 -> l
     1:1:boolean hasOptions():14564:14564 -> m
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$1 -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$1 -> com.android.tools.r8.internal.yj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():15176:15176 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15182:15182 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14441:14443 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14412 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15182 -> a
@@ -49540,13 +49540,13 @@
     59:59:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14412 -> a
     59:59:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15182 -> a
     59:59:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):15176 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder -> com.android.tools.r8.internal.xj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder -> com.android.tools.r8.internal.zj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions options_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dj;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():14788 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14770 -> <init>
@@ -49555,22 +49555,22 @@
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14770 -> <init>
     3:155:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):14794:14946 -> <init>
     3:155:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):14770 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14889 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14770 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14770:14770 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):14893:14896 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):14770 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15158:15158 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14770 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.getDefaultInstance():15172:15172 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto):14902 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yj;)Lcom/android/tools/r8/internal/xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aj;)Lcom/android/tools/r8/internal/zj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.hasName():14516:14516 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto):14903 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -49595,14 +49595,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14867 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):14770 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15152 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14770 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14770:14770 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):14893:14896 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):14770 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -49612,9 +49612,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto build():14830:14832 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():14770 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14933:14939 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/zj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14935 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):14935:14941 -> c
@@ -49624,10 +49624,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):15152 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):14770 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$8700():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():14820 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto build():14830:14832 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():14770 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49635,10 +49635,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$8800():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14782 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():14783:14783 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto buildPartial():14839:14845 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Aj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.access$9202(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto,java.lang.Object):14412:14412 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto buildPartial():14845 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto buildPartial():14848:14848 -> q
@@ -49647,18 +49647,18 @@
     11:11:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto.access$9402(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto,int):14412:14412 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto buildPartial():14854 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto buildPartial():14855:14855 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions -> com.android.tools.r8.internal.Dj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     java.util.List uninterpretedOption_ -> f
     byte memoizedIsInitialized -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions DEFAULT_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bj;"}
     1:9:void <clinit>():31771:31779 -> <clinit>
     1:142:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):30903:31044 -> <init>
     1:142:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):30895 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cj;)V"}
     143:282:void <init>():30905:31044 -> <init>
     283:283:void <init>():30906:30906 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -49666,7 +49666,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):31070 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -49751,7 +49751,7 @@
     50:53:boolean isInitialized():31058:31061 -> a
     54:54:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31216:31216 -> a
     54:54:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):30895 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions getDefaultInstanceForType():31800:31800 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():30895 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49763,7 +49763,7 @@
     8:8:int com.android.tools.r8.internal.DescriptorProtos$OneofOptions.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$OneofOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     10:10:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     10:10:int getSerializedSize():31088 -> c
     10:10:int com.android.tools.r8.internal.DescriptorProtos$OneofOptions.getSerializedSize():0 -> c
@@ -49772,9 +49772,9 @@
     13:13:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     13:13:int getSerializedSize():31086 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():30895:30895 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():30919:30919 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):31099:31102 -> equals
     5:5:java.util.List getUninterpretedOptionList():30995:30995 -> equals
     5:5:boolean equals(java.lang.Object):31104 -> equals
@@ -49805,16 +49805,16 @@
     9:11:int hashCode():31123:31125 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$20500():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30979 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():30980:30980 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder toBuilder():31209:31210 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Aj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$1 -> com.android.tools.r8.internal.zj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$1 -> com.android.tools.r8.internal.Bj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():31779:31779 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31785:31785 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31779 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):30925:30927 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):30895 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31785 -> a
@@ -49874,32 +49874,32 @@
     61:61:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):30895 -> a
     61:61:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31785 -> a
     61:61:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31779 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder -> com.android.tools.r8.internal.Cj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     java.util.List uninterpretedOption_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:202:void <init>():31241:31442 -> <init>
     1:202:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):31222 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     203:398:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):31247:31442 -> <init>
     203:398:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):31222 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31222:31222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31335:31335 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):31366:31369 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):31222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31761:31761 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.getDefaultInstance():31775:31775 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions):31375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bj;)Lcom/android/tools/r8/internal/Aj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dj;)Lcom/android/tools/r8/internal/Cj;"}
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions):31376:31376 -> a
     10:10:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.access$20900(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions):30895:30895 -> a
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions):31377 -> a
@@ -49938,12 +49938,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31755 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31222 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31222:31222 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31313:31313 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):31222 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):31366:31369 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):31222 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -49953,9 +49953,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions build():31281:31283 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():31222 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31428:31434 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Aj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Cj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31430 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):31430:31436 -> c
@@ -49965,10 +49965,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31755 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):31222 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$20400():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():31271 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions build():31281:31283 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():31222 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -49976,33 +49976,33 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$20500():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31235 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():31236:31236 -> n
     1:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions buildPartial():31290:31297 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dj;"}
     9:9:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.access$20902(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions,java.util.List):30895:30895 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions buildPartial():31297 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions buildPartial():31299:31299 -> q
     11:11:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions.access$20902(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions,java.util.List):30895:30895 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions buildPartial():31299 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofOptions buildPartial():31301:31301 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto -> com.android.tools.r8.internal.Gj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object name_ -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List method_ -> g
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions options_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jj;"}
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ej;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ej;"}
     1:9:void <clinit>():20075:20083 -> <clinit>
     1:217:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):18967:19183 -> <init>
     1:217:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18960 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fj;)V"}
     218:432:void <init>():18969:19183 -> <init>
     433:434:void <init>():18970:18971 -> <init>
     1:1:boolean isInitialized():19186:19186 -> a
@@ -50012,10 +50012,10 @@
     3:3:boolean isInitialized():19191 -> a
     4:15:boolean isInitialized():19191:19202 -> a
     16:25:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):19209:19218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     26:26:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19380:19380 -> a
     26:26:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):18960 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto getDefaultInstanceForType():20104:20104 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():18960 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50027,7 +50027,7 @@
     11:11:int com.android.tools.r8.internal.DescriptorProtos$ServiceDescriptorProto.getSerializedSize():0 -> c
     12:12:int getSerializedSize():0:0 -> c
     12:12:int com.android.tools.r8.internal.DescriptorProtos$ServiceDescriptorProto.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19252},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19252},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     19246:19248:int getSerializedSize():19234:19236 -> c
     19246:19248:int com.android.tools.r8.internal.DescriptorProtos$ServiceDescriptorProto.getSerializedSize():0 -> c
     19249:19249:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
@@ -50039,9 +50039,9 @@
     19252:19252:int getSerializedSize():19232 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder toBuilder():19373:19374 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():18960 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():18984:18984 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):19248:19251 -> equals
     5:5:boolean hasName():19077:19077 -> equals
     5:5:boolean equals(java.lang.Object):19253 -> equals
@@ -50078,20 +50078,20 @@
     9:16:int hashCode():19282:19289 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$12800():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19063 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19064:19064 -> j
     1:9:java.lang.String getName():19085:19093 -> k
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions getOptions():19173:19173 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jj;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.getDefaultInstance():35278:35278 -> l
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions getOptions():19173 -> l
     1:1:boolean hasOptions():19165:19165 -> m
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$1 -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$1 -> com.android.tools.r8.internal.Ej:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():20083:20083 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20089:20089 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20083 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):18990:18992 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18960 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20089 -> a
@@ -50150,16 +50150,16 @@
     77:79:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):18960 -> a
     77:79:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20089 -> a
     77:79:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):20083 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder -> com.android.tools.r8.internal.Fj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object name_ -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.util.List method_ -> h
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 methodBuilder_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions options_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jj;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():19408 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):19390 -> <init>
@@ -50168,22 +50168,22 @@
     2:87:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):19390 -> <init>
     88:372:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):19414:19698 -> <init>
     88:372:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):19390 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19525 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19390:19390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):19529:19532 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):19390 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20065:20065 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.getDefaultInstance():20079:20079 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto):19538 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ej;)Lcom/android/tools/r8/internal/Dj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gj;)Lcom/android/tools/r8/internal/Fj;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.hasName():19077:19077 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto):19539 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -50238,14 +50238,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19503 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):19390 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20059 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19390 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19390:19390 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):19529:19532 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):19390 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -50255,9 +50255,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto build():19457:19459 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():19390 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19600:19606 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Dj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Fj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19602 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):19602:19608 -> c
@@ -50267,10 +50267,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):20059 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):19390 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$12700():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():19447 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto build():19457:19459 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():19390 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50278,10 +50278,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$12800():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19402 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():19403:19403 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto buildPartial():19466:19472 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ej;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.access$13202(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,java.lang.Object):18960:18960 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto buildPartial():19472 -> q
     9:14:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto buildPartial():19473:19478 -> q
@@ -50296,20 +50296,20 @@
     20:20:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.access$13502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,int):18960:18960 -> q
     20:20:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto buildPartial():19490 -> q
     21:21:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto buildPartial():19491:19491 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions -> com.android.tools.r8.internal.Hj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions -> com.android.tools.r8.internal.Jj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     boolean deprecated_ -> g
     java.util.List uninterpretedOption_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions DEFAULT_INSTANCE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hj;"}
     1:9:void <clinit>():35274:35282 -> <clinit>
     1:181:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):34272:34452 -> <init>
     1:181:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):34264 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ij;)V"}
     182:360:void <init>():34274:34452 -> <init>
     361:361:void <init>():34275:34275 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
@@ -50317,7 +50317,7 @@
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):1165 -> a
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.newExtensionWriter():1215 -> a
     1:1:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):34478 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     2:2:java.util.Iterator com.android.tools.r8.com.google.protobuf.FieldSet.iterator():232:232 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter.<init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage,boolean):1170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -50402,7 +50402,7 @@
     53:56:boolean isInitialized():34466:34469 -> a
     57:57:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34641:34641 -> a
     57:57:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions getDefaultInstanceForType():35303:35303 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():34264 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50419,7 +50419,7 @@
     10:10:int com.android.tools.r8.internal.DescriptorProtos$ServiceOptions.getSerializedSize():0 -> c
     11:11:int getSerializedSize():0:0 -> c
     11:11:int com.android.tools.r8.internal.DescriptorProtos$ServiceOptions.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     12:12:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.extensionsSerializedSize():1223:1223 -> c
     12:12:int getSerializedSize():34503 -> c
     12:12:int com.android.tools.r8.internal.DescriptorProtos$ServiceOptions.getSerializedSize():0 -> c
@@ -50428,9 +50428,9 @@
     15:15:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     15:15:int getSerializedSize():34501 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():34264:34264 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():34288:34288 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):34514:34517 -> equals
     5:5:boolean hasDeprecated():34374:34374 -> equals
     5:5:boolean equals(java.lang.Object):34519 -> equals
@@ -50475,16 +50475,16 @@
     13:15:int hashCode():34548:34550 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$23100():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34353 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34354:34354 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder toBuilder():34634:34635 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$1 -> com.android.tools.r8.internal.Fj:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ij;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$1 -> com.android.tools.r8.internal.Hj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():35282:35282 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35288:35288 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34294:34296 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):34264 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35288 -> a
@@ -50548,33 +50548,33 @@
     76:76:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):34264 -> a
     76:76:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35288 -> a
     76:76:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):35282 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder -> com.android.tools.r8.internal.Ij:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> g
     boolean deprecated_ -> h
     java.util.List uninterpretedOption_ -> i
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 uninterpretedOptionBuilder_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:280:void <init>():34666:34945 -> <init>
     1:280:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):34647 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     281:554:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):34672:34945 -> <init>
     281:554:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):34647 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34647:34647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34768:34768 -> a
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):34799:34802 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):34647 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35264:35264 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.getDefaultInstance():35278:35278 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions):34808 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hj;)Lcom/android/tools/r8/internal/Gj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jj;)Lcom/android/tools/r8/internal/Ij;"}
     9:9:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.hasDeprecated():34374:34374 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions):34809 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -50620,12 +50620,12 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35258 -> b
     1:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34647 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34647:34647 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34746:34746 -> b
     4:4:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):34647 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):34799:34802 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):34647 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -50635,9 +50635,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions build():34708:34710 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():34647 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34864:34870 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Gj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Ij;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34866 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):34866:34872 -> c
@@ -50647,10 +50647,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):35258 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):34647 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$23000():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():34698 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions build():34708:34710 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():34647 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50658,10 +50658,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$23100():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34660 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():34661:34661 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions buildPartial():34717:34721 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jj;"}
     6:6:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.access$23502(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions,boolean):34264:34264 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions buildPartial():34721 -> q
     7:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions buildPartial():34724:34729 -> q
@@ -50673,18 +50673,18 @@
     16:16:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions.access$23702(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions,int):34264:34264 -> q
     16:16:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions buildPartial():34733 -> q
     17:17:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceOptions buildPartial():34734:34734 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo -> com.android.tools.r8.internal.Pj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     java.util.List location_ -> e
     byte memoizedIsInitialized -> f
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo DEFAULT_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ij;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kj;"}
     1:9:void <clinit>():43331:43339 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):39318:39318 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39311 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lj;)V"}
     2617:2617:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):41934:41934 -> <init>
     2617:2617:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39311 -> <init>
     2618:2618:void <init>():39320:39320 -> <init>
@@ -50692,10 +50692,10 @@
     5233:5233:void <init>():39321:39321 -> <init>
     1:5:boolean isInitialized():41937:41941 -> a
     6:9:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):41948:41951 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42088:42088 -> a
     10:10:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):39311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo getDefaultInstanceForType():43360:43360 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():39311 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50707,15 +50707,15 @@
     8:8:int com.android.tools.r8.internal.DescriptorProtos$SourceCodeInfo.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$SourceCodeInfo.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41975},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41975},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     41973:41974:int getSerializedSize():41964:41965 -> c
     41973:41974:int com.android.tools.r8.internal.DescriptorProtos$SourceCodeInfo.getSerializedSize():0 -> c
     41975:41975:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeMessageSize(int,com.android.tools.r8.com.google.protobuf.MessageLite):661:661 -> c
     41975:41975:int getSerializedSize():41962 -> c
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():39311:39311 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():39334:39334 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):41974:41977 -> equals
     5:5:java.util.List getLocationList():41725:41725 -> equals
     5:5:boolean equals(java.lang.Object):41979 -> equals
@@ -50740,16 +50740,16 @@
     7:10:int hashCode():41994:41997 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27300():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39394 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39395:39395 -> j
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder toBuilder():42081:42082 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jj;"}
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$1 -> com.android.tools.r8.internal.Ij:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lj;"}
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$1 -> com.android.tools.r8.internal.Kj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():43339:43339 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43345:43345 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43339 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39340:39342 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39311 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43345 -> a
@@ -50800,12 +50800,12 @@
     44:46:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39311 -> a
     44:46:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43345 -> a
     44:46:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):43339 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder -> com.android.tools.r8.internal.Lj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.util.List location_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 locationBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():42117 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):42099 -> <init>
@@ -50814,22 +50814,22 @@
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):42099 -> <init>
     3:162:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):42123:42282 -> <init>
     3:162:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):42099 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42211 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42099 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42099:42099 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):42215:42218 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):42099 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43321:43321 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42099 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.getDefaultInstance():43335:43335 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo):42224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nj;)Lcom/android/tools/r8/internal/Jj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pj;)Lcom/android/tools/r8/internal/Lj;"}
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo):42225:42225 -> a
     10:10:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.access$28900(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo):39311:39311 -> a
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo):42226 -> a
@@ -50867,14 +50867,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42189 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):42099 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43315 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42099 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42099:42099 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):42215:42218 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):42099 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -50884,9 +50884,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo build():42157:42159 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():42099 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42268:42274 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Jj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Lj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42270 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):42270:42276 -> c
@@ -50896,10 +50896,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):43315 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):42099 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27200():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():42147 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo build():42157:42159 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():42099 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -50907,40 +50907,40 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27300():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42111 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():42112:42112 -> n
     1:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo buildPartial():42166:42173 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pj;"}
     9:9:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.access$28902(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo,java.util.List):39311:39311 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo buildPartial():42173 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo buildPartial():42175:42175 -> q
     11:11:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo.access$28902(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo,java.util.List):39311:39311 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo buildPartial():42175 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo buildPartial():42177:42177 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location -> com.android.tools.r8.internal.Oj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     com.android.tools.r8.com.google.protobuf.Internal$IntList path_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     int pathMemoizedSerializedSize -> g
     com.android.tools.r8.com.google.protobuf.Internal$IntList span_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     int spanMemoizedSerializedSize -> i
     java.lang.Object leadingComments_ -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.lang.Object trailingComments_ -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList leadingDetachedComments_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     byte memoizedIsInitialized -> m
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location DEFAULT_INSTANCE -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mj;"}
     1:9:void <clinit>():41640:41648 -> <clinit>
     1:547:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):39719:40265 -> <init>
     1:547:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39712 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nj;)V"}
     548:1092:void <init>():39721:40265 -> <init>
     1093:1093:com.android.tools.r8.com.google.protobuf.IntArrayList com.android.tools.r8.com.google.protobuf.IntArrayList.emptyList():54:54 -> <init>
     1093:1093:com.android.tools.r8.com.google.protobuf.Internal$IntList com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.emptyIntList():395 -> <init>
@@ -50948,7 +50948,7 @@
     1094:1098:void <init>():39722:39726 -> <init>
     1:5:boolean isInitialized():40268:40272 -> a
     6:6:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):40279:40279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     7:7:java.util.List getPathList():39898:39898 -> a
     7:7:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):40280 -> a
     8:8:int com.android.tools.r8.com.google.protobuf.IntArrayList.size():164:164 -> a
@@ -50981,7 +50981,7 @@
     26:37:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):40292:40303 -> a
     38:38:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40508:40508 -> a
     38:38:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):39712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location getDefaultInstanceForType():41669:41669 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():39712 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -51021,9 +51021,9 @@
     52:55:int getSerializedSize():40352:40355 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder toBuilder():40501:40502 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():39712 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():39739:39739 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):40364:40367 -> equals
     5:5:java.util.List getPathList():39898:39898 -> equals
     5:5:boolean equals(java.lang.Object):40369 -> equals
@@ -51102,14 +51102,14 @@
     37:40:int hashCode():40414:40417 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27500():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39859 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():39860:39860 -> j
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$1 -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$1 -> com.android.tools.r8.internal.Mj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():41648:41648 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41654:41654 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41648 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39745:39747 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39712 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41654 -> a
@@ -51248,19 +51248,19 @@
     144:146:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):39712 -> a
     144:146:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41654 -> a
     144:146:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):41648 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder -> com.android.tools.r8.internal.Nj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     com.android.tools.r8.com.google.protobuf.Internal$IntList path_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     com.android.tools.r8.com.google.protobuf.Internal$IntList span_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     java.lang.Object leadingComments_ -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     java.lang.Object trailingComments_ -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList leadingDetachedComments_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kJ;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():40532 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):40514 -> <init>
@@ -51273,7 +51273,7 @@
     3:787:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):40514 -> <init>
     788:788:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40538:40538 -> <init>
     788:788:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):40514 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     789:789:com.android.tools.r8.com.google.protobuf.IntArrayList com.android.tools.r8.com.google.protobuf.IntArrayList.emptyList():54:54 -> <init>
     789:789:com.android.tools.r8.com.google.protobuf.Internal$IntList com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.emptyIntList():395 -> <init>
     789:789:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):40729 -> <init>
@@ -51283,18 +51283,18 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40645 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40514 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40514:40514 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):40649:40652 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):40514 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41630:41630 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40514 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.getDefaultInstance():41644:41644 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location):40658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mj;)Lcom/android/tools/r8/internal/Lj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj;)Lcom/android/tools/r8/internal/Nj;"}
     9:9:com.android.tools.r8.com.google.protobuf.Internal$IntList com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.access$27900(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location):39712:39712 -> a
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location):40659 -> a
     10:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location):40659:40660 -> a
@@ -51349,14 +51349,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40623 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):40514 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41624 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40514 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40514:40514 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):40649:40652 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):40514 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -51366,9 +51366,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location build():40575:40577 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():40514 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40716:40722 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Lj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Nj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40718 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):40718:40724 -> c
@@ -51378,10 +51378,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):41624 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):40514 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27400():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():40565 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location build():40575:40577 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():40514 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -51389,10 +51389,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$27500():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40526 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():40527:40527 -> n
     1:5:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location buildPartial():40584:40588 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oj;"}
     6:6:void com.android.tools.r8.com.google.protobuf.AbstractProtobufList.makeImmutable():133:133 -> q
     6:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location buildPartial():40588 -> q
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -51418,7 +51418,7 @@
     28:28:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location.access$28402(com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location,int):39712:39712 -> q
     28:28:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location buildPartial():40610 -> q
     29:29:com.android.tools.r8.com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location buildPartial():40611:40611 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption -> com.android.tools.r8.internal.Vj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.util.List name_ -> f
@@ -51428,18 +51428,18 @@
     long negativeIntValue_ -> i
     double doubleValue_ -> j
     com.android.tools.r8.com.google.protobuf.ByteString stringValue_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V7;"}
     java.lang.Object aggregateValue_ -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     byte memoizedIsInitialized -> m
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption DEFAULT_INSTANCE -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qj;"}
     1:9:void <clinit>():39021:39029 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):36806:36806 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36799 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rj;)V"}
     1081:1081:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):37886:37886 -> <init>
     1081:1081:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36799 -> <init>
     1082:1082:void <init>():36808:36808 -> <init>
@@ -51452,7 +51452,7 @@
     3:3:boolean isInitialized():37894 -> a
     4:9:boolean isInitialized():37894:37899 -> a
     10:17:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):37906:37913 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     18:18:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeUInt64(int,long):1197:1197 -> a
     18:18:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):37913 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -51479,7 +51479,7 @@
     34:37:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):37924:37927 -> a
     38:38:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):38144:38144 -> a
     38:38:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):36799 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption getDefaultInstanceForType():39050:39050 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():36799 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -51491,7 +51491,7 @@
     8:8:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75923},"outline":"Lcom/android/tools/r8/internal/J50;a(Lcom/android/tools/r8/internal/xN;II)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75923},"outline":"Lcom/android/tools/r8/internal/N50;a(Lcom/android/tools/r8/internal/BN;II)I"}
     37949:37953:int getSerializedSize():37940:37944 -> c
     37949:37953:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
     37954:37954:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeUInt64Size(int,long):557:557 -> c
@@ -51510,7 +51510,7 @@
     37959:37959:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
     37960:37960:int getSerializedSize():0:0 -> c
     37960:37960:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75924},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75924},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     75915:75916:int getSerializedSize():37955:37956 -> c
     75915:75916:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption.getSerializedSize():0 -> c
     75917:75917:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBytesSize(int,com.android.tools.r8.com.google.protobuf.ByteString):629:629 -> c
@@ -51524,9 +51524,9 @@
     75924:75924:int getSerializedSize():37953 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder toBuilder():38137:38138 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():36799 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():36825:36825 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:4:boolean equals(java.lang.Object):37972:37975 -> equals
     5:5:java.util.List getNameList():37666:37666 -> equals
     5:5:boolean equals(java.lang.Object):37977 -> equals
@@ -51622,14 +51622,14 @@
     43:46:int hashCode():38050:38053 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$25000():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():36917 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():36918:36918 -> j
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$1 -> com.android.tools.r8.internal.Oj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$1 -> com.android.tools.r8.internal.Qj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():39029:39029 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39035:39035 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39029 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36831:36833 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36799 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39035 -> a
@@ -51704,19 +51704,19 @@
     90:92:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36799 -> a
     90:92:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39035 -> a
     90:92:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):39029 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder -> com.android.tools.r8.internal.Pj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder -> com.android.tools.r8.internal.Rj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.util.List name_ -> g
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 nameBuilder_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     java.lang.Object identifierValue_ -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     long positiveIntValue_ -> j
     long negativeIntValue_ -> k
     double doubleValue_ -> l
     com.android.tools.r8.com.google.protobuf.ByteString stringValue_ -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V7;"}
     java.lang.Object aggregateValue_ -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
@@ -51727,22 +51727,22 @@
     2:514:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):38159 -> <init>
     515:1251:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):38183:38919 -> <init>
     515:1251:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):38159 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38309 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38159:38159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):38313:38316 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):38159 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39011:39011 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.getDefaultInstance():39025:39025 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption):38322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tj;)Lcom/android/tools/r8/internal/Pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vj;)Lcom/android/tools/r8/internal/Rj;"}
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption):38323:38323 -> a
     10:10:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.access$26300(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption):36799:36799 -> a
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption):38324 -> a
@@ -51817,14 +51817,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38287 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):38159 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39005 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38159 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38159:38159 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):38313:38316 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):38159 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -51834,9 +51834,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption build():38229:38231 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():38159 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38393:38399 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Pj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Rj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38395 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):38395:38401 -> c
@@ -51846,10 +51846,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):39005 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):38159 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$24900():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():38219 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption build():38229:38231 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():38159 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -51857,10 +51857,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$25000():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():38171 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():38172:38172 -> n
     1:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption buildPartial():38238:38246 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vj;"}
     10:10:java.util.List com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.access$26302(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption,java.util.List):36799:36799 -> q
     10:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption buildPartial():38246 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption buildPartial():38248:38248 -> q
@@ -51887,7 +51887,7 @@
     25:25:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption.access$27002(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption,int):36799:36799 -> q
     25:25:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption buildPartial():38274 -> q
     26:26:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption buildPartial():38275:38275 -> q
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart -> com.android.tools.r8.internal.Uj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> e
     java.lang.Object namePart_ -> f
@@ -51895,21 +51895,21 @@
     boolean isExtension_ -> g
     byte memoizedIsInitialized -> h
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart DEFAULT_INSTANCE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uj;"}
     com.android.tools.r8.com.google.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sj;"}
     1:9:void <clinit>():37624:37632 -> <clinit>
     1:149:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):36972:37120 -> <init>
     1:149:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36965 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tj;)V"}
     150:296:void <init>():36974:37120 -> <init>
     297:297:void <init>():36975:36975 -> <init>
     1:13:boolean isInitialized():37123:37135 -> a
     14:20:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):37142:37148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     21:21:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):37301:37301 -> a
     21:21:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):36965 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart getDefaultInstanceForType():37653:37653 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType():36965 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -51918,16 +51918,16 @@
       # {"id":"com.android.tools.r8.synthesized"}
     9:9:int getSerializedSize():0:0 -> c
     9:9:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption$NamePart.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":37175},"outline":"Lcom/android/tools/r8/internal/B60;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":37175},"outline":"Lcom/android/tools/r8/internal/F60;a(III)I"}
     37173:37174:int getSerializedSize():37164:37165 -> c
     37173:37174:int com.android.tools.r8.internal.DescriptorProtos$UninterpretedOption$NamePart.getSerializedSize():0 -> c
     37175:37175:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBoolSize(int,boolean):604:604 -> c
     37175:37175:int getSerializedSize():37162 -> c
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder toBuilder():37294:37295 -> d
     1:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():36965 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():36988:36988 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:7:boolean equals(java.lang.Object):37174:37180 -> equals
     8:16:java.lang.String getNamePart():37069:37077 -> equals
     8:16:boolean equals(java.lang.Object):37181 -> equals
@@ -51960,16 +51960,16 @@
     22:26:int hashCode():37206:37210 -> hashCode
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$25200():6:6 -> j
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37047 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37048:37048 -> j
     1:1:boolean hasIsExtension():37109:37109 -> k
     1:1:boolean hasNamePart():37061:37061 -> l
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$1 -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$1 -> com.android.tools.r8.internal.Sj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     1:1:void <init>():37632:37632 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37638:37638 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37632 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):36994:36996 -> a
     2:4:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36965 -> a
     2:4:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37638 -> a
@@ -52020,7 +52020,7 @@
     44:44:void com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.<init>(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):36965 -> a
     44:44:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37638 -> a
     44:44:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37632 -> a
-com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder -> com.android.tools.r8.internal.Tj:
 # {"id":"sourceFile","fileName":"DescriptorProtos.java"}
     int bitField0_ -> f
     java.lang.Object namePart_ -> g
@@ -52034,22 +52034,22 @@
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):37315 -> <init>
     3:147:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):37339:37483 -> <init>
     3:147:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent,com.android.tools.r8.com.google.protobuf.DescriptorProtos$1):37315 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):755:755 -> a
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37425 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37315:37315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     3:6:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):37429:37432 -> a
     3:6:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):37315 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     7:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37614:37614 -> a
     7:7:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.getDefaultInstance():37628:37628 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart):37438 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sj;)Lcom/android/tools/r8/internal/Rj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uj;)Lcom/android/tools/r8/internal/Tj;"}
     9:10:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart):37439:37440 -> a
     11:11:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.access$25600(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart):36965:36965 -> a
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart):37441 -> a
@@ -52065,14 +52065,14 @@
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):717:717 -> b
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37403 -> b
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):37315 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFieldsInternal(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):760:761 -> b
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> b
     2:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37608 -> b
     2:3:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37315 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37315:37315 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/H0;"}
     5:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):37429:37432 -> b
     5:8:com.android.tools.r8.com.google.protobuf.Message$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):37315 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
@@ -52082,9 +52082,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart build():37370:37372 -> build
     1:3:com.android.tools.r8.com.google.protobuf.MessageLite build():37315 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37470:37476 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/Rj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/Tj;"}
     8:8:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():73:73 -> c
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37472 -> c
     9:15:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):37472:37478 -> c
@@ -52094,10 +52094,10 @@
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):767 -> d
     1:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37608 -> d
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):37315 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$25100():6:6 -> f
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():37360 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart build():37370:37372 -> h
     1:3:com.android.tools.r8.com.google.protobuf.Message build():37315 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
@@ -52105,10 +52105,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable com.android.tools.r8.com.google.protobuf.DescriptorProtos.access$25200():6:6 -> n
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37327 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable():37328:37328 -> n
     1:7:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart buildPartial():37379:37385 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Uj;"}
     8:8:java.lang.Object com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.access$25602(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart,java.lang.Object):36965:36965 -> q
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart buildPartial():37385 -> q
     9:9:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart buildPartial():37387:37387 -> q
@@ -52117,24 +52117,24 @@
     11:11:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart.access$25802(com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart,int):36965:36965 -> q
     11:11:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart buildPartial():37390 -> q
     12:12:com.android.tools.r8.com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart buildPartial():37391:37391 -> q
-com.android.tools.r8.com.google.protobuf.Descriptors -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.com.google.protobuf.Descriptors -> com.android.tools.r8.internal.rk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     java.util.logging.Logger logger -> a
     int[] EMPTY_INT_ARRAY -> b
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor[] EMPTY_DESCRIPTORS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] EMPTY_FIELD_DESCRIPTORS -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor[] EMPTY_ENUM_DESCRIPTORS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ek;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor[] EMPTY_SERVICE_DESCRIPTORS -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ok;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/qk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor[] EMPTY_ONEOF_DESCRIPTORS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/nk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/pk;"}
     1:7:void <clinit>():82:88 -> <clinit>
     1:1:java.lang.String computeFullName(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):2283:2283 -> a
     1:1:java.lang.String access$2300(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Xj;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/Zj;Ljava/lang/String;)Ljava/lang/String;"}
     2:2:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFullName():695:695 -> a
     2:2:java.lang.String computeFullName(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):2283 -> a
     2:2:java.lang.String access$2300(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):81 -> a
@@ -52149,25 +52149,25 @@
     5:5:java.lang.String access$2300(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):81 -> a
     6:7:java.lang.String computeFullName(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):2287:2288 -> a
     6:7:java.lang.String access$2300(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String):81 -> a
-com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor -> com.android.tools.r8.internal.Zj:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hi;"}
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor[] nestedTypes -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor[] enumTypes -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ek;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] fields -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] fieldsSortedByNumber -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] extensions -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor[] oneofs -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/nk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/pk;"}
     int[] extensionRangeLowerBounds -> k
     int[] extensionRangeUpperBounds -> l
     1:7:void <init>(java.lang.String):861:867 -> <init>
@@ -52210,7 +52210,7 @@
     53:53:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder.build():5867:5867 -> <init>
     53:53:void <init>(java.lang.String):874 -> <init>
     54:58:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):899:903 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fi;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Xj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hi;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/Zj;)V"}
     59:59:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.getOneofDeclCount():7237:7237 -> <init>
     59:59:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):907 -> <init>
     60:60:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.getOneofDeclCount():7237:7237 -> <init>
@@ -52337,7 +52337,7 @@
     157:157:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):988 -> <init>
     158:159:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):988:989 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():701:701 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():695:695 -> c
     1:1:java.lang.String getName():678:678 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto toProto():672:672 -> e
@@ -52396,14 +52396,14 @@
     26:26:void validateNoDuplicateFieldNumbers():1022:1022 -> g
     26:26:void crossLink():1003 -> g
     27:28:void crossLink():1005:1006 -> g
-com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool -> com.android.tools.r8.internal.Zj:
+com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool -> com.android.tools.r8.internal.bk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     java.util.Set dependencies -> a
     boolean allowUnknownDependencies -> b
     java.util.Map descriptorsByName -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:36:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):2385:2420 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/kk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/mk;)V"}
     37:47:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):2386:2396 -> <init>
     48:48:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getPackage():125:125 -> <init>
     48:48:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):2398 -> <init>
@@ -52414,12 +52414,12 @@
     1:1:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getPublicDependencies():160:160 -> a
     1:1:void importPublicDependencies(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2410 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk;)V"}
     2:2:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getPublicDependencies():160:160 -> a
     2:2:void importPublicDependencies(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2410 -> a
     3:5:void importPublicDependencies(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2410:2412 -> a
     6:6:com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor findSymbol(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$SearchFilter):2432:2432 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/lk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/nk;"}
     7:7:boolean isType(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2457:2457 -> a
     7:7:com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor findSymbol(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$SearchFilter):2435 -> a
     8:8:boolean isAggregate(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2462:2462 -> a
@@ -52435,7 +52435,7 @@
     14:78:com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor lookupSymbol(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$SearchFilter):2482:2546 -> a
     14:78:com.android.tools.r8.internal.Descriptors$GenericDescriptor com.android.tools.r8.internal.Descriptors$DescriptorPool.lookupSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor,java.lang.String):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;)Lcom/android/tools/r8/internal/lk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nk;Ljava/lang/String;)Lcom/android/tools/r8/internal/nk;"}
     79:79:java.util.logging.Logger com.android.tools.r8.com.google.protobuf.Descriptors.access$100():81:81 -> a
     79:79:com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor lookupSymbol(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$SearchFilter):2547 -> a
     79:79:com.android.tools.r8.internal.Descriptors$GenericDescriptor com.android.tools.r8.internal.Descriptors$DescriptorPool.lookupSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor,java.lang.String):0 -> a
@@ -52455,7 +52455,7 @@
     102:102:com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor lookupSymbol(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$SearchFilter):2540:2540 -> a
     102:102:com.android.tools.r8.internal.Descriptors$GenericDescriptor com.android.tools.r8.internal.Descriptors$DescriptorPool.lookupSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor,java.lang.String):0 -> a
     103:123:void addPackage(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2653:2673 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kk;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk;Ljava/lang/String;)V"}
     124:124:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getName():105:105 -> a
     124:124:void addPackage(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2673 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -52466,10 +52466,10 @@
     127:145:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2575 -> a
     127:145:void com.android.tools.r8.internal.Descriptors$DescriptorPool.addSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nk;)V"}
     146:146:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):0:0 -> a
     146:146:void com.android.tools.r8.internal.Descriptors$DescriptorPool.addSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":204,"2":205,"3":206,"4":207,"5":208},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":204,"2":205,"3":206,"4":207,"5":208},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     147:147:void com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorValidationException.<init>(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$1):2315:2315 -> a
     147:147:void validateSymbolName(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2703 -> a
     147:147:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2575 -> a
@@ -52481,7 +52481,7 @@
     149:158:void com.android.tools.r8.internal.Descriptors$DescriptorPool.addSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor):0 -> a
     159:159:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):0:0 -> a
     159:159:void com.android.tools.r8.internal.Descriptors$DescriptorPool.addSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":209,"2":210,"3":211,"4":212,"5":213},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":209,"2":210,"3":211,"4":212,"5":213},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     160:160:void com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorValidationException.<init>(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$1):2315:2315 -> a
     160:160:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2586 -> a
     160:160:void com.android.tools.r8.internal.Descriptors$DescriptorPool.addSymbol(com.android.tools.r8.internal.Descriptors$GenericDescriptor):0 -> a
@@ -52531,29 +52531,29 @@
     211:211:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2586:2586 -> a
     212:212:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2586:2586 -> a
     213:213:void addSymbol(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor):2586:2586 -> a
-com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$PackageDescriptor -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool$PackageDescriptor -> com.android.tools.r8.internal.ak:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     java.lang.String name -> b
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     1:4:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor):2635:2638 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/kk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/mk;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2632:2632 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():2627:2627 -> c
     1:1:java.lang.String getName():2622:2622 -> d
     1:1:com.android.tools.r8.com.google.protobuf.Message toProto():2617:2617 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.toProto():99:99 -> e
     2:2:com.android.tools.r8.com.google.protobuf.Message toProto():2617 -> e
-com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorValidationException -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorValidationException -> com.android.tools.r8.internal.ck:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     1:7:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,java.lang.String):2339:2345 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nk;Ljava/lang/String;)V"}
     8:8:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,java.lang.String):2359:2359 -> <init>
     8:8:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$1):2315 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kk;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mk;Ljava/lang/String;)V"}
     9:9:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getName():105:105 -> <init>
     9:9:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,java.lang.String):2359 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -52566,24 +52566,24 @@
     12:12:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor.getName():105:105 -> <init>
     12:12:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,java.lang.String):2364 -> <init>
     12:12:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$1):2315 -> <init>
-com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor -> com.android.tools.r8.internal.ek:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ni;"}
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor[] values -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/fk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor[] valuesSortedByNumber -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/fk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hk;"}
     int distinctNumbers -> g
     java.util.Map unknownValues -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.lang.ref.ReferenceQueue cleanupQueue -> i
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):1887:1887 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):1737 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Li;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Xj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ni;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/Zj;)V"}
     2:14:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):1879:1891 -> <init>
     2:14:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):1737 -> <init>
     15:15:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto.getValueCount():16275:16275 -> <init>
@@ -52647,7 +52647,7 @@
     43:43:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):1897:1897 -> <init>
     43:43:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):1737 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumber(int):1815:1815 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/fk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/hk;"}
     2:3:java.lang.Object com.android.tools.r8.com.google.protobuf.Descriptors.binarySearch(java.lang.Object[],int,com.android.tools.r8.com.google.protobuf.Descriptors$NumberGetter,int):2795:2796 -> a
     2:3:java.lang.Object com.android.tools.r8.com.google.protobuf.Descriptors.access$2100(java.lang.Object[],int,com.android.tools.r8.com.google.protobuf.Descriptors$NumberGetter,int):81 -> a
     2:3:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumber(int):1815 -> a
@@ -52667,9 +52667,9 @@
     5:5:java.lang.Object com.android.tools.r8.com.google.protobuf.Descriptors.access$2100(java.lang.Object[],int,com.android.tools.r8.com.google.protobuf.Descriptors$NumberGetter,int):81 -> a
     5:5:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumber(int):1815 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():1773:1773 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     2:31:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumberCreatingIfUnknown(int):1833:1862 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/fk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/hk;"}
     32:32:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumberCreatingIfUnknown(int):1848:1848 -> b
     33:33:int com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor$UnknownEnumValueReference.access$3300(com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor$UnknownEnumValueReference):1819:1819 -> b
     33:33:com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor findValueByNumberCreatingIfUnknown(int):1848 -> b
@@ -52679,25 +52679,25 @@
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumDescriptorProto toProto():1751:1751 -> e
     1:1:com.android.tools.r8.com.google.protobuf.Message toProto():1737 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
-com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor$UnknownEnumValueReference -> com.android.tools.r8.internal.bk:
+com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor$UnknownEnumValueReference -> com.android.tools.r8.internal.dk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     int number -> a
     1:2:void <init>(int,com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor):1823:1824 -> <init>
     1:2:void <init>(int,com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$1):1819 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fk;)V"}
-com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor -> com.android.tools.r8.internal.fk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/hk;)V"}
+com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor -> com.android.tools.r8.internal.hk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ri;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ti;"}
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek;"}
     java.util.Comparator BY_NUMBER -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fk;"}
     1:1:void <clinit>():1940:1940 -> <clinit>
     1:6:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,int):2024:2029 -> <init>
     1:6:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):1938 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ri;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/ck;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ti;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/ek;)V"}
     7:7:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor.getFullName():1767:1767 -> <init>
     7:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,int):2029 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -52711,7 +52711,7 @@
     10:10:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):1938 -> <init>
     11:12:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,java.lang.Integer):2035:2036 -> <init>
     11:12:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,java.lang.Integer,com.android.tools.r8.com.google.protobuf.Descriptors$1):1938 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ck;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ek;Ljava/lang/Integer;)V"}
     13:13:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor.getName():1757:1757 -> <init>
     13:13:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor,java.lang.Integer):2036 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -52750,7 +52750,7 @@
     2:2:int getNumber():1980 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2001:2001 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor.access$3800(com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor):1737:1737 -> b
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2001 -> b
     1:1:java.lang.String getFullName():1995:1995 -> c
@@ -52759,7 +52759,7 @@
     1:1:com.android.tools.r8.com.google.protobuf.Message toProto():1938 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:java.lang.String toString():1985:1985 -> toString
-com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor$1 -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor$1 -> com.android.tools.r8.internal.fk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     1:1:void <init>():1941:1941 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1941:1941 -> compare
@@ -52783,33 +52783,33 @@
     5:5:int compare(java.lang.Object,java.lang.Object):1941 -> compare
     6:6:int compare(com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor):1944:1944 -> compare
     6:6:int compare(java.lang.Object,java.lang.Object):1941 -> compare
-com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor$2 -> com.android.tools.r8.internal.ek:
+com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor$2 -> com.android.tools.r8.internal.gk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     1:1:void <init>():1949:1949 -> <init>
-com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor -> com.android.tools.r8.internal.jk:
+com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor -> com.android.tools.r8.internal.lk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     int index -> b
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto proto -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ej;"}
     java.lang.String fullName -> d
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor extensionScope -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     boolean isProto3Optional -> g
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type type -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor containingType -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor messageType -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor containingOneof -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor enumType -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek;"}
     java.lang.Object defaultValue -> m
     com.android.tools.r8.com.google.protobuf.WireFormat$FieldType[] table -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/wm0;"}
     1:1:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType[] com.android.tools.r8.com.google.protobuf.WireFormat$FieldType.values():111:111 -> <clinit>
     1:1:void <clinit>():1171 -> <clinit>
     2:2:void <clinit>():1171:1171 -> <clinit>
@@ -52821,7 +52821,7 @@
     6:7:void <clinit>():1417:1418 -> <clinit>
     1:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,boolean):1476:1482 -> <init>
     1:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,boolean,com.android.tools.r8.com.google.protobuf.Descriptors$1):1057 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cj;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Xj;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ej;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/Zj;IZ)V"}
     8:8:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto.getType():12294:12294 -> <init>
     8:8:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,boolean):1483 -> <init>
     8:8:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FieldDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,boolean,com.android.tools.r8.com.google.protobuf.Descriptors$1):1057 -> <init>
@@ -52928,7 +52928,7 @@
     1:1:void access$1400(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1057 -> a
     1:1:void com.android.tools.r8.internal.Descriptors$FieldDescriptor.access$1400(com.android.tools.r8.internal.Descriptors$FieldDescriptor):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)V"}
     2:2:void crossLink():1536:1536 -> a
     2:2:void access$1400(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1057 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -52986,7 +52986,7 @@
     28:28:void com.android.tools.r8.internal.Descriptors$FieldDescriptor.access$1400(com.android.tools.r8.internal.Descriptors$FieldDescriptor):0 -> a
     29:29:void access$1400(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):0:0 -> a
     29:29:void com.android.tools.r8.internal.Descriptors$FieldDescriptor.access$1400(com.android.tools.r8.internal.Descriptors$FieldDescriptor):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":428,"2":429,"3":430},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":428,"2":429,"3":430},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     30:30:void com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorValidationException.<init>(com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor,java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$1):2315:2315 -> a
     30:30:void crossLink():1552 -> a
     30:30:void access$1400(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1057 -> a
@@ -53317,7 +53317,7 @@
     430:430:void crossLink():1552:1552 -> a
     430:430:void access$1400(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1057 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():1133:1133 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():1101:1101 -> c
     1:1:int compareTo(java.lang.Object):1057:1057 -> compareTo
     2:2:int compareTo(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1343:1343 -> compareTo
@@ -53354,7 +53354,7 @@
     8:8:java.lang.Object getDefaultValue():1222:1222 -> g
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType getJavaType():1121:1121 -> h
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor getEnumType():1326 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ek;"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type.getJavaType():1407:1407 -> h
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType getJavaType():1121 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53363,13 +53363,13 @@
     8:9:com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor getEnumType():1327:1328 -> h
     1:1:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType getLiteType():1144:1144 -> i
     1:1:com.android.tools.r8.com.google.protobuf.WireFormat$JavaType getLiteJavaType():1127 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ym0;"}
     2:2:com.android.tools.r8.com.google.protobuf.WireFormat$JavaType com.android.tools.r8.com.google.protobuf.WireFormat$FieldType.getJavaType():160:160 -> i
     2:2:com.android.tools.r8.com.google.protobuf.WireFormat$JavaType getLiteJavaType():1127 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType getJavaType():1121:1121 -> k
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getMessageType():1316 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type.getJavaType():1407:1407 -> k
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType getJavaType():1121 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53438,75 +53438,75 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getFullName():1101:1101 -> toString
     1:1:java.lang.String toString():1353 -> toString
-com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$1 -> com.android.tools.r8.internal.gk:
+com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$1 -> com.android.tools.r8.internal.ik:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     1:1:void <init>():1060:1060 -> <init>
-com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType -> com.android.tools.r8.internal.jk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     java.lang.Object defaultDefault -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/Serializable;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType INT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType LONG -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType FLOAT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType DOUBLE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType BOOLEAN -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType STRING -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType BYTE_STRING -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType ENUM -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType MESSAGE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     1:9:void <clinit>():1424:1432 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):1434:1435 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILjava/io/Serializable;)V"}
-com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type -> com.android.tools.r8.internal.ik:
+com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type -> com.android.tools.r8.internal.kk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType javaType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type STRING -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type GROUP -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type MESSAGE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type BYTES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type ENUM -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type[] types -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ik;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/kk;"}
     1:18:void <clinit>():1374:1391 -> <clinit>
     19:19:void <clinit>():1373:1373 -> <clinit>
     20:20:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$Type[] values():1373:1373 -> <clinit>
     20:20:void <clinit>():1394 -> <clinit>
     21:21:void <clinit>():1394:1394 -> <clinit>
     1:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType):1396:1397 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/hk;)V"}
-com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor -> com.android.tools.r8.internal.kk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/jk;)V"}
+com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor -> com.android.tools.r8.internal.mk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ij;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor[] messageTypes -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor[] enumTypes -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ek;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor[] services -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ok;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/qk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] extensions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[] publicDependencies -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool pool -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bk;"}
     1:6:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool,boolean):513:518 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ij;[Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Zj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kj;[Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/bk;)V"}
     7:7:java.lang.String getName():105:105 -> <init>
     7:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool,boolean):519 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53594,7 +53594,7 @@
     78:78:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool,boolean):572 -> <init>
     79:79:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],com.android.tools.r8.com.google.protobuf.Descriptors$DescriptorPool,boolean):572:572 -> <init>
     80:81:void <init>(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):577:578 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Xj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Zj;)V"}
     82:82:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.newBuilder():2346:2346 -> <init>
     82:82:void <init>(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):580 -> <init>
     83:83:void <init>(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):580:580 -> <init>
@@ -53630,7 +53630,7 @@
     123:123:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder.build():2477:2477 -> <init>
     123:123:void <init>(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):584 -> <init>
     1:2:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor buildFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):318:319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ij;[Lcom/android/tools/r8/internal/kk;)Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kj;[Lcom/android/tools/r8/internal/mk;)Lcom/android/tools/r8/internal/mk;"}
     3:3:void crossLink():599:599 -> a
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor buildFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):321 -> a
     4:4:void com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.access$1200(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):648:648 -> a
@@ -53730,13 +53730,13 @@
     34:35:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor buildFrom(com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[],boolean):321 -> a
     36:43:byte[] latin1Cat(java.lang.String[]):335:342 -> a
     36:43:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor internalBuildGeneratedFileFrom(java.lang.String[],com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[]):413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;[Lcom/android/tools/r8/internal/kk;)Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;[Lcom/android/tools/r8/internal/mk;)Lcom/android/tools/r8/internal/mk;"}
     44:44:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto.parseFrom(byte[]):2297:2297 -> a
     44:44:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor internalBuildGeneratedFileFrom(java.lang.String[],com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[]):417 -> a
     45:48:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor internalBuildGeneratedFileFrom(java.lang.String[],com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[]):426:429 -> a
     49:49:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor internalBuildGeneratedFileFrom(java.lang.String[],com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor[]):419:419 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():111:111 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():117:117 -> c
     1:1:java.lang.String getName():105:105 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$FileDescriptorProto toProto():99:99 -> e
@@ -53748,27 +53748,27 @@
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor$Syntax getSyntax():178:178 -> g
 com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor$Syntax -> R8$$REMOVED$$CLASS$$70:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
-com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor -> com.android.tools.r8.internal.lk:
+com.android.tools.r8.com.google.protobuf.Descriptors$GenericDescriptor -> com.android.tools.r8.internal.nk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     1:1:void <init>():2303:2303 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$1):2300 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     java.lang.String getFullName() -> c
     java.lang.String getName() -> d
     com.android.tools.r8.com.google.protobuf.Message toProto() -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
-com.android.tools.r8.com.google.protobuf.Descriptors$MethodDescriptor -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.com.google.protobuf.Descriptors$MethodDescriptor -> com.android.tools.r8.internal.ok:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uj;"}
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     1:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor,int):2239:2245 -> <init>
     1:7:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2158 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sj;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/ok;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uj;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/qk;)V"}
     8:8:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor.getFullName():2083:2083 -> <init>
     8:8:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor,int):2245 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53781,30 +53781,30 @@
     11:11:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor,int):2247:2247 -> <init>
     11:11:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2158 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2191:2191 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():2185:2185 -> c
     1:1:java.lang.String getName():2175:2175 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MethodDescriptorProto toProto():2169:2169 -> e
     1:1:com.android.tools.r8.com.google.protobuf.Message toProto():2158 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
-com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor -> com.android.tools.r8.internal.pk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     int index -> b
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto proto -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aj;"}
     java.lang.String fullName -> d
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor containingType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     int fieldCount -> g
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] fields -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     1:8:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):2770:2777 -> <init>
     1:8:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2710 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yj;Lcom/android/tools/r8/internal/kk;Lcom/android/tools/r8/internal/Xj;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aj;Lcom/android/tools/r8/internal/mk;Lcom/android/tools/r8/internal/Zj;I)V"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2723:2723 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():2728:2728 -> c
     1:1:java.lang.String getName():2718:2718 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$OneofDescriptorProto toProto():2758:2758 -> e
@@ -53813,18 +53813,18 @@
     1:1:boolean isSynthetic():2744:2744 -> g
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.access$4200(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1057:1057 -> g
     2:2:boolean isSynthetic():2744 -> g
-com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.com.google.protobuf.Descriptors$ServiceDescriptor -> com.android.tools.r8.internal.qk:
 # {"id":"sourceFile","fileName":"Descriptors.java"}
     com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto proto -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ej;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gj;"}
     java.lang.String fullName -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor file -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mk;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$MethodDescriptor[] methods -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ok;"}
     1:5:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int):2125:2129 -> <init>
     1:5:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2056 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ej;Lcom/android/tools/r8/internal/kk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gj;Lcom/android/tools/r8/internal/mk;)V"}
     6:6:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto.getMethodCount():19139:19139 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int):2131 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2056 -> <init>
@@ -53846,29 +53846,29 @@
     13:13:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int):2136:2136 -> <init>
     13:13:void <init>(com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto,com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor,int,com.android.tools.r8.com.google.protobuf.Descriptors$1):2056 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor getFile():2089:2089 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mk;"}
     1:1:java.lang.String getFullName():2083:2083 -> c
     1:1:java.lang.String getName():2073:2073 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DescriptorProtos$ServiceDescriptorProto toProto():2067:2067 -> e
     1:1:com.android.tools.r8.com.google.protobuf.Message toProto():2056 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
-com.android.tools.r8.com.google.protobuf.DynamicMessage -> com.android.tools.r8.internal.Cm:
+com.android.tools.r8.com.google.protobuf.DynamicMessage -> com.android.tools.r8.internal.Em:
 # {"id":"sourceFile","fileName":"DynamicMessage.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.FieldSet fields -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bp;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] oneofCases -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet unknownFields -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
     int memoizedSize -> h
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.FieldSet,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[],com.android.tools.r8.com.google.protobuf.UnknownFieldSet):70:70 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;Lcom/android/tools/r8/internal/yp;[Lcom/android/tools/r8/internal/jk;Lcom/android/tools/r8/internal/Zj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;Lcom/android/tools/r8/internal/Bp;[Lcom/android/tools/r8/internal/lk;Lcom/android/tools/r8/internal/dk0;)V"}
     2:20:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.FieldSet,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[],com.android.tools.r8.com.google.protobuf.UnknownFieldSet):56:74 -> <init>
     1:1:boolean isInitialized():241:241 -> a
     2:2:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     3:3:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getOptions():711:711 -> a
     3:3:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53957,7 +53957,7 @@
     42:42:com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.toProto():672:672 -> a
     42:42:com.android.tools.r8.com.google.protobuf.DynamicMessage getDefaultInstance(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;)Lcom/android/tools/r8/internal/Cm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;)Lcom/android/tools/r8/internal/Em;"}
     43:43:int com.android.tools.r8.com.google.protobuf.DescriptorProtos$DescriptorProto.getOneofDeclCount():7237:7237 -> a
     43:43:com.android.tools.r8.com.google.protobuf.DynamicMessage getDefaultInstance(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -53972,7 +53972,7 @@
     50:50:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> a
     50:50:boolean isInitialized(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.FieldSet):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;Lcom/android/tools/r8/internal/yp;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;Lcom/android/tools/r8/internal/Bp;)Z"}
     51:51:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> a
     51:51:boolean isInitialized(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.FieldSet):227 -> a
     52:52:boolean isInitialized(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.FieldSet):227:227 -> a
@@ -53987,7 +53987,7 @@
     63:63:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> a
     63:63:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):304 -> a
     63:63:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     64:64:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):304:304 -> a
     64:64:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):188 -> a
     65:65:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):189:189 -> a
@@ -53999,7 +53999,7 @@
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> b
     2:2:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):304 -> b
     2:2:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):194 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     3:3:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):304:304 -> b
     3:3:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):194 -> b
     4:4:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):195:195 -> b
@@ -54093,7 +54093,7 @@
     26:26:int com.android.tools.r8.internal.DynamicMessage.getSerializedSize():0 -> c
     27:27:int getSerializedSize():0:0 -> c
     27:27:int com.android.tools.r8.internal.DynamicMessage.getSerializedSize():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":34},"outline":"Lcom/android/tools/r8/internal/Gf;a(III)I"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":34},"outline":"Lcom/android/tools/r8/internal/If;a(III)I"}
     28:28:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBytesSize(int,com.android.tools.r8.com.google.protobuf.ByteString):629:629 -> c
     28:28:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeRawMessageSetExtensionSize(int,com.android.tools.r8.com.google.protobuf.ByteString):691 -> c
     28:28:int com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.getSerializedSizeAsMessageSetExtension(int):868 -> c
@@ -54110,7 +54110,7 @@
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForType():274:274 -> d
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder toBuilder():279 -> d
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():51 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     2:2:void com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder.<init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.DynamicMessage$1):319:319 -> d
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForType():274 -> d
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder toBuilder():279 -> d
@@ -54118,9 +54118,9 @@
     3:3:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder toBuilder():279:279 -> d
     3:3:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():51 -> d
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():222:222 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():157:157 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:1:java.util.Map getAllFields():167:167 -> g
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForType():274:274 -> h
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType():51 -> h
@@ -54128,18 +54128,18 @@
     2:2:void com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder.<init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.DynamicMessage$1):319:319 -> h
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForType():274 -> h
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType():51 -> h
-com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder -> com.android.tools.r8.internal.Dm:
 # {"id":"sourceFile","fileName":"DynamicMessage.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.FieldSet fields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bp;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor[] oneofCases -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lk;"}
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet unknownFields -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
     1:2:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):326:327 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;)V"}
     3:3:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.FieldSet.newFieldSet():99:99 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):328 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):328:328 -> <init>
@@ -54160,7 +54160,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):606:607 -> a
     2:3:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> a
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> a
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet.newBuilder():71 -> a
@@ -54177,7 +54177,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):587 -> a
     7:7:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     8:8:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613:613 -> a
     8:8:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):587 -> a
     8:8:com.android.tools.r8.com.google.protobuf.Message$Builder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):319 -> a
@@ -54214,7 +54214,7 @@
     29:29:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     30:30:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613:613 -> a
     30:30:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):497 -> a
     31:31:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):498:498 -> a
@@ -54224,12 +54224,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/H0;"}
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):600:600 -> b
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):319 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/H0;"}
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> b
     3:3:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):503 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     4:4:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613:613 -> b
     4:4:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):503 -> b
     5:5:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):504:504 -> b
@@ -54253,7 +54253,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):519 -> b
     17:17:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):319 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/H0;"}
     18:18:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613:613 -> b
     18:18:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):519 -> b
     18:18:com.android.tools.r8.com.google.protobuf.Message$Builder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):319 -> b
@@ -54341,7 +54341,7 @@
     1:1:boolean isInitialized():439:439 -> build
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage build():378 -> build
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite build():319 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage build():386:386 -> build
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite build():319 -> build
     3:7:com.android.tools.r8.com.google.protobuf.DynamicMessage build():379:383 -> build
@@ -54353,7 +54353,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):459 -> c
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):319 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/H0;"}
     2:2:void verifyContainingType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):613:613 -> c
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):459 -> c
     2:2:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):319 -> c
@@ -54394,7 +54394,7 @@
     9:9:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder clone():433:433 -> clone
     9:9:java.lang.Object clone():319 -> clone
     1:3:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):349:351 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/Bm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)Lcom/android/tools/r8/internal/Dm;"}
     4:4:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.DynamicMessage.access$200(com.android.tools.r8.com.google.protobuf.DynamicMessage):51:51 -> d
     4:4:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):352 -> d
     5:5:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):352:352 -> d
@@ -54440,9 +54440,9 @@
     31:31:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):366:366 -> d
     32:51:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.Message):353:372 -> d
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():595:595 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():444:444 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     1:1:java.util.Map getAllFields():454:454 -> g
     1:1:boolean isInitialized():439:439 -> h
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage build():378 -> h
@@ -54457,7 +54457,7 @@
     1:1:com.android.tools.r8.com.google.protobuf.Message buildPartial():319:319 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:1:com.android.tools.r8.com.google.protobuf.DynamicMessage buildPartial():409:409 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Em;"}
     2:2:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getOptions():711:711 -> k
     2:2:com.android.tools.r8.com.google.protobuf.DynamicMessage buildPartial():409 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -54488,43 +54488,43 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:com.android.tools.r8.com.google.protobuf.DynamicMessage buildPartial():412 -> k
     14:26:com.android.tools.r8.com.google.protobuf.DynamicMessage buildPartial():412:424 -> k
-com.android.tools.r8.com.google.protobuf.ExtensionRegistry -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.com.google.protobuf.ExtensionRegistry -> com.android.tools.r8.internal.Co:
 # {"id":"sourceFile","fileName":"ExtensionRegistry.java"}
     java.util.Map immutableExtensionsByNumber -> d
     com.android.tools.r8.com.google.protobuf.ExtensionRegistry EMPTY_REGISTRY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Co;"}
     1:1:void <clinit>():299:299 -> <clinit>
     1:5:void <init>(boolean):292:296 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.com.google.protobuf.ExtensionRegistry$DescriptorIntPair -> com.android.tools.r8.internal.xo:
+com.android.tools.r8.com.google.protobuf.ExtensionRegistry$DescriptorIntPair -> com.android.tools.r8.internal.Bo:
 # {"id":"sourceFile","fileName":"ExtensionRegistry.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     int number -> b
     1:3:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):347:349 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;I)V"}
     1:5:boolean equals(java.lang.Object):359:363 -> equals
     1:1:int hashCode():354:354 -> hashCode
-com.android.tools.r8.com.google.protobuf.ExtensionRegistryFactory -> com.android.tools.r8.internal.zo:
+com.android.tools.r8.com.google.protobuf.ExtensionRegistryFactory -> com.android.tools.r8.internal.Do:
 # {"id":"sourceFile","fileName":"ExtensionRegistryFactory.java"}
     java.lang.Class EXTENSION_REGISTRY_CLASS -> a
     1:1:java.lang.Class reflectExtensionRegistry():51:51 -> <clinit>
     1:1:void <clinit>():47 -> <clinit>
     2:2:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Go:
 # {"id":"sourceFile","fileName":"ExtensionRegistryLite.java"}
     java.util.Map extensionsByNumber -> a
     com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite emptyRegistry -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Co;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Go;"}
     com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite EMPTY_REGISTRY_LITE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Co;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Go;"}
     1:1:void <clinit>():197:197 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):199:203 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Co;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Go;)V"}
     6:7:void <init>(boolean):210:211 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:4:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite getEmptyRegistry():126:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Co;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Go;"}
     5:5:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite com.android.tools.r8.com.google.protobuf.ExtensionRegistryFactory.createEmpty():68:68 -> a
     5:5:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite getEmptyRegistry():134 -> a
     6:12:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite com.android.tools.r8.com.google.protobuf.ExtensionRegistryFactory.invokeSubclassFactory(java.lang.String):80:86 -> a
@@ -54533,14 +54533,14 @@
     13:13:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite com.android.tools.r8.com.google.protobuf.ExtensionRegistryFactory.createEmpty():70:70 -> a
     13:13:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite getEmptyRegistry():134 -> a
     14:17:com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite getEmptyRegistry():134:137 -> a
-com.android.tools.r8.com.google.protobuf.FieldSet -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.com.google.protobuf.FieldSet -> com.android.tools.r8.internal.Bp:
 # {"id":"sourceFile","fileName":"FieldSet.java"}
     com.android.tools.r8.com.google.protobuf.SmallSortedMap fields -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zc0;"}
     boolean isImmutable -> b
     boolean hasLazyField -> c
     com.android.tools.r8.com.google.protobuf.FieldSet DEFAULT_INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bp;"}
     1:1:void <clinit>():114:114 -> <clinit>
     1:2:void <init>():81:82 -> <init>
     3:3:com.android.tools.r8.com.google.protobuf.SmallSortedMap com.android.tools.r8.com.google.protobuf.SmallSortedMap.newFieldMap(int):95:95 -> <init>
@@ -54555,7 +54555,7 @@
     10:10:void <init>(boolean):89:89 -> <init>
     11:13:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap):92:94 -> <init>
     11:13:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,com.android.tools.r8.com.google.protobuf.FieldSet$1):51 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;)V"}
     1:3:java.util.Map getAllFields():192:194 -> a
     4:4:boolean com.android.tools.r8.com.google.protobuf.SmallSortedMap.isImmutable():174:174 -> a
     4:4:java.util.Map getAllFields():194 -> a
@@ -54566,7 +54566,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:java.util.Map getAllFields():199:199 -> a
     12:12:com.android.tools.r8.com.google.protobuf.SmallSortedMap cloneAllFieldsMap(com.android.tools.r8.com.google.protobuf.SmallSortedMap,boolean):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;Z)Lcom/android/tools/r8/internal/ic0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;Z)Lcom/android/tools/r8/internal/mc0;"}
     13:13:com.android.tools.r8.com.google.protobuf.SmallSortedMap com.android.tools.r8.com.google.protobuf.SmallSortedMap.newFieldMap(int):95:95 -> a
     13:13:com.android.tools.r8.com.google.protobuf.SmallSortedMap cloneAllFieldsMap(com.android.tools.r8.com.google.protobuf.SmallSortedMap,boolean):204 -> a
     14:14:int com.android.tools.r8.com.google.protobuf.SmallSortedMap.getNumArrayEntries():179:179 -> a
@@ -54594,10 +54594,10 @@
     33:33:void cloneFieldEntry(java.util.Map,java.util.Map$Entry,boolean):223 -> a
     33:33:com.android.tools.r8.com.google.protobuf.SmallSortedMap cloneAllFieldsMap(com.android.tools.r8.com.google.protobuf.SmallSortedMap,boolean):209 -> a
     34:38:boolean hasField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite):252:256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     39:39:boolean hasField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite):253:253 -> a
     40:40:void mergeFrom(com.android.tools.r8.com.google.protobuf.FieldSet):504:504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bp;)V"}
     41:41:int com.android.tools.r8.com.google.protobuf.SmallSortedMap.getNumArrayEntries():179:179 -> a
     41:41:void mergeFrom(com.android.tools.r8.com.google.protobuf.FieldSet):504 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -54612,7 +54612,7 @@
     46:49:void mergeFrom(com.android.tools.r8.com.google.protobuf.FieldSet):505:508 -> a
     50:53:java.lang.Object cloneIfMutable(java.lang.Object):513:516 -> a
     54:62:void writeMessageSetTo(java.util.Map$Entry,com.android.tools.r8.com.google.protobuf.CodedOutputStream):604:612 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map$Entry;Lcom/android/tools/r8/internal/Ud;)V"}
     63:63:int com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getNumber():1091:1091 -> a
     63:63:void writeMessageSetTo(java.util.Map$Entry,com.android.tools.r8.com.google.protobuf.CodedOutputStream):612 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -54630,7 +54630,7 @@
     69:70:void writeMessageSetTo(java.util.Map$Entry,com.android.tools.r8.com.google.protobuf.CodedOutputStream):612 -> a
     71:71:void writeMessageSetTo(java.util.Map$Entry,com.android.tools.r8.com.google.protobuf.CodedOutputStream):614:614 -> a
     72:130:void writeElementNoTag(com.android.tools.r8.com.google.protobuf.CodedOutputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):654:712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;Lcom/android/tools/r8/internal/sm0;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;Lcom/android/tools/r8/internal/wm0;Ljava/lang/Object;)V"}
     131:131:void com.android.tools.r8.com.google.protobuf.CodedOutputStream.writeSInt64NoTag(long):423:423 -> a
     131:131:void writeElementNoTag(com.android.tools.r8.com.google.protobuf.CodedOutputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):712 -> a
     132:132:void com.android.tools.r8.com.google.protobuf.CodedOutputStream.writeSInt64NoTag(long):423:423 -> a
@@ -54691,7 +54691,7 @@
     173:173:void com.android.tools.r8.com.google.protobuf.CodedOutputStream.writeDoubleNoTag(double):442:442 -> a
     173:173:void writeElementNoTag(com.android.tools.r8.com.google.protobuf.CodedOutputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):656 -> a
     174:174:void writeField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.com.google.protobuf.CodedOutputStream):729:729 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wp;Ljava/lang/Object;Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zp;Ljava/lang/Object;Lcom/android/tools/r8/internal/Ud;)V"}
     175:175:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
     175:175:void writeField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.com.google.protobuf.CodedOutputStream):729 -> a
     176:176:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
@@ -54779,7 +54779,7 @@
     229:229:int getMessageSetSerializedSize(java.util.Map$Entry):801:801 -> a
     229:229:int com.android.tools.r8.internal.FieldSet.getMessageSetSerializedSize(java.util.Map$Entry):0 -> a
     230:287:int computeElementSizeNoTag(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):834:891 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sm0;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wm0;Ljava/lang/Object;)I"}
     288:288:int computeElementSizeNoTag(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):874:874 -> a
     289:289:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeSInt64SizeNoTag(long):796:796 -> a
     289:289:int computeElementSizeNoTag(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):874 -> a
@@ -54814,7 +54814,7 @@
     336:336:int computeElementSizeNoTag(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):838:838 -> a
     337:337:int computeElementSizeNoTag(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):836:836 -> a
     338:338:int computeFieldSize(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):896:896 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wp;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zp;Ljava/lang/Object;)I"}
     339:339:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
     339:339:int computeFieldSize(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):896 -> a
     340:340:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
@@ -54837,10 +54837,10 @@
     361:367:int computeElementSize(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,int,java.lang.Object):816:822 -> a
     361:367:int computeFieldSize(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):915 -> a
     1:12:void setField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):277:288 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wp;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zp;Ljava/lang/Object;)V"}
     13:32:void setField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):279:298 -> b
     33:33:boolean isValidType(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):413:413 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sm0;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wm0;Ljava/lang/Object;)Z"}
     34:34:java.lang.Object com.android.tools.r8.com.google.protobuf.Internal.checkNotNull(java.lang.Object):64:64 -> b
     34:34:boolean isValidType(com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,java.lang.Object):413 -> b
     35:35:com.android.tools.r8.com.google.protobuf.WireFormat$JavaType com.android.tools.r8.com.google.protobuf.WireFormat$FieldType.getJavaType():160:160 -> b
@@ -54870,7 +54870,7 @@
     88:88:int getSerializedSize():766 -> b
     89:92:int getSerializedSize():767:770 -> b
     1:1:void verifyType(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):393:393 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wp;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zp;Ljava/lang/Object;)V"}
     2:2:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> c
     2:2:void verifyType(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):393 -> c
     3:3:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> c
@@ -54919,7 +54919,7 @@
     1:1:java.lang.Object clone():51:51 -> clone
     2:2:com.android.tools.r8.com.google.protobuf.FieldSet newFieldSet():99:99 -> clone
     2:2:com.android.tools.r8.com.google.protobuf.FieldSet clone():169 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bp;"}
     3:3:com.android.tools.r8.com.google.protobuf.FieldSet clone():170:170 -> clone
     4:4:int com.android.tools.r8.com.google.protobuf.SmallSortedMap.getNumArrayEntries():179:179 -> clone
     4:4:com.android.tools.r8.com.google.protobuf.FieldSet clone():170 -> clone
@@ -54936,10 +54936,10 @@
     1:5:void makeImmutable():123:127 -> d
     1:6:boolean equals(java.lang.Object):146:151 -> equals
     1:1:int hashCode():156:156 -> hashCode
-com.android.tools.r8.com.google.protobuf.FieldSet$Builder -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.com.google.protobuf.FieldSet$Builder -> com.android.tools.r8.internal.yp:
 # {"id":"sourceFile","fileName":"FieldSet.java"}
     com.android.tools.r8.com.google.protobuf.SmallSortedMap fields -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ic0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mc0;"}
     boolean isMutable -> b
     boolean hasNestedBuilders -> c
     1:1:void <init>():931:931 -> <init>
@@ -54952,7 +54952,7 @@
     3:5:void <init>():931 -> <init>
     3:5:void <init>(com.android.tools.r8.com.google.protobuf.FieldSet$1):923 -> <init>
     1:11:java.lang.Object replaceBuilders(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):976:986 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wp;Ljava/lang/Object;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zp;Ljava/lang/Object;)Ljava/lang/Object;"}
     12:12:java.lang.Object replaceBuilder(java.lang.Object):1008:1008 -> a
     12:12:java.lang.Object replaceBuilders(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):987 -> a
     13:15:java.lang.Object replaceBuilders(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):994:996 -> a
@@ -54961,7 +54961,7 @@
     19:19:java.lang.Object replaceBuilders(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):1001 -> a
     20:20:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
     20:20:void verifyType(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):1217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)V"}
     21:21:com.android.tools.r8.com.google.protobuf.WireFormat$FieldType com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getLiteType():1144:1144 -> a
     21:21:void verifyType(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):1217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55017,31 +55017,31 @@
     76:76:java.lang.Object com.android.tools.r8.com.google.protobuf.FieldSet.access$700(java.lang.Object):51:51 -> a
     76:76:void mergeFromField(java.util.Map$Entry):1299 -> a
     77:77:void mergeFromField(java.util.Map$Entry):1299:1299 -> a
-com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.zp:
 # {"id":"sourceFile","fileName":"FieldSet.java"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3 -> com.android.tools.r8.internal.as:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3 -> com.android.tools.r8.internal.cs:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet unknownFields -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
     1:1:void <init>():93:93 -> <init>
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.google.protobuf.UnknownFieldSet.getDefaultInstance():81:81 -> <init>
     2:2:void <init>():94 -> <init>
     3:3:void <init>():94:94 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):97:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)V"}
     5:5:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.getUnknownFields():820:820 -> <init>
     5:5:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):98 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):98:98 -> <init>
     com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Lcom/android/tools/r8/internal/H0;"}
     1:1:int com.android.tools.r8.com.google.protobuf.IntArrayList.size():164:164 -> a
     1:1:com.android.tools.r8.com.google.protobuf.Internal$IntList mutableCopy(com.android.tools.r8.com.google.protobuf.Internal$IntList):403 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lz;)Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nz;)Lcom/android/tools/r8/internal/Nz;"}
     2:2:com.android.tools.r8.com.google.protobuf.Internal$IntList mutableCopy(com.android.tools.r8.com.google.protobuf.Internal$IntList):404:404 -> a
     3:3:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):268:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     4:4:com.android.tools.r8.com.google.protobuf.Message parseWithIOException(com.android.tools.r8.com.google.protobuf.Parser,java.io.InputStream):339:339 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g1;Ljava/io/InputStream;)Lcom/android/tools/r8/internal/J0;"}
     5:5:com.android.tools.r8.com.google.protobuf.MessageLite com.android.tools.r8.com.google.protobuf.AbstractParser.parseFrom(java.io.InputStream):237:237 -> a
@@ -55102,7 +55102,7 @@
     32:32:com.android.tools.r8.com.google.protobuf.Message parseWithIOException(com.android.tools.r8.com.google.protobuf.Parser,java.io.InputStream):339 -> a
     33:33:com.android.tools.r8.com.google.protobuf.Message parseWithIOException(com.android.tools.r8.com.google.protobuf.Parser,java.io.InputStream):341:341 -> a
     34:34:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForType(com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent):529:529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rb0;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vb0;)Lcom/android/tools/r8/internal/H0;"}
     35:38:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):1844:1847 -> a
     35:38:java.lang.reflect.Method access$1000(java.lang.Class,java.lang.String,java.lang.Class[]):79 -> a
     39:51:java.lang.Object invokeOrDie(java.lang.reflect.Method,java.lang.Object,java.lang.Object[]):1856:1868 -> a
@@ -55122,7 +55122,7 @@
     63:63:int com.android.tools.r8.com.google.protobuf.CodedOutputStream.computeBytesSize(int,com.android.tools.r8.com.google.protobuf.ByteString):629:629 -> a
     63:63:int computeStringSize(int,java.lang.Object):3083 -> a
     64:65:void writeString(com.android.tools.r8.com.google.protobuf.CodedOutputStream,int,java.lang.Object):3097:3098 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;ILjava/lang/Object;)V"}
     66:66:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeString(int,java.lang.String):1215:1215 -> a
     66:66:void writeString(com.android.tools.r8.com.google.protobuf.CodedOutputStream,int,java.lang.Object):3098 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55135,9 +55135,9 @@
     70:70:void com.android.tools.r8.com.google.protobuf.CodedOutputStream$ArrayEncoder.writeBytes(int,com.android.tools.r8.com.google.protobuf.ByteString):1222:1222 -> a
     70:70:void writeString(com.android.tools.r8.com.google.protobuf.CodedOutputStream,int,java.lang.Object):3100 -> a
     1:1:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):273:273 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():133:133 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable.access$000(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable):1895:1895 -> f
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType():133 -> f
     1:1:java.util.Map getAllFields():238:238 -> g
@@ -55212,38 +55212,38 @@
     29:29:java.util.Map getAllFieldsMutable(boolean):181 -> i
     30:45:java.util.Map getAllFieldsMutable(boolean):184:199 -> i
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable() -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1 -> com.android.tools.r8.internal.Ir:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1 -> com.android.tools.r8.internal.Kr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent val$parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vb0;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3,com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent):529:529 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vb0;)V"}
     1:1:void markDirty():532:532 -> a
     2:2:void com.android.tools.r8.com.google.protobuf.SingleFieldBuilderV3.markDirty():225:225 -> a
     2:2:void markDirty():532 -> a
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder -> com.android.tools.r8.internal.Mr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent builderParent -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nr;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder$BuilderParentImpl meAsParent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lr;"}
     boolean isClean -> d
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet unknownFields -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):557:557 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nr;)V"}
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.google.protobuf.UnknownFieldSet.getDefaultInstance():81:81 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):551 -> <init>
     3:10:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):551:558 -> <init>
     1:1:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):700:700 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     1:5:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):705:709 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):674:674 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/H0;"}
     2:3:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):781:782 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> c
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.access$000():304 -> c
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet.newBuilder():71 -> c
@@ -55254,13 +55254,13 @@
     6:7:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):783:784 -> c
     8:8:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder mergeUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):781:781 -> c
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder setUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet) -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Mr;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields():820:820 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     1:1:java.util.Map getAllFields():626:626 -> g
     1:1:void markClean():581:581 -> j
     1:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder clone():596:597 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mr;"}
     1:3:java.util.Map getAllFieldsMutable():631:633 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/TreeMap;"}
     4:4:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable.access$000(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable):1895:1895 -> l
@@ -55331,34 +55331,34 @@
     30:30:java.util.Map getAllFieldsMutable():652 -> l
     31:43:java.util.Map getAllFieldsMutable():655:667 -> l
     1:4:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent getParentForChildren():841:844 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lr;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable internalGetFieldAccessorTable() -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bs;"}
     1:1:void onBuilt():570:570 -> o
     2:2:void markClean():581:581 -> o
     2:2:void onBuilt():571 -> o
     1:5:void onChanged():852:856 -> p
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder$BuilderParentImpl -> com.android.tools.r8.internal.Jr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder$BuilderParentImpl -> com.android.tools.r8.internal.Lr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder this$0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mr;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):828:828 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$1):828 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)V"}
     1:1:void markDirty():832:832 -> a
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent -> com.android.tools.r8.internal.Nr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder -> com.android.tools.r8.internal.Or:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.FieldSet$Builder extensions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
     1:1:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder.<init>():554:554 -> <init>
     1:1:void <init>():1360 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$BuilderParent):1364:1364 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nr;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage.access$600(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):978:978 -> a
     1:1:void mergeExtensionFields(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):1811 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pr;)V"}
     2:3:void ensureExtensionsIsMutable():1379:1380 -> a
     2:3:void mergeExtensionFields(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage):1812 -> a
     4:4:com.android.tools.r8.com.google.protobuf.FieldSet$Builder com.android.tools.r8.com.google.protobuf.FieldSet.newBuilder():110:110 -> a
@@ -55413,7 +55413,7 @@
     24:24:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     24:24:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1738 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     25:25:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     25:25:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1738 -> a
     26:26:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> a
@@ -55433,7 +55433,7 @@
     1:1:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> b
     1:1:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1634 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> b
     2:2:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1634 -> b
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> b
@@ -55460,7 +55460,7 @@
     1:1:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> c
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1790 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Mr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Or;"}
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> c
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1790 -> c
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> c
@@ -55509,7 +55509,7 @@
     35:35:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1797 -> c
     36:36:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> c
     36:36:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1803 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/H0;"}
     37:37:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1804:1804 -> c
     38:38:com.android.tools.r8.com.google.protobuf.DynamicMessage$Builder com.android.tools.r8.com.google.protobuf.DynamicMessage.newBuilder(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor):141:141 -> c
     38:38:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilderForField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1804 -> c
@@ -55521,7 +55521,7 @@
     1:1:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> d
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1749 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Mr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Or;"}
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> d
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):1749 -> d
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> d
@@ -55571,16 +55571,16 @@
     5:5:java.util.Map com.android.tools.r8.com.google.protobuf.FieldSet$Builder.getAllFields():1031:1031 -> g
     5:5:java.util.Map getAllFields():1627 -> g
     6:8:java.util.Map getAllFields():1627:1629 -> g
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage -> com.android.tools.r8.internal.Pr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.FieldSet extensions -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bp;"}
     1:1:void <init>():987:987 -> <init>
     2:2:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.FieldSet.newFieldSet():99:99 -> <init>
     2:2:void <init>():988 -> <init>
     3:3:void <init>():988:988 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):993:993 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Or;)V"}
     5:5:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder.buildExtensions():1610:1610 -> <init>
     5:5:com.android.tools.r8.com.google.protobuf.FieldSet com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder.access$400(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):1352 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55659,7 +55659,7 @@
     21:21:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):994 -> <init>
     22:22:void <init>(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableBuilder):994:994 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,int):1133:1133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Uj0;Lcom/android/tools/r8/internal/Co;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Yj0;Lcom/android/tools/r8/internal/Go;I)Z"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.GeneratedMessageV3.getDescriptorForType():133:133 -> a
     2:2:boolean parseUnknownField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,int):1134 -> a
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable.access$000(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable):1895:1895 -> a
@@ -55670,7 +55670,7 @@
     6:6:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     6:6:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     7:7:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     7:7:boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1254 -> a
     8:8:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> a
@@ -55691,7 +55691,7 @@
     1:1:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> b
     1:1:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1264 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> b
     2:2:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1264 -> b
     3:3:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> b
@@ -55729,18 +55729,18 @@
     3:4:java.util.Map getAllFields():1240:1241 -> g
 com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$ExtendableMessage$ExtensionWriter -> R8$$REMOVED$$CLASS$$71:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable -> com.android.tools.r8.internal.bs:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor[] fields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Or;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Qr;"}
     java.lang.String[] camelCaseNames -> c
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor[] oneofs -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Pr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Rr;"}
     boolean initialized -> e
     1:3:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String[]):1922:1924 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;[Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;[Ljava/lang/String;)V"}
     4:4:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String[]):1925 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55751,7 +55751,7 @@
     7:7:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String[]):1926 -> <init>
     8:9:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,java.lang.String[]):1926:1927 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor access$100(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable,com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor):1895:1895 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zr;Lcom/android/tools/r8/internal/nk;)Lcom/android/tools/r8/internal/Pr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bs;Lcom/android/tools/r8/internal/pk;)Lcom/android/tools/r8/internal/Rr;"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor.getContainingType():2732:2732 -> a
     2:2:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor getOneof(com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor):2022 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55766,7 +55766,7 @@
     10:10:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor getOneof(com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor):2023:2023 -> a
     10:10:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor access$100(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable,com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor):1895 -> a
     11:11:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor access$200(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1895:1895 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zr;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/Or;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bs;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/Qr;"}
     12:12:com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingType():1243:1243 -> a
     12:12:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):2008 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55788,7 +55788,7 @@
     19:19:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):2009:2009 -> a
     19:19:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor access$200(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):1895 -> a
     20:25:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable ensureFieldAccessorsInitialized(java.lang.Class,java.lang.Class):1940:1945 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/Class;)Lcom/android/tools/r8/internal/Zr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/Class;)Lcom/android/tools/r8/internal/bs;"}
     26:26:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> a
     26:26:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable ensureFieldAccessorsInitialized(java.lang.Class,java.lang.Class):1945 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55839,36 +55839,36 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:59:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable ensureFieldAccessorsInitialized(java.lang.Class,java.lang.Class):1968 -> a
     60:89:com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable ensureFieldAccessorsInitialized(java.lang.Class,java.lang.Class):1968:1997 -> a
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor -> com.android.tools.r8.internal.Or:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$FieldAccessor -> com.android.tools.r8.internal.Qr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Z"}
     boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Z"}
     com.android.tools.r8.com.google.protobuf.Message$Builder newBuilder() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H0;"}
     void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Ljava/lang/Object;"}
     java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Ljava/lang/Object;"}
 com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$MapFieldAccessor -> R8$$REMOVED$$CLASS$$72:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor -> com.android.tools.r8.internal.Pr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$OneofAccessor -> com.android.tools.r8.internal.Rr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor descriptor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj;"}
     java.lang.reflect.Method caseMethod -> b
     java.lang.reflect.Method caseMethodBuilder -> c
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor fieldDescriptor -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lk;"}
     1:2:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2064:2065 -> <init>
     1:2:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xj;ILjava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj;ILjava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)V"}
     3:3:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getOneofs():721:721 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2066 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -55885,17 +55885,17 @@
     10:10:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     11:11:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     11:11:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6236,"2":6237,"3":6238,"4":6239,"5":6240},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6236,"2":6237,"3":6238,"4":6239,"5":6240},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2083:2083:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2072:2072 -> <init>
     2083:2083:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     2084:2084:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     2084:2084:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6241,"2":6242,"3":6243,"4":6244,"5":6245},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6241,"2":6242,"3":6243,"4":6244,"5":6245},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     4157:4158:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2073:2074 -> <init>
     4157:4158:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     4159:4159:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     4159:4159:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6248,"2":6249,"3":6250,"4":6251},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6248,"2":6249,"3":6250,"4":6251},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     6235:6235:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2076:2076 -> <init>
     6235:6235:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$OneofAccessor.<init>(com.android.tools.r8.internal.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     6236:6236:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2072:2072 -> <init>
@@ -55912,10 +55912,10 @@
     6249:6249:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2076:2076 -> <init>
     6250:6250:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2076:2076 -> <init>
     6251:6251:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int,java.lang.String,java.lang.Class,java.lang.Class):2076:2076 -> <init>
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor -> com.android.tools.r8.internal.Sr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor enumDescriptor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek;"}
     java.lang.reflect.Method valueOfMethod -> d
     java.lang.reflect.Method getValueDescriptorMethod -> e
     boolean supportUnknownEnumValue -> f
@@ -55925,7 +55925,7 @@
     1:6:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2806:2811 -> <init>
     1:6:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)V"}
     7:7:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getFile():1133:1133 -> <init>
     7:7:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2813 -> <init>
     7:7:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
@@ -55937,22 +55937,22 @@
     9:9:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     10:10:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11290,"2":11291,"3":11292,"4":11293,"5":11294},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11290,"2":11291,"3":11292,"4":11293,"5":11294},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2825:2826:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2815:2816 -> <init>
     2825:2826:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     2827:2827:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     2827:2827:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11296,"2":11297,"3":11298,"4":11299,"5":11300},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11296,"2":11297,"3":11298,"4":11299,"5":11300},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     5644:5645:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2817:2818 -> <init>
     5644:5645:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     5646:5646:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     5646:5646:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11302,"2":11303,"3":11304,"4":11305,"5":11306},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11302,"2":11303,"3":11304,"4":11305,"5":11306},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     8465:8466:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2819:2820 -> <init>
     8465:8466:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     8467:8467:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     8467:8467:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11308,"2":11309,"3":11310,"4":11311,"5":11312},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11308,"2":11309,"3":11310,"4":11311,"5":11312},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     11288:11289:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2821:2822 -> <init>
     11288:11289:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
     11290:11290:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2815:2815 -> <init>
@@ -55976,7 +55976,7 @@
     11311:11311:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2821:2821 -> <init>
     11312:11312:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2821:2821 -> <init>
     1:1:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2839:2839 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Ljava/lang/Object;"}
     2:2:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor.getRepeatedCount(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2550:2550 -> b
     2:2:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2840 -> b
     3:3:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.getRepeatedCount(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2458:2458 -> b
@@ -56004,7 +56004,7 @@
     13:13:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2842 -> b
     14:16:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2842:2844 -> b
     17:17:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2850:2850 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Ljava/lang/Object;"}
     18:18:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor.getRepeatedCount(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2554:2554 -> b
     18:18:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2851 -> b
     19:19:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.getRepeatedCount(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2463:2463 -> b
@@ -56032,7 +56032,7 @@
     29:29:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2853 -> b
     30:32:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2853:2855 -> b
     33:34:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2887:2888 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     35:35:int com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor.getNumber():1980:1980 -> b
     35:35:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2889 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56042,20 +56042,20 @@
     36:36:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2889 -> b
     37:37:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2889:2889 -> b
     38:42:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2888:2892 -> b
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor -> com.android.tools.r8.internal.Ur:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.Class type -> a
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$MethodInvoker invoker -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tr;"}
     1:5:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2478:2482 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)V"}
     1:1:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2542:2542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Z"}
     2:2:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2546:2546 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Z"}
     3:3:void clear(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2558:2558 -> a
     3:3:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2511 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     4:4:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.clear(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2468:2468 -> a
     4:4:void clear(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2558 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56067,27 +56067,27 @@
     8:8:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilder():2562:2562 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H0;"}
     1:1:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2491:2491 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Ljava/lang/Object;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2425:2425 -> b
     2:2:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2491 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2425:2425 -> b
     3:3:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2491 -> b
     4:4:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2495:2495 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Ljava/lang/Object;"}
     5:5:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2430:2430 -> b
     5:5:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2495 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2430:2430 -> b
     6:6:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2495 -> b
     7:7:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2538:2538 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     8:8:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2453:2453 -> b
     8:8:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2538 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2453:2453 -> b
     9:9:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2538 -> b
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker -> com.android.tools.r8.internal.Rr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker -> com.android.tools.r8.internal.Tr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.reflect.Method getMethod -> a
     java.lang.reflect.Method getMethodBuilder -> b
@@ -56127,7 +56127,7 @@
     21:21:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.<init>(java.lang.String,java.lang.Class,java.lang.Class):0:0 -> <init>
     22:22:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):2420:2420 -> <init>
     22:22:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$RepeatedFieldAccessor$ReflectionInvoker.<init>(java.lang.String,java.lang.Class,java.lang.Class):0 -> <init>
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedMessageFieldAccessor -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$RepeatedMessageFieldAccessor -> com.android.tools.r8.internal.Vr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.reflect.Method newBuilderMethod -> c
     1:3:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class):3004:3006 -> <init>
@@ -56140,12 +56140,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H0;"}
     1:10:java.lang.Object coerceType(java.lang.Object):3015:3024 -> b
     1:10:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):3034 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     11:11:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):3034:3034 -> b
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor -> com.android.tools.r8.internal.Wr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     com.android.tools.r8.com.google.protobuf.Descriptors$EnumDescriptor enumDescriptor -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek;"}
     java.lang.reflect.Method valueOfMethod -> g
     java.lang.reflect.Method getValueDescriptorMethod -> h
     boolean supportUnknownEnumValue -> i
@@ -56155,7 +56155,7 @@
     1:6:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2743:2748 -> <init>
     1:6:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
     7:7:com.android.tools.r8.com.google.protobuf.Descriptors$FileDescriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getFile():1133:1133 -> <init>
     7:7:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2750 -> <init>
     7:7:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
@@ -56167,17 +56167,17 @@
     9:9:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     10:10:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8278,"2":8279,"3":8280,"4":8281,"5":8282},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8278,"2":8279,"3":8280,"4":8281,"5":8282},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2762:2763:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2752:2753 -> <init>
     2762:2763:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     2764:2764:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     2764:2764:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8284,"2":8285,"3":8286,"4":8287,"5":8288},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8284,"2":8285,"3":8286,"4":8287,"5":8288},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     5518:5519:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2754:2755 -> <init>
     5518:5519:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     5520:5520:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     5520:5520:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8290,"2":8291,"3":8292,"4":8293,"5":8294},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8290,"2":8291,"3":8292,"4":8293,"5":8294},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     8276:8277:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2756:2757 -> <init>
     8276:8277:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularEnumFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     8278:8278:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2752:2752 -> <init>
@@ -56196,7 +56196,7 @@
     8293:8293:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2756:2756 -> <init>
     8294:8294:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2756:2756 -> <init>
     1:2:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2791:2792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     3:3:int com.android.tools.r8.com.google.protobuf.Descriptors$EnumValueDescriptor.getNumber():1980:1980 -> a
     3:3:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2793 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56207,20 +56207,20 @@
     5:5:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2793:2793 -> a
     6:10:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2792:2796 -> a
     1:5:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2773:2777 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Ljava/lang/Object;"}
     6:10:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2782:2786 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor -> com.android.tools.r8.internal.Wr:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor -> com.android.tools.r8.internal.Yr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.Class type -> a
     com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor field -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lk;"}
     boolean isOneofField -> c
     boolean hasHasMethod -> d
     com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$MethodInvoker invoker -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xr;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2240:2240 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.com.google.protobuf.Descriptors$OneofDescriptor com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.getContainingOneof():1248:1248 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2242 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56249,14 +56249,14 @@
     12:12:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2247 -> <init>
     13:25:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2247:2259 -> <init>
     1:1:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2293:2293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     2:2:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2216:2216 -> a
     2:2:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2216:2216 -> a
     3:3:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2293 -> a
     4:6:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2323:2325 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Z"}
     7:7:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.getOneofFieldNumber(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2206:2206 -> a
     7:7:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2325 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56277,7 +56277,7 @@
     16:16:boolean com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2221:2221 -> a
     16:16:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2329 -> a
     17:19:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2333:2335 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Z"}
     20:20:int com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.getOneofFieldNumber(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2211:2211 -> a
     20:20:boolean has(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56300,22 +56300,22 @@
     30:30:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilder():2357:2357 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H0;"}
     1:1:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2277:2277 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/as;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cs;)Ljava/lang/Object;"}
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2196:2196 -> b
     2:2:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2277 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2196:2196 -> b
     3:3:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3):2277 -> b
     4:4:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2281:2281 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;)Ljava/lang/Object;"}
     5:5:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2201:2201 -> b
     5:5:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2281 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:java.lang.Object com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2201:2201 -> b
     6:6:java.lang.Object get(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder):2281 -> b
     7:7:void addRepeated(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2319:2319 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker -> com.android.tools.r8.internal.Vr:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker -> com.android.tools.r8.internal.Xr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.reflect.Method getMethod -> a
     java.lang.reflect.Method getMethodBuilder -> b
@@ -56351,16 +56351,16 @@
     20:20:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.<init>(java.lang.String,java.lang.Class,java.lang.Class,java.lang.String,boolean,boolean):0:0 -> <init>
     21:23:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String,boolean,boolean):2188:2190 -> <init>
     21:23:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularFieldAccessor$ReflectionInvoker.<init>(java.lang.String,java.lang.Class,java.lang.Class,java.lang.String,boolean,boolean):0 -> <init>
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularMessageFieldAccessor -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularMessageFieldAccessor -> com.android.tools.r8.internal.Zr:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.reflect.Method newBuilderMethod -> f
     1:4:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2959:2962 -> <init>
     1:4:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularMessageFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
     5:5:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularMessageFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2970,"2":2971,"3":2972,"4":2973,"5":2974},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2970,"2":2971,"3":2972,"4":2973,"5":2974},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2968:2969:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2963:2964 -> <init>
     2968:2969:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularMessageFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     2970:2970:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2963:2963 -> <init>
@@ -56370,30 +56370,30 @@
     2974:2974:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2963:2963 -> <init>
     1:10:java.lang.Object coerceType(java.lang.Object):2971:2980 -> a
     1:10:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2986 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
     11:11:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2986:2986 -> a
     12:12:com.android.tools.r8.com.google.protobuf.Message$Builder newBuilder():2990:2990 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H0;"}
-com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor -> com.android.tools.r8.internal.as:
 # {"id":"sourceFile","fileName":"GeneratedMessageV3.java"}
     java.lang.reflect.Method setBytesMethodBuilder -> f
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2916:2916 -> <init>
     1:1:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)V"}
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     2:2:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8765,"2":8766,"3":8767,"4":8768,"5":8769},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8765,"2":8766,"3":8767,"4":8768,"5":8769},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2920:2920:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2918:2918 -> <init>
     2920:2920:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     2921:2921:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     2921:2921:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8771,"2":8772,"3":8773,"4":8774,"5":8775},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8771,"2":8772,"3":8773,"4":8774,"5":8775},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     5841:5841:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2920:2920 -> <init>
     5841:5841:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     5842:5842:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0:0 -> <init>
     5842:5842:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8777,"2":8778,"3":8779,"4":8780,"5":8781},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8777,"2":8778,"3":8779,"4":8780,"5":8781},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     8764:8764:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2922:2922 -> <init>
     8764:8764:void com.android.tools.r8.internal.GeneratedMessageV3$FieldAccessorTable$SingularStringFieldAccessor.<init>(com.android.tools.r8.internal.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):0 -> <init>
     8765:8765:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2918:2918 -> <init>
@@ -56412,13 +56412,13 @@
     8780:8780:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2922:2922 -> <init>
     8781:8781:void <init>(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.String,java.lang.Class,java.lang.Class,java.lang.String):2922:2922 -> <init>
     1:4:void set(com.android.tools.r8.com.google.protobuf.GeneratedMessageV3$Builder,java.lang.Object):2942:2945 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kr;Ljava/lang/Object;)V"}
-com.android.tools.r8.com.google.protobuf.IntArrayList -> com.android.tools.r8.internal.Lz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mr;Ljava/lang/Object;)V"}
+com.android.tools.r8.com.google.protobuf.IntArrayList -> com.android.tools.r8.internal.Nz:
 # {"id":"sourceFile","fileName":"IntArrayList.java"}
     int[] array -> c
     int size -> d
     com.android.tools.r8.com.google.protobuf.IntArrayList EMPTY_LIST -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
     1:1:void <clinit>():48:48 -> <clinit>
     2:2:void com.android.tools.r8.com.google.protobuf.AbstractProtobufList.makeImmutable():133:133 -> <clinit>
     2:2:void <clinit>():50 -> <clinit>
@@ -56443,7 +56443,7 @@
     27:27:void com.android.tools.r8.internal.IntArrayList.add(int,java.lang.Object):0 -> add
     28:28:void add(int,java.lang.Object):0:0 -> add
     28:28:void com.android.tools.r8.internal.IntArrayList.add(int,java.lang.Object):0 -> add
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     29:29:java.lang.String makeOutOfBoundsExceptionMessage(int):295:295 -> add
     29:29:void addInt(int,int):212 -> add
     29:29:void add(int,java.lang.Integer):189 -> add
@@ -56495,7 +56495,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     3:3:void ensureIndexInRange(int):0:0 -> k
     3:3:void com.android.tools.r8.internal.IntArrayList.ensureIndexInRange(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6,"2":7,"3":8,"4":9},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6,"2":7,"3":8,"4":9},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     4:4:java.lang.String makeOutOfBoundsExceptionMessage(int):295:295 -> k
     4:4:void ensureIndexInRange(int):290 -> k
     4:4:void com.android.tools.r8.internal.IntArrayList.ensureIndexInRange(int):0 -> k
@@ -56510,7 +56510,7 @@
     9:9:java.lang.String makeOutOfBoundsExceptionMessage(int):295:295 -> k
     9:9:void ensureIndexInRange(int):290 -> k
     1:4:com.android.tools.r8.com.google.protobuf.Internal$IntList mutableCopyWithCapacity(int):125:128 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Nz;"}
     5:5:com.android.tools.r8.com.google.protobuf.Internal$IntList mutableCopyWithCapacity(int):126:126 -> l
     1:9:java.lang.Integer remove(int):271:279 -> remove
     1:9:java.lang.Object remove(int):45 -> remove
@@ -56525,7 +56525,7 @@
     7:7:java.lang.Integer set(int,java.lang.Integer):169:169 -> set
     7:7:java.lang.Object set(int,java.lang.Object):45 -> set
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.protobuf.Internal -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.com.google.protobuf.Internal -> com.android.tools.r8.internal.UA:
 # {"id":"sourceFile","fileName":"Internal.java"}
     java.nio.charset.Charset US_ASCII -> a
     java.nio.charset.Charset UTF_8 -> b
@@ -56560,14 +56560,14 @@
     327:327:void <clinit>():382 -> <clinit>
     1:1:java.lang.String toStringUtf8(byte[]):191:191 -> a
     2:2:int hashBoolean(boolean):234:234 -> a
-com.android.tools.r8.com.google.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.com.google.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.RA:
 # {"id":"sourceFile","fileName":"Internal.java"}
     int getNumber() -> a
-com.android.tools.r8.com.google.protobuf.Internal$ListAdapter -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.com.google.protobuf.Internal$ListAdapter -> com.android.tools.r8.internal.SA:
 # {"id":"sourceFile","fileName":"Internal.java"}
     java.util.List fromList -> b
     com.android.tools.r8.com.google.protobuf.Internal$ListAdapter$Converter converter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M60;"}
     1:3:void <init>(java.util.List,com.android.tools.r8.com.google.protobuf.Internal$ListAdapter$Converter):404:406 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
     1:1:java.lang.Object get(int):411:411 -> get
@@ -56630,10 +56630,10 @@
     14:14:java.lang.Object com.android.tools.r8.com.android.aapt.Resources$OverlayableItem$1.convert(java.lang.Object):13349 -> get
     14:14:java.lang.Object get(int):411 -> get
     1:1:int size():416:416 -> size
-com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.EB:
 # {"id":"sourceFile","fileName":"InvalidProtocolBufferException.java"}
     com.android.tools.r8.com.google.protobuf.MessageLite unfinishedMessage -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BN;"}
     int $r8$clinit -> c
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(java.lang.String):47:47 -> <init>
@@ -56641,28 +56641,28 @@
     3:3:void <init>(java.io.IOException):51:51 -> <init>
     4:4:void <init>(java.io.IOException):43:43 -> <init>
     1:1:java.io.IOException unwrapIOException():103:103 -> a
-com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException$InvalidWireTypeException -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException$InvalidWireTypeException -> com.android.tools.r8.internal.CB:
 # {"id":"sourceFile","fileName":"InvalidProtocolBufferException.java"}
     1:1:void <init>(java.lang.String):143:143 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.com.google.protobuf.LazyField -> com.android.tools.r8.internal.cJ:
+com.android.tools.r8.com.google.protobuf.LazyField -> com.android.tools.r8.internal.gJ:
 # {"id":"sourceFile","fileName":"LazyField.java"}
-com.android.tools.r8.com.google.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.bJ:
+com.android.tools.r8.com.google.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.fJ:
 # {"id":"sourceFile","fileName":"LazyField.java"}
     java.util.Iterator iterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wc0;"}
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wc0;)V"}
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.com.google.protobuf.LazyStringArrayList -> com.android.tools.r8.internal.eJ:
+com.android.tools.r8.com.google.protobuf.LazyStringArrayList -> com.android.tools.r8.internal.iJ:
 # {"id":"sourceFile","fileName":"LazyStringArrayList.java"}
     java.util.List list -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.com.google.protobuf.LazyStringList EMPTY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iJ;"}
     1:1:void <clinit>():64:64 -> <clinit>
     2:2:void com.android.tools.r8.com.google.protobuf.AbstractProtobufList.makeImmutable():133:133 -> <clinit>
     2:2:void <clinit>():67 -> <clinit>
@@ -56674,9 +56674,9 @@
     2:3:void <init>(int):84 -> <init>
     2:3:void <init>():80 -> <init>
     4:6:void <init>(com.android.tools.r8.com.google.protobuf.LazyStringList):87:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kJ;)V"}
     1:3:void add(com.android.tools.r8.com.google.protobuf.ByteString):217:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     1:1:void add(int,java.lang.Object):61:61 -> add
     2:4:void add(int,java.lang.String):146:148 -> add
     2:4:void add(int,java.lang.Object):61 -> add
@@ -56687,7 +56687,7 @@
     1:3:void clear():210:212 -> clear
     1:1:boolean com.android.tools.r8.com.google.protobuf.AbstractProtobufList.isModifiable():128:128 -> g
     1:1:com.android.tools.r8.com.google.protobuf.LazyStringList getUnmodifiableView():412 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kJ;"}
     2:2:com.android.tools.r8.com.google.protobuf.LazyStringList getUnmodifiableView():413:413 -> g
     3:3:java.lang.Object getRaw(int):231:231 -> g
     1:13:java.lang.String get(int):112:124 -> get
@@ -56717,15 +56717,15 @@
     4:9:java.lang.String set(int,java.lang.String):141 -> set
     4:9:java.lang.Object set(int,java.lang.Object):61 -> set
     1:1:int size():134:134 -> size
-com.android.tools.r8.com.google.protobuf.LazyStringList -> com.android.tools.r8.internal.gJ:
+com.android.tools.r8.com.google.protobuf.LazyStringList -> com.android.tools.r8.internal.kJ:
 # {"id":"sourceFile","fileName":"LazyStringList.java"}
     void add(com.android.tools.r8.com.google.protobuf.ByteString) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     java.lang.Object getRaw(int) -> g
     com.android.tools.r8.com.google.protobuf.LazyStringList getUnmodifiableView() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kJ;"}
     java.util.List getUnderlyingElements() -> l
-com.android.tools.r8.com.google.protobuf.MapFieldLite -> com.android.tools.r8.internal.iM:
+com.android.tools.r8.com.google.protobuf.MapFieldLite -> com.android.tools.r8.internal.mM:
 # {"id":"sourceFile","fileName":"MapFieldLite.java"}
     boolean isMutable -> b
     int $r8$clinit -> c
@@ -56818,39 +56818,39 @@
     2:2:java.lang.Object remove(java.lang.Object):115:115 -> remove
     3:3:void ensureMutable():232:232 -> remove
     3:3:java.lang.Object remove(java.lang.Object):114 -> remove
-com.android.tools.r8.com.google.protobuf.MessageLite -> com.android.tools.r8.internal.xN:
+com.android.tools.r8.com.google.protobuf.MessageLite -> com.android.tools.r8.internal.BN:
 # {"id":"sourceFile","fileName":"MessageLite.java"}
     void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     int getSerializedSize() -> c
     com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
-com.android.tools.r8.com.google.protobuf.MessageLite$Builder -> com.android.tools.r8.internal.wN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
+com.android.tools.r8.com.google.protobuf.MessageLite$Builder -> com.android.tools.r8.internal.AN:
 # {"id":"sourceFile","fileName":"MessageLite.java"}
     com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     com.android.tools.r8.com.google.protobuf.MessageLite build() -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
-com.android.tools.r8.com.google.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.zN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
+com.android.tools.r8.com.google.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.DN:
 # {"id":"sourceFile","fileName":"MessageLiteOrBuilder.java"}
     boolean isInitialized() -> a
-com.android.tools.r8.com.google.protobuf.MessageOrBuilder -> com.android.tools.r8.internal.AN:
+com.android.tools.r8.com.google.protobuf.MessageOrBuilder -> com.android.tools.r8.internal.EN:
 # {"id":"sourceFile","fileName":"MessageOrBuilder.java"}
     boolean hasField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Z"}
     com.android.tools.r8.com.google.protobuf.Message getDefaultInstanceForType() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)Ljava/lang/Object;"}
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet getUnknownFields() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor getDescriptorForType() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj;"}
     java.util.Map getAllFields() -> g
-com.android.tools.r8.com.google.protobuf.MessageReflection -> com.android.tools.r8.internal.EN:
+com.android.tools.r8.com.google.protobuf.MessageReflection -> com.android.tools.r8.internal.IN:
 # {"id":"sourceFile","fileName":"MessageReflection.java"}
     1:1:java.lang.String subMessagePrefix(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,int):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/jk;I)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/lk;I)Ljava/lang/String;"}
     2:2:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     2:2:java.lang.String subMessagePrefix(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,int):159 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56864,7 +56864,7 @@
     7:7:java.lang.String subMessagePrefix(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,int):162 -> a
     8:14:java.lang.String subMessagePrefix(java.lang.String,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,int):162:168 -> a
     15:15:void findMissingFields(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,java.lang.String,java.util.List):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AN;Ljava/lang/String;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EN;Ljava/lang/String;Ljava/util/ArrayList;)V"}
     16:16:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> a
     16:16:void findMissingFields(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,java.lang.String,java.util.List):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -56894,7 +56894,7 @@
     48:48:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getOptions():711:711 -> a
     48:48:boolean mergeFieldFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget,int):732 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Uj0;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/Xj;Lcom/android/tools/r8/internal/DN;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Yj0;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/Zj;Lcom/android/tools/r8/internal/HN;I)Z"}
     49:49:com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getOptions():711:711 -> a
     49:49:boolean mergeFieldFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget,int):732 -> a
     50:50:boolean com.android.tools.r8.com.google.protobuf.DescriptorProtos$MessageOptions.getMessageSetWireFormat():27069:27069 -> a
@@ -57009,7 +57009,7 @@
     195:202:boolean mergeFieldFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget,int):843:850 -> a
     203:203:boolean mergeFieldFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget,int):837:837 -> a
     204:238:boolean mergeFieldFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget,int):832:866 -> a
-com.android.tools.r8.com.google.protobuf.MessageReflection$BuilderAdapter -> com.android.tools.r8.internal.BN:
+com.android.tools.r8.com.google.protobuf.MessageReflection$BuilderAdapter -> com.android.tools.r8.internal.FN:
 # {"id":"sourceFile","fileName":"MessageReflection.java"}
     com.android.tools.r8.com.google.protobuf.Message$Builder builder -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H0;"}
@@ -57017,22 +57017,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H0;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.ExtensionRegistry$ExtensionInfo com.android.tools.r8.com.google.protobuf.ExtensionRegistry.findImmutableExtensionByNumber(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):171:171 -> a
     1:1:com.android.tools.r8.com.google.protobuf.ExtensionRegistry$ExtensionInfo findExtensionByNumber(com.android.tools.r8.com.google.protobuf.ExtensionRegistry,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):427 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yo;Lcom/android/tools/r8/internal/Xj;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/Zj;I)V"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):393:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
     3:3:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget$ContainerType getContainerType():415:415 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     4:6:java.lang.Object parseMessage(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):466:468 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
     7:7:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):364:364 -> a
     7:7:java.lang.Object parseMessage(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):469 -> a
     8:14:java.lang.Object parseMessage(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):469:475 -> a
     15:19:com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation getUtf8Validation(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):534:538 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)I"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):374:374 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
     2:4:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):442:444 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
     5:5:java.lang.Object getField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):364:364 -> b
     5:5:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):445 -> b
     6:8:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):445:447 -> b
@@ -57043,17 +57043,17 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):450 -> b
     11:12:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):450:451 -> b
-com.android.tools.r8.com.google.protobuf.MessageReflection$ExtensionAdapter -> com.android.tools.r8.internal.CN:
+com.android.tools.r8.com.google.protobuf.MessageReflection$ExtensionAdapter -> com.android.tools.r8.internal.GN:
 # {"id":"sourceFile","fileName":"MessageReflection.java"}
     com.android.tools.r8.com.google.protobuf.FieldSet extensions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bp;"}
     1:2:void <init>(com.android.tools.r8.com.google.protobuf.FieldSet):555:556 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bp;)V"}
     1:1:com.android.tools.r8.com.google.protobuf.ExtensionRegistry$ExtensionInfo com.android.tools.r8.com.google.protobuf.ExtensionRegistry.findImmutableExtensionByNumber(com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):171:171 -> a
     1:1:com.android.tools.r8.com.google.protobuf.ExtensionRegistry$ExtensionInfo findExtensionByNumber(com.android.tools.r8.com.google.protobuf.ExtensionRegistry,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int):629 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yo;Lcom/android/tools/r8/internal/Xj;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/Zj;I)V"}
     2:2:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):595:595 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
     3:8:void com.android.tools.r8.com.google.protobuf.FieldSet.addRepeatedField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):366:371 -> a
     3:8:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):595 -> a
     9:9:java.lang.Object com.android.tools.r8.com.google.protobuf.FieldSet.getField(com.android.tools.r8.com.google.protobuf.FieldSet$FieldDescriptorLite):265:265 -> a
@@ -57066,46 +57066,46 @@
     18:18:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget$ContainerType getContainerType():617:617 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     19:19:java.lang.Object parseMessage(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):657:657 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
     20:20:com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation getUtf8Validation(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):700:700 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)I"}
     1:1:com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object):576:576 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
     2:2:java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message):639:639 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
-com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget -> com.android.tools.r8.internal.DN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
+com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget -> com.android.tools.r8.internal.HN:
 # {"id":"sourceFile","fileName":"MessageReflection.java"}
     com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget addRepeatedField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
     com.android.tools.r8.com.google.protobuf.ExtensionRegistry$ExtensionInfo findExtensionByNumber(com.android.tools.r8.com.google.protobuf.ExtensionRegistry,com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yo;Lcom/android/tools/r8/internal/Xj;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/Zj;I)V"}
     com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget$ContainerType getContainerType() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation getUtf8Validation(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;)I"}
     java.lang.Object parseMessage(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
     java.lang.Object parseGroup(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,com.android.tools.r8.com.google.protobuf.Message) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;Lcom/android/tools/r8/internal/jk;)Lcom/android/tools/r8/internal/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;Lcom/android/tools/r8/internal/lk;)Lcom/android/tools/r8/internal/J0;"}
     com.android.tools.r8.com.google.protobuf.MessageReflection$MergeTarget setField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/DN;"}
-com.android.tools.r8.com.google.protobuf.Parser -> com.android.tools.r8.internal.TV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)Lcom/android/tools/r8/internal/HN;"}
+com.android.tools.r8.com.google.protobuf.Parser -> com.android.tools.r8.internal.XV:
 # {"id":"sourceFile","fileName":"Parser.java"}
     java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
-com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 -> com.android.tools.r8.internal.V40:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
+com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 -> com.android.tools.r8.internal.Z40:
 # {"id":"sourceFile","fileName":"RepeatedFieldBuilderV3.java"}
     com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lr;"}
     java.util.List messages -> b
     boolean isMessagesListMutable -> c
     java.util.List builders -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean isClean -> e
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3$BuilderExternalList externalBuilderList -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y40;"}
     1:5:void <init>(java.util.List,boolean,com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent,boolean):130:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;ZLcom/android/tools/r8/internal/Jr;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;ZLcom/android/tools/r8/internal/Lr;Z)V"}
     1:1:com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 addMessage(com.android.tools.r8.com.google.protobuf.AbstractMessage):301:301 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J0;)V"}
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.Internal.checkNotNull(java.lang.Object):64:64 -> a
@@ -57159,12 +57159,12 @@
     36:37:com.android.tools.r8.com.google.protobuf.AbstractMessage getMessage(int,boolean):222 -> b
     36:37:java.util.List build():481 -> b
     38:44:java.util.List build():481:487 -> b
-com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3$BuilderExternalList -> com.android.tools.r8.internal.U40:
+com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3$BuilderExternalList -> com.android.tools.r8.internal.Y40:
 # {"id":"sourceFile","fileName":"RepeatedFieldBuilderV3.java"}
     com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3 builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
     1:2:void <init>(com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3):613:614 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
     1:1:void incrementModCount():628:628 -> a
     1:1:com.android.tools.r8.com.google.protobuf.AbstractMessage$Builder get(int):624:624 -> get
     1:1:java.lang.Object get(int):605 -> get
@@ -57190,7 +57190,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.protobuf.RepeatedFieldBuilderV3.getCount():172:172 -> size
     3:3:int size():619 -> size
-com.android.tools.r8.com.google.protobuf.SingleFieldBuilderV3 -> com.android.tools.r8.internal.Rb0:
+com.android.tools.r8.com.google.protobuf.SingleFieldBuilderV3 -> com.android.tools.r8.internal.Vb0:
 # {"id":"sourceFile","fileName":"SingleFieldBuilderV3.java"}
     com.android.tools.r8.com.google.protobuf.AbstractMessage$BuilderParent parent -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I0;"}
@@ -57208,14 +57208,14 @@
     1:5:com.android.tools.r8.com.google.protobuf.AbstractMessage getMessage():99:103 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J0;"}
     1:8:void onChanged():212:219 -> c
-com.android.tools.r8.com.google.protobuf.SmallSortedMap -> com.android.tools.r8.internal.vc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap -> com.android.tools.r8.internal.zc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     int maxArraySize -> b
     java.util.List entryList -> c
     java.util.Map overflowEntries -> d
     boolean isImmutable -> e
     com.android.tools.r8.com.google.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yc0;"}
     java.util.Map overflowEntriesDescending -> g
     int $r8$clinit -> h
       # {"id":"com.android.tools.r8.synthesized"}
@@ -57279,7 +57279,7 @@
     8:13:java.lang.Object remove(java.lang.Object):285 -> remove
     14:17:java.lang.Object remove(java.lang.Object):289:292 -> remove
     1:1:int size():207:207 -> size
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.ic0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.mc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     1:1:void <init>(int):95:95 -> <init>
     1:1:boolean com.android.tools.r8.com.google.protobuf.SmallSortedMap.isImmutable():174:174 -> k
@@ -57292,35 +57292,35 @@
     13:26:void com.android.tools.r8.com.google.protobuf.SmallSortedMap.makeImmutable():155:168 -> k
     13:26:void makeImmutable():114 -> k
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):95:95 -> put
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.oc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.sc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     java.util.Iterator ITERATOR -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oc0;"}
     java.lang.Iterable ITERABLE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qc0;"}
     1:19:void <clinit>():632:650 -> <clinit>
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.kc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.oc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     1:1:void <init>():633:633 -> <init>
     1:1:boolean hasNext():636:636 -> hasNext
     1:1:java.lang.Object next():641:641 -> next
     1:1:void remove():646:646 -> remove
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.mc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.qc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     1:1:void <init>():651:651 -> <init>
     1:1:java.util.Iterator iterator():654:654 -> iterator
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.qc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.uc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     java.lang.Comparable key -> b
     java.lang.Object value -> c
     com.android.tools.r8.com.google.protobuf.SmallSortedMap this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zc0;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,java.util.Map$Entry):405:405 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;Ljava/util/Map$Entry;)V"}
     2:4:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,java.lang.Comparable,java.lang.Object):408:410 -> <init>
     2:4:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,java.util.Map$Entry):405 -> <init>
     5:7:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,java.lang.Comparable,java.lang.Object):408:410 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;Ljava/lang/Comparable;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;Ljava/lang/Comparable;Ljava/lang/Object;)V"}
     1:1:int compareTo(java.lang.Object):399:399 -> compareTo
     2:2:java.lang.Comparable getKey():415:415 -> compareTo
     2:2:int compareTo(com.android.tools.r8.com.google.protobuf.SmallSortedMap$Entry):425 -> compareTo
@@ -57346,16 +57346,16 @@
     2:2:java.lang.Object setValue(java.lang.Object):430 -> setValue
     3:4:java.lang.Object setValue(java.lang.Object):431:432 -> setValue
     1:1:java.lang.String toString():456:456 -> toString
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.sc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.wc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     int pos -> b
     boolean nextCalledBeforeRemove -> c
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.com.google.protobuf.SmallSortedMap this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zc0;"}
     1:3:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap):534:536 -> <init>
     1:3:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,com.android.tools.r8.com.google.protobuf.SmallSortedMap$1):534 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;)V"}
     1:1:boolean hasNext():542:542 -> hasNext
     2:2:java.util.List com.android.tools.r8.com.google.protobuf.SmallSortedMap.access$600(com.android.tools.r8.com.google.protobuf.SmallSortedMap):83:83 -> hasNext
     2:2:boolean hasNext():542 -> hasNext
@@ -57426,13 +57426,13 @@
     23:25:void remove():568 -> remove
     26:26:void remove():568:568 -> remove
     27:27:void remove():560:560 -> remove
-com.android.tools.r8.com.google.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.uc0:
+com.android.tools.r8.com.google.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.yc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     com.android.tools.r8.com.google.protobuf.SmallSortedMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zc0;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap):466:466 -> <init>
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.SmallSortedMap,com.android.tools.r8.com.google.protobuf.SmallSortedMap$1):466 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zc0;)V"}
     1:1:boolean add(java.lang.Object):466:466 -> add
     2:3:boolean add(java.util.Map$Entry):494:495 -> add
     2:3:boolean add(java.lang.Object):466 -> add
@@ -57441,7 +57441,7 @@
     1:1:java.util.Iterator iterator():470:470 -> iterator
     1:3:boolean remove(java.lang.Object):509:511 -> remove
     1:1:int size():475:475 -> size
-com.android.tools.r8.com.google.protobuf.TextFormat -> com.android.tools.r8.internal.Bg0:
+com.android.tools.r8.com.google.protobuf.TextFormat -> com.android.tools.r8.internal.Fg0:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():62:62 -> <clinit>
@@ -57454,7 +57454,7 @@
     3:3:com.android.tools.r8.com.google.protobuf.TextFormat$Parser$Builder com.android.tools.r8.com.google.protobuf.TextFormat$Parser.newBuilder():1569 -> <clinit>
     3:3:void <clinit>():1437 -> <clinit>
     1:1:com.android.tools.r8.com.google.protobuf.ByteString unescapeBytes(java.lang.CharSequence):2300:2300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/P7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/R7;"}
     2:2:com.android.tools.r8.com.google.protobuf.ByteString com.android.tools.r8.com.google.protobuf.ByteString.copyFromUtf8(java.lang.String):463:463 -> a
     2:2:com.android.tools.r8.com.google.protobuf.ByteString unescapeBytes(java.lang.CharSequence):2300 -> a
     3:3:int com.android.tools.r8.com.google.protobuf.ByteString$LiteralByteString.size():1354:1354 -> a
@@ -57555,30 +57555,30 @@
     375:450:long parseInteger(java.lang.String,boolean,boolean):2569:2644 -> a
     451:451:long parseInteger(java.lang.String,boolean,boolean):2638:2638 -> a
     1:1:boolean isHex(byte):2509:2509 -> b
-com.android.tools.r8.com.google.protobuf.TextFormat$InvalidEscapeSequenceException -> com.android.tools.r8.internal.xg0:
+com.android.tools.r8.com.google.protobuf.TextFormat$InvalidEscapeSequenceException -> com.android.tools.r8.internal.Bg0:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
     1:1:void <init>(java.lang.String):2476:2476 -> <init>
 com.android.tools.r8.com.google.protobuf.TextFormat$Parser -> R8$$REMOVED$$CLASS$$74:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
 com.android.tools.r8.com.google.protobuf.TextFormat$Parser$Builder -> R8$$REMOVED$$CLASS$$73:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
-com.android.tools.r8.com.google.protobuf.TextFormat$Printer -> com.android.tools.r8.internal.zg0:
+com.android.tools.r8.com.google.protobuf.TextFormat$Printer -> com.android.tools.r8.internal.Dg0:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
     com.android.tools.r8.com.google.protobuf.TypeRegistry typeRegistry -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hj0;"}
     com.android.tools.r8.com.google.protobuf.TextFormat$Printer DEFAULT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dg0;"}
     1:1:void <clinit>():295:295 -> <clinit>
     2:2:com.android.tools.r8.com.google.protobuf.TypeRegistry com.android.tools.r8.com.google.protobuf.TypeRegistry$EmptyTypeRegistryHolder.access$000():49:49 -> <clinit>
     2:2:com.android.tools.r8.com.google.protobuf.TypeRegistry com.android.tools.r8.com.google.protobuf.TypeRegistry.getEmptyTypeRegistry():55 -> <clinit>
     2:2:void <clinit>():295 -> <clinit>
     3:3:void <clinit>():295:295 -> <clinit>
     1:3:void <init>(boolean,com.android.tools.r8.com.google.protobuf.TypeRegistry):302:304 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hj0;)V"}
     1:1:java.util.Map com.android.tools.r8.com.google.protobuf.UnknownFieldSet.asMap():112:112 -> a
     1:1:void printUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):752 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;Lcom/android/tools/r8/internal/Ag0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;Lcom/android/tools/r8/internal/Eg0;)V"}
     2:2:java.util.Map com.android.tools.r8.com.google.protobuf.UnknownFieldSet.asMap():112:112 -> a
     2:2:void printUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):752 -> a
     3:5:void printUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):752:754 -> a
@@ -57607,7 +57607,7 @@
     28:28:void com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator.outdent():844:844 -> a
     28:28:void printUnknownFields(com.android.tools.r8.com.google.protobuf.UnknownFieldSet,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):769 -> a
     29:29:void print(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):349:349 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AN;Lcom/android/tools/r8/internal/Ag0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EN;Lcom/android/tools/r8/internal/Eg0;)V"}
     30:30:java.lang.String com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFullName():695:695 -> a
     30:30:void print(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):349 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -57746,7 +57746,7 @@
     112:112:void printMessage(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):705:705 -> a
     112:112:void print(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):353 -> a
     113:113:java.lang.String printToString(com.android.tools.r8.com.google.protobuf.MessageOrBuilder):603:603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AN;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EN;)Ljava/lang/String;"}
     114:114:void print(com.android.tools.r8.com.google.protobuf.MessageOrBuilder,java.lang.Appendable):339:339 -> a
     114:114:java.lang.String printToString(com.android.tools.r8.com.google.protobuf.MessageOrBuilder):604 -> a
     115:115:com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator com.android.tools.r8.com.google.protobuf.TextFormat.multiLineOutput(java.lang.Appendable):809:809 -> a
@@ -57759,13 +57759,13 @@
     120:122:void printUnknownField(int,int,java.util.List,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):779:781 -> a
     120:122:void com.android.tools.r8.internal.TextFormat$Printer.printUnknownField(int,int,java.util.List,com.android.tools.r8.internal.TextFormat$TextGenerator):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/List;Lcom/android/tools/r8/internal/Ag0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/List;Lcom/android/tools/r8/internal/Eg0;)V"}
     123:123:void printUnknownFieldValue(int,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):696:696 -> a
     123:123:void printUnknownField(int,int,java.util.List,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):782 -> a
     123:123:void com.android.tools.r8.internal.TextFormat$Printer.printUnknownField(int,int,java.util.List,com.android.tools.r8.internal.TextFormat$TextGenerator):0 -> a
     124:124:void printUnknownField(int,int,java.util.List,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):0:0 -> a
     124:124:void com.android.tools.r8.internal.TextFormat$Printer.printUnknownField(int,int,java.util.List,com.android.tools.r8.internal.TextFormat$TextGenerator):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":195,"2":196,"3":197,"4":198},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":195,"2":196,"3":197,"4":198},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     125:125:void printUnknownFieldValue(int,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):696:696 -> a
     125:125:void printUnknownField(int,int,java.util.List,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):782 -> a
     125:125:void com.android.tools.r8.internal.TextFormat$Printer.printUnknownField(int,int,java.util.List,com.android.tools.r8.internal.TextFormat$TextGenerator):0 -> a
@@ -57897,7 +57897,7 @@
     199:199:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     199:199:void printSingleField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):711 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;Lcom/android/tools/r8/internal/Ag0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;Lcom/android/tools/r8/internal/Eg0;)V"}
     200:200:boolean com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor.isExtension():1235:1235 -> a
     200:200:void printSingleField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):711 -> a
     201:201:void printSingleField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):712:712 -> a
@@ -58025,11 +58025,11 @@
     401:401:void com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator.outdent():844:844 -> a
     401:401:void printSingleField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):744 -> a
     402:402:void printSingleField(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor,java.lang.Object,com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator):747:747 -> a
-com.android.tools.r8.com.google.protobuf.TextFormat$Printer$MapEntryAdapter -> com.android.tools.r8.internal.yg0:
+com.android.tools.r8.com.google.protobuf.TextFormat$Printer$MapEntryAdapter -> com.android.tools.r8.internal.Cg0:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
     java.lang.Object entry -> b
     1:5:void <init>(java.lang.Object,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):459:463 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jk;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lk;Ljava/lang/Object;)V"}
     6:6:com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor$JavaType extractFieldType(com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):469:469 -> <init>
     6:6:void <init>(java.lang.Object,com.android.tools.r8.com.google.protobuf.Descriptors$FieldDescriptor):465 -> <init>
     7:7:java.util.List com.android.tools.r8.com.google.protobuf.Descriptors$Descriptor.getFields():716:716 -> <init>
@@ -58056,7 +58056,7 @@
     2:2:int compareTo(java.lang.Object):450 -> compareTo
     3:3:int compareTo(com.android.tools.r8.com.google.protobuf.TextFormat$Printer$MapEntryAdapter):489:489 -> compareTo
     3:3:int compareTo(java.lang.Object):450 -> compareTo
-com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator -> com.android.tools.r8.internal.Ag0:
+com.android.tools.r8.com.google.protobuf.TextFormat$TextGenerator -> com.android.tools.r8.internal.Eg0:
 # {"id":"sourceFile","fileName":"TextFormat.java"}
     java.lang.Appendable output -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/StringBuilder;"}
@@ -58069,46 +58069,46 @@
     2:10:void <init>(java.lang.Appendable,boolean,com.android.tools.r8.com.google.protobuf.TextFormat$1):817 -> <init>
     1:5:void print(java.lang.CharSequence):854:858 -> a
     6:8:void eol():868:870 -> a
-com.android.tools.r8.com.google.protobuf.TextFormatEscaper -> com.android.tools.r8.internal.Fg0:
+com.android.tools.r8.com.google.protobuf.TextFormatEscaper -> com.android.tools.r8.internal.Jg0:
 # {"id":"sourceFile","fileName":"TextFormatEscaper.java"}
     1:45:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):50:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eg0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ig0;)Ljava/lang/String;"}
     46:46:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):68:68 -> a
     47:59:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):62:74 -> a
     60:66:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):65:71 -> a
     67:67:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):59:59 -> a
     68:111:java.lang.String escapeBytes(com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence):56:99 -> a
-com.android.tools.r8.com.google.protobuf.TextFormatEscaper$1 -> com.android.tools.r8.internal.Cg0:
+com.android.tools.r8.com.google.protobuf.TextFormatEscaper$1 -> com.android.tools.r8.internal.Gg0:
 # {"id":"sourceFile","fileName":"TextFormatEscaper.java"}
     com.android.tools.r8.com.google.protobuf.ByteString val$input -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V7;"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.ByteString):110:110 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     1:1:byte byteAt(int):118:118 -> a
     1:1:int size():113:113 -> size
-com.android.tools.r8.com.google.protobuf.TextFormatEscaper$2 -> com.android.tools.r8.internal.Dg0:
+com.android.tools.r8.com.google.protobuf.TextFormatEscaper$2 -> com.android.tools.r8.internal.Hg0:
 # {"id":"sourceFile","fileName":"TextFormatEscaper.java"}
     byte[] val$input -> a
     1:1:void <init>(byte[]):126:126 -> <init>
     1:1:byte byteAt(int):134:134 -> a
     1:1:int size():129:129 -> size
-com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence -> com.android.tools.r8.internal.Eg0:
+com.android.tools.r8.com.google.protobuf.TextFormatEscaper$ByteSequence -> com.android.tools.r8.internal.Ig0:
 # {"id":"sourceFile","fileName":"TextFormatEscaper.java"}
     byte byteAt(int) -> a
     int size() -> size
-com.android.tools.r8.com.google.protobuf.TypeRegistry -> com.android.tools.r8.internal.dj0:
+com.android.tools.r8.com.google.protobuf.TypeRegistry -> com.android.tools.r8.internal.hj0:
 # {"id":"sourceFile","fileName":"TypeRegistry.java"}
     java.util.Map types -> a
     int $r8$clinit -> b
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <clinit>():47:47 -> <clinit>
     1:2:void <init>(java.util.Map):80:81 -> <init>
-com.android.tools.r8.com.google.protobuf.TypeRegistry$EmptyTypeRegistryHolder -> com.android.tools.r8.internal.cj0:
+com.android.tools.r8.com.google.protobuf.TypeRegistry$EmptyTypeRegistryHolder -> com.android.tools.r8.internal.gj0:
 # {"id":"sourceFile","fileName":"TypeRegistry.java"}
     com.android.tools.r8.com.google.protobuf.TypeRegistry EMPTY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hj0;"}
     1:2:void <clinit>():50:51 -> <clinit>
-com.android.tools.r8.com.google.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Mj0:
+com.android.tools.r8.com.google.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Qj0:
 # {"id":"sourceFile","fileName":"UninitializedMessageException.java"}
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.MessageLite):51:51 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -58116,15 +58116,15 @@
     2:12:void <init>(java.util.List):58 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     13:13:void <init>(java.util.List):58:58 -> <init>
-com.android.tools.r8.com.google.protobuf.UnknownFieldSet -> com.android.tools.r8.internal.Zj0:
+com.android.tools.r8.com.google.protobuf.UnknownFieldSet -> com.android.tools.r8.internal.dk0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     java.util.TreeMap fields -> b
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet defaultInstance -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
     1:987:void <clinit>():89:1075 -> <clinit>
     1:2:void <init>(java.util.TreeMap):65:66 -> <init>
     1:3:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):129:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ud;)V"}
     4:4:void com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.writeTo(int,com.android.tools.r8.com.google.protobuf.CodedOutputStream):770:770 -> a
     4:4:void writeTo(com.android.tools.r8.com.google.protobuf.CodedOutputStream):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -58216,7 +58216,7 @@
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder newBuilder():71 -> d
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder toBuilder():290 -> d
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():58 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AN;"}
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder toBuilder():290:290 -> d
     2:2:com.android.tools.r8.com.google.protobuf.MessageLite$Builder toBuilder():58 -> d
     1:1:boolean equals(java.lang.Object):98:98 -> equals
@@ -58238,18 +58238,18 @@
     6:6:java.lang.String toString():141 -> toString
     7:9:java.lang.String com.android.tools.r8.com.google.protobuf.TextFormat$Printer.printToString(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):615:617 -> toString
     7:9:java.lang.String toString():141 -> toString
-com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder -> com.android.tools.r8.internal.Uj0:
+com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder -> com.android.tools.r8.internal.Yj0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     java.util.TreeMap fieldBuilders -> b
     1:3:void <init>():306:308 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.google.protobuf.UnknownFieldSet.getDefaultInstance():81:81 -> a
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):397 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zj0;)Lcom/android/tools/r8/internal/Uj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dk0;)Lcom/android/tools/r8/internal/Yj0;"}
     2:2:java.util.TreeMap com.android.tools.r8.com.google.protobuf.UnknownFieldSet.access$200(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):58:58 -> a
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):398 -> a
     3:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet):398:399 -> a
     5:7:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder getFieldBuilder(int):321:323 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Vj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Zj0;"}
     8:8:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder.create():891:891 -> a
     8:8:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder.access$300():884 -> a
     8:8:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.newBuilder():687 -> a
@@ -58277,7 +58277,7 @@
     18:18:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeVarintField(int,int):434:434 -> a
     19:19:boolean hasField(int):457:457 -> a
     19:19:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeField(int,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):415 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ak0;)V"}
     20:20:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeField(int,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):416:416 -> a
     21:21:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder addField(int,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):470:470 -> a
     21:21:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeField(int,com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):421 -> a
@@ -58298,9 +58298,9 @@
     27:28:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream):490:491 -> a
     27:28:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):604 -> a
     27:28:com.android.tools.r8.com.google.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):304 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Lcom/android/tools/r8/internal/wN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Lcom/android/tools/r8/internal/AN;"}
     29:29:boolean mergeFieldFrom(int,com.android.tools.r8.com.google.protobuf.CodedInputStream):527:527 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Nd;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Pd;)Z"}
     30:30:com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException$InvalidWireTypeException com.android.tools.r8.com.google.protobuf.InvalidProtocolBufferException.invalidWireType():134:134 -> a
     30:30:boolean mergeFieldFrom(int,com.android.tools.r8.com.google.protobuf.CodedInputStream):527 -> a
     31:31:boolean mergeFieldFrom(int,com.android.tools.r8.com.google.protobuf.CodedInputStream):527:527 -> a
@@ -58407,7 +58407,7 @@
     75:75:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder.addVarint(long):1015:1015 -> a
     75:75:boolean mergeFieldFrom(int,com.android.tools.r8.com.google.protobuf.CodedInputStream):508 -> a
     1:1:com.android.tools.r8.com.google.protobuf.MessageLite build():304:304 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BN;"}
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder clone():356:356 -> clone
     1:1:java.lang.Object clone():304 -> clone
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder create():311:311 -> clone
@@ -58418,11 +58418,11 @@
     3:6:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder clone():357:360 -> clone
     3:6:java.lang.Object clone():304 -> clone
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet build():336:336 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dk0;"}
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet com.android.tools.r8.com.google.protobuf.UnknownFieldSet.getDefaultInstance():81:81 -> h
     2:2:com.android.tools.r8.com.google.protobuf.UnknownFieldSet build():337 -> h
     3:7:com.android.tools.r8.com.google.protobuf.UnknownFieldSet build():339:343 -> h
-com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field -> com.android.tools.r8.internal.Wj0:
+com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field -> com.android.tools.r8.internal.ak0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     java.util.List varint -> a
     java.util.List fixed32 -> b
@@ -58452,14 +58452,14 @@
     1:1:java.lang.Object[] getIdentityArray():748:748 -> hashCode
     1:1:int hashCode():743 -> hashCode
     2:2:int hashCode():743:743 -> hashCode
-com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder -> com.android.tools.r8.internal.Vj0:
+com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder -> com.android.tools.r8.internal.Zj0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field result -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ak0;"}
     1:2:void <init>():886:887 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$500(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):682:682 -> a
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):977 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wj0;)Lcom/android/tools/r8/internal/Vj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ak0;)Lcom/android/tools/r8/internal/Zj0;"}
     2:3:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):977:978 -> a
     4:4:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$500(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):682:682 -> a
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):978 -> a
@@ -58519,7 +58519,7 @@
     44:44:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):1005 -> a
     45:45:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder mergeFrom(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):1005:1005 -> a
     46:47:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field build():935:936 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ak0;"}
     48:48:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$500(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):682:682 -> a
     48:48:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field build():936 -> a
     49:49:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field build():937:937 -> a
@@ -58582,7 +58582,7 @@
     87:87:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field build():960 -> a
     1:1:java.lang.Object clone():884:884 -> clone
     2:3:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder clone():899:900 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zj0;"}
     4:4:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$500(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field):682:682 -> clone
     4:4:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder clone():900 -> clone
     5:5:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$502(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field,java.util.List):682:682 -> clone
@@ -58638,7 +58638,7 @@
     37:37:java.util.List com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field.access$902(com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field,java.util.List):682:682 -> clone
     37:37:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder clone():923 -> clone
     38:39:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Field$Builder clone():926:927 -> clone
-com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Parser -> com.android.tools.r8.internal.Xj0:
+com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Parser -> com.android.tools.r8.internal.bk0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     1:1:void <init>():1058:1058 -> <init>
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.create():311:311 -> a
@@ -58646,7 +58646,7 @@
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet.newBuilder():71 -> a
     1:1:com.android.tools.r8.com.google.protobuf.UnknownFieldSet parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1063 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1058 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/Co;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/Go;)Ljava/lang/Object;"}
     2:3:com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder com.android.tools.r8.com.google.protobuf.UnknownFieldSet$Builder.mergeFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream):490:491 -> a
     2:3:com.android.tools.r8.com.google.protobuf.UnknownFieldSet parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1065 -> a
     2:3:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1058 -> a
@@ -58671,14 +58671,14 @@
     10:10:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1058 -> a
     11:11:com.android.tools.r8.com.google.protobuf.UnknownFieldSet parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1067:1067 -> a
     11:11:java.lang.Object parsePartialFrom(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.ExtensionRegistryLite):1058 -> a
-com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList -> com.android.tools.r8.internal.ok0:
+com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList -> com.android.tools.r8.internal.sk0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     com.android.tools.r8.com.google.protobuf.LazyStringList list -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iJ;"}
     1:2:void <init>(com.android.tools.r8.com.google.protobuf.LazyStringList):52:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iJ;)V"}
     1:1:void add(com.android.tools.r8.com.google.protobuf.ByteString):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/V7;)V"}
     1:1:java.lang.Object getRaw(int):63:63 -> g
     2:2:java.lang.Object com.android.tools.r8.com.google.protobuf.LazyStringArrayList.getRaw(int):231:231 -> g
     2:2:java.lang.Object getRaw(int):63 -> g
@@ -58686,7 +58686,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.protobuf.LazyStringArrayList.getRaw(int):231:231 -> g
     3:3:java.lang.Object getRaw(int):63 -> g
     4:4:com.android.tools.r8.com.google.protobuf.LazyStringList getUnmodifiableView():208:208 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kJ;"}
     1:1:java.lang.String get(int):58:58 -> get
     1:1:java.lang.Object get(int):47 -> get
     1:1:java.util.Iterator iterator():165:165 -> iterator
@@ -58698,11 +58698,11 @@
     3:3:java.util.List getUnderlyingElements():188 -> l
     1:1:java.util.ListIterator listIterator(int):113:113 -> listIterator
     1:1:int size():68:68 -> size
-com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList$1 -> com.android.tools.r8.internal.kk0:
+com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList$1 -> com.android.tools.r8.internal.ok0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     java.util.ListIterator iter -> b
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList,int):113:113 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ok0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sk0;I)V"}
     2:2:com.android.tools.r8.com.google.protobuf.LazyStringList com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList.access$000(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList,int):114 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList,int):114:114 -> <init>
@@ -58721,11 +58721,11 @@
     1:1:void set(java.lang.Object):113:113 -> set
     2:2:void set(java.lang.String):153:153 -> set
     2:2:void set(java.lang.Object):113 -> set
-com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList$2 -> com.android.tools.r8.internal.mk0:
+com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList$2 -> com.android.tools.r8.internal.qk0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     java.util.Iterator iter -> b
     1:1:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList):165:165 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ok0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sk0;)V"}
     2:2:com.android.tools.r8.com.google.protobuf.LazyStringList com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList.access$000(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList):166 -> <init>
     3:3:void <init>(com.android.tools.r8.com.google.protobuf.UnmodifiableLazyStringList):166:166 -> <init>
@@ -58733,11 +58733,11 @@
     1:1:java.lang.String next():175:175 -> next
     1:1:java.lang.Object next():165 -> next
     1:1:void remove():180:180 -> remove
-com.android.tools.r8.com.google.protobuf.UnsafeUtil -> com.android.tools.r8.internal.Ik0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil -> com.android.tools.r8.internal.Mk0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     java.lang.Class MEMORY_CLASS -> a
     com.android.tools.r8.com.google.protobuf.UnsafeUtil$MemoryAccessor MEMORY_ACCESSOR -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lk0;"}
     boolean HAS_UNSAFE_BYTEBUFFER_OPERATIONS -> c
     boolean HAS_UNSAFE_ARRAY_OPERATIONS -> d
     long BYTE_ARRAY_BASE_OFFSET -> e
@@ -58775,12 +58775,12 @@
     1:1:int arrayIndexScale(java.lang.Class):116:116 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;)V"}
     1:13:boolean determineAndroidSupportByAddressSize(java.lang.Class):350:362 -> c
-com.android.tools.r8.com.google.protobuf.UnsafeUtil$1 -> com.android.tools.r8.internal.Dk0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil$1 -> com.android.tools.r8.internal.Hk0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     1:1:void <init>():294:294 -> <init>
     1:7:sun.misc.Unsafe run():297:303 -> run
     1:7:java.lang.Object run():294 -> run
-com.android.tools.r8.com.google.protobuf.UnsafeUtil$Android32MemoryAccessor -> com.android.tools.r8.internal.Ek0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil$Android32MemoryAccessor -> com.android.tools.r8.internal.Ik0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     1:1:void <init>(sun.misc.Unsafe):878:878 -> <init>
     1:1:byte getByte(java.lang.Object,long):892:892 -> a
@@ -58810,7 +58810,7 @@
     8:8:void com.android.tools.r8.com.google.protobuf.UnsafeUtil.access$500(java.lang.Object,long,byte):43 -> a
     8:8:void putByte(java.lang.Object,long,byte):904 -> a
     1:1:boolean supportsUnsafeByteBufferOperations():948:948 -> b
-com.android.tools.r8.com.google.protobuf.UnsafeUtil$Android64MemoryAccessor -> com.android.tools.r8.internal.Fk0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil$Android64MemoryAccessor -> com.android.tools.r8.internal.Jk0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     1:1:void <init>(sun.misc.Unsafe):753:753 -> <init>
     1:1:byte getByte(java.lang.Object,long):767:767 -> a
@@ -58840,7 +58840,7 @@
     8:8:void com.android.tools.r8.com.google.protobuf.UnsafeUtil.access$500(java.lang.Object,long,byte):43 -> a
     8:8:void putByte(java.lang.Object,long,byte):779 -> a
     1:1:boolean supportsUnsafeByteBufferOperations():823:823 -> b
-com.android.tools.r8.com.google.protobuf.UnsafeUtil$JvmMemoryAccessor -> com.android.tools.r8.internal.Gk0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil$JvmMemoryAccessor -> com.android.tools.r8.internal.Kk0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     1:1:void <init>(sun.misc.Unsafe):613:613 -> <init>
     1:18:boolean supportsUnsafeArrayOperations():623:640 -> a
@@ -58873,7 +58873,7 @@
     17:29:boolean supportsUnsafeByteBufferOperations():692:704 -> b
     30:30:boolean com.android.tools.r8.com.google.protobuf.UnsafeUtil$MemoryAccessor.supportsUnsafeByteBufferOperations():588:588 -> b
     30:30:boolean supportsUnsafeByteBufferOperations():687 -> b
-com.android.tools.r8.com.google.protobuf.UnsafeUtil$MemoryAccessor -> com.android.tools.r8.internal.Hk0:
+com.android.tools.r8.com.google.protobuf.UnsafeUtil$MemoryAccessor -> com.android.tools.r8.internal.Lk0:
 # {"id":"sourceFile","fileName":"UnsafeUtil.java"}
     sun.misc.Unsafe unsafe -> a
     1:2:void <init>(sun.misc.Unsafe):483:484 -> <init>
@@ -58887,10 +58887,10 @@
     1:1:int arrayIndexScale(java.lang.Class):496:496 -> b
     2:2:int getInt(java.lang.Object,long):533:533 -> b
     1:1:long getLong(java.lang.Object,long):541:541 -> c
-com.android.tools.r8.com.google.protobuf.Utf8 -> com.android.tools.r8.internal.Tk0:
+com.android.tools.r8.com.google.protobuf.Utf8 -> com.android.tools.r8.internal.Xk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     com.android.tools.r8.com.google.protobuf.Utf8$Processor processor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ok0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sk0;"}
     1:1:boolean com.android.tools.r8.com.google.protobuf.UnsafeUtil.hasUnsafeArrayOperations():87:87 -> <clinit>
     1:1:boolean com.android.tools.r8.com.google.protobuf.Utf8$UnsafeProcessor.isAvailable():1172 -> <clinit>
     1:1:void <clinit>():84 -> <clinit>
@@ -58905,7 +58905,7 @@
     15:28:int encodedLengthGeneral(java.lang.CharSequence,int):270:283 -> a
     15:28:int encodedLength(java.lang.CharSequence):256 -> a
     29:29:int encodedLength(java.lang.CharSequence):263:263 -> a
-com.android.tools.r8.com.google.protobuf.Utf8$DecodeUtil -> com.android.tools.r8.internal.Nk0:
+com.android.tools.r8.com.google.protobuf.Utf8$DecodeUtil -> com.android.tools.r8.internal.Rk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:11:void handleThreeBytes(byte,byte,byte,char[],int):1937:1947 -> a
     1:11:void access$900(byte,byte,byte,char[],int):1903 -> a
@@ -58922,7 +58922,7 @@
     35:35:void handleFourBytes(byte,byte,byte,byte,char[],int):1964:1964 -> a
     35:35:void access$1000(byte,byte,byte,byte,char[],int):1903 -> a
     36:36:boolean isNotTrailingByte(byte):1977:1977 -> a
-com.android.tools.r8.com.google.protobuf.Utf8$Processor -> com.android.tools.r8.internal.Ok0:
+com.android.tools.r8.com.google.protobuf.Utf8$Processor -> com.android.tools.r8.internal.Sk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:1:void <init>():380:380 -> <init>
     java.lang.String decodeUtf8(byte[],int,int) -> a
@@ -58930,7 +58930,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[BII)I"}
     int partialIsValidUtf8(int,byte[],int,int) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"([BII)I"}
-com.android.tools.r8.com.google.protobuf.Utf8$SafeProcessor -> com.android.tools.r8.internal.Pk0:
+com.android.tools.r8.com.google.protobuf.Utf8$SafeProcessor -> com.android.tools.r8.internal.Tk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:1:void <init>():860:860 -> <init>
     1:17:java.lang.String decodeUtf8(byte[],int,int):958:974 -> a
@@ -59001,10 +59001,10 @@
     38:38:int partialIsValidUtf8NonAscii(byte[],int,int):1151:1151 -> b
     38:38:int partialIsValidUtf8(byte[],int,int):1102 -> b
     38:38:int partialIsValidUtf8(int,byte[],int,int):946 -> b
-com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException -> com.android.tools.r8.internal.Qk0:
+com.android.tools.r8.com.google.protobuf.Utf8$UnpairedSurrogateException -> com.android.tools.r8.internal.Uk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:1:void <init>(int,int):227:227 -> <init>
-com.android.tools.r8.com.google.protobuf.Utf8$UnsafeProcessor -> com.android.tools.r8.internal.Rk0:
+com.android.tools.r8.com.google.protobuf.Utf8$UnsafeProcessor -> com.android.tools.r8.internal.Vk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:1:void <init>():1169:1169 -> <init>
     1:1:byte com.android.tools.r8.com.google.protobuf.UnsafeUtil.getByte(byte[],long):176:176 -> a
@@ -59134,10 +59134,10 @@
     11:11:int partialIsValidUtf8(byte[],long,int):1785 -> b
     11:11:int partialIsValidUtf8(int,byte[],int,int):1267 -> b
     12:13:int partialIsValidUtf8(int,byte[],int,int):1179:1180 -> b
-com.android.tools.r8.com.google.protobuf.WireFormat -> com.android.tools.r8.internal.wm0:
+com.android.tools.r8.com.google.protobuf.WireFormat -> com.android.tools.r8.internal.Am0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:43:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):227:269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nd;Lcom/android/tools/r8/internal/sm0;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pd;Lcom/android/tools/r8/internal/wm0;I)Ljava/lang/Object;"}
     44:44:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):255:255 -> a
     45:45:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):253:253 -> a
     46:46:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):251:251 -> a
@@ -59162,64 +59162,64 @@
     93:93:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):233:233 -> a
     94:94:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):231:231 -> a
     95:95:java.lang.Object readPrimitiveField(com.android.tools.r8.com.google.protobuf.CodedInputStream,com.android.tools.r8.com.google.protobuf.WireFormat$FieldType,com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation):229:229 -> a
-com.android.tools.r8.com.google.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.sm0:
+com.android.tools.r8.com.google.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.wm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType javaType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     int wireType -> c
     com.android.tools.r8.com.google.protobuf.WireFormat$FieldType GROUP -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qm0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$FieldType ENUM -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wm0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$FieldType[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/wm0;"}
     1:38:void <clinit>():112:149 -> <clinit>
     39:39:void <clinit>():111:111 -> <clinit>
     1:3:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):151:153 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/um0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/ym0;I)V"}
     4:6:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):151:153 -> <init>
     4:6:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int,com.android.tools.r8.com.google.protobuf.WireFormat$1):111 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/um0;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/ym0;II)V"}
     1:1:boolean isPackable():0:0 -> a
-com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.km0:
+com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.om0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):120:120 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.mm0:
+com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.qm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):126:126 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/um0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ym0;)V"}
     1:1:boolean isPackable():129:129 -> a
-com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.om0:
+com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.sm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):132:132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/um0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ym0;)V"}
     1:1:boolean isPackable():135:135 -> a
-com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.qm0:
+com.android.tools.r8.com.google.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.um0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.com.google.protobuf.WireFormat$JavaType,int):138:138 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/um0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ym0;)V"}
     1:1:boolean isPackable():141:141 -> a
-com.android.tools.r8.com.google.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.um0:
+com.android.tools.r8.com.google.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.ym0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType INT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType LONG -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType FLOAT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType DOUBLE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType BOOLEAN -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType STRING -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType BYTE_STRING -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType ENUM -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     com.android.tools.r8.com.google.protobuf.WireFormat$JavaType MESSAGE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/um0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym0;"}
     1:9:void <clinit>():85:93 -> <clinit>
     1:1:void <init>(java.lang.String,int,java.lang.Object):95:95 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILjava/io/Serializable;)V"}
@@ -59229,7 +59229,7 @@
 # {"id":"sourceFile","fileName":"WireFormat.java"}
 com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation$3 -> R8$$REMOVED$$CLASS$$77:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
-com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.vm0:
+com.android.tools.r8.com.google.protobuf.WireFormat$Utf8Validation$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.zm0:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
@@ -59262,7 +59262,7 @@
     java.util.List proguardConfig -> k
     boolean printHelpAndExit -> l
     1:13:void <init>(java.util.List,java.lang.String,com.android.tools.r8.CompilationMode,int,boolean,boolean,boolean,java.lang.String,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,java.lang.String,boolean):67:79 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Ljava/lang/String;Lcom/android/tools/r8/CompilationMode;IZZZLjava/lang/String;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;Ljava/lang/String;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Ljava/lang/String;Lcom/android/tools/r8/CompilationMode;IZZZLjava/lang/String;Lcom/android/tools/r8/MapIdProvider;Lcom/android/tools/r8/SourceFileProvider;Ljava/lang/String;Z)V"}
     1:26:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):84:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;)Lcom/android/tools/r8/compatproguard/CompatProguard$a;"}
     27:34:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):107:114 -> a
@@ -59271,7 +59271,7 @@
 com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions$1 -> com.android.tools.r8.compatproguard.a:
 # {"id":"sourceFile","fileName":"CompatProguard.java"}
     1:1:void <init>():84:84 -> <init>
-com.android.tools.r8.compatproguard.DepsFileWriter -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.compatproguard.DepsFileWriter -> com.android.tools.r8.internal.oi:
 # {"id":"sourceFile","fileName":"DepsFileWriter.java"}
     java.nio.file.Path dependentFile -> a
     java.lang.String dependencyOutput -> b
@@ -59289,7 +59289,7 @@
     17:17:void finished():51 -> finished
     18:21:void finished():51:54 -> finished
     22:36:void finished():41:55 -> finished
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Me:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     java.util.function.Consumer testingConsumer -> a
     java.lang.Thread mainThread -> b
@@ -59299,18 +59299,18 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):42:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:7:void <init>(com.android.tools.r8.utils.InternalOptions):39:44 -> <init>
     1:7:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):48:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ee;)V"}
-com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext -> com.android.tools.r8.internal.De:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge;)V"}
+com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext -> com.android.tools.r8.internal.Fe:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring desugaring -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N8;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():180:180 -> <clinit>
     1:2:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):185:186 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/internal/L8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/N8;)V"}
     1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.getParent():139:139 -> a
     1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):191 -> a
     2:2:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):192:192 -> a
@@ -59325,18 +59325,18 @@
     3:3:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSyntheticSuffix(java.lang.StringBuilder):125 -> b
     3:3:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):198 -> b
     4:4:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):198:198 -> b
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Ge:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     1:1:void <init>():18:18 -> <init>
     java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder) -> a
     java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder) -> b
-com.android.tools.r8.contexts.CompilationContext$MainThreadContext -> com.android.tools.r8.internal.Fe:
+com.android.tools.r8.contexts.CompilationContext$MainThreadContext -> com.android.tools.r8.internal.He:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     java.lang.Thread mainThread -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():151:151 -> <clinit>
     1:2:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.lang.Thread):158:159 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Ljava/lang/Thread;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Ljava/lang/Thread;)V"}
     1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.getParent():139:139 -> a
     1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):164 -> a
     2:2:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):164:164 -> a
@@ -59345,7 +59345,7 @@
     3:3:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):164 -> a
     4:4:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):164:164 -> a
     5:6:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext(com.android.tools.r8.graph.DexProgramClass):173:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Le;"}
     7:7:int com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.incrementAndGetNextId():143:143 -> a
     7:7:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext(com.android.tools.r8.graph.DexProgramClass):174 -> a
     8:8:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext(com.android.tools.r8.graph.DexProgramClass):174:174 -> a
@@ -59359,16 +59359,16 @@
     3:3:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSyntheticSuffix(java.lang.StringBuilder):125 -> b
     3:3:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):169 -> b
     4:4:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):169:169 -> b
-com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.Ie:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     com.android.tools.r8.graph.ProgramMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():209:209 -> <clinit>
     1:2:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod):213:214 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le;"}
     2:2:com.android.tools.r8.graph.DexProgramClass getClassContext():232:232 -> a
     2:2:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():226 -> a
     3:3:int com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.incrementAndGetNextId():143:143 -> a
@@ -59396,40 +59396,40 @@
     3:3:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):255 -> b
     4:6:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):241:243 -> b
     4:6:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):255 -> b
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.He:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.Je:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     com.android.tools.r8.contexts.CompilationContext parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ke;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Me;"}
     int processorId -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():73:73 -> <clinit>
     1:3:void <init>(com.android.tools.r8.contexts.CompilationContext,int):77:79 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ke;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Me;I)V"}
     1:1:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ee;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge;)V"}
     2:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):95:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ge;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ie;"}
     4:4:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):115:115 -> a
     4:4:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):120 -> a
     1:1:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):115:115 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):125 -> b
-com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext -> com.android.tools.r8.internal.Ke:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     int nextId -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):134:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;)V"}
     2:5:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):132:135 -> <init>
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Le:
 # {"id":"sourceFile","fileName":"CompilationContext.java"}
     com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ie;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ke;"}
     com.android.tools.r8.graph.DexProgramClass classContext -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     int positionId -> c
     1:4:void <init>(com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext,com.android.tools.r8.graph.DexProgramClass,int):267:270 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/graph/D2;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ke;Lcom/android/tools/r8/graph/D2;I)V"}
     1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):279:279 -> a
     2:2:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):274:274 -> a
     2:2:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):279 -> a
@@ -59437,18 +59437,18 @@
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):284:284 -> b
     2:2:java.lang.StringBuilder buildSuffix(java.lang.StringBuilder):274:274 -> b
     2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):284 -> b
-com.android.tools.r8.debuginfo.DebugRepresentation -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.debuginfo.DebugRepresentation -> com.android.tools.r8.internal.Xh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap paramToInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):82:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:2:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):46:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Sh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Uh;"}
     3:12:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):52:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Sh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Uh;"}
     13:13:java.util.Collection com.android.tools.r8.dex.VirtualFile.classes():310:310 -> a
     13:13:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):64 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -59460,7 +59460,7 @@
     19:19:void lambda$fromFiles$2(java.util.Map,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.DexProgramClass):64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/graph/D2;)V"}
     20:20:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)I"}
     21:24:boolean isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):180:183 -> a
     21:24:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.ProgramMethod):67 -> a
     25:25:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.ProgramMethod):70:70 -> a
@@ -59525,9 +59525,9 @@
     121:123:void com.android.tools.r8.dex.VirtualFile.setDebugRepresentation(com.android.tools.r8.debuginfo.DebugRepresentation):162:164 -> a
     121:123:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):136 -> a
     124:124:com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary lambda$computeForFile$4(int):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Rh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Th;"}
     125:125:void lambda$computeForFile$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.AppView,java.lang.Integer,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/graph/y;Ljava/lang/Integer;Lcom/android/tools/r8/internal/Rh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/graph/y;Ljava/lang/Integer;Lcom/android/tools/r8/internal/Th;)V"}
     126:130:com.android.tools.r8.debuginfo.DebugRepresentation$ConversionInfo com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):361:365 -> a
     126:130:void lambda$computeForFile$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.AppView,java.lang.Integer,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):133 -> a
     131:131:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():317:317 -> a
@@ -59611,9 +59611,9 @@
     173:175:java.lang.String toString(boolean):174:176 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/lang/String;"}
     176:176:java.lang.Integer lambda$toString$7(com.android.tools.r8.debuginfo.DebugRepresentation$ConversionInfo):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ph;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh;)Ljava/lang/Integer;"}
     177:177:java.lang.String lambda$toString$8(boolean,com.android.tools.r8.debuginfo.DebugRepresentation$ConversionInfo):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Ph;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Rh;)Ljava/lang/String;"}
     178:178:int getExpansionOverhead(int,int,int):273:273 -> a
     179:179:com.android.tools.r8.dex.code.DexInstruction getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):474:474 -> a
     179:179:boolean verifyLastExecutableInstructionWithinBound(com.android.tools.r8.graph.DexCode,int):467 -> a
@@ -59627,15 +59627,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     3:3:boolean verifyMethodHasOverloads(com.android.tools.r8.graph.ProgramMethod):163:163 -> c
     1:1:java.lang.String toString():170:170 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$ConversionInfo -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.debuginfo.DebugRepresentation$ConversionInfo -> com.android.tools.r8.internal.Rh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     int paramCount -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap conversions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():408:408 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):418:421 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Ny;)V"}
     1:4:java.lang.String toString(boolean):449:452 -> a
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3.iterator():1118:1118 -> a
     5:5:java.lang.String toString(boolean):452 -> a
@@ -59649,11 +59649,11 @@
     9:9:java.lang.String toString(boolean):452 -> a
     10:20:java.lang.String toString(boolean):452:462 -> a
     1:1:java.lang.String toString():445:445 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary -> com.android.tools.r8.internal.Rh:
+com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary -> com.android.tools.r8.internal.Th:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     int paramCount -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pcToCost -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():288:288 -> <clinit>
     1:1:void <init>(int):294:294 -> <init>
@@ -59665,12 +59665,12 @@
     3:5:void com.android.tools.r8.debuginfo.DebugRepresentation$PcCostInfo.add(int):217:219 -> a
     3:5:void addCost(int,int):301 -> a
     1:7:java.lang.String toString():397:403 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary$ConversionState -> com.android.tools.r8.internal.Qh:
+com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary$ConversionState -> com.android.tools.r8.internal.Sh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap groups -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     com.android.tools.r8.debuginfo.DebugRepresentation$PcConversionInfo converted -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vh;"}
     int flushedPc -> c
     int unconvertedPc -> d
     int normalCost -> e
@@ -59679,22 +59679,22 @@
     1:12:void flush():325:336 -> a
     13:16:void reset():313:316 -> a
     13:16:void flush():338 -> a
-com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate -> com.android.tools.r8.internal.Uh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     int getDexPcEncodingCutoff(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)I"}
-com.android.tools.r8.debuginfo.DebugRepresentation$PcConversionInfo -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.debuginfo.DebugRepresentation$PcConversionInfo -> com.android.tools.r8.internal.Vh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     int pc -> a
     boolean converted -> b
     int methods -> c
     int normalCost -> d
     com.android.tools.r8.debuginfo.DebugRepresentation$PcConversionInfo NO_CONVERSION -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vh;"}
     1:1:void <clinit>():225:225 -> <clinit>
     1:5:void <init>(int,boolean,int,int):237:241 -> <init>
     1:12:java.lang.String toString():246:257 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$PcCostInfo -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.debuginfo.DebugRepresentation$PcCostInfo -> com.android.tools.r8.internal.Wh:
 # {"id":"sourceFile","fileName":"DebugRepresentation.java"}
     int pc -> a
     int cost -> b
@@ -59704,21 +59704,21 @@
     1:1:void <init>(int):211:211 -> <init>
     2:23:void <init>(int):192:213 -> <init>
     1:10:java.lang.String toString():199:208 -> toString
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Mk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryKeepRuleGenerator.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):49:51 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRun():63:63 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     2:2:boolean shouldRun():63 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
     3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean shouldRun():63 -> a
     3:3:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
@@ -59727,11 +59727,11 @@
 com.android.tools.r8.dex.ApplicationReader -> com.android.tools.r8.dex.c:
 # {"id":"sourceFile","fileName":"ApplicationReader.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory itemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.Timing timing -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.utils.AndroidApp inputApp -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/utils/i;"}
     com.android.tools.r8.graph.DexApplicationReadFlags flags -> e
@@ -59739,7 +59739,7 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():65:65 -> <clinit>
     1:5:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):78:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication read():86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/r4;"}
     2:6:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource):90:94 -> a
@@ -59776,12 +59776,12 @@
     41:41:com.android.tools.r8.utils.AndroidApiLevel validateOrComputeMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.dex.DexReader):254:254 -> a
     42:42:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):111:111 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/graph/r4;"}
-    43:43:com.android.tools.r8.utils.DumpInputFlags com.android.tools.r8.utils.InternalOptions.getDumpInputFlags():1039:1039 -> a
+    43:43:com.android.tools.r8.utils.DumpInputFlags com.android.tools.r8.utils.InternalOptions.getDumpInputFlags():1045:1045 -> a
     43:43:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     44:44:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):111:111 -> a
     45:45:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.DumpInputFlags):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/wm;)Lcom/android/tools/r8/graph/r4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ym;)Lcom/android/tools/r8/graph/r4;"}
     46:57:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229:240 -> a
     46:57:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.DumpInputFlags):119 -> a
     58:77:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.DumpInputFlags):120:139 -> a
@@ -59802,7 +59802,7 @@
     99:99:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.DumpInputFlags):151 -> a
     100:105:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.DumpInputFlags):151:156 -> a
     106:118:void dumpApplication(com.android.tools.r8.utils.DumpInputFlags):161:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ym;)V"}
     119:119:void dumpApplication(com.android.tools.r8.utils.DumpInputFlags):171:171 -> a
     120:120:com.android.tools.r8.shaking.MainDexInfo readMainDexClassesForR8(com.android.tools.r8.graph.DexApplication):184:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3;)Lcom/android/tools/r8/shaking/Y1;"}
@@ -59838,9 +59838,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/shaking/W1;Ljava/lang/Iterable;)V"}
     161:161:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo$Builder,java.lang.Iterable):218:218 -> a
     162:166:void throwIncompatibleDexVersionAndMinApi(com.android.tools.r8.utils.DexVersion):260:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/am;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cm;)V"}
     167:167:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.threading.TaskCollection):275:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/r4$a;Lcom/android/tools/r8/internal/wg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/r4$a;Lcom/android/tools/r8/internal/Ag0;)V"}
     168:170:void lambda$readProguardMap$1(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.StringResource):280:282 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w0;Lcom/android/tools/r8/t0;)V"}
     171:171:void lambda$readProguardMap$1(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.StringResource):279:279 -> a
@@ -59853,7 +59853,7 @@
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.dex.a:
 # {"id":"sourceFile","fileName":"ApplicationReader.java"}
     com.android.tools.r8.threading.TaskCollection tasks -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ag0;"}
     java.util.Queue programClasses -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentLinkedQueue;"}
     java.util.Queue classpathClasses -> c
@@ -59871,7 +59871,7 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():291:291 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,com.android.tools.r8.threading.TaskCollection):312:312 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/c;Lcom/android/tools/r8/internal/wg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/c;Lcom/android/tools/r8/internal/Ag0;)V"}
     2:4:void <init>(com.android.tools.r8.dex.ApplicationReader,com.android.tools.r8.threading.TaskCollection):296:298 -> <init>
     5:5:com.android.tools.r8.graph.DexApplicationReadFlags$Builder com.android.tools.r8.graph.DexApplicationReadFlags.builder():72:72 -> <init>
     5:5:void <init>(com.android.tools.r8.dex.ApplicationReader,com.android.tools.r8.threading.TaskCollection):301 -> <init>
@@ -59896,7 +59896,7 @@
     31:31:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource):97:97 -> a
     31:31:void lambda$readClassSources$2(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource):442 -> a
     32:35:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):467:470 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Ljava/util/concurrent/ConcurrentLinkedQueue;Ljava/util/List;Lcom/android/tools/r8/graph/c4;)Lcom/android/tools/r8/internal/gd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Ljava/util/concurrent/ConcurrentLinkedQueue;Ljava/util/List;Lcom/android/tools/r8/graph/c4;)Lcom/android/tools/r8/internal/id;"}
     36:36:void com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.<init>():163:163 -> a
     36:36:void com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.<init>():219 -> a
     36:36:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.builder():192 -> a
@@ -60042,7 +60042,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/r;"}
     java.util.function.Predicate isTypeMissing -> d
@@ -60054,7 +60054,7 @@
     com.android.tools.r8.DexIndexedConsumer programConsumer -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/n;"}
     com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer globalsSyntheticsConsumer -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dB;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():96:96 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.DexIndexedConsumer):180:182 -> <init>
@@ -60073,12 +60073,12 @@
     10:10:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.hasEmulatedInterfaces():212 -> <init>
     10:10:com.android.tools.r8.dex.CodeToKeep com.android.tools.r8.dex.CodeToKeep.createCodeToKeep(com.android.tools.r8.graph.AppView):35 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.DexIndexedConsumer):183 -> <init>
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> <init>
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> <init>
     11:11:com.android.tools.r8.dex.CodeToKeep com.android.tools.r8.dex.CodeToKeep.createCodeToKeep(com.android.tools.r8.graph.AppView):36 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.DexIndexedConsumer):183 -> <init>
     12:12:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> <init>
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> <init>
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:com.android.tools.r8.dex.CodeToKeep com.android.tools.r8.dex.CodeToKeep.createCodeToKeep(com.android.tools.r8.graph.AppView):36 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.DexIndexedConsumer):183 -> <init>
@@ -60116,7 +60116,7 @@
     12:12:com.android.tools.r8.dex.FileWriter$ByteBufferResult com.android.tools.r8.dex.FileWriter.generate():210:210 -> a
     12:12:com.android.tools.r8.dex.FileWriter$ByteBufferResult lambda$writeDexFile$12(com.android.tools.r8.dex.FileWriter):980 -> a
     13:15:java.util.List distribute(java.util.concurrent.ExecutorService):214:216 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():588:588 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():587:587 -> a
     16:16:java.util.List distribute(java.util.concurrent.ExecutorService):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:19:java.util.List distribute(java.util.concurrent.ExecutorService):218:220 -> a
@@ -60126,29 +60126,29 @@
     21:21:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     21:21:java.util.List distribute(java.util.concurrent.ExecutorService):220 -> a
     22:37:java.util.List distribute(java.util.concurrent.ExecutorService):220:235 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():633:633 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():632:632 -> a
     38:38:java.util.List distribute(java.util.concurrent.ExecutorService):235 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():633:633 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():632:632 -> a
     39:39:java.util.List distribute(java.util.concurrent.ExecutorService):235 -> a
     40:40:java.util.List distribute(java.util.concurrent.ExecutorService):236:236 -> a
-    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():653:653 -> a
+    41:41:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():652:652 -> a
     41:41:java.util.List distribute(java.util.concurrent.ExecutorService):240 -> a
     42:42:java.util.List distribute(java.util.concurrent.ExecutorService):240:240 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2746:2746 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2752:2752 -> a
     43:43:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2746:2746 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2752:2752 -> a
     44:44:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2746:2746 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2752:2752 -> a
     45:45:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2747:2747 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2753:2753 -> a
     46:46:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2747:2747 -> a
+    47:47:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2753:2753 -> a
     47:47:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2496:2496 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2747 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2502:2502 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.canUseMultidex():2753 -> a
     48:48:java.util.List distribute(java.util.concurrent.ExecutorService):241 -> a
     49:51:java.util.List distribute(java.util.concurrent.ExecutorService):241:243 -> a
     52:52:boolean com.android.tools.r8.shaking.MainDexInfo.isEmpty():225:225 -> a
@@ -60172,17 +60172,17 @@
     69:69:java.util.List distribute(java.util.concurrent.ExecutorService):254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     70:86:java.util.List distribute(java.util.concurrent.ExecutorService):255:271 -> a
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():633:633 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():632:632 -> a
     87:87:java.util.List distribute(java.util.concurrent.ExecutorService):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():633:633 -> a
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():632:632 -> a
     88:88:java.util.List distribute(java.util.concurrent.ExecutorService):271 -> a
     89:89:java.util.List distribute(java.util.concurrent.ExecutorService):272:272 -> a
-    90:90:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():592:592 -> a
+    90:90:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():591:591 -> a
     90:90:java.util.List distribute(java.util.concurrent.ExecutorService):273 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     91:92:java.util.List distribute(java.util.concurrent.ExecutorService):273:274 -> a
-    93:93:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():592:592 -> a
+    93:93:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():591:591 -> a
     93:93:java.util.List distribute(java.util.concurrent.ExecutorService):275 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     94:94:java.util.List distribute(java.util.concurrent.ExecutorService):275:275 -> a
@@ -60220,20 +60220,20 @@
     115:115:void encodeChecksums(java.lang.Iterable):298 -> a
     116:116:boolean willComputeProguardMap():303:303 -> a
     116:116:void lambda$computeMarkerStrings$4(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.dex.Marker):467 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/B1;Ljava/util/List;Lcom/android/tools/r8/dex/W;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/B1;Ljava/util/List;Lcom/android/tools/r8/dex/W;)V"}
     117:127:void lambda$computeMarkerStrings$4(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.dex.Marker):468:478 -> a
     128:132:java.util.Collection rewriteJumboStringsAndComputeDebugRepresentation(java.util.concurrent.ExecutorService,java.util.List,java.util.List):326:330 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/ArrayList;)Ljava/util/ArrayList;"}
     133:133:java.util.Collection rewriteJumboStringsAndComputeDebugRepresentation(java.util.concurrent.ExecutorService,java.util.List,java.util.List):326:326 -> a
     134:134:com.android.tools.r8.utils.Timing lambda$rewriteJumboStringsAndComputeDebugRepresentation$0(java.util.List,com.android.tools.r8.dex.VirtualFile):329:329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/ph0;"}
     135:135:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):340:340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/ph0;)V"}
     136:136:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     136:136:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):340 -> a
     137:146:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):341:350 -> a
     147:161:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):342:356 -> a
-    162:162:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():588:588 -> a
+    162:162:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():587:587 -> a
     162:162:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):356 -> a
     163:163:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):358:358 -> a
     164:164:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
@@ -60302,20 +60302,20 @@
     266:266:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.ApplicationWriter$LazyDexString.compute():1008:1008 -> a
     266:266:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):435 -> a
     267:276:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):435:444 -> a
-    277:277:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    277:277:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     277:277:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):444 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     278:278:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    278:278:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    278:278:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     278:278:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):444 -> a
     279:290:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):444:455 -> a
     291:291:java.lang.Boolean lambda$write$2(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):402:402 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/c10;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/g10;)Ljava/lang/Boolean;"}
     292:292:void lambda$write$3(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):408:408 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/j;Lcom/android/tools/r8/graph/D2;)V"}
     293:315:void computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):460:482 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Ljava/util/ArrayList;)V"}
     316:316:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):544:544 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/J0;)Lcom/android/tools/r8/graph/H2;"}
     317:329:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):518:530 -> a
@@ -60355,13 +60355,13 @@
     454:490:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.naming.KotlinModuleSynthesizer):735:771 -> a
     454:490:void supplyAdditionalConsumers(com.android.tools.r8.graph.AppView):719 -> a
     491:491:void lambda$supplyAdditionalConsumers$8(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexType,java.util.List):694:694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     492:501:void lambda$supplyAdditionalConsumers$8(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexType,java.util.List):693:702 -> a
     502:510:void lambda$supplyAdditionalConsumers$8(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexType,java.util.List):697:705 -> a
     511:511:void lambda$supplyAdditionalConsumers$8(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexType,java.util.List):696:696 -> a
     512:512:void lambda$supplyAdditionalConsumers$8(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexType,java.util.List):695:695 -> a
     513:513:void lambda$supplyAdditionalConsumers$9(com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataEntryResource):712:712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/DataEntryResource;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/DataEntryResource;)V"}
     514:514:void insertAttributeAnnotations():778:778 -> a
     515:531:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):787:803 -> a
     515:531:void insertAttributeAnnotations():779 -> a
@@ -60467,7 +60467,7 @@
     653:653:void insertAttributeAnnotations():779 -> a
     654:654:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):867:867 -> a
     654:654:void insertAttributeAnnotations():779 -> a
-    655:655:boolean com.android.tools.r8.utils.InternalOptions.canUseSealedClasses():2661:2661 -> a
+    655:655:boolean com.android.tools.r8.utils.InternalOptions.canUseSealedClasses():2667:2667 -> a
     655:655:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):867 -> a
     655:655:void insertAttributeAnnotations():779 -> a
     656:656:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):870:870 -> a
@@ -60482,11 +60482,11 @@
     666:666:void insertAttributeAnnotations():779 -> a
     667:672:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):868:873 -> a
     667:672:void insertAttributeAnnotations():779 -> a
-    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2657:2657 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2663:2663 -> a
     673:673:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):873 -> a
     673:673:void insertAttributeAnnotations():779 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    674:674:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2657:2657 -> a
+    674:674:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2663:2663 -> a
     674:674:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):873 -> a
     674:674:void insertAttributeAnnotations():779 -> a
     675:675:void insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):874:874 -> a
@@ -60590,7 +60590,7 @@
     794:798:void lambda$rewriteCodeWithJumboStrings$11(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.ProgramMethod):961:965 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;)V"}
     799:799:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):975:975 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/ByteBufferProvider;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/dex/F;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/ByteBufferProvider;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/dex/F;"}
     800:800:void com.android.tools.r8.dex.FileWriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.CodeToKeep,com.android.tools.r8.dex.VirtualFile):113:113 -> a
     800:800:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):975 -> a
     801:803:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):978:980 -> a
@@ -60601,7 +60601,7 @@
     807:837:void printItemUseInfo(com.android.tools.r8.dex.VirtualFile):1014:1044 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;)V"}
     1:1:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):345:345 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/ph0;"}
     2:2:boolean com.android.tools.r8.dex.VirtualFile.isEmpty():306:306 -> b
     2:2:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):594 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -60611,11 +60611,11 @@
     3:3:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
     4:16:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):598:610 -> b
     4:16:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
-    17:17:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():653:653 -> b
+    17:17:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():652:652 -> b
     17:17:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):610 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
-    18:18:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():653:653 -> b
+    18:18:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():652:652 -> b
     18:18:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):610 -> b
     18:18:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
     19:19:com.android.tools.r8.FeatureSplit com.android.tools.r8.dex.VirtualFile.getFeatureSplit():144:144 -> b
@@ -60623,11 +60623,11 @@
     19:19:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
     20:25:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):614:619 -> b
     20:25:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
-    26:26:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():649:649 -> b
+    26:26:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():648:648 -> b
     26:26:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):619 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:26:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
-    27:27:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():649:649 -> b
+    27:27:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():648:648 -> b
     27:27:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):619 -> b
     27:27:com.android.tools.r8.utils.Timing lambda$writeVirtualFiles$1(java.util.List,com.android.tools.r8.dex.VirtualFile):346 -> b
     28:35:void writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):624:631 -> b
@@ -60672,7 +60672,7 @@
     2:2:void write(java.util.concurrent.ExecutorService):308 -> c
     3:4:void write(java.util.concurrent.ExecutorService):308:309 -> c
     5:5:com.android.tools.r8.utils.Timing rewriteJumboStringsAndComputeDebugRepresentation(com.android.tools.r8.dex.VirtualFile,java.util.List):314:314 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/ph0;"}
     6:6:boolean com.android.tools.r8.dex.VirtualFile.isEmpty():306:306 -> c
     6:6:void computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):555 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -60700,11 +60700,11 @@
     com.android.tools.r8.dex.Marker val$marker -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W;"}
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     com.android.tools.r8.graph.DexItemFactory val$factory -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.dex.Marker,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexItemFactory):469:469 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/B1;)V"}
     1:1:com.android.tools.r8.graph.DexString internalCompute():473:473 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     2:2:java.lang.String com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId.getId():36:36 -> a
@@ -60740,11 +60740,11 @@
 com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.dex.e:
 # {"id":"sourceFile","fileName":"ApplicationWriter.java"}
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     com.android.tools.r8.dex.ApplicationWriter this$0 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/k;"}
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):506:506 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Lcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Lcom/android/tools/r8/internal/m7;)V"}
     1:1:com.android.tools.r8.graph.DexString internalCompute():509:509 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
 com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.dex.f:
@@ -60770,11 +60770,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/f0;"}
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     com.android.tools.r8.utils.InternalOptions val$options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set val$generatedResourceNames -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.KotlinModuleSynthesizer,java.util.Set):740:740 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/f0;Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/naming/N;Ljava/util/HashSet;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/f0;Lcom/android/tools/r8/DataResourceConsumer;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/naming/N;Ljava/util/HashSet;)V"}
     1:1:void visit(com.android.tools.r8.DataDirectoryResource):743:743 -> visit
     2:2:com.android.tools.r8.DataDirectoryResource com.android.tools.r8.dex.ResourceAdapter.adaptIfNeeded(com.android.tools.r8.DataDirectoryResource):78:78 -> visit
     2:2:void visit(com.android.tools.r8.DataDirectoryResource):743 -> visit
@@ -60841,10 +60841,10 @@
     20:20:java.util.Collection rewriteJumboStringsAndComputeDebugRepresentation(java.util.concurrent.ExecutorService,java.util.List,java.util.List):57:57 -> a
     21:21:java.util.Collection rewriteJumboStringsAndComputeDebugRepresentation(java.util.concurrent.ExecutorService,java.util.List,java.util.List):56:56 -> a
     22:22:com.android.tools.r8.utils.Timing lambda$rewriteJumboStringsAndComputeDebugRepresentation$0(java.util.List,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/internal/ph0;"}
     23:23:com.android.tools.r8.utils.Timing lambda$rewriteJumboStringsAndComputeDebugRepresentation$0(java.util.List,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile):60:60 -> a
     24:24:com.android.tools.r8.utils.Timing rewriteJumboStringsAndComputeDebugRepresentationWithExternalStringIds(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.graph.ObjectToOffsetMapping):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Ljava/util/List;Lcom/android/tools/r8/graph/r5;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Ljava/util/List;Lcom/android/tools/r8/graph/r5;)Lcom/android/tools/r8/internal/ph0;"}
     25:25:boolean com.android.tools.r8.dex.VirtualFile.isEmpty():306:306 -> a
     25:25:void computeOffsetMappingAndRewriteJumboStringsWithExternalStringIds(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):82 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -60863,7 +60863,7 @@
     35:37:com.android.tools.r8.utils.Timing rewriteJumboStringsAndComputeDebugRepresentationWithExternalStringIds(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.graph.ObjectToOffsetMapping):70 -> a
     38:39:com.android.tools.r8.utils.Timing rewriteJumboStringsAndComputeDebugRepresentationWithExternalStringIds(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.graph.ObjectToOffsetMapping):72:73 -> a
     40:75:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):100:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/ph0;)V"}
     76:76:boolean com.android.tools.r8.dex.VirtualFile.isEmpty():306:306 -> a
     76:76:com.android.tools.r8.dex.FileWriter$DexContainerSection writeVirtualFileSection(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List,int,com.android.tools.r8.dex.DexOutputBuffer,boolean):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -61007,7 +61007,7 @@
     170:170:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):163 -> a
     171:179:void writeVirtualFiles(java.util.concurrent.ExecutorService,java.util.List,java.util.List,com.android.tools.r8.utils.Timing):167:175 -> a
     180:180:com.android.tools.r8.dex.FileWriter$DexContainerSection writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,int,boolean):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/dex/y;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/lh0;IZ)Lcom/android/tools/r8/dex/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/dex/y;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/ph0;IZ)Lcom/android/tools/r8/dex/G;"}
     181:181:com.android.tools.r8.dex.CodeToKeep com.android.tools.r8.dex.ApplicationWriter.getDesugaredLibraryCodeToKeep():209:209 -> a
     181:181:com.android.tools.r8.dex.FileWriter$DexContainerSection writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,int,boolean):276 -> a
     182:188:com.android.tools.r8.dex.FileWriter$DexContainerSection writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,int,boolean):276:282 -> a
@@ -61051,7 +61051,7 @@
 com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.dex.n:
 # {"id":"sourceFile","fileName":"ClassesChecksum.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -61063,13 +61063,13 @@
     29:29:java.util.Set com.android.tools.r8.com.google.gson.JsonObject.entrySet():135:135 -> a
     29:29:void append(com.android.tools.r8.com.google.gson.JsonObject):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;)V"}
     30:30:java.util.Set com.android.tools.r8.com.google.gson.JsonObject.entrySet():135:135 -> a
     30:30:void append(com.android.tools.r8.com.google.gson.JsonObject):31 -> a
     31:32:void append(com.android.tools.r8.com.google.gson.JsonObject) -> a
     33:33:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry.getKey():389:389 -> a
     33:33:void lambda$toJsonString$1(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry):52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/internal/dT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/internal/hT;)V"}
     34:34:void lambda$toJsonString$1(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry):52:52 -> a
     35:35:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry.getLongValue():393:393 -> a
     35:35:void lambda$toJsonString$1(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry):52 -> a
@@ -61078,7 +61078,7 @@
 # {"id":"sourceFile","fileName":"CodeToKeep.java"}
     1:1:void <init>():28:28 -> <init>
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
@@ -61118,7 +61118,7 @@
     33:35:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):138:140 -> a
     33:35:void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass):148 -> a
     36:40:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):174:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     41:43:java.lang.String convertType(com.android.tools.r8.graph.DexType):166:168 -> a
     41:43:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):178 -> a
     44:55:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):178:189 -> a
@@ -61181,7 +61181,7 @@
     5:5:void recordMethod(com.android.tools.r8.graph.DexMethod):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     6:6:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):245:245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
 com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.dex.s:
 # {"id":"sourceFile","fileName":"CompatByteBuffer.java"}
     java.nio.ByteBuffer buffer -> a
@@ -61225,21 +61225,21 @@
 # {"id":"sourceFile","fileName":"Constants.java"}
     byte[] DEX_FILE_MAGIC_PREFIX -> a
     com.android.tools.r8.cf.CfVersion CORRESPONDING_CLASS_FILE_VERSION -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     1:15:void <clinit>():11:25 -> <clinit>
 com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.dex.u:
 # {"id":"sourceFile","fileName":"DebugBytecodeWriter.java"}
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/r5;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.DexDebugInfoForWriting info -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/Z0;"}
     java.nio.ByteBuffer buffer -> e
     1:6:void <init>(com.android.tools.r8.graph.DexDebugInfoForWriting,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):27:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z0;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z0;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     1:2:byte[] generate():36:37 -> a
     3:6:void maybeGrow(int):41:44 -> a
     1:2:void putByte(int):49:50 -> b
@@ -61263,17 +61263,17 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.util.Collection getAnnotationDirectoryLayout():50 -> a
     4:7:java.util.Collection getCodeLayoutForClasses(java.util.Collection):110:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E30;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I30;)Ljava/util/ArrayList;"}
     8:8:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator.next():1170:1170 -> a
     8:8:java.util.Collection getCodeLayoutForClasses(java.util.Collection):113 -> a
     9:27:java.util.Collection getCodeLayoutForClasses(java.util.Collection):113:131 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     28:28:java.util.Collection getCodeLayoutForClasses(java.util.Collection):131 -> a
     29:29:java.util.Collection getCodeLayoutForClasses(java.util.Collection):133:133 -> a
     30:33:java.util.Collection getCodeLayoutForClasses(java.util.Collection):132:135 -> a
     34:37:void lambda$getCodeLayoutForClasses$0(com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):117:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/v;Ljava/util/List;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/v;Ljava/util/List;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     38:38:void lambda$getCodeLayoutForClasses$0(com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):120 -> a
     39:39:void com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts.addCode(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):82:82 -> a
     39:39:void lambda$getCodeLayoutForClasses$0(com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):121 -> a
@@ -61282,7 +61282,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:41:void com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts.addCode(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):82:82 -> a
     41:41:void lambda$getCodeLayoutForClasses$0(com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):121 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     42:42:void com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts.addCode(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):82 -> a
     42:42:void lambda$getCodeLayoutForClasses$0(com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):121 -> a
     43:43:void com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy$DeduplicatedCodeCounts.addCode(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):82:82 -> a
@@ -61377,7 +61377,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:int getCount(com.android.tools.r8.graph.ProgramMethod):96:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)I"}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     3:3:int getCount(com.android.tools.r8.graph.ProgramMethod):97 -> a
     4:4:int getCount(com.android.tools.r8.graph.ProgramMethod):98:98 -> a
     5:13:int getCount(com.android.tools.r8.graph.ProgramMethod):97:105 -> a
@@ -61493,23 +61493,23 @@
     com.android.tools.r8.graph.ClassKind classKind -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/V;"}
     com.android.tools.r8.utils.InternalOptions options -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap checksums -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     com.android.tools.r8.graph.OffsetToObjectMapping indexedItems -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/s5;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap offsetMap -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap nonPcBasedDebugInfo -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions):147:147 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/iB;)V"}
     2:2:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions,int,com.android.tools.r8.dex.DexParser):155:155 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/gB;ILcom/android/tools/r8/dex/C;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/iB;ILcom/android/tools/r8/dex/C;)V"}
     3:6:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions,int,com.android.tools.r8.dex.DexParser):131:134 -> <init>
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     7:7:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions,int,com.android.tools.r8.dex.DexParser):134 -> <init>
@@ -61759,7 +61759,7 @@
     270:271:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):761 -> a
     272:275:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):763:766 -> a
     276:287:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):765:776 -> a
-    288:288:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    288:288:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     288:288:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):777 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     289:289:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1572:1572 -> a
@@ -62414,7 +62414,7 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1487:1487 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/internal/iB;)V"}
     2:39:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1458:1495 -> <init>
     40:40:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):192:192 -> <init>
     40:40:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1496 -> <init>
@@ -62659,19 +62659,19 @@
 com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.D:
 # {"id":"sourceFile","fileName":"DexReader.java"}
     com.android.tools.r8.utils.DexVersion version -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     1:1:void com.android.tools.r8.dex.BinaryReader.<init>(com.android.tools.r8.ProgramResource):22:22 -> <init>
     1:1:void <init>(com.android.tools.r8.ProgramResource):27 -> <init>
     2:2:void <init>(com.android.tools.r8.ProgramResource):28:28 -> <init>
     3:4:void <init>(com.android.tools.r8.origin.Origin,byte[]):37:38 -> <init>
     5:6:void <init>(com.android.tools.r8.origin.Origin,byte[],int):42:43 -> <init>
     1:43:com.android.tools.r8.utils.DexVersion parseMagic(com.android.tools.r8.dex.CompatByteBuffer,int):49:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;I)Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;I)Lcom/android/tools/r8/internal/cm;"}
     44:44:com.android.tools.r8.utils.DexVersion parseMagic(com.android.tools.r8.dex.CompatByteBuffer,int):89:89 -> a
     45:45:com.android.tools.r8.utils.DexVersion parseMagic(com.android.tools.r8.dex.CompatByteBuffer,int):81:81 -> a
     46:46:com.android.tools.r8.utils.DexVersion parseMagic(com.android.tools.r8.dex.CompatByteBuffer,int):52:52 -> a
     1:1:com.android.tools.r8.utils.DexVersion getDexVersion():109:109 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cm;"}
     1:7:void setByteOrder():97:103 -> j
 com.android.tools.r8.dex.DexSection -> com.android.tools.r8.dex.E:
 # {"id":"sourceFile","fileName":"DexSection.java"}
@@ -62709,11 +62709,11 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/r5;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.dex.DexOutputBuffer dest -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/y;"}
     com.android.tools.r8.dex.FileWriter$MixedSectionOffsets mixedSectionOffsets -> f
@@ -62952,7 +62952,7 @@
     148:148:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):226:226 -> a
     149:152:com.android.tools.r8.dex.FileWriter$SizeAndCount sizeAndCountOfCodeItems(java.lang.Iterable):475:478 -> a
     149:152:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):229 -> a
-    153:153:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+    153:153:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     153:153:com.android.tools.r8.dex.FileWriter$SizeAndCount sizeAndCountOfCodeItems(java.lang.Iterable):478 -> a
     153:153:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):229 -> a
     154:155:com.android.tools.r8.dex.FileWriter$SizeAndCount sizeAndCountOfCodeItems(java.lang.Iterable):478:479 -> a
@@ -63049,7 +63049,7 @@
     218:218:boolean com.android.tools.r8.dex.DexOutputBuffer.isAligned(int):186:186 -> a
     218:218:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):251 -> a
     219:223:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):251:255 -> a
-    224:224:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2772:2772 -> a
+    224:224:boolean com.android.tools.r8.utils.InternalOptions.canUseCanonicalizedCodeObjects():2778:2778 -> a
     224:224:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):255 -> a
     225:231:com.android.tools.r8.dex.FileWriter$DexContainerSection generate(int,com.android.tools.r8.utils.DexVersion$Layout):256:262 -> a
     232:232:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,int):1654:1654 -> a
@@ -63520,7 +63520,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     691:691:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1671:1671 -> a
     691:691:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):651 -> a
-    692:692:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3216:3216 -> a
+    692:692:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3222:3222 -> a
     692:692:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1671 -> a
     692:692:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):651 -> a
     693:693:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1671:1671 -> a
@@ -63706,11 +63706,11 @@
     836:836:void checkThatInvokeCustomIsAllowed():1720:1720 -> a
     836:836:void writeCallSite(com.android.tools.r8.graph.DexCallSite):797 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)V"}
-    837:837:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> a
-    837:837:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609 -> a
+    837:837:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> a
+    837:837:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615 -> a
     837:837:void checkThatInvokeCustomIsAllowed():1720 -> a
     837:837:void writeCallSite(com.android.tools.r8.graph.DexCallSite):797 -> a
-    838:838:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609:2609 -> a
+    838:838:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615:2615 -> a
     838:838:void checkThatInvokeCustomIsAllowed():1720 -> a
     838:838:void writeCallSite(com.android.tools.r8.graph.DexCallSite):797 -> a
     839:839:void writeCallSite(com.android.tools.r8.graph.DexCallSite):798:798 -> a
@@ -63738,11 +63738,11 @@
     851:851:void checkThatInvokeCustomIsAllowed():1720:1720 -> a
     851:851:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):771 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y2;)V"}
-    852:852:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> a
-    852:852:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609 -> a
+    852:852:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> a
+    852:852:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615 -> a
     852:852:void checkThatInvokeCustomIsAllowed():1720 -> a
     852:852:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):771 -> a
-    853:853:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609:2609 -> a
+    853:853:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615:2615 -> a
     853:853:void checkThatInvokeCustomIsAllowed():1720 -> a
     853:853:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):771 -> a
     854:859:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):773:778 -> a
@@ -64143,35 +64143,35 @@
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.J:
 # {"id":"sourceFile","fileName":"FileWriter.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap codes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap debugInfos -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap typeLists -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap stringData -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap annotations -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap annotationSets -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap annotationSetRefLists -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap annotationDirectories -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classesWithData -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     java.util.Map classToAnnotationDirectory -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map classToStaticFieldValues -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.InternalOptions options -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():1397:1397 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):1433:1433 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1428:1428 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions):1402 -> <init>
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():140:140 -> <init>
@@ -64200,11 +64200,11 @@
     20:20:void <init>(com.android.tools.r8.utils.InternalOptions):1412 -> <init>
     21:43:void <init>(com.android.tools.r8.utils.InternalOptions):1412:1434 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1422:1422 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SS;"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defaultReturnValue(int):44:44 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1423 -> a
     3:4:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1438:1439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;Ljava/lang/Object;)Z"}
     5:5:boolean add(com.android.tools.r8.graph.DexProgramClass):1455:1455 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     6:7:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1446:1447 -> a
@@ -64213,7 +64213,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f1;)Z"}
     9:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1465:1465 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;)Z"}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3216:3216 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3222:3222 -> a
     10:10:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1465 -> a
     11:14:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1465:1468 -> a
     15:15:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode):1478:1478 -> a
@@ -64231,11 +64231,11 @@
     28:30:void setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1510:1512 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/s0;)V"}
     31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1580:1581 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/M20;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/Q20;)I"}
     33:34:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1640:1641 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;ILcom/android/tools/r8/internal/U0;)V"}
     35:36:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1645:1646 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;ILcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;ILcom/android/tools/r8/internal/Q20;)V"}
     1:1:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection):784:784 -> b
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):1473 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -64255,15 +64255,15 @@
     10:11:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection):789 -> b
     10:11:void visit(com.android.tools.r8.graph.DexEncodedMethod):1473 -> b
     12:12:java.util.Collection getStringData():1540:1540 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I30;"}
     13:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.keySet():76:76 -> b
     13:13:java.util.Collection getStringData():1540 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:15:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1571:1572 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;Ljava/lang/Object;)I"}
     16:16:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1622:1622 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;)I"}
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3216:3216 -> b
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3222:3222 -> b
     17:17:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1622 -> b
     18:21:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1622:1625 -> b
 com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.dex.K:
@@ -64305,14 +64305,14 @@
     com.android.tools.r8.graph.AppView appView -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.IntBox nextFileId -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sz;"}
     com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo directSubClasses -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/P;"}
     java.util.Comparator DEX_PROGRAM_CLASS_COMPARATOR -> j
     boolean $assertionsDisabled -> k
     1:3:void <clinit>():42:44 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.VirtualFile,java.util.List,java.util.List,java.util.Set,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):296:296 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Ljava/util/ArrayList;Ljava/util/List;Ljava/util/Set;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Ljava/util/ArrayList;Ljava/util/List;Ljava/util/Set;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     2:24:void <init>(com.android.tools.r8.dex.VirtualFile,java.util.List,java.util.List,java.util.Set,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):283:305 -> <init>
     1:1:int lambda$static$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):45:45 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)I"}
@@ -64663,13 +64663,13 @@
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo debugEventBasedInfo -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/W0$a;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap debugEventTargets -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.Map payloadToSwitch -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map tryTargets -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap tryRangeStartAndEndTargets -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.Map handlerTargets -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> l
@@ -64896,7 +64896,7 @@
 com.android.tools.r8.dex.Marker -> com.android.tools.r8.dex.W:
 # {"id":"sourceFile","fileName":"Marker.java"}
     com.android.tools.r8.com.google.gson.JsonObject jsonObject -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XC;"}
     com.android.tools.r8.dex.Marker$Tool tool -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W$b;"}
     java.lang.String D8_PREFIX -> c
@@ -64910,7 +64910,7 @@
     2:4:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.com.google.gson.JsonObject):64:66 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.Marker$Tool):61 -> <init>
     5:7:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.com.google.gson.JsonObject):64:66 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/internal/VC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/internal/XC;)V"}
     1:1:com.android.tools.r8.dex.Marker setVersion(java.lang.String):94:94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/dex/W;"}
     2:2:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> a
@@ -64949,7 +64949,7 @@
     18:18:java.lang.String getBackend():178 -> a
     19:31:java.lang.String getBackend():178:190 -> a
     32:32:void lambda$toString$0(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):257:257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/util/Map$Entry;)V"}
     33:45:com.android.tools.r8.dex.Marker parse(com.android.tools.r8.graph.DexString):282:294 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/dex/W;"}
     46:46:boolean hasMarkerPrefix(byte[]):301:301 -> a
@@ -65168,17 +65168,17 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.naming.NamingLens namingLens -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/r0;"}
     com.android.tools.r8.utils.InternalOptions options -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():33:33 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):41:46 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:6:boolean shouldAdapt(com.android.tools.r8.DataEntryResource,com.android.tools.r8.utils.InternalOptions,java.util.function.Function):92:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DataEntryResource;Lcom/android/tools/r8/internal/gB;Ljava/util/function/Function;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DataEntryResource;Lcom/android/tools/r8/internal/iB;Ljava/util/function/Function;)Z"}
     7:7:boolean com.android.tools.r8.shaking.ProguardPathFilter.isEnabled():55:55 -> a
     7:7:boolean shouldAdapt(com.android.tools.r8.DataEntryResource,com.android.tools.r8.utils.InternalOptions,java.util.function.Function):98 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -65247,7 +65247,7 @@
     int outputFrom -> d
     int position -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack prefixEndPositionsExclusive -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     com.android.tools.r8.dex.ResourceAdapter this$0 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/f0;"}
     boolean $assertionsDisabled -> h
@@ -65358,19 +65358,19 @@
 com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy -> com.android.tools.r8.dex.h0:
 # {"id":"sourceFile","fileName":"StartupMixedSectionLayoutStrategy.java"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfileForWriting -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     java.util.LinkedHashSet annotationLayout -> f
     java.util.LinkedHashSet annotationDirectoryLayout -> g
     java.util.LinkedHashSet annotationSetLayout -> h
     java.util.LinkedHashSet annotationSetRefListLayout -> i
     java.util.LinkedHashSet classDataLayout -> j
     com.android.tools.r8.utils.collections.LinkedProgramMethodSet codeLayout -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dK;"}
     java.util.LinkedHashSet encodedArrayLayout -> l
     java.util.LinkedHashSet stringDataLayout -> m
     java.util.LinkedHashSet typeListLayout -> n
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.dex.VirtualFile):56:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/J;Lcom/android/tools/r8/internal/yd0;Lcom/android/tools/r8/dex/t0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/J;Lcom/android/tools/r8/internal/Cd0;Lcom/android/tools/r8/dex/t0;)V"}
     6:6:java.util.Collection com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.getAnnotations():1544:1544 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.dex.VirtualFile):60 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -65495,7 +65495,7 @@
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.getReference():51:51 -> a
     1:1:void collectStartupItems(com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/Bd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/Fd0;)V"}
     2:12:void collectStartupItems(com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map):97:107 -> a
     13:13:void collectStartupItems(com.android.tools.r8.dex.VirtualFile):78:78 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;)V"}
@@ -65512,7 +65512,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Lcom/android/tools/r8/graph/I2;)V"}
     26:30:void collectStartupItems(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):121:125 -> a
     26:30:void lambda$collectStartupItems$3(com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/Dd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/Hd0;)V"}
     31:32:boolean com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection.addCode(com.android.tools.r8.graph.ProgramMethod):224:225 -> a
     31:32:void collectStartupItems(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):126 -> a
     31:32:void lambda$collectStartupItems$3(com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):89 -> a
@@ -65547,7 +65547,7 @@
     43:43:void lambda$collectStartupItems$1(com.android.tools.r8.dex.VirtualFile,java.util.function.BiConsumer):81 -> a
     44:44:void lambda$collectStartupItems$1(com.android.tools.r8.dex.VirtualFile,java.util.function.BiConsumer):81:81 -> a
     1:1:void lambda$collectStartupItems$2(com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):87:87 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/Bd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/g0;Ljava/util/Map;Lcom/android/tools/r8/internal/Fd0;)V"}
     2:2:java.util.Collection getAnnotationLayout():142:142 -> b
     3:3:java.util.Collection com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy.getAnnotationLayout():45:45 -> b
     3:3:java.util.Collection getAnnotationLayout():142 -> b
@@ -65680,7 +65680,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;)V"}
     6:6:void addAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):192:192 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;)V"}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3216:3216 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikEmptyAnnotationSetBug():3222:3222 -> a
     7:7:void addAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):192 -> a
     8:9:void addAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):192:193 -> a
     10:11:void addAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):198:199 -> a
@@ -65719,17 +65719,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/n0;"}
     com.android.tools.r8.FeatureSplit featureSplit -> d
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     com.android.tools.r8.graph.DexString primaryClassDescriptor -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.debuginfo.DebugRepresentation debugRepresentation -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xh;"}
     com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/r5;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():70:70 -> <clinit>
     1:109:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.FeatureSplit,com.android.tools.r8.profile.startup.profile.StartupProfile):107:215 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/FeatureSplit;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/FeatureSplit;Lcom/android/tools/r8/internal/Cd0;)V"}
     110:120:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.FeatureSplit,com.android.tools.r8.profile.startup.profile.StartupProfile):108:118 -> <init>
     121:121:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> <init>
     121:121:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.FeatureSplit,com.android.tools.r8.profile.startup.profile.StartupProfile):119 -> <init>
@@ -65744,12 +65744,12 @@
     200:200:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):178:178 -> a
     201:201:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):178:178 -> a
     202:203:java.util.Map computeOriginalNameMapping(java.util.Collection,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.ClassNameMapper):204:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/naming/b;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/naming/b;)Ljava/util/IdentityHashMap;"}
     204:207:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):207:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/Map;Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/Map;Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/D2;)V"}
     208:208:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass) -> a
     209:211:void computeMapping(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.ObjectToOffsetMapping):234:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/r5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/r5;)V"}
     212:212:void addClass(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     213:213:void com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):1017:1017 -> a
@@ -65835,11 +65835,11 @@
     com.android.tools.r8.dex.VirtualFile mainDexFile -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/t0;"}
     com.android.tools.r8.utils.InternalOptions options -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():392:392 -> <clinit>
     1:14:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):403:416 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Cd0;)V"}
     15:15:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):415:415 -> <init>
     1:1:void fillForMainDexList(java.util.Set):420:420 -> a
     2:2:boolean com.android.tools.r8.shaking.MainDexInfo.isEmpty():225:225 -> a
@@ -65912,7 +65912,7 @@
     37:37:void com.android.tools.r8.dex.VirtualFile.commitTransaction():294:294 -> a
     37:37:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):432 -> a
     38:49:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):465:476 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Cd0;)V"}
     50:50:void com.android.tools.r8.dex.VirtualFile.<init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.FeatureSplit):92:92 -> a
     50:50:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):476 -> a
     51:54:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):477:480 -> a
@@ -65969,11 +65969,11 @@
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
     java.util.concurrent.ExecutorService executorService -> i
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():494:494 -> <clinit>
     1:3:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.profile.startup.profile.StartupProfile):505:507 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Cd0;)V"}
     1:2:java.util.List run():512:513 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
     3:3:boolean com.android.tools.r8.dex.VirtualFile.isEmpty():306:306 -> a
@@ -66031,7 +66031,7 @@
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection base -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/s0;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils rewriter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BJ;"}
     java.util.Set classes -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashSet;"}
     java.util.Set fields -> e
@@ -66106,7 +66106,7 @@
 com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.dex.o0:
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions):567:567 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/k;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;)V"}
     1:6:java.util.List run():573:578 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
     7:7:void com.android.tools.r8.dex.VirtualFile.commitTransaction():294:294 -> a
@@ -66173,15 +66173,15 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.dex.VirtualFile$VirtualFileCycler cycler -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/r0;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():1305:1305 -> <clinit>
     1:8:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.utils.IntBox):1420:1427 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;Lcom/android/tools/r8/graph/y;Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/yd0;Lcom/android/tools/r8/internal/Qz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;Lcom/android/tools/r8/graph/y;Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Cd0;Lcom/android/tools/r8/internal/Sz;)V"}
     1:1:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():1226:1226 -> a
     1:1:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1671 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -66432,7 +66432,7 @@
     182:182:void distributeClasses(java.util.List):1501:1501 -> a
     183:188:java.lang.String extractPrefixToken(int,java.lang.String,boolean):1612:1617 -> a
     189:189:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1634:1634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/iB;)Z"}
     190:190:int com.android.tools.r8.dex.VirtualFile.getNumberOfClasses():277:277 -> a
     190:190:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1635 -> a
     191:191:int com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction.getNumberOfClasses():1090:1090 -> a
@@ -66457,7 +66457,7 @@
     1:3:void <init>(java.util.List,java.util.List):1318:1320 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
     1:2:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1329:1330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/dex/p0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/dex/p0;"}
     3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Comparator,java.util.function.Predicate):1337:1348 -> a
     3:14:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,java.util.Map,com.android.tools.r8.profile.startup.profile.StartupProfile):1327 -> a
     15:15:java.util.Comparator getClassesByPackageComparator(java.util.Map):1353:1353 -> a
@@ -66465,9 +66465,9 @@
     16:38:int lambda$getClassesByPackageComparator$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1354:1376 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)I"}
     39:39:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.profile.startup.profile.StartupProfile):1382:1382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)Ljava/util/function/Predicate;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)Ljava/util/function/Predicate;"}
     40:40:boolean lambda$getStartupClassPredicate$1(com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.DexProgramClass):1382:1382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;Lcom/android/tools/r8/graph/D2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;Lcom/android/tools/r8/graph/D2;)Z"}
 com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.dex.r0:
 # {"id":"sourceFile","fileName":"VirtualFile.java"}
     java.util.List files -> a
@@ -66477,16 +66477,16 @@
     com.android.tools.r8.graph.AppView appView -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.IntBox nextFileId -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sz;"}
     java.util.Iterator allFilesCyclic -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qC;"}
     java.util.Iterator activeFiles -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uC;"}
     com.android.tools.r8.FeatureSplit featureSplit -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():1187:1187 -> <clinit>
     1:8:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.IntBox):1202:1209 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Qz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/List;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Sz;)V"}
     9:9:com.android.tools.r8.FeatureSplit com.android.tools.r8.dex.VirtualFile.getFeatureSplit():144:144 -> <init>
     9:9:void <init>(java.util.List,java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.IntBox):1209 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -66599,7 +66599,7 @@
 com.android.tools.r8.dex.code.CfOrDexInstruction -> com.android.tools.r8.dex.code.c:
 # {"id":"sourceFile","fileName":"CfOrDexInstruction.java"}
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B9;"}
     com.android.tools.r8.dex.code.DexInstruction asDexInstruction() -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/z1;"}
 com.android.tools.r8.dex.code.CfOrDexStaticFieldRead -> com.android.tools.r8.dex.code.d:
@@ -66611,7 +66611,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddDouble2Addr -> com.android.tools.r8.dex.code.e:
@@ -66621,9 +66621,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddFloat -> com.android.tools.r8.dex.code.h:
@@ -66633,7 +66633,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddFloat2Addr -> com.android.tools.r8.dex.code.g:
@@ -66643,9 +66643,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddInt -> com.android.tools.r8.dex.code.j:
@@ -66655,7 +66655,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddInt2Addr -> com.android.tools.r8.dex.code.i:
@@ -66665,9 +66665,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddIntLit16 -> com.android.tools.r8.dex.code.k:
@@ -66677,7 +66677,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddIntLit8 -> com.android.tools.r8.dex.code.l:
@@ -66687,7 +66687,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddLong -> com.android.tools.r8.dex.code.n:
@@ -66697,7 +66697,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAddLong2Addr -> com.android.tools.r8.dex.code.m:
@@ -66707,9 +66707,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAget -> com.android.tools.r8.dex.code.o:
@@ -66719,7 +66719,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66730,7 +66730,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66741,7 +66741,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66752,7 +66752,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66763,7 +66763,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66774,7 +66774,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66785,7 +66785,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66796,7 +66796,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAndInt2Addr -> com.android.tools.r8.dex.code.v:
@@ -66806,9 +66806,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAndIntLit16 -> com.android.tools.r8.dex.code.x:
@@ -66818,7 +66818,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAndIntLit8 -> com.android.tools.r8.dex.code.y:
@@ -66828,7 +66828,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAndLong -> com.android.tools.r8.dex.code.A:
@@ -66838,7 +66838,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAndLong2Addr -> com.android.tools.r8.dex.code.z:
@@ -66848,9 +66848,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexAput -> com.android.tools.r8.dex.code.B:
@@ -66860,7 +66860,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66871,7 +66871,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66882,7 +66882,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66893,7 +66893,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66904,7 +66904,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66915,7 +66915,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66926,7 +66926,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -66937,9 +66937,9 @@
     2:2:void <init>(int,int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8:8 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addArrayLength(int,int):1153:1153 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addArrayLength(int,int):1153:1153 -> a
@@ -67217,9 +67217,9 @@
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     6:6:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
@@ -67229,7 +67229,7 @@
     9:9:void registerUse(com.android.tools.r8.graph.UseRegistry):98 -> a
     10:10:void registerUse(com.android.tools.r8.graph.UseRegistry):98:98 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     12:12:void com.android.tools.r8.ir.conversion.IRBuilder.addCheckCast(int,com.android.tools.r8.graph.DexType):1172:1172 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -67247,7 +67247,7 @@
     2:2:void <init>(int,int,int):21:21 -> <init>
     1:1:java.lang.String getSmaliName():31:31 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexCmpgDouble -> com.android.tools.r8.dex.code.Q:
@@ -67257,7 +67257,7 @@
     2:2:void <init>(int,int,int):21:21 -> <init>
     1:1:java.lang.String getSmaliName():31:31 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexCmpgFloat -> com.android.tools.r8.dex.code.S:
@@ -67267,7 +67267,7 @@
     2:2:void <init>(int,int,int):21:21 -> <init>
     1:1:java.lang.String getSmaliName():31:31 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexCmplDouble -> com.android.tools.r8.dex.code.T:
@@ -67277,7 +67277,7 @@
     2:2:void <init>(int,int,int):21:21 -> <init>
     1:1:java.lang.String getSmaliName():31:31 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexCmplFloat -> com.android.tools.r8.dex.code.U:
@@ -67287,7 +67287,7 @@
     2:2:void <init>(int,int,int):21:21 -> <init>
     1:1:java.lang.String getSmaliName():31:31 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexCompareHelper -> com.android.tools.r8.dex.code.V:
@@ -67307,11 +67307,11 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:int decodedValue():43:43 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):61:62 -> a
     4:4:int decodedValue():43:43 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     6:6:int decodedValue():43:43 -> a
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67320,7 +67320,7 @@
     9:9:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     10:10:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:int decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67337,14 +67337,14 @@
     2:2:void <init>(int,int):23:23 -> <init>
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:int decodedValue():43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):55:56 -> a
     5:5:int decodedValue():43:43 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:int decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67362,15 +67362,15 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     boolean isDexConst4() -> G
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:int decodedValue():43:43 -> a
     3:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):64:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):64:64 -> a
     6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):58:59 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):58:58 -> b
     com.android.tools.r8.dex.code.DexConst4 asDexConst4() -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/X;"}
@@ -67389,9 +67389,9 @@
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     6:6:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:83 -> a
@@ -67401,7 +67401,7 @@
     9:9:void registerUse(com.android.tools.r8.graph.UseRegistry):88 -> a
     10:10:void registerUse(com.android.tools.r8.graph.UseRegistry):88:88 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:com.android.tools.r8.graph.DexType lambda$internalSubSpecify$0(com.android.tools.r8.dex.code.DexFormat21c):39:39 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.dex.code.DexConstClass asConstClass() -> c
@@ -67417,11 +67417,11 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:int decodedValue():43:43 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):61:62 -> a
     4:4:int decodedValue():43:43 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     6:6:int decodedValue():43:43 -> a
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67430,7 +67430,7 @@
     9:9:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     10:10:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:int decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67459,7 +67459,7 @@
     1:1:java.lang.String getSmaliName():47:47 -> A
     1:1:com.android.tools.r8.graph.DexMethodHandle getMethodHandle():37:37 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103:103 -> a
     3:3:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):123:123 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):103 -> a
@@ -67470,7 +67470,7 @@
     6:6:void registerUse(com.android.tools.r8.graph.UseRegistry):72:72 -> a
     7:7:com.android.tools.r8.graph.DexMethodHandle getMethodHandle():37:37 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
     9:9:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):123:123 -> a
     9:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
@@ -67489,13 +67489,13 @@
     16:16:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     17:17:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:com.android.tools.r8.graph.DexMethodHandle lambda$internalSubSpecify$0(com.android.tools.r8.dex.code.DexFormat21c):57:57 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)Lcom/android/tools/r8/graph/y2;"}
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):62:62 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():42:42 -> u
     int getOpcode() -> x
@@ -67516,7 +67516,7 @@
     1:1:java.lang.String getSmaliName():46:46 -> A
     1:1:com.android.tools.r8.graph.DexProto getMethodType():36:36 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):98:99 -> a
     4:6:void com.android.tools.r8.graph.DexProto.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):117:119 -> a
     4:6:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):99 -> a
@@ -67526,7 +67526,7 @@
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):71:71 -> a
     9:9:com.android.tools.r8.graph.DexProto getMethodType():36:36 -> a
     9:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     10:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82:83 -> a
     12:12:int com.android.tools.r8.graph.ObjectToOffsetMapping.getOffsetFor(com.android.tools.r8.graph.DexProto):429:429 -> a
     12:12:int com.android.tools.r8.graph.DexProto.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):125 -> a
@@ -67543,13 +67543,13 @@
     18:18:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     19:19:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     20:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:com.android.tools.r8.graph.DexProto lambda$internalSubSpecify$0(com.android.tools.r8.dex.code.DexFormat21c):56:56 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)Lcom/android/tools/r8/graph/E2;"}
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():41:41 -> u
     int getOpcode() -> x
@@ -67574,13 +67574,13 @@
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):40:40 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     6:6:int com.android.tools.r8.graph.ObjectToOffsetMapping.getOffsetFor(com.android.tools.r8.graph.DexString):441:441 -> a
     6:6:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):433 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -67594,7 +67594,7 @@
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):101:101 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):98:98 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1262 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -67603,7 +67603,7 @@
     1:1:com.android.tools.r8.graph.DexString lambda$internalSubSpecify$0(com.android.tools.r8.dex.code.DexFormat21c):40:40 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)Lcom/android/tools/r8/graph/H2;"}
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     com.android.tools.r8.dex.code.DexConstString asConstString() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/d0;"}
     boolean canThrow() -> i
@@ -67627,16 +67627,16 @@
     1:1:com.android.tools.r8.graph.DexString getString():26:26 -> Q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     1:1:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1262 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:6:void com.android.tools.r8.ir.conversion.IRBuilder.addConstString(int,com.android.tools.r8.graph.DexString):1262:1264 -> a
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     com.android.tools.r8.dex.code.DexConstStringJumbo asConstStringJumbo() -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/e0;"}
     boolean canThrow() -> i
@@ -67650,7 +67650,7 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:long decodedValue():43:43 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:long decodedValue():43:43 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67659,12 +67659,12 @@
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     9:9:long decodedValue():43:43 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:long decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67681,10 +67681,10 @@
     2:2:void <init>(int,int):23:23 -> <init>
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:long decodedValue():43:43 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     4:4:long decodedValue():43:43 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67693,12 +67693,12 @@
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     8:8:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     10:10:long decodedValue():43:43 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:long decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67716,7 +67716,7 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:long decodedValue():43:43 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:long decodedValue():43:43 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67725,12 +67725,12 @@
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     9:9:long decodedValue():43:43 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:long decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67748,7 +67748,7 @@
     1:1:java.lang.String getSmaliName():33:33 -> A
     1:1:long decodedValue():43:43 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:long decodedValue():43:43 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
@@ -67757,12 +67757,12 @@
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):55:55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     9:9:long decodedValue():43:43 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):48:48 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:long decodedValue():43:43 -> b
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):49:49 -> b
@@ -67779,7 +67779,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDivDouble2Addr -> com.android.tools.r8.dex.code.j0:
@@ -67789,9 +67789,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDivFloat -> com.android.tools.r8.dex.code.m0:
@@ -67801,7 +67801,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDivFloat2Addr -> com.android.tools.r8.dex.code.l0:
@@ -67811,9 +67811,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDivInt -> com.android.tools.r8.dex.code.o0:
@@ -67823,7 +67823,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67834,9 +67834,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67847,7 +67847,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67858,7 +67858,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67869,7 +67869,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67880,9 +67880,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67893,9 +67893,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDoubleToInt -> com.android.tools.r8.dex.code.u0:
@@ -67905,9 +67905,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexDoubleToLong -> com.android.tools.r8.dex.code.v0:
@@ -67917,9 +67917,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexFillArrayData -> com.android.tools.r8.dex.code.w0:
@@ -67929,7 +67929,7 @@
     2:2:void <init>(int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:int com.android.tools.r8.dex.code.DexFormat31t.getPayloadOffset():61:61 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.resolveAndBuildNewArrayFilledData(int,int):966:966 -> a
@@ -67938,7 +67938,7 @@
     4:4:void com.android.tools.r8.ir.conversion.IRBuilder.resolveAndBuildNewArrayFilledData(int,int):966:966 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -67973,7 +67973,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63:63 -> a
     6:6:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> a
@@ -67981,12 +67981,12 @@
     9:9:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     9:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):66 -> a
     10:39:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):106:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     40:40:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int):354:354 -> a
     40:40:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):135 -> a
     41:51:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):135:145 -> a
     52:52:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):151:151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:long lambda$specify$1(com.android.tools.r8.dex.code.DexFillArrayDataPayload):26:26 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/x0;)J"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):77:77 -> b
@@ -67994,7 +67994,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):77 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:short[] lambda$specify$2(com.android.tools.r8.dex.code.DexFillArrayDataPayload):26:26 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/x0;)[S"}
     1:3:int hashCode():83:85 -> hashCode
@@ -68007,13 +68007,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:com.android.tools.r8.graph.DexType getType():58:58 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     3:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:54 -> a
     5:5:com.android.tools.r8.graph.DexType getType():58:58 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
     7:15:void com.android.tools.r8.ir.conversion.IRBuilder.addNewArrayFilled(com.android.tools.r8.graph.DexType,int,int[]):1637:1645 -> a
     7:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63 -> a
@@ -68024,7 +68024,7 @@
     17:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63 -> a
     24:24:com.android.tools.r8.graph.DexType getType():58:58 -> a
     24:24:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     25:26:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:80 -> a
     27:27:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     27:27:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
@@ -68042,19 +68042,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/I2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:com.android.tools.r8.graph.DexType getType():58:58 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     3:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:54 -> a
     5:5:com.android.tools.r8.graph.DexType getType():58:58 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
     7:21:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1701:1715 -> a
     7:21:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63 -> a
     22:22:com.android.tools.r8.graph.DexType getType():58:58 -> a
     22:22:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     23:24:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:80 -> a
     25:25:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     25:25:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
@@ -68071,9 +68071,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexFloatToInt -> com.android.tools.r8.dex.code.B0:
@@ -68083,9 +68083,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexFloatToLong -> com.android.tools.r8.dex.code.C0:
@@ -68095,9 +68095,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexFormat10t -> com.android.tools.r8.dex.code.D0:
@@ -68109,15 +68109,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/dex/code/A1;)V"}
     4:6:void <init>(int):28:30 -> <init>
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     2:2:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     2:2:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
@@ -68126,7 +68126,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56 -> b
     4:4:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():46:46 -> hashCode
 com.android.tools.r8.dex.code.DexFormat10x -> com.android.tools.r8.dex.code.E0:
 # {"id":"sourceFile","fileName":"DexFormat10x.java"}
@@ -68134,14 +68134,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/A1;)V"}
     2:2:void <init>():23:23 -> <init>
     1:1:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     1:1:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):38:38 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
 com.android.tools.r8.dex.code.DexFormat11n -> com.android.tools.r8.dex.code.F0:
 # {"id":"sourceFile","fileName":"DexFormat11n.java"}
     byte A -> f
@@ -68156,13 +68156,13 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     6:6:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat11n):24:24 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/F0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71:71 -> b
@@ -68170,7 +68170,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):76:76 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():61:61 -> hashCode
 com.android.tools.r8.dex.code.DexFormat11x -> com.android.tools.r8.dex.code.G0:
 # {"id":"sourceFile","fileName":"DexFormat11x.java"}
@@ -68181,15 +68181,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/dex/code/A1;)V"}
     3:5:void <init>(int):28:30 -> <init>
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     2:2:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56:56 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     2:2:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
@@ -68198,7 +68198,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56 -> b
     4:4:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():46:46 -> hashCode
 com.android.tools.r8.dex.code.DexFormat12x -> com.android.tools.r8.dex.code.H0:
 # {"id":"sourceFile","fileName":"DexFormat12x.java"}
@@ -68214,15 +68214,15 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):59:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     7:7:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat12x):24:24 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/H0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):64:64 -> b
@@ -68230,7 +68230,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):64 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):69:69 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():54:54 -> hashCode
 com.android.tools.r8.dex.code.DexFormat20t -> com.android.tools.r8.dex.code.I0:
 # {"id":"sourceFile","fileName":"DexFormat20t.java"}
@@ -68246,12 +68246,12 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):51:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     6:6:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
@@ -68263,7 +68263,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):56 -> b
     4:4:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():46:46 -> hashCode
 com.android.tools.r8.dex.code.DexFormat21c -> com.android.tools.r8.dex.code.J0:
 # {"id":"sourceFile","fileName":"DexFormat21c.java"}
@@ -68283,7 +68283,7 @@
     2:2:int lambda$internalAcceptCompareTo$0(com.android.tools.r8.dex.code.DexFormat21c):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)I"}
     3:3:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:void lambda$internalAcceptCompareTo$1(com.android.tools.r8.utils.structural.StructuralSpecification):43:43 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withSpec(com.android.tools.r8.utils.structural.StructuralMapping):27:27 -> b
@@ -68299,7 +68299,7 @@
     7:7:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     7:7:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):49 -> b
     8:8:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():34:34 -> hashCode
 com.android.tools.r8.dex.code.DexFormat21h -> com.android.tools.r8.dex.code.K0:
 # {"id":"sourceFile","fileName":"DexFormat21h.java"}
@@ -68318,7 +68318,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
@@ -68327,7 +68327,7 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat21h):24:24 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/K0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):65:65 -> b
@@ -68352,7 +68352,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
@@ -68361,9 +68361,9 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:8:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat21s):26:26 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/L0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):67:67 -> b
@@ -68371,7 +68371,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):67 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):72:72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():57:57 -> hashCode
 com.android.tools.r8.dex.code.DexFormat21t -> com.android.tools.r8.dex.code.M0:
 # {"id":"sourceFile","fileName":"DexFormat21t.java"}
@@ -68387,15 +68387,15 @@
     5:9:void <init>(int,int):38:42 -> <init>
     1:1:int[] getTargets():78:78 -> B
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.IfType getType() -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:int lambda$specify$0(com.android.tools.r8.dex.code.DexFormat21t):28:28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/M0;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):28:28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:54 -> a
@@ -68404,7 +68404,7 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):83:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1389:1389 -> a
     11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1464 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):85 -> a
@@ -68429,9 +68429,9 @@
     20:25:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1467 -> a
     20:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):85 -> a
     26:26:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     27:27:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat21t):28:28 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/M0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):69:69 -> b
@@ -68439,7 +68439,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):69 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):90:90 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():59:59 -> hashCode
 com.android.tools.r8.dex.code.DexFormat22b -> com.android.tools.r8.dex.code.N0:
 # {"id":"sourceFile","fileName":"DexFormat22b.java"}
@@ -68462,7 +68462,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56:56 -> a
@@ -68471,10 +68471,10 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:9:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     10:10:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):81:81 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat22b):27:27 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/N0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71:71 -> b
@@ -68482,7 +68482,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):76:76 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int lambda$specify$2(com.android.tools.r8.dex.code.DexFormat22b):27:27 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/N0;)I"}
     1:1:int hashCode():61:61 -> hashCode
@@ -68505,7 +68505,7 @@
     3:3:void lambda$internalAcceptHashing$3(com.android.tools.r8.utils.structural.StructuralSpecification):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat22c):23:23 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/O0;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):23:23 -> b
@@ -68515,7 +68515,7 @@
     5:5:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     5:5:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):54 -> b
     6:6:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:com.android.tools.r8.graph.DexReference lambda$specify$2(com.android.tools.r8.dex.code.DexFormat22c):23:23 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/O0;)Lcom/android/tools/r8/graph/F2;"}
     1:1:int hashCode():44:44 -> hashCode
@@ -68537,7 +68537,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56:56 -> a
@@ -68546,10 +68546,10 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:9:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     10:10:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):81:81 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat22s):27:27 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/P0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71:71 -> b
@@ -68557,7 +68557,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):71 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):76:76 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int lambda$specify$2(com.android.tools.r8.dex.code.DexFormat22s):27:27 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/P0;)I"}
     1:1:int hashCode():61:61 -> hashCode
@@ -68576,15 +68576,15 @@
     6:12:void <init>(int,int,int):40:46 -> <init>
     1:1:int[] getTargets():82:82 -> B
     com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.IfType getType() -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:int lambda$specify$0(com.android.tools.r8.dex.code.DexFormat22t):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/Q0;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:58 -> a
@@ -68593,7 +68593,7 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):87:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1389:1389 -> a
     11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1437 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):89 -> a
@@ -68618,9 +68618,9 @@
     23:28:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1443 -> a
     23:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):89 -> a
     29:29:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     30:30:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat22t):29:29 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/Q0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73:73 -> b
@@ -68628,7 +68628,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):94:94 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int lambda$specify$2(com.android.tools.r8.dex.code.DexFormat22t):29:29 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/Q0;)I"}
     1:1:int hashCode():63:63 -> hashCode
@@ -68649,7 +68649,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51:51 -> a
@@ -68658,9 +68658,9 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:8:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat22x):25:25 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/R0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):66:66 -> b
@@ -68668,7 +68668,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):66 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):71:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():56:56 -> hashCode
 com.android.tools.r8.dex.code.DexFormat23x -> com.android.tools.r8.dex.code.S0:
 # {"id":"sourceFile","fileName":"DexFormat23x.java"}
@@ -68691,7 +68691,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):55:55 -> a
@@ -68700,9 +68700,9 @@
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:8:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat23x):26:26 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/S0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> b
@@ -68710,7 +68710,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):75:75 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int lambda$specify$2(com.android.tools.r8.dex.code.DexFormat23x):26:26 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/S0;)I"}
     1:1:int hashCode():60:60 -> hashCode
@@ -68723,12 +68723,12 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):50:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):40:40 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):55:55 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
@@ -68738,7 +68738,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):55 -> b
     4:4:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:java.lang.String com.android.tools.r8.dex.code.DexInstruction.formatOffset(int):273:273 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):60 -> b
     6:6:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):60:60 -> b
@@ -68766,7 +68766,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:54 -> a
@@ -68786,7 +68786,7 @@
     10:10:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     12:12:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$specify$1(com.android.tools.r8.dex.code.DexFormat31c):29:29 -> b
@@ -68796,7 +68796,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):69 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):74:74 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():59:59 -> hashCode
 com.android.tools.r8.dex.code.DexFormat31i -> com.android.tools.r8.dex.code.V0:
 # {"id":"sourceFile","fileName":"DexFormat31i.java"}
@@ -68812,14 +68812,14 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
     6:6:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     7:7:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat31i):25:25 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/V0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):65:65 -> b
@@ -68843,14 +68843,14 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     5:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:51 -> a
     7:7:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexFormat31t):25:25 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/W0;)I"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):80:80 -> b
@@ -68858,7 +68858,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):80 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():70:70 -> hashCode
     1:1:int getPayloadOffset():61:61 -> y
 com.android.tools.r8.dex.code.DexFormat32x -> com.android.tools.r8.dex.code.X0:
@@ -68883,12 +68883,12 @@
     3:3:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):63:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     6:6:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
     8:8:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
@@ -68902,7 +68902,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):68 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):73:73 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int hashCode():58:58 -> hashCode
 com.android.tools.r8.dex.code.DexFormat35c -> com.android.tools.r8.dex.code.Y0:
 # {"id":"sourceFile","fileName":"DexFormat35c.java"}
@@ -68936,7 +68936,7 @@
     9:9:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):76:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     10:11:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):107:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     12:19:void appendRegisterArguments(java.lang.StringBuilder,java.lang.String):86:93 -> a
     12:19:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):108 -> a
     20:21:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):111:112 -> a
@@ -68947,7 +68947,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):81 -> b
     5:6:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):98:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     7:14:void appendRegisterArguments(java.lang.StringBuilder,java.lang.String):86:93 -> b
     7:14:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):99 -> b
     15:16:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):101:102 -> b
@@ -68987,7 +68987,7 @@
     3:3:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):55:55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:11:void appendRegisterRange(java.lang.StringBuilder):64:70 -> a
     5:11:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):85 -> a
     12:13:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):88:89 -> a
@@ -68998,7 +68998,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):60 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):75:75 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     6:12:void appendRegisterRange(java.lang.StringBuilder):64:70 -> b
     6:12:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):76 -> b
     13:14:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):78:79 -> b
@@ -69044,7 +69044,7 @@
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
@@ -69053,7 +69053,7 @@
     8:8:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     1:1:long lambda$specify$1(com.android.tools.r8.dex.code.DexFormat51l):25:25 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/a1;)J"}
     2:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):65:65 -> b
@@ -69070,7 +69070,7 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexGoto16 -> com.android.tools.r8.dex.code.b1:
@@ -69081,7 +69081,7 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexGoto32 -> com.android.tools.r8.dex.code.c1:
@@ -69092,9 +69092,9 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8:8 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfEq -> com.android.tools.r8.dex.code.e1:
@@ -69104,9 +69104,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfEqz -> com.android.tools.r8.dex.code.f1:
@@ -69116,9 +69116,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfGe -> com.android.tools.r8.dex.code.g1:
@@ -69128,9 +69128,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfGez -> com.android.tools.r8.dex.code.h1:
@@ -69140,9 +69140,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfGt -> com.android.tools.r8.dex.code.i1:
@@ -69152,9 +69152,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfGtz -> com.android.tools.r8.dex.code.j1:
@@ -69164,9 +69164,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfLe -> com.android.tools.r8.dex.code.k1:
@@ -69176,9 +69176,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfLez -> com.android.tools.r8.dex.code.l1:
@@ -69188,9 +69188,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfLt -> com.android.tools.r8.dex.code.m1:
@@ -69200,9 +69200,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfLtz -> com.android.tools.r8.dex.code.n1:
@@ -69212,9 +69212,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfNe -> com.android.tools.r8.dex.code.o1:
@@ -69224,9 +69224,9 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIfNez -> com.android.tools.r8.dex.code.p1:
@@ -69236,9 +69236,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ql0;"}
     1:1:com.android.tools.r8.ir.code.IfType getType():40:40 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIget -> com.android.tools.r8.dex.code.q1:
@@ -69251,7 +69251,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69265,7 +69265,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69279,7 +69279,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69293,7 +69293,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69307,7 +69307,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69318,9 +69318,9 @@
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/l1;)V"}
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):32:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):51:51 -> a
@@ -69336,7 +69336,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69350,7 +69350,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -69364,11 +69364,11 @@
     1:1:com.android.tools.r8.graph.DexType getType():69:69 -> Q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry):74:74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     5:5:void com.android.tools.r8.ir.conversion.IRBuilder.addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1484:1484 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):79 -> a
     6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1484:1484 -> a
@@ -69380,7 +69380,7 @@
     9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1488 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):79 -> a
     10:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):95:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     12:12:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     12:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):96 -> a
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):97:97 -> a
@@ -69418,17 +69418,17 @@
     1:1:boolean isSimpleNop():241:241 -> N
     boolean isSwitchPayload() -> P
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):32:32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     3:8:int acceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):354:359 -> a
@@ -69464,13 +69464,13 @@
     35:35:java.lang.String toSmaliString(com.android.tools.r8.dex.code.DexInstruction):380:380 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     36:36:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting,com.android.tools.r8.dex.code.DexInstruction):392:392 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     1:1:com.android.tools.r8.dex.code.DexCheckCast asCheckCast():0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/O;"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:2:java.lang.String formatOffset(int):273:273 -> b
     3:4:java.lang.String formatString(java.lang.String):285:286 -> b
     5:5:java.lang.String formatOffset(int):273:273 -> b
@@ -69500,7 +69500,7 @@
     1:1:int getCompareToId():346:346 -> l
     1:1:boolean instructionTypeCanThrow():431:431 -> o
     1:1:com.android.tools.r8.cf.code.CfInstruction asCfInstruction():151:151 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B9;"}
     com.android.tools.r8.dex.code.DexInstruction asDexInstruction() -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():342:342 -> r
@@ -69545,9 +69545,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIntToChar -> com.android.tools.r8.dex.code.D1:
@@ -69557,9 +69557,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIntToDouble -> com.android.tools.r8.dex.code.E1:
@@ -69569,9 +69569,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIntToFloat -> com.android.tools.r8.dex.code.F1:
@@ -69581,9 +69581,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIntToLong -> com.android.tools.r8.dex.code.G1:
@@ -69593,9 +69593,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexIntToShort -> com.android.tools.r8.dex.code.H1:
@@ -69605,9 +69605,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexInvokeCustom -> com.android.tools.r8.dex.code.I1:
@@ -69627,7 +69627,7 @@
     1:1:java.lang.String getSmaliName():39:39 -> A
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():65:65 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70:70 -> a
     3:4:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1553:1554 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
@@ -69650,14 +69650,14 @@
     9:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
     21:21:com.android.tools.r8.graph.DexCallSite getCallSite():65:65 -> a
     21:21:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     22:23:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:55 -> a
     24:24:com.android.tools.r8.graph.DexCallSite getCallSite():65:65 -> a
     24:24:void registerUse(com.android.tools.r8.graph.UseRegistry):60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     25:25:void registerUse(com.android.tools.r8.graph.UseRegistry):60:60 -> a
     26:26:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     27:27:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     27:27:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86 -> a
     28:28:com.android.tools.r8.graph.DexCallSite getCallSite():65:65 -> a
@@ -69687,7 +69687,7 @@
     1:1:java.lang.String getSmaliName():39:39 -> A
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():60:60 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70:70 -> a
     3:4:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1573:1574 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
@@ -69710,7 +69710,7 @@
     9:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):70 -> a
     21:21:com.android.tools.r8.graph.DexCallSite getCallSite():60:60 -> a
     21:21:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     22:23:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:55 -> a
     24:24:com.android.tools.r8.graph.DexCallSite getCallSite():60:60 -> a
     24:24:void registerUse(com.android.tools.r8.graph.UseRegistry):65 -> a
@@ -69718,7 +69718,7 @@
     25:25:void registerUse(com.android.tools.r8.graph.UseRegistry):65:65 -> a
     26:26:com.android.tools.r8.graph.DexCallSite getCallSite():60:60 -> a
     26:26:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     27:28:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86:87 -> a
     29:29:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     29:29:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87 -> a
@@ -69738,11 +69738,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
@@ -69755,11 +69755,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
     int getOpcode() -> x
@@ -69771,11 +69771,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
@@ -69788,11 +69788,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
     int getOpcode() -> x
@@ -69803,15 +69803,15 @@
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):24:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     com.android.tools.r8.ir.code.InvokeType getInvokeType() -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):36:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):38:39 -> a
     6:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     8:8:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.graph.lens.MethodLookupResult.getType():39:39 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -69840,15 +69840,15 @@
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):24:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     com.android.tools.r8.ir.code.InvokeType getInvokeType() -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):36:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):38:39 -> a
     6:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     8:8:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.graph.lens.MethodLookupResult.getType():39:39 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -69915,7 +69915,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;IIIII)V"}
     1:1:java.lang.String getSmaliName():44:44 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.dex.code.DexFormat45cc.getMethod():180:180 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
     3:3:com.android.tools.r8.graph.DexProto com.android.tools.r8.dex.code.DexFormat45cc.getProto():185:185 -> a
@@ -69929,7 +69929,7 @@
     15:15:int com.android.tools.r8.dex.code.DexFormat45cc.internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):94:94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     16:16:void com.android.tools.r8.dex.code.DexFormat45cc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.dex.code.DexFormat45cc.getMethod():180:180 -> a
     17:17:void com.android.tools.r8.dex.code.DexFormat45cc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):112 -> a
     18:19:void com.android.tools.r8.dex.code.DexFormat45cc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):112:113 -> a
@@ -69945,7 +69945,7 @@
     27:29:void com.android.tools.r8.graph.DexProto.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):117:119 -> a
     27:29:void com.android.tools.r8.dex.code.DexFormat45cc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):117 -> a
     30:30:void com.android.tools.r8.dex.code.DexFormat45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     31:31:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     31:31:void com.android.tools.r8.dex.code.DexFormat45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):131 -> a
     32:32:void com.android.tools.r8.dex.code.DexFormat45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):131:131 -> a
@@ -69970,7 +69970,7 @@
     46:46:void com.android.tools.r8.dex.code.DexFormat45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):139 -> a
     47:47:void com.android.tools.r8.dex.code.DexFormat45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):140:140 -> a
     48:49:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):145:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     50:57:void com.android.tools.r8.dex.code.DexFormat45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):168:175 -> a
     50:57:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):146 -> a
     58:60:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):149:151 -> a
@@ -69985,7 +69985,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     3:3:void com.android.tools.r8.dex.code.DexFormat45cc.internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):99 -> b
     4:5:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):157:158 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     6:13:void com.android.tools.r8.dex.code.DexFormat45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):168:175 -> b
     6:13:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):158 -> b
     14:17:java.lang.String com.android.tools.r8.dex.code.DexFormat45cc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):160:163 -> b
@@ -70051,14 +70051,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void registerUse(com.android.tools.r8.graph.UseRegistry):51:51 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     6:6:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.dex.code.DexFormat4rcc.getProto():164:164 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56:56 -> a
     9:9:void com.android.tools.r8.dex.code.DexFormat4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     10:10:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     10:10:void com.android.tools.r8.dex.code.DexFormat4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):66 -> a
     11:11:void com.android.tools.r8.dex.code.DexFormat4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):66:66 -> a
@@ -70085,7 +70085,7 @@
     27:27:int com.android.tools.r8.dex.code.DexFormat4rcc.internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     28:28:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     29:35:void com.android.tools.r8.dex.code.DexFormat4rcc.appendRegisterRange(java.lang.StringBuilder):148:154 -> a
     29:35:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):107 -> a
     36:38:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):110:112 -> a
@@ -70094,7 +70094,7 @@
     39:39:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):112 -> a
     40:41:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):112:113 -> a
     42:42:void com.android.tools.r8.dex.code.DexFormat4rcc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     43:43:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> a
     43:43:void com.android.tools.r8.dex.code.DexFormat4rcc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):126 -> a
     44:45:void com.android.tools.r8.dex.code.DexFormat4rcc.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):126:127 -> a
@@ -70116,7 +70116,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     3:3:void com.android.tools.r8.dex.code.DexFormat4rcc.internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):91 -> b
     4:4:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:11:void com.android.tools.r8.dex.code.DexFormat4rcc.appendRegisterRange(java.lang.StringBuilder):148:154 -> b
     5:11:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):97 -> b
     12:14:java.lang.String com.android.tools.r8.dex.code.DexFormat4rcc.toString(com.android.tools.r8.utils.RetracerForCodePrinting):99:101 -> b
@@ -70138,11 +70138,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
@@ -70155,11 +70155,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
     int getOpcode() -> x
@@ -70171,11 +70171,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
@@ -70188,11 +70188,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
     int getOpcode() -> x
@@ -70204,11 +70204,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;IIIII)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
@@ -70221,11 +70221,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.String getSmaliName():38:38 -> A
     1:1:com.android.tools.r8.ir.code.InvokeType getInvokeType():28:28 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():33:33 -> u
     int getOpcode() -> x
@@ -70239,7 +70239,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70253,7 +70253,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70267,7 +70267,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70281,7 +70281,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70295,7 +70295,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70309,7 +70309,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -70323,29 +70323,29 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexItemBasedConstString -> com.android.tools.r8.dex.code.f2:
 # {"id":"sourceFile","fileName":"DexItemBasedConstString.java"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):30:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     1:1:java.lang.String getSmaliName():59:59 -> A
     1:1:com.android.tools.r8.graph.DexReference getItem():35:35 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
     3:3:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     6:7:void registerUse(com.android.tools.r8.graph.UseRegistry):114:115 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     8:8:com.android.tools.r8.graph.DexReference getItem():35:35 -> a
@@ -70358,7 +70358,7 @@
     12:12:void registerUse(com.android.tools.r8.graph.UseRegistry):116 -> a
     13:13:void registerUse(com.android.tools.r8.graph.UseRegistry):116:116 -> a
     14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1269:1269 -> a
     15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -70367,7 +70367,7 @@
     1:1:com.android.tools.r8.graph.DexReference lambda$internalSubSpecify$0(com.android.tools.r8.dex.code.DexFormat21c):75:75 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/J0;)Lcom/android/tools/r8/graph/F2;"}
     2:2:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):91:91 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     boolean canThrow() -> i
     int getCompareToId() -> l
     1:1:java.lang.String getName():54:54 -> u
@@ -70379,9 +70379,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexLongToFloat -> com.android.tools.r8.dex.code.h2:
@@ -70391,9 +70391,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexLongToInt -> com.android.tools.r8.dex.code.i2:
@@ -70403,9 +70403,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMonitorEnter -> com.android.tools.r8.dex.code.j2:
@@ -70415,7 +70415,7 @@
     2:2:void <init>(int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
@@ -70433,7 +70433,7 @@
     2:2:void <init>(int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.MonitorType,int):1299:1299 -> a
@@ -70451,9 +70451,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMove16 -> com.android.tools.r8.dex.code.l2:
@@ -70463,7 +70463,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveException -> com.android.tools.r8.dex.code.n2:
@@ -70473,7 +70473,7 @@
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveFrom16 -> com.android.tools.r8.dex.code.o2:
@@ -70483,7 +70483,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveObject -> com.android.tools.r8.dex.code.q2:
@@ -70493,9 +70493,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String getName():25:25 -> u
@@ -70507,7 +70507,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String getName():25:25 -> u
@@ -70519,7 +70519,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1306:1306 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String getName():25:25 -> u
@@ -70531,7 +70531,7 @@
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveResultObject -> com.android.tools.r8.dex.code.t2:
@@ -70541,7 +70541,7 @@
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveResultWide -> com.android.tools.r8.dex.code.u2:
@@ -70551,7 +70551,7 @@
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveWide -> com.android.tools.r8.dex.code.w2:
@@ -70561,9 +70561,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveWide16 -> com.android.tools.r8.dex.code.v2:
@@ -70573,7 +70573,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMoveWideFrom16 -> com.android.tools.r8.dex.code.x2:
@@ -70583,7 +70583,7 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulDouble -> com.android.tools.r8.dex.code.z2:
@@ -70595,7 +70595,7 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():30:30 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulDouble2Addr -> com.android.tools.r8.dex.code.y2:
@@ -70605,9 +70605,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulFloat -> com.android.tools.r8.dex.code.B2:
@@ -70619,7 +70619,7 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():30:30 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulFloat2Addr -> com.android.tools.r8.dex.code.A2:
@@ -70629,9 +70629,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulInt -> com.android.tools.r8.dex.code.D2:
@@ -70643,7 +70643,7 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():30:30 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulInt2Addr -> com.android.tools.r8.dex.code.C2:
@@ -70653,9 +70653,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulIntLit16 -> com.android.tools.r8.dex.code.E2:
@@ -70665,7 +70665,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulIntLit8 -> com.android.tools.r8.dex.code.F2:
@@ -70675,7 +70675,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulLong -> com.android.tools.r8.dex.code.H2:
@@ -70687,7 +70687,7 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     1:1:java.lang.String getSmaliName():35:35 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():30:30 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexMulLong2Addr -> com.android.tools.r8.dex.code.G2:
@@ -70697,9 +70697,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNegDouble -> com.android.tools.r8.dex.code.I2:
@@ -70709,9 +70709,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNegFloat -> com.android.tools.r8.dex.code.J2:
@@ -70721,9 +70721,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNegInt -> com.android.tools.r8.dex.code.K2:
@@ -70733,9 +70733,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNegLong -> com.android.tools.r8.dex.code.L2:
@@ -70745,9 +70745,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNewArray -> com.android.tools.r8.dex.code.M2:
@@ -70758,7 +70758,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/I2;)V"}
     1:1:java.lang.String getSmaliName():39:39 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:com.android.tools.r8.graph.DexType getType():64:64 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     3:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:55 -> a
@@ -70768,13 +70768,13 @@
     6:6:void registerUse(com.android.tools.r8.graph.UseRegistry):60:60 -> a
     7:7:com.android.tools.r8.graph.DexType getType():64:64 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     8:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:86 -> a
     10:10:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,int,java.nio.ShortBuffer):104:104 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87:87 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     13:13:com.android.tools.r8.graph.DexType getType():64:64 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):69 -> a
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1789:1789 -> a
@@ -70805,16 +70805,16 @@
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):50:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):72:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     6:6:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):73 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):74:74 -> a
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):79:79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     10:12:void com.android.tools.r8.ir.conversion.IRBuilder.addNewInstance(int,com.android.tools.r8.graph.DexType):1807:1809 -> a
     10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):88 -> a
     13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
@@ -70834,9 +70834,9 @@
     1:1:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):50:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     4:4:com.android.tools.r8.graph.DexType getType():80:80 -> a
     4:4:void registerUse(com.android.tools.r8.graph.UseRegistry):76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
@@ -70844,7 +70844,7 @@
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     7:7:com.android.tools.r8.graph.DexType getType():80:80 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):85 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):85:85 -> a
@@ -70872,7 +70872,7 @@
     5:5:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):38:38 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:java.lang.String getName():55:55 -> u
@@ -70884,9 +70884,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexNotLong -> com.android.tools.r8.dex.code.R2:
@@ -70896,9 +70896,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrInt -> com.android.tools.r8.dex.code.T2:
@@ -70908,7 +70908,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrInt2Addr -> com.android.tools.r8.dex.code.S2:
@@ -70918,9 +70918,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrIntLit16 -> com.android.tools.r8.dex.code.U2:
@@ -70930,7 +70930,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrIntLit8 -> com.android.tools.r8.dex.code.V2:
@@ -70940,7 +70940,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrLong -> com.android.tools.r8.dex.code.X2:
@@ -70950,7 +70950,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexOrLong2Addr -> com.android.tools.r8.dex.code.W2:
@@ -70960,9 +70960,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexPackedSwitch -> com.android.tools.r8.dex.code.Y2:
@@ -70973,7 +70973,7 @@
     1:1:java.lang.String getSmaliName():31:31 -> A
     boolean isIntSwitch() -> I
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:int com.android.tools.r8.dex.code.DexFormat31t.getPayloadOffset():61:61 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):49:49 -> a
@@ -70983,7 +70983,7 @@
     5:5:void com.android.tools.r8.ir.conversion.IRBuilder.resolveAndBuildSwitch(int,int,int):961:961 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):49 -> a
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:java.lang.String getName():26:26 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexPackedSwitchPayload -> com.android.tools.r8.dex.code.Z2:
@@ -71011,13 +71011,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59:59 -> a
     6:6:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59 -> a
     7:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60:62 -> a
     10:25:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting,com.android.tools.r8.dex.code.DexInstruction):112:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     26:40:java.lang.String toSmaliString(com.android.tools.r8.dex.code.DexInstruction):132:146 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     1:1:int lambda$specify$1(com.android.tools.r8.dex.code.DexPackedSwitchPayload):25:25 -> b
@@ -71027,7 +71027,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):107:107 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int[] lambda$specify$2(com.android.tools.r8.dex.code.DexPackedSwitchPayload):25:25 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/Z2;)[I"}
     1:3:int hashCode():79:81 -> hashCode
@@ -71042,7 +71042,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[I[Lcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.String getSmaliName():59:59 -> A
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:3:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:com.android.tools.r8.graph.DexField[] lambda$specify$0(com.android.tools.r8.dex.code.DexRecordFieldValues):89:89 -> a
@@ -71050,13 +71050,13 @@
     5:5:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):89:89 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):140 -> a
     11:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):141:144 -> a
@@ -71065,7 +71065,7 @@
     3:3:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):85 -> b
     4:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):105:106 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     6:12:void appendArguments(java.lang.StringBuilder):94:100 -> b
     6:12:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):107 -> b
     13:13:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):108:108 -> b
@@ -71082,7 +71082,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRemDouble2Addr -> com.android.tools.r8.dex.code.b3:
@@ -71092,9 +71092,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRemFloat -> com.android.tools.r8.dex.code.e3:
@@ -71104,7 +71104,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRemFloat2Addr -> com.android.tools.r8.dex.code.d3:
@@ -71114,9 +71114,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRemInt -> com.android.tools.r8.dex.code.g3:
@@ -71126,7 +71126,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71137,9 +71137,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71150,7 +71150,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71161,7 +71161,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71172,7 +71172,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71183,9 +71183,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
@@ -71197,7 +71197,7 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexReturnObject -> com.android.tools.r8.dex.code.m3:
@@ -71208,7 +71208,7 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexReturnVoid -> com.android.tools.r8.dex.code.n3:
@@ -71221,7 +71221,7 @@
     1:1:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:java.lang.String getName():24:24 -> u
@@ -71234,7 +71234,7 @@
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:int[] getTargets():39:39 -> B
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():24:24 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRsubInt -> com.android.tools.r8.dex.code.p3:
@@ -71244,7 +71244,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexRsubIntLit8 -> com.android.tools.r8.dex.code.q3:
@@ -71254,7 +71254,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSafeCheckCast -> com.android.tools.r8.dex.code.r3:
@@ -71262,7 +71262,7 @@
     1:1:void <init>(int,com.android.tools.r8.graph.DexType):19:19 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;)V"}
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addSafeCheckCast(int,com.android.tools.r8.graph.DexType):1176:1176 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -71278,7 +71278,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71292,7 +71292,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71306,7 +71306,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71320,7 +71320,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71334,7 +71334,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71345,9 +71345,9 @@
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;)V"}
     1:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
@@ -71367,7 +71367,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71381,7 +71381,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71392,7 +71392,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShlInt2Addr -> com.android.tools.r8.dex.code.A3:
@@ -71402,9 +71402,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShlIntLit8 -> com.android.tools.r8.dex.code.C3:
@@ -71414,7 +71414,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2025:2025 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -71443,7 +71443,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShlLong2Addr -> com.android.tools.r8.dex.code.D3:
@@ -71453,9 +71453,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShrInt -> com.android.tools.r8.dex.code.G3:
@@ -71465,7 +71465,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShrInt2Addr -> com.android.tools.r8.dex.code.F3:
@@ -71475,9 +71475,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShrIntLit8 -> com.android.tools.r8.dex.code.H3:
@@ -71487,7 +71487,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2045:2045 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -71516,7 +71516,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexShrLong2Addr -> com.android.tools.r8.dex.code.I3:
@@ -71526,9 +71526,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSparseSwitch -> com.android.tools.r8.dex.code.K3:
@@ -71539,7 +71539,7 @@
     1:1:java.lang.String getSmaliName():35:35 -> A
     boolean isIntSwitch() -> I
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:int com.android.tools.r8.dex.code.DexFormat31t.getPayloadOffset():61:61 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):48:48 -> a
@@ -71549,7 +71549,7 @@
     5:5:void com.android.tools.r8.ir.conversion.IRBuilder.resolveAndBuildSwitch(int,int,int):961:961 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):48 -> a
     6:6:java.lang.String toSmaliString(com.android.tools.r8.utils.RetracerForCodePrinting):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSparseSwitchPayload -> com.android.tools.r8.dex.code.L3:
@@ -71576,13 +71576,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63:63 -> a
     6:6:void com.android.tools.r8.dex.code.DexInstruction.write16BitValue(int,java.nio.ShortBuffer):112:112 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> a
     7:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64:68 -> a
     12:27:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting,com.android.tools.r8.dex.code.DexInstruction):118:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     28:43:java.lang.String toSmaliString(com.android.tools.r8.dex.code.DexInstruction):138:153 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;)Ljava/lang/String;"}
     1:1:int[] lambda$specify$1(com.android.tools.r8.dex.code.DexSparseSwitchPayload):25:25 -> b
@@ -71592,7 +71592,7 @@
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):79 -> b
     5:5:java.lang.String toString(com.android.tools.r8.utils.RetracerForCodePrinting):113:113 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:int[] lambda$specify$2(com.android.tools.r8.dex.code.DexSparseSwitchPayload):25:25 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/L3;)[I"}
     1:3:int hashCode():85:87 -> hashCode
@@ -71607,7 +71607,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71621,7 +71621,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71635,7 +71635,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71649,7 +71649,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71663,7 +71663,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71677,7 +71677,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71691,7 +71691,7 @@
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean canThrow() -> i
     1:1:java.lang.String getName():27:27 -> u
     int getOpcode() -> x
@@ -71702,7 +71702,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubDouble2Addr -> com.android.tools.r8.dex.code.T3:
@@ -71712,9 +71712,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubFloat -> com.android.tools.r8.dex.code.W3:
@@ -71724,7 +71724,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubFloat2Addr -> com.android.tools.r8.dex.code.V3:
@@ -71734,9 +71734,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubInt -> com.android.tools.r8.dex.code.Y3:
@@ -71746,7 +71746,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubInt2Addr -> com.android.tools.r8.dex.code.X3:
@@ -71756,9 +71756,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubLong -> com.android.tools.r8.dex.code.a4:
@@ -71768,7 +71768,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSubLong2Addr -> com.android.tools.r8.dex.code.Z3:
@@ -71778,9 +71778,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexSwitchPayload -> com.android.tools.r8.dex.code.b4:
@@ -71792,7 +71792,7 @@
     int[] keys() -> Q
     int[] switchTargetOffsets() -> R
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
 com.android.tools.r8.dex.code.DexThrow -> com.android.tools.r8.dex.code.c4:
 # {"id":"sourceFile","fileName":"DexThrow.java"}
     1:1:void <init>(int,com.android.tools.r8.dex.code.BytecodeStream):15:15 -> <init>
@@ -71800,7 +71800,7 @@
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.lang.String getSmaliName():29:29 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     3:3:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> a
@@ -71823,7 +71823,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexUshrInt2Addr -> com.android.tools.r8.dex.code.d4:
@@ -71833,9 +71833,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexUshrIntLit8 -> com.android.tools.r8.dex.code.f4:
@@ -71845,7 +71845,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2065:2065 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
@@ -71874,7 +71874,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexUshrLong2Addr -> com.android.tools.r8.dex.code.g4:
@@ -71884,9 +71884,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorInt -> com.android.tools.r8.dex.code.j4:
@@ -71896,7 +71896,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorInt2Addr -> com.android.tools.r8.dex.code.i4:
@@ -71906,9 +71906,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorIntLit16 -> com.android.tools.r8.dex.code.k4:
@@ -71918,7 +71918,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorIntLit8 -> com.android.tools.r8.dex.code.l4:
@@ -71928,7 +71928,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorLong -> com.android.tools.r8.dex.code.n4:
@@ -71938,7 +71938,7 @@
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.dex.code.DexXorLong2Addr -> com.android.tools.r8.dex.code.m4:
@@ -71948,9 +71948,9 @@
     2:2:void <init>(int,int):20:20 -> <init>
     1:1:java.lang.String getSmaliName():30:30 -> A
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     1:1:java.lang.String getName():25:25 -> u
     int getOpcode() -> x
 com.android.tools.r8.diagnostic.DefinitionClassContext -> com.android.tools.r8.diagnostic.DefinitionClassContext:
@@ -72111,7 +72111,7 @@
 # {"id":"sourceFile","fileName":"MissingClassInfoImpl.java"}
     com.android.tools.r8.references.ClassReference classReference -> b
     1:2:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.references.ClassReference getClassReference():29:29 -> getClassReference
 com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.diagnostic.internal.g:
 # {"id":"sourceFile","fileName":"MissingClassInfoImpl.java"}
@@ -72122,15 +72122,15 @@
 com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.diagnostic.internal.j:
 # {"id":"sourceFile","fileName":"MissingDefinitionInfoBase.java"}
     java.util.Collection referencedFromContexts -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.Collection):16:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:3:java.lang.String getDiagnosticMessage():22:24 -> getDiagnosticMessage
     1:1:java.util.Collection getReferencedFromContexts():29:29 -> getReferencedFromContexts
 com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.diagnostic.internal.i:
 # {"id":"sourceFile","fileName":"MissingDefinitionInfoBase.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder referencedFromContextsBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:1:void <init>():37:37 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
@@ -72199,7 +72199,7 @@
     57:59:void lambda$writeDiagnosticMessage$3(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingMethodInfo):102:104 -> a
     60:60:void lambda$writeDiagnosticMessage$3(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingMethodInfo):103:103 -> a
     61:61:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/diagnostic/DefinitionClassContext;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/diagnostic/DefinitionClassContext;)V"}
     62:62:void com.android.tools.r8.utils.BoxBase.setMin(java.lang.Object,java.util.Comparator) -> a
     62:62:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):66 -> a
     62:62:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):118 -> a
@@ -72208,7 +72208,7 @@
     63:64:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):66 -> a
     63:64:void lambda$writeReferencedFromSuffix$4(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionClassContext):118 -> a
     65:65:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/diagnostic/DefinitionFieldContext;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/diagnostic/DefinitionFieldContext;)V"}
     66:66:java.util.Comparator com.android.tools.r8.utils.FieldReferenceUtils.getFieldReferenceComparator():57:57 -> a
     66:66:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):122 -> a
     67:67:void com.android.tools.r8.utils.BoxBase.setMin(java.lang.Object,java.util.Comparator):62:62 -> a
@@ -72219,7 +72219,7 @@
     68:69:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):66 -> a
     68:69:void lambda$writeReferencedFromSuffix$5(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionFieldContext):121 -> a
     70:71:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):125:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/diagnostic/DefinitionMethodContext;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/diagnostic/DefinitionMethodContext;)V"}
     72:72:void com.android.tools.r8.utils.BoxBase.setMin(java.lang.Object,java.util.Comparator):62:62 -> a
     72:72:void com.android.tools.r8.utils.Box.setMin(java.lang.Object,java.util.Comparator):66 -> a
     72:72:void lambda$writeReferencedFromSuffix$6(com.android.tools.r8.utils.Box,com.android.tools.r8.diagnostic.DefinitionMethodContext):124 -> a
@@ -72234,11 +72234,11 @@
 com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.diagnostic.internal.m:
 # {"id":"sourceFile","fileName":"MissingDefinitionsDiagnosticImpl.java"}
     java.util.Collection missingDefinitions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(java.util.Collection):21:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:void lambda$getDiagnosticMessage$0(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):70:70 -> a
     2:2:void lambda$getDiagnosticMessage$0(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):69:69 -> a
     1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
@@ -72262,14 +72262,14 @@
 com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.diagnostic.internal.l:
 # {"id":"sourceFile","fileName":"MissingDefinitionsDiagnosticImpl.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder missingDefinitionsBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:1:void <init>():80:80 -> <init>
     2:2:void <init>():78:78 -> <init>
 com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.diagnostic.internal.o:
 # {"id":"sourceFile","fileName":"MissingFieldInfoImpl.java"}
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:2:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/FieldReference;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/FieldReference;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():29:29 -> getFieldReference
 com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.diagnostic.internal.n:
 # {"id":"sourceFile","fileName":"MissingFieldInfoImpl.java"}
@@ -72281,7 +72281,7 @@
 # {"id":"sourceFile","fileName":"MissingMethodInfoImpl.java"}
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:2:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():29:29 -> getMethodReference
 com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.diagnostic.internal.p:
 # {"id":"sourceFile","fileName":"MissingMethodInfoImpl.java"}
@@ -72289,7 +72289,7 @@
     1:1:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/diagnostic/internal/i;"}
-com.android.tools.r8.dump.DumpOptions -> com.android.tools.r8.internal.xm:
+com.android.tools.r8.dump.DumpOptions -> com.android.tools.r8.internal.zm:
 # {"id":"sourceFile","fileName":"DumpOptions.java"}
     com.android.tools.r8.dex.Marker$Backend backend -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W$a;"}
@@ -72300,7 +72300,7 @@
     boolean optimizeMultidexForLinearAlloc -> e
     int threadCount -> f
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     java.util.Optional intermediate -> h
     java.util.Optional includeDataResources -> i
     java.util.Optional isolatedSplits -> j
@@ -72308,9 +72308,9 @@
     java.util.Optional minification -> l
     java.util.Optional forceProguardCompatibility -> m
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xo;"}
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y2;"}
     java.util.List mainDexKeepRules -> q
@@ -72325,85 +72325,85 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.lang.String traceReferencesConsumer -> x
     1:26:void <init>(com.android.tools.r8.dex.Marker$Backend,com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,boolean,int,com.android.tools.r8.utils.InternalOptions$DesugarState,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.shaking.ProguardConfiguration,java.util.List,java.util.Collection,java.util.Collection,boolean,boolean,java.util.Map,boolean,java.lang.String,com.android.tools.r8.AndroidResourceProvider):116:141 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$a;Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/CompilationMode;ILcom/android/tools/r8/internal/Tk;ZILcom/android/tools/r8/internal/gB$g;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lcom/android/tools/r8/internal/Uo;Lcom/android/tools/r8/shaking/Y2;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZZLjava/util/HashMap;Ljava/lang/String;Lcom/android/tools/r8/AndroidResourceProvider;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$a;Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/CompilationMode;ILcom/android/tools/r8/internal/Vk;ZILcom/android/tools/r8/internal/iB$g;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lcom/android/tools/r8/internal/Xo;Lcom/android/tools/r8/shaking/Y2;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZZLjava/util/HashMap;Ljava/lang/String;Lcom/android/tools/r8/AndroidResourceProvider;)V"}
     1:1:void lambda$getBuildPropertiesFileContent$0(java.lang.StringBuilder,java.lang.String,java.lang.String):147:147 -> a
     2:2:void lambda$getBuildProperties$1(java.util.Map,java.lang.String):187:187 -> a
-    3:3:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> a
+    3:3:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> a
     3:3:void lambda$getBuildProperties$1(java.util.Map,java.lang.String):187 -> a
     4:4:void parse(java.lang.String,com.android.tools.r8.dump.DumpOptions$Builder):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/xm$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/zm$a;)V"}
     5:14:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):196:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm$a;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm$a;Ljava/lang/String;)V"}
     15:69:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):211:265 -> a
     15:69:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    70:70:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setSystemProperty(java.lang.String,java.lang.String):518:518 -> a
+    70:70:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setSystemProperty(java.lang.String,java.lang.String):530:530 -> a
     70:70:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     70:70:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    71:71:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setSystemProperty(java.lang.String,java.lang.String):518:518 -> a
+    71:71:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setSystemProperty(java.lang.String,java.lang.String):530:530 -> a
     71:71:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):265 -> a
     71:71:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     72:72:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):267:267 -> a
     72:72:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     73:73:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):216:216 -> a
     73:73:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    74:74:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):508:508 -> a
+    74:74:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setEnableMissingLibraryApiModeling(boolean):520:520 -> a
     74:74:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     74:74:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    75:75:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTraceReferencesConsumer(java.lang.String):410:410 -> a
+    75:75:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTraceReferencesConsumer(java.lang.String):422:422 -> a
     75:75:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):261 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     75:75:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     76:76:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):252:252 -> a
     76:76:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    77:77:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTreeShaking(boolean):471:471 -> a
+    77:77:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTreeShaking(boolean):483:483 -> a
     77:77:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):252 -> a
     77:77:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     78:78:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):249:249 -> a
     78:78:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    79:79:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIsolatedSplits(boolean):456:456 -> a
+    79:79:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIsolatedSplits(boolean):468:468 -> a
     79:79:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):249 -> a
     79:79:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     80:80:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):231:231 -> a
     80:80:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    81:81:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinApi(int):420:420 -> a
+    81:81:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinApi(int):432:432 -> a
     81:81:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     81:81:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     82:82:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):246:246 -> a
     82:82:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    83:83:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIncludeDataResources(java.util.Optional):451:451 -> a
+    83:83:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIncludeDataResources(java.util.Optional):463:463 -> a
     83:83:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     83:83:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     84:84:com.android.tools.r8.dex.Marker$Tool com.android.tools.r8.dex.Marker$Tool.valueOf(java.lang.String):32:32 -> a
     84:84:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):219 -> a
     84:84:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    85:85:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTool(com.android.tools.r8.dex.Marker$Tool):405:405 -> a
+    85:85:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTool(com.android.tools.r8.dex.Marker$Tool):417:417 -> a
     85:85:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:85:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     86:87:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):222:223 -> a
     86:87:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    88:88:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):415:415 -> a
+    88:88:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):427:427 -> a
     88:88:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):223 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:88:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     89:90:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):224:225 -> a
     89:90:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    91:91:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):415:415 -> a
+    91:91:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setCompilationMode(com.android.tools.r8.CompilationMode):427:427 -> a
     91:91:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):225 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     91:91:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     92:123:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):227:258 -> a
     92:123:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    124:124:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setForceProguardCompatibility(boolean):461:461 -> a
+    124:124:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setForceProguardCompatibility(boolean):473:473 -> a
     124:124:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):258 -> a
     124:124:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     125:125:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):234:234 -> a
     125:125:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    126:126:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setOptimizeMultidexForLinearAlloc(boolean):431:431 -> a
+    126:126:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setOptimizeMultidexForLinearAlloc(boolean):443:443 -> a
     126:126:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     126:126:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
@@ -72412,90 +72412,93 @@
     127:127:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     128:170:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):213:255 -> a
     128:170:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    171:171:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinification(boolean):466:466 -> a
+    171:171:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setMinification(boolean):478:478 -> a
     171:171:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):255 -> a
     171:171:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     172:172:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):243:243 -> a
     172:172:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    173:173:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIntermediate(boolean):446:446 -> a
+    173:173:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setIntermediate(boolean):458:458 -> a
     173:173:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):243 -> a
     173:173:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     174:174:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.utils.InternalOptions$DesugarState.valueOf(java.lang.String):163:163 -> a
     174:174:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):240 -> a
     174:174:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    175:175:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugarState(com.android.tools.r8.utils.InternalOptions$DesugarState):441:441 -> a
+    175:175:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setDesugarState(com.android.tools.r8.utils.InternalOptions$DesugarState):453:453 -> a
     175:175:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     175:175:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     176:176:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):237:237 -> a
     176:176:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
-    177:177:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setThreadCount(int):436:436 -> a
+    177:177:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setThreadCount(int):448:448 -> a
     177:177:void parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     177:177:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):206 -> a
     178:178:void lambda$parse$2(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String):202:202 -> a
     179:179:void parseKeyValueError(java.lang.String,java.lang.String):273:273 -> a
-    180:180:void addOptionalDumpEntry(java.util.Map,java.lang.String,java.util.Optional):290:290 -> a
+    180:180:java.lang.String getAndroidApiExtensionPackages():277:277 -> a
+    181:181:void addOptionalDumpEntry(java.util.Map,java.lang.String,java.util.Optional):302:302 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/lang/String;Ljava/util/Optional;)V"}
-    181:181:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> a
-    181:181:void lambda$addOptionalDumpEntry$3(java.util.Map,java.lang.String,java.lang.Object):290 -> a
-    182:182:com.android.tools.r8.dump.DumpOptions$Builder builder(com.android.tools.r8.dex.Marker$Tool):345:345 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$b;)Lcom/android/tools/r8/internal/xm$a;"}
-    183:183:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTool(com.android.tools.r8.dex.Marker$Tool):405:405 -> a
-    183:183:com.android.tools.r8.dump.DumpOptions$Builder builder(com.android.tools.r8.dex.Marker$Tool):345 -> a
-    184:184:com.android.tools.r8.AndroidResourceProvider getAndroidResourceProvider():353:353 -> a
-    1:1:java.util.Collection getArtProfileProviders():329:329 -> b
-    1:2:java.util.Map getBuildProperties():152:153 -> c
+    182:182:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> a
+    182:182:void lambda$addOptionalDumpEntry$3(java.util.Map,java.lang.String,java.lang.Object):302 -> a
+    183:183:com.android.tools.r8.dump.DumpOptions$Builder builder(com.android.tools.r8.dex.Marker$Tool):357:357 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$b;)Lcom/android/tools/r8/internal/zm$a;"}
+    184:184:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTool(com.android.tools.r8.dex.Marker$Tool):417:417 -> a
+    184:184:com.android.tools.r8.dump.DumpOptions$Builder builder(com.android.tools.r8.dex.Marker$Tool):357 -> a
+    1:1:com.android.tools.r8.AndroidResourceProvider getAndroidResourceProvider():365:365 -> b
+    1:1:java.util.Collection getArtProfileProviders():341:341 -> c
+    1:2:java.util.Map getBuildProperties():152:153 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/LinkedHashMap;"}
-    3:3:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    3:3:java.util.Map getBuildProperties():153 -> c
-    4:5:java.util.Map getBuildProperties():154:155 -> c
-    6:6:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    6:6:java.util.Map getBuildProperties():155 -> c
-    7:9:java.util.Map getBuildProperties():157:159 -> c
-    10:10:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    10:10:java.util.Map getBuildProperties():159 -> c
-    11:14:java.util.Map getBuildProperties():160:163 -> c
-    15:15:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    15:15:java.util.Map getBuildProperties():160 -> c
-    16:16:java.util.Map getBuildProperties():164:164 -> c
-    17:17:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    17:17:java.util.Map getBuildProperties():164 -> c
-    18:19:java.util.Map getBuildProperties():165:166 -> c
-    20:20:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    20:20:java.util.Map getBuildProperties():165 -> c
-    21:21:java.util.Map getBuildProperties():167:167 -> c
-    22:22:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    22:22:java.util.Map getBuildProperties():167 -> c
-    23:24:java.util.Map getBuildProperties():168:169 -> c
-    25:25:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    25:25:java.util.Map getBuildProperties():168 -> c
-    26:27:java.util.Map getBuildProperties():170:171 -> c
-    28:28:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    28:28:java.util.Map getBuildProperties():171 -> c
-    29:36:java.util.Map getBuildProperties():173:180 -> c
-    37:37:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):294:294 -> c
-    37:37:java.util.Map getBuildProperties():180 -> c
-    38:41:java.util.Map getBuildProperties():182:185 -> c
-    1:4:java.lang.String getBuildPropertiesFileContent():145:148 -> d
-    1:1:com.android.tools.r8.CompilationMode getCompilationMode():281:281 -> e
-    1:1:boolean hasDesugaredLibraryConfiguration():298:298 -> f
-    1:1:java.lang.String getDesugaredLibraryJsonSource():302 -> f
-    2:2:java.lang.String getDesugaredLibraryJsonSource():303:303 -> f
-    1:1:com.android.tools.r8.features.FeatureSplitConfiguration getFeatureSplitConfiguration():309:309 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Uo;"}
-    1:1:java.util.List getMainDexKeepRules():321:321 -> h
-    1:1:int getMinApi():285:285 -> i
-    1:1:java.lang.String getParsedProguardConfiguration():313:313 -> j
-    2:2:java.lang.String com.android.tools.r8.shaking.ProguardConfiguration.getParsedConfiguration():509:509 -> j
-    2:2:java.lang.String getParsedProguardConfiguration():313 -> j
+    3:3:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    3:3:java.util.Map getBuildProperties():153 -> d
+    4:5:java.util.Map getBuildProperties():154:155 -> d
+    6:6:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    6:6:java.util.Map getBuildProperties():155 -> d
+    7:9:java.util.Map getBuildProperties():157:159 -> d
+    10:10:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    10:10:java.util.Map getBuildProperties():159 -> d
+    11:14:java.util.Map getBuildProperties():160:163 -> d
+    15:15:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    15:15:java.util.Map getBuildProperties():160 -> d
+    16:16:java.util.Map getBuildProperties():164:164 -> d
+    17:17:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    17:17:java.util.Map getBuildProperties():164 -> d
+    18:19:java.util.Map getBuildProperties():165:166 -> d
+    20:20:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    20:20:java.util.Map getBuildProperties():165 -> d
+    21:21:java.util.Map getBuildProperties():167:167 -> d
+    22:22:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    22:22:java.util.Map getBuildProperties():167 -> d
+    23:24:java.util.Map getBuildProperties():168:169 -> d
+    25:25:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    25:25:java.util.Map getBuildProperties():168 -> d
+    26:27:java.util.Map getBuildProperties():170:171 -> d
+    28:28:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    28:28:java.util.Map getBuildProperties():171 -> d
+    29:36:java.util.Map getBuildProperties():173:180 -> d
+    37:37:void addDumpEntry(java.util.Map,java.lang.String,java.lang.Object):306:306 -> d
+    37:37:java.util.Map getBuildProperties():180 -> d
+    38:41:java.util.Map getBuildProperties():182:185 -> d
+    1:4:java.lang.String getBuildPropertiesFileContent():145:148 -> e
+    1:1:com.android.tools.r8.CompilationMode getCompilationMode():285:285 -> f
+    1:1:boolean hasDesugaredLibraryConfiguration():310:310 -> g
+    1:1:java.lang.String getDesugaredLibraryJsonSource():314 -> g
+    2:2:java.lang.String getDesugaredLibraryJsonSource():315:315 -> g
+    1:1:boolean getEnableSameFilePolicy():297:297 -> h
+    1:1:com.android.tools.r8.features.FeatureSplitConfiguration getFeatureSplitConfiguration():321:321 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xo;"}
+    1:1:boolean getIsolatedSplits():289:289 -> j
+    1:1:java.util.List getMainDexKeepRules():333:333 -> k
+    1:1:int getMinApi():293:293 -> l
+    1:1:java.lang.String getParsedProguardConfiguration():325:325 -> m
+    2:2:java.lang.String com.android.tools.r8.shaking.ProguardConfiguration.getParsedConfiguration():509:509 -> m
+    2:2:java.lang.String getParsedProguardConfiguration():325 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.util.Collection getStartupProfileProviders():337:337 -> k
-    1:1:boolean hasAndroidResourcesProvider():349:349 -> l
-    1:1:boolean hasArtProfileProviders():325:325 -> m
-    1:1:boolean hasMainDexKeepRules():317:317 -> n
-    1:1:boolean hasStartupProfileProviders():333:333 -> o
-com.android.tools.r8.dump.DumpOptions$Builder -> com.android.tools.r8.internal.xm$a:
+    1:1:java.util.Collection getStartupProfileProviders():349:349 -> n
+    1:1:boolean hasAndroidResourcesProvider():361:361 -> o
+    1:1:boolean hasArtProfileProviders():337:337 -> p
+    1:1:boolean hasMainDexKeepRules():329:329 -> q
+    1:1:boolean hasStartupProfileProviders():345:345 -> r
+com.android.tools.r8.dump.DumpOptions$Builder -> com.android.tools.r8.internal.zm$a:
 # {"id":"sourceFile","fileName":"DumpOptions.java"}
     com.android.tools.r8.dex.Marker$Backend backend -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W$a;"}
@@ -72506,7 +72509,7 @@
     boolean optimizeMultidexForLinearAlloc -> e
     int threadCount -> f
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     java.util.Optional intermediate -> h
     java.util.Optional includeDataResources -> i
     java.util.Optional isolatedSplits -> j
@@ -72514,9 +72517,9 @@
     java.util.Optional minification -> l
     java.util.Optional forceProguardCompatibility -> m
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xo;"}
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y2;"}
     java.util.List mainDexKeepRules -> q
@@ -72531,32 +72534,32 @@
     java.util.Map systemProperties -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     boolean $assertionsDisabled -> y
-    1:1:void <clinit>():356:356 -> <clinit>
-    1:1:void <init>():390:390 -> <init>
-    2:29:void <init>():358:385 -> <init>
-    1:1:com.android.tools.r8.dump.DumpOptions$Builder applyIf(boolean,java.util.function.Consumer):394:394 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/internal/xm$a;"}
-    2:2:com.android.tools.r8.dump.DumpOptions$Builder setBackend(com.android.tools.r8.dex.Marker$Backend):400:400 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$a;)Lcom/android/tools/r8/internal/xm$a;"}
-    3:3:com.android.tools.r8.dump.DumpOptions$Builder setForceProguardCompatibility(boolean):461:461 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xm$a;"}
-    4:4:com.android.tools.r8.dump.DumpOptions$Builder setSystemProperty(java.lang.String,java.lang.String):518:518 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/xm$a;"}
-    5:7:void lambda$getCurrentSystemProperties$0(java.util.Map,java.lang.String):533:535 -> a
-    8:10:com.android.tools.r8.dump.DumpOptions build():542:544 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xm;"}
-    1:1:com.android.tools.r8.dump.DumpOptions$Builder setIntermediate(boolean):446:446 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xm$a;"}
-    2:5:java.util.Map getCurrentSystemProperties():528:531 -> b
-    1:1:com.android.tools.r8.dump.DumpOptions$Builder setIsolatedSplits(boolean):456:456 -> c
+    1:1:void <clinit>():368:368 -> <clinit>
+    1:1:void <init>():402:402 -> <init>
+    2:29:void <init>():370:397 -> <init>
+    1:1:com.android.tools.r8.dump.DumpOptions$Builder applyIf(boolean,java.util.function.Consumer):406:406 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/internal/zm$a;"}
+    2:2:com.android.tools.r8.dump.DumpOptions$Builder setBackend(com.android.tools.r8.dex.Marker$Backend):412:412 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W$a;)Lcom/android/tools/r8/internal/zm$a;"}
+    3:3:com.android.tools.r8.dump.DumpOptions$Builder setForceProguardCompatibility(boolean):473:473 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/zm$a;"}
+    4:4:com.android.tools.r8.dump.DumpOptions$Builder setSystemProperty(java.lang.String,java.lang.String):530:530 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/zm$a;"}
+    5:7:void lambda$getCurrentSystemProperties$0(java.util.Map,java.lang.String):545:547 -> a
+    8:10:com.android.tools.r8.dump.DumpOptions build():554:556 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zm;"}
+    1:1:com.android.tools.r8.dump.DumpOptions$Builder setIntermediate(boolean):458:458 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/zm$a;"}
+    2:5:java.util.Map getCurrentSystemProperties():540:543 -> b
+    1:1:com.android.tools.r8.dump.DumpOptions$Builder setIsolatedSplits(boolean):468:468 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)V"}
-    2:2:com.android.tools.r8.dump.DumpOptions$Builder readCurrentSystemProperties():523:523 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xm$a;"}
-    1:1:com.android.tools.r8.dump.DumpOptions$Builder setMinification(boolean):466:466 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xm$a;"}
-    1:1:com.android.tools.r8.dump.DumpOptions$Builder setTreeShaking(boolean):471:471 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xm$a;"}
-com.android.tools.r8.dump.ProguardConfigSanitizer -> com.android.tools.r8.internal.AY:
+    2:2:com.android.tools.r8.dump.DumpOptions$Builder readCurrentSystemProperties():535:535 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zm$a;"}
+    1:1:com.android.tools.r8.dump.DumpOptions$Builder setMinification(boolean):478:478 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/zm$a;"}
+    1:1:com.android.tools.r8.dump.DumpOptions$Builder setTreeShaking(boolean):483:483 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/zm$a;"}
+com.android.tools.r8.dump.ProguardConfigSanitizer -> com.android.tools.r8.internal.EY:
 # {"id":"sourceFile","fileName":"ProguardConfigSanitizer.java"}
     java.util.function.Consumer cleanLineCallback -> a
     java.util.function.Consumer commentCallback -> b
@@ -72569,7 +72572,7 @@
     1:1:void lambda$new$0(java.lang.String):14 -> a
     2:2:void unhandled():11:11 -> a
     3:3:com.android.tools.r8.dump.ProguardConfigSanitizer createDefaultForward(java.util.function.Consumer):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/AY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/EY;"}
     4:4:com.android.tools.r8.dump.ProguardConfigSanitizer onCleanLine(java.util.function.Consumer):37:37 -> a
     4:4:com.android.tools.r8.dump.ProguardConfigSanitizer createDefaultForward(java.util.function.Consumer):29 -> a
     5:5:com.android.tools.r8.dump.ProguardConfigSanitizer createDefaultForward(java.util.function.Consumer):29:29 -> a
@@ -72583,16 +72586,16 @@
     10:10:com.android.tools.r8.dump.ProguardConfigSanitizer createDefaultForward(java.util.function.Consumer):32 -> a
     11:12:com.android.tools.r8.dump.ProguardConfigSanitizer createDefaultForward(java.util.function.Consumer):32:33 -> a
     13:13:void lambda$createDefaultForward$3(com.android.tools.r8.dump.ProguardConfigSanitizer):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EY;)V"}
     1:1:void lambda$new$1(java.lang.String):15:15 -> b
     2:2:void lambda$createDefaultForward$4(com.android.tools.r8.dump.ProguardConfigSanitizer):31:31 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EY;)V"}
     3:3:com.android.tools.r8.dump.ProguardConfigSanitizer onPrintDirective(java.util.function.Consumer):62:62 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/AY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/EY;"}
     1:1:void unhandled():11:11 -> c
     1:1:void lambda$new$2(java.lang.String):16 -> c
     2:2:void lambda$createDefaultForward$5(com.android.tools.r8.dump.ProguardConfigSanitizer):32:32 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EY;)V"}
     1:13:void sanitize(java.lang.String):67:79 -> d
 com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic -> com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic:
 # {"id":"sourceFile","fileName":"AssumeNoSideEffectsRuleForObjectMembersDiagnostic.java"}
@@ -72646,9 +72649,9 @@
 com.android.tools.r8.errors.CheckDiscardDiagnostic -> com.android.tools.r8.errors.CheckDiscardDiagnostic:
 # {"id":"sourceFile","fileName":"CheckDiscardDiagnostic.java"}
     java.util.List messages -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.List):49:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:2:void lambda$getDiagnosticMessage$0(java.lang.StringBuilder,java.lang.String):77:78 -> a
     1:11:java.lang.String getDiagnosticMessage():71:81 -> getDiagnosticMessage
     1:1:int getNumberOfFailures():54:54 -> getNumberOfFailures
@@ -72657,7 +72660,7 @@
 com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder -> com.android.tools.r8.errors.c:
 # {"id":"sourceFile","fileName":"CheckDiscardDiagnostic.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder messagesBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:2:void <init>():23:24 -> <init>
     1:4:com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder addFailedItems(java.util.List,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer):31:34 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/shaking/N0;Lcom/android/tools/r8/shaking/E4;)Lcom/android/tools/r8/errors/c;"}
@@ -72667,9 +72670,9 @@
 com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic -> com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic:
 # {"id":"sourceFile","fileName":"CheckEnumUnboxedDiagnostic.java"}
     java.util.List messages -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.List):22:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder builder():27:27 -> builder
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/errors/d;"}
     1:6:java.lang.String getDiagnosticMessage():44:49 -> getDiagnosticMessage
@@ -72678,7 +72681,7 @@
 com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder -> com.android.tools.r8.errors.d:
 # {"id":"sourceFile","fileName":"CheckEnumUnboxedDiagnostic.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder messagesBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:3:void <init>():52:54 -> <init>
     1:3:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):57:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Lcom/android/tools/r8/errors/d;"}
@@ -72698,7 +72701,7 @@
     1:1:int getCodeSize():32:32 -> getCodeSize
     1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.Ne:
 # {"id":"sourceFile","fileName":"CompilationError.java"}
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
@@ -72715,7 +72718,7 @@
     9:11:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):34 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/MethodPosition;)V"}
     12:14:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):42:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Le;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Ne;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;)V"}
 com.android.tools.r8.errors.ConstantDynamicDesugarDiagnostic -> com.android.tools.r8.errors.ConstantDynamicDesugarDiagnostic:
 # {"id":"sourceFile","fileName":"ConstantDynamicDesugarDiagnostic.java"}
     com.android.tools.r8.origin.Origin origin -> b
@@ -72830,7 +72833,7 @@
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.WA:
 # {"id":"sourceFile","fileName":"InternalCompilerError.java"}
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String):21:21 -> <init>
@@ -72838,10 +72841,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ResourceException;)V"}
     4:4:void <init>(java.lang.Throwable):29:29 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Exception;)V"}
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.AB:
 # {"id":"sourceFile","fileName":"InvalidDebugInfoException.java"}
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.BB:
 # {"id":"sourceFile","fileName":"InvalidDescriptorException.java"}
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
@@ -72857,7 +72860,7 @@
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic -> com.android.tools.r8.internal.DO:
+com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic -> com.android.tools.r8.internal.HO:
 # {"id":"sourceFile","fileName":"MissingGlobalSyntheticsConsumerDiagnostic.java"}
     java.lang.String generatingReason -> b
     1:2:void <init>(java.lang.String):13:14 -> <init>
@@ -72884,11 +72887,11 @@
     int numberOfStartupMethods -> c
     int numberOfNonStartupMethods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap numberOfStartupClassesByNumberOfStartupMethods -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:5:void <init>(int,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):31:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/px;)V"}
     1:1:java.lang.Integer lambda$getDiagnosticMessage$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dx;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fx;)Ljava/lang/Integer;"}
     1:20:java.lang.String getDiagnosticMessage():51:70 -> getDiagnosticMessage
     21:24:java.lang.String getDiagnosticMessage():69:72 -> getDiagnosticMessage
     25:31:java.lang.String getDiagnosticMessage():71:77 -> getDiagnosticMessage
@@ -72901,7 +72904,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():84:84 -> <clinit>
     1:6:com.android.tools.r8.errors.StartupClassesNonStartupFractionDiagnostic createStartupClassesNonStartupFractionDiagnostic(java.util.List,com.android.tools.r8.profile.startup.profile.StartupProfile):89:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/errors/StartupClassesNonStartupFractionDiagnostic;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/errors/StartupClassesNonStartupFractionDiagnostic;"}
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():100:100 -> a
     7:7:com.android.tools.r8.errors.StartupClassesNonStartupFractionDiagnostic createStartupClassesNonStartupFractionDiagnostic(java.util.List,com.android.tools.r8.profile.startup.profile.StartupProfile):94 -> a
     8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue(int):44:44 -> a
@@ -72921,11 +72924,11 @@
 com.android.tools.r8.errors.StartupClassesOverflowDiagnostic$Factory -> com.android.tools.r8.errors.f:
 # {"id":"sourceFile","fileName":"StartupClassesOverflowDiagnostic.java"}
     1:1:com.android.tools.r8.errors.StartupClassesOverflowDiagnostic createStartupClassesOverflowDiagnostic(int):48:48 -> a
-com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.Jj0:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.Nj0:
 # {"id":"sourceFile","fileName":"Unimplemented.java"}
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
-com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.qk0:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.uk0:
 # {"id":"sourceFile","fileName":"Unreachable.java"}
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>(java.lang.String):23:23 -> <init>
@@ -72939,35 +72942,35 @@
 com.android.tools.r8.errors.UnsupportedConstMethodHandleDiagnostic -> com.android.tools.r8.errors.UnsupportedConstMethodHandleDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedConstMethodHandleDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2589:2589 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2595:2595 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2589:2589 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2595:2595 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
 com.android.tools.r8.errors.UnsupportedConstMethodTypeDiagnostic -> com.android.tools.r8.errors.UnsupportedConstMethodTypeDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedConstMethodTypeDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2597:2597 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2603:2603 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2597:2597 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2603:2603 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
 com.android.tools.r8.errors.UnsupportedDefaultInterfaceMethodDiagnostic -> com.android.tools.r8.errors.UnsupportedDefaultInterfaceMethodDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedDefaultInterfaceMethodDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2621:2621 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultInterfaceMethodsApiLevel():2625 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2627:2627 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultInterfaceMethodsApiLevel():2631 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2621:2621 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultInterfaceMethodsApiLevel():2625 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2627:2627 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultInterfaceMethodsApiLevel():2631 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
@@ -72996,32 +72999,32 @@
 com.android.tools.r8.errors.UnsupportedInvokeCustomDiagnostic -> com.android.tools.r8.errors.UnsupportedInvokeCustomDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedInvokeCustomDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():24 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
 com.android.tools.r8.errors.UnsupportedInvokePolymorphicMethodHandleDiagnostic -> com.android.tools.r8.errors.UnsupportedInvokePolymorphicMethodHandleDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedInvokePolymorphicMethodHandleDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):20:20 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2573:2573 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2579:2579 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):20 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):20:20 -> <init>
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2573:2573 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2579:2579 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():26 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():28:28 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
 com.android.tools.r8.errors.UnsupportedInvokePolymorphicVarHandleDiagnostic -> com.android.tools.r8.errors.UnsupportedInvokePolymorphicVarHandleDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedInvokePolymorphicVarHandleDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnVarHandleApiLevel():2581:2581 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnVarHandleApiLevel():2587:2587 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnVarHandleApiLevel():2581:2581 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnVarHandleApiLevel():2587:2587 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
@@ -73035,24 +73038,24 @@
 com.android.tools.r8.errors.UnsupportedPrivateInterfaceMethodDiagnostic -> com.android.tools.r8.errors.UnsupportedPrivateInterfaceMethodDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedPrivateInterfaceMethodDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.privateInterfaceMethodsApiLevel():2637:2637 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.privateInterfaceMethodsApiLevel():2643:2643 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.privateInterfaceMethodsApiLevel():2637:2637 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.privateInterfaceMethodsApiLevel():2643:2643 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
 com.android.tools.r8.errors.UnsupportedStaticInterfaceMethodDiagnostic -> com.android.tools.r8.errors.UnsupportedStaticInterfaceMethodDiagnostic:
 # {"id":"sourceFile","fileName":"UnsupportedStaticInterfaceMethodDiagnostic.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2621:2621 -> <init>
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.staticInterfaceMethodsApiLevel():2629 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2627:2627 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.staticInterfaceMethodsApiLevel():2635 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19 -> <init>
     3:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):19:19 -> <init>
     1:1:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2621:2621 -> getDiagnosticMessage
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.staticInterfaceMethodsApiLevel():2629 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.defaultAndStaticInterfaceMethodsApiLevel():2627:2627 -> getDiagnosticMessage
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.staticInterfaceMethodsApiLevel():2635 -> getDiagnosticMessage
     2:2:java.lang.String getDiagnosticMessage():25 -> getDiagnosticMessage
     3:3:java.lang.String getDiagnosticMessage():25:25 -> getDiagnosticMessage
     4:4:java.lang.String getDiagnosticMessage():24:24 -> getDiagnosticMessage
@@ -73068,35 +73071,35 @@
     2:2:com.android.tools.r8.position.Position com.android.tools.r8.shaking.ProguardClassSpecification.getPosition():248:248 -> getPosition
     2:2:com.android.tools.r8.position.Position getPosition():27 -> getPosition
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.om:
 # {"id":"sourceFile","fileName":"DontWarnConfiguration.java"}
     1:1:void <init>():12:12 -> <init>
     boolean matches(com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     boolean validate(com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     1:1:boolean matches(com.android.tools.r8.graph.Definition):27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;)Z"}
     2:2:boolean com.android.tools.r8.shaking.ProguardConfiguration.hasDontWarnPatterns():601:601 -> a
     2:2:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Y2;)Lcom/android/tools/r8/internal/mm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Y2;)Lcom/android/tools/r8/internal/om;"}
     3:3:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):16:16 -> a
     4:4:com.android.tools.r8.shaking.ProguardClassFilter com.android.tools.r8.shaking.ProguardConfiguration.getDontWarnPatterns(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness):606:606 -> a
     4:4:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):17 -> a
     5:5:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):17:17 -> a
     6:6:com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration empty():23:23 -> a
     6:6:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):19 -> a
-com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.Qm:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.Sm:
 # {"id":"sourceFile","fileName":"EmptyDontWarnConfiguration.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     2:2:boolean validate(com.android.tools.r8.utils.InternalOptions):19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.rR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.vR:
 # {"id":"sourceFile","fileName":"NonEmptyDontWarnConfiguration.java"}
     java.util.List dontWarnPatterns -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Map matchedDontWarnPatterns -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> c
@@ -73115,12 +73118,12 @@
     8:8:java.util.Set lambda$recordMatch$0(com.android.tools.r8.shaking.ProguardClassNameList):45:45 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M2;)Ljava/util/Set;"}
     9:11:boolean validate(com.android.tools.r8.utils.InternalOptions):52:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     12:14:boolean validateNoUnnecessaryDontWarnWildcards():59:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     15:20:boolean validateNoUnnecessaryDontWarnWildcards():60:65 -> a
     1:3:boolean validateNoUnusedDontWarnPatterns(com.android.tools.r8.utils.InternalOptions):72:74 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     4:6:boolean validateNoUnusedDontWarnPatterns(com.android.tools.r8.utils.InternalOptions):73:75 -> b
 com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode -> com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode:
 # {"id":"sourceFile","fileName":"AnnotationGraphNode.java"}
@@ -73155,19 +73158,19 @@
 com.android.tools.r8.experimental.graphinfo.GraphConsumer -> com.android.tools.r8.experimental.graphinfo.GraphConsumer:
 # {"id":"sourceFile","fileName":"GraphConsumer.java"}
     void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo) -> acceptEdge
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/hs;)V"}
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.hs:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/js;)V"}
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.js:
 # {"id":"sourceFile","fileName":"GraphEdgeInfo.java"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():6:8 -> <clinit>
     1:2:void <init>(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):42:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hs$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/js$a;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     1:45:java.lang.String getInfoPrefix():51:95 -> b
     46:46:java.lang.String getInfoPrefix():90:90 -> b
     47:47:java.lang.String getInfoPrefix():88:88 -> b
@@ -73190,58 +73193,58 @@
     1:1:boolean equals(java.lang.Object):106:106 -> equals
     1:1:int hashCode():111:111 -> hashCode
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.is:
 # {"id":"sourceFile","fileName":"GraphEdgeInfo.java"}
     int[] $SwitchMap$com$android$tools$r8$experimental$graphinfo$GraphEdgeInfo$EdgeKind -> a
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.hs$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.js$a:
 # {"id":"sourceFile","fileName":"GraphEdgeInfo.java"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind KeepRule -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind CompatibilityRule -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ConditionalKeepRule -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind KeepRulePrecondition -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind InstantiatedIn -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind InvokedViaSuper -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind TargetedBySuper -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind InvokedFrom -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind InvokedFromLambdaCreatedIn -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind AnnotatedOn -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedFrom -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReflectiveUseFrom -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReachableFromLiveType -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedInAnnotation -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind IsLibraryMethod -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind OverridingMethod -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind MethodHandleUseFrom -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedFromXml -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind Unknown -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/js$a;"}
     1:21:void <clinit>():17:37 -> <clinit>
     22:22:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] values():15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.experimental.graphinfo.GraphNode -> com.android.tools.r8.experimental.graphinfo.GraphNode:
 # {"id":"sourceFile","fileName":"GraphNode.java"}
     boolean isLibraryNode -> a
@@ -73290,7 +73293,7 @@
     1:1:com.android.tools.r8.references.MethodReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.nd:
 # {"id":"sourceFile","fileName":"ClassToFeatureSplitMap.java"}
     java.util.Map classToFeatureSplitMap -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -73301,9 +73304,9 @@
     1:3:void <init>(java.util.Map,java.util.Map):36:38 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nd;"}
     2:6:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):58:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Uo;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xo;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/internal/nd;"}
     7:7:java.util.List com.android.tools.r8.features.FeatureSplitConfiguration.getFeatureSplits():74:74 -> a
     7:7:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):63 -> a
     8:30:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.Reporter):63:85 -> a
@@ -73326,13 +73329,13 @@
     57:57:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getFeatureSplit$1(com.android.tools.r8.synthesis.SyntheticNaming):149:149 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     58:58:com.android.tools.r8.features.ClassToFeatureSplitMap lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/nd;"}
     59:59:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/nd;"}
     60:67:void lambda$rewrittenWithLens$3(com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):239:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/FeatureSplit;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/FeatureSplit;)V"}
     68:75:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):253:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/nd;"}
     76:76:com.android.tools.r8.features.ClassToFeatureSplitMap getMap(com.android.tools.r8.graph.AppView):268:268 -> a
     76:76:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):273 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Z"}
@@ -73365,8 +73368,8 @@
     84:84:boolean isInSameFeature(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):223 -> a
     1:1:boolean isEmpty():169:169 -> b
     2:14:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):236:248 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/ld;"}
-com.android.tools.r8.features.FeatureSplitBoundaryOptimizationUtils -> com.android.tools.r8.internal.Ro:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/nd;"}
+com.android.tools.r8.features.FeatureSplitBoundaryOptimizationUtils -> com.android.tools.r8.internal.Uo:
 # {"id":"sourceFile","fileName":"FeatureSplitBoundaryOptimizationUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -73420,7 +73423,7 @@
     17:17:boolean isSafeForAccess(com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):30 -> a
     18:26:boolean isSafeForAccess(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):48:56 -> a
     18:26:boolean isSafeForAccess(com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):30 -> a
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.Uo:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.Xo:
 # {"id":"sourceFile","fileName":"FeatureSplitConfiguration.java"}
     java.util.List featureSplits -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -73428,7 +73431,7 @@
     1:3:void <init>(java.util.List,boolean):21:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Z)V"}
     1:1:java.util.List getFeatureSplits():74:74 -> a
-com.android.tools.r8.features.FeatureSplitConfiguration$Builder -> com.android.tools.r8.internal.So:
+com.android.tools.r8.features.FeatureSplitConfiguration$Builder -> com.android.tools.r8.internal.Vo:
 # {"id":"sourceFile","fileName":"FeatureSplitConfiguration.java"}
     java.util.List featureSplits -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -73436,19 +73439,19 @@
     1:3:void <init>():81:83 -> <init>
     1:1:java.util.List getFeatureSplits():92:92 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.To:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.Wo:
 # {"id":"sourceFile","fileName":"FeatureSplitConfiguration.java"}
     java.util.Set providers -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.DataResourceConsumer consumer -> b
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):35:37 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/DataResourceConsumer;)V"}
-com.android.tools.r8.features.IsolatedFeatureSplitsChecker -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.features.IsolatedFeatureSplitsChecker -> com.android.tools.r8.internal.gC:
 # {"id":"sourceFile","fileName":"IsolatedFeatureSplitsChecker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.features.ClassToFeatureSplitMap features -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     4:4:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.graph.AppInfoWithClassHierarchy.getClassToFeatureSplitMap():148:148 -> <init>
@@ -73535,7 +73538,7 @@
     1:4:void traceMethodInvoke(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):65:68 -> d
     1:4:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):151 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.features.diagnostic.IllegalAccessWithIsolatedFeatureSplitsDiagnostic -> com.android.tools.r8.internal.fu:
+com.android.tools.r8.features.diagnostic.IllegalAccessWithIsolatedFeatureSplitsDiagnostic -> com.android.tools.r8.internal.hu:
 # {"id":"sourceFile","fileName":"IllegalAccessWithIsolatedFeatureSplitsDiagnostic.java"}
     com.android.tools.r8.graph.DexReference accessedItem -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F2;"}
@@ -73571,7 +73574,7 @@
     com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d;)Lcom/android/tools/r8/graph/d;"}
     com.android.tools.r8.graph.AbstractAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/d;"}
     com.android.tools.r8.graph.AbstractAccessContexts withoutPrunedItems(com.android.tools.r8.graph.PrunedItems) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/graph/d;"}
     int getNumberOfAccessContexts() -> b
@@ -73591,14 +73594,14 @@
     2:2:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     2:2:void lambda$flattenAccessContexts$2(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/CY;)V"}
     3:3:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     3:3:void lambda$flattenAccessContexts$2(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):240 -> a
     4:4:com.android.tools.r8.graph.AbstractAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/d;"}
     5:6:void forEachAccess(java.util.function.Consumer,java.util.function.Predicate):181:182 -> a
     7:8:void lambda$forEachAccess$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):184:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/CY;)V"}
     9:11:void forEachAccessContext(java.util.function.Consumer):196:198 -> a
     12:12:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     12:12:void forEachAccessContext(java.util.function.Consumer):199 -> a
@@ -73637,7 +73640,7 @@
     46:46:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):373 -> a
     47:58:com.android.tools.r8.graph.AbstractAccessContexts join(com.android.tools.r8.graph.AbstractAccessContexts):376:387 -> a
     59:59:void lambda$join$4(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):379:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/CY;)V"}
     60:60:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(java.util.Collection):61:61 -> a
     60:60:void lambda$join$4(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):379 -> a
     61:61:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(int):45:45 -> a
@@ -73667,7 +73670,7 @@
     4:4:int getNumberOfAccessContexts():215 -> b
     5:5:int getNumberOfAccessContexts():217:217 -> b
     6:6:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$flattenAccessContexts$1(com.android.tools.r8.graph.DexField):236:236 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/CY;"}
     7:7:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):272:272 -> b
     8:8:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> b
     8:8:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):273 -> b
@@ -73676,7 +73679,7 @@
     9:9:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):273 -> b
     10:11:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):273:274 -> b
     12:13:com.android.tools.r8.graph.AbstractAccessContexts$ConcreteAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):323:324 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/a;"}
     14:14:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.GraphLens.lookupField(com.android.tools.r8.graph.DexField):333:333 -> b
     14:14:com.android.tools.r8.graph.AbstractAccessContexts$ConcreteAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):325 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -73705,7 +73708,7 @@
     35:37:com.android.tools.r8.graph.AbstractAccessContexts$ConcreteAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):344:346 -> b
     38:40:com.android.tools.r8.graph.AbstractAccessContexts$ConcreteAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):345:347 -> b
     41:41:void lambda$join$6(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):384:384 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/CY;)V"}
     42:42:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> b
     42:42:void lambda$join$6(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):385 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -73713,9 +73716,9 @@
     43:43:void lambda$join$6(java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):385 -> b
     1:1:boolean isEmpty():310:310 -> c
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$join$5(com.android.tools.r8.graph.DexField):384:384 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/CY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordAccess$3(com.android.tools.r8.graph.DexField):315:315 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/CY;"}
 com.android.tools.r8.graph.AbstractAccessContexts$EmptyAccessContexts -> com.android.tools.r8.graph.b:
 # {"id":"sourceFile","fileName":"AbstractAccessContexts.java"}
     com.android.tools.r8.graph.AbstractAccessContexts$EmptyAccessContexts INSTANCE -> a
@@ -73733,7 +73736,7 @@
     6:6:com.android.tools.r8.graph.AbstractAccessContexts withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/graph/d;"}
     7:7:com.android.tools.r8.graph.AbstractAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/d;"}
     1:1:int getNumberOfAccessContexts():0:0 -> b
     2:2:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):0:0 -> b
     boolean isEmpty() -> c
@@ -73754,7 +73757,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/graph/d;"}
     6:6:void forEachAccessContext(java.util.function.Consumer):432:432 -> a
     7:7:com.android.tools.r8.graph.AbstractAccessContexts rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):468:468 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/d;"}
     1:1:boolean isAccessedOnlyInMethodSatisfying(java.util.function.Predicate):0:0 -> b
     2:2:int getNumberOfAccessContexts():452:452 -> b
     boolean isEmpty() -> c
@@ -73763,7 +73766,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):24:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     3:3:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):206:206 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):25 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -73778,7 +73781,7 @@
     8:10:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):29:31 -> a
     11:15:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):30:34 -> a
     16:26:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):66:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     27:33:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):101:107 -> a
     27:33:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):76 -> a
     34:38:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):77:81 -> a
@@ -73800,7 +73803,7 @@
     int originalFlags -> b
     int modifiedFlags -> c
     java.util.List NAMES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> e
     1:12:void <clinit>():16:27 -> <clinit>
     1:3:void <init>(int,int):55:57 -> <init>
@@ -73833,10 +73836,10 @@
     4:4:void demote(int):311:311 -> b
     4:4:void demoteFromSynthetic():239 -> b
     1:1:java.util.List getNames():49:49 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:boolean isSet(int,int):0:0 -> d
     2:2:java.util.List getPredicates():38:38 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:7:int getVisibilityOrdinal():132:138 -> e
     1:3:boolean equals(java.lang.Object):107:109 -> equals
     1:1:boolean isSet(int):281:281 -> g
@@ -73905,7 +73908,7 @@
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/I;"}
     com.android.tools.r8.utils.BooleanBox obsolete -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F6;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:com.android.tools.r8.graph.DexApplication com.android.tools.r8.synthesis.CommittedItems.getApplication():55:55 -> <init>
@@ -73917,13 +73920,13 @@
     3:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.shaking.MainDexInfo):50:50 -> <init>
     4:4:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.shaking.MainDexInfo):48:48 -> <init>
     5:10:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.utils.BooleanBox):66:71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/internal/D6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/internal/F6;)V"}
     1:1:com.android.tools.r8.graph.AppInfo createInitialAppInfo(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/synthesis/D;)Lcom/android/tools/r8/graph/h;"}
     2:3:com.android.tools.r8.graph.AppInfo createInitialAppInfo(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy,com.android.tools.r8.shaking.MainDexInfo):42:43 -> a
     2:3:com.android.tools.r8.graph.AppInfo createInitialAppInfo(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):35 -> a
     4:5:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/h;"}
     6:6:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.PrunedItems.getPrunedApp():97:97 -> a
     6:6:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -73978,7 +73981,7 @@
     1:1:boolean hasClassHierarchy():261:261 -> h
     1:1:boolean hasLiveness():271:271 -> i
     1:1:com.android.tools.r8.utils.InternalOptions options():98:98 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:void unsetObsolete():110:110 -> k
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():266:266 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j;"}
@@ -73987,7 +73990,7 @@
 com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.j:
 # {"id":"sourceFile","fileName":"AppInfoWithClassHierarchy.java"}
     com.android.tools.r8.features.ClassToFeatureSplitMap classToFeatureSplitMap -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
     com.android.tools.r8.shaking.MissingClasses missingClasses -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/e2;"}
     boolean $assertionsDisabled -> i
@@ -74000,13 +74003,13 @@
     3:3:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):84 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$CreateDesugaringViewOnAppInfo,com.android.tools.r8.graph.AppInfo):84:84 -> <init>
     5:7:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses):73:75 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/a;Lcom/android/tools/r8/internal/ld;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/shaking/e2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/a;Lcom/android/tools/r8/internal/nd;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/shaking/e2;)V"}
     1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/h;"}
     2:2:com.android.tools.r8.graph.AppInfo rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):41:41 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Y1;)Lcom/android/tools/r8/graph/h;"}
     3:4:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):54:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/ld;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/synthesis/D;)Lcom/android/tools/r8/graph/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/nd;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/synthesis/D;)Lcom/android/tools/r8/graph/j;"}
     5:5:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses.empty():51:51 -> a
     5:5:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):58 -> a
     6:6:com.android.tools.r8.graph.AppInfoWithClassHierarchy createInitialAppInfoWithClassHierarchy(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):58:58 -> a
@@ -74027,21 +74030,21 @@
     17:17:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):112 -> a
     18:18:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithClassHierarchy(java.util.function.Function):112:112 -> a
     19:22:com.android.tools.r8.utils.TraversalContinuation traverseSuperClasses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):171:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Oh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Sh0;)Lcom/android/tools/r8/internal/Oh0;"}
     23:23:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     23:23:com.android.tools.r8.utils.TraversalContinuation traverseSuperClasses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.utils.TraversalContinuation traverseSuperClasses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):180:180 -> a
     25:25:void forEachSuperType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):263:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Nh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Rh0;)V"}
     26:27:com.android.tools.r8.utils.TraversalContinuation lambda$forEachSuperType$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):266:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     28:28:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):306:306 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     29:58:boolean isStrictSubtypeOfClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):329:358 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;)Z"}
     59:60:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOfClass$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):347:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Oh0;"}
     61:61:com.android.tools.r8.utils.TraversalContinuation$Break com.android.tools.r8.utils.TraversalContinuation.doBreak(java.lang.Object):152:152 -> a
     61:61:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOfClass$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):348 -> a
     62:62:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOfClass$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):351:351 -> a
@@ -74087,7 +74090,7 @@
     115:122:java.util.List com.android.tools.r8.graph.MethodResolution.getAbstractInterfaceMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):250 -> a
     115:122:java.util.List getAbstractInterfaceMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):571 -> a
     123:123:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):580:580 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/U4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/U4;"}
     124:127:com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder com.android.tools.r8.graph.MethodResolution.resolveMaximallySpecificTargetHelper(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):263:266 -> a
     124:127:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.MethodResolution.resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):239 -> a
     124:127:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):581 -> a
@@ -74148,7 +74151,7 @@
     6:6:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):123 -> b
     7:7:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):123:123 -> b
     8:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130:131 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/j;"}
     10:10:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.PrunedItems.getPrunedApp():97:97 -> b
     10:10:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):132 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -74165,7 +74168,7 @@
     24:24:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):142 -> b
     25:26:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):142:143 -> b
     27:32:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):201:206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Oh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Sh0;)Lcom/android/tools/r8/internal/Oh0;"}
     33:33:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> b
     33:33:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriFunction):207 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -74281,7 +74284,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/U4;"}
     1:1:boolean hasClassHierarchy():157:157 -> h
     2:3:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):379:380 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/zA;"}
     4:4:com.android.tools.r8.ir.analysis.type.InterfaceCollection com.android.tools.r8.ir.analysis.type.InterfaceCollection.empty():76:76 -> h
     4:4:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):382 -> h
     5:7:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):386:388 -> h
@@ -74290,7 +74293,7 @@
     9:25:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):393:409 -> h
     26:26:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):27:27 -> h
     26:26:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):409 -> h
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():3151:3151 -> h
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():3157:3157 -> h
     27:27:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):27 -> h
     27:27:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):409 -> h
     28:29:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions) -> h
@@ -74298,7 +74301,7 @@
     30:59:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):410:439 -> h
     60:60:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):27:27 -> h
     60:60:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):439 -> h
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():3151:3151 -> h
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.canHaveZipFileWithMissingCloseableBug():3157:3157 -> h
     61:61:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):27 -> h
     61:61:com.android.tools.r8.ir.analysis.type.InterfaceCollection implementedInterfaces(com.android.tools.r8.graph.DexType):439 -> h
     62:63:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isKnownToImplement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):28:29 -> h
@@ -74311,7 +74314,7 @@
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():163:163 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j;"}
     1:1:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():148:148 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ld;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nd;"}
     1:1:com.android.tools.r8.shaking.MissingClasses getMissingClasses():152:152 -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/e2;"}
     void notifyMinifierFinished() -> p
@@ -74323,7 +74326,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens applied -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Map services -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     boolean $assertionsDisabled -> d
@@ -74335,7 +74338,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Ljava/util/Map;)V"}
     4:4:void lambda$computeAllServiceImplementations$0(java.util.Set,com.android.tools.r8.FeatureSplit,java.util.List):73:73 -> a
     5:12:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):78:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xu;"}
     13:23:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):81:91 -> a
     24:53:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Z"}
@@ -74343,10 +74346,10 @@
     57:57:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:104 -> a
     58:58:boolean lambda$hasServiceImplementationsInFeature$2(com.android.tools.r8.FeatureSplit):108:108 -> a
     59:59:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/l;"}
     60:70:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):139:149 -> a
     60:70:com.android.tools.r8.graph.AppServices lambda$rewrittenWithLens$3(com.android.tools.r8.graph.lens.GraphLens):134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/l;"}
     71:75:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):148:152 -> a
     71:75:com.android.tools.r8.graph.AppServices lambda$rewrittenWithLens$3(com.android.tools.r8.graph.lens.GraphLens):134 -> a
     76:76:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):151:151 -> a
@@ -74374,7 +74377,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Map services -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):227:227 -> <init>
@@ -74441,25 +74444,25 @@
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.y:
 # {"id":"sourceFile","fileName":"AppView.java"}
     com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection libraryMethodSideEffectModelCollection -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KJ;"}
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator argumentPropagator -> B
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d3;"}
     com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GJ;"}
     com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g10;"}
     boolean allCodeProcessed -> E
     java.util.function.Predicate classesEscapingIntoLibrary -> F
     com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kv;"}
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zs;"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses verticallyMergedClasses -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql0;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection openClosedInterfacesCollection -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
     java.util.Set cfByteCodePassThrough -> L
     java.util.Map sourceDebugExtensions -> M
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -74468,10 +74471,10 @@
     com.android.tools.r8.naming.SeedMapper applyMappingSeedMapper -> O
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/T0;"}
     com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState resourceShrinkerState -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q10;"}
     java.util.Set alreadyLibraryDesugared -> Q
     com.android.tools.r8.contexts.CompilationContext context -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ke;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Me;"}
     java.lang.Thread mainThread -> S
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> T
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/a;"}
@@ -74492,17 +74495,17 @@
     com.android.tools.r8.shaking.AssumeInfoCollection assumeInfoCollection -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/l;"}
     com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/om;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens genericSignaturesLens -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.InitClassLens initClassLens -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iv;"}
     com.android.tools.r8.graph.lens.GraphLens kotlinMetadataLens -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.naming.NamingLens namingLens -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/r0;"}
     com.android.tools.r8.shaking.ProguardCompatibilityActions proguardCompatibilityActions -> m
@@ -74514,11 +74517,11 @@
     com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet mainDexRootSet -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/j4;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/p1;"}
     com.android.tools.r8.optimize.compose.ComposeReferences composeReferences -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Te;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ve;"}
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C1;"}
     com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueConstantPropagationJoiner abstractValueConstantPropagationJoiner -> u
@@ -74528,14 +74531,14 @@
     com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueParameterJoiner abstractValueParameterJoiner -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G1;"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iw;"}
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tb0;"}
     com.android.tools.r8.ir.desugar.TypeRewriter typeRewriter -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kj0;"}
     1:1:void <clinit>():86:86 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):193:193 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/f4;Lcom/android/tools/r8/internal/yd0;ILcom/android/tools/r8/internal/gj0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/f4;Lcom/android/tools/r8/internal/Cd0;ILcom/android/tools/r8/internal/kj0;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection.builder():34:34 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):101 -> <init>
     3:11:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):101:109 -> <init>
@@ -74549,24 +74552,24 @@
     54:54:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):153 -> <init>
     55:595:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):153:693 -> <init>
     596:620:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):194:218 -> <init>
-    621:624:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1669:1672 -> <init>
+    621:624:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1675:1678 -> <init>
     621:624:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):218 -> <init>
     625:641:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):219:235 -> <init>
     1:1:com.android.tools.r8.graph.lens.GraphLens graphLens():665:665 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     1:1:boolean hasCfByteCodePassThroughMethods():995:995 -> B
     1:1:boolean hasLiveness():955:955 -> C
     1:1:boolean hasUnboxedEnums():910:910 -> D
     1:1:com.android.tools.r8.contexts.CompilationContext lambda$new$0():198:198 -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ke;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Me;"}
     2:2:com.android.tools.r8.contexts.CompilationContext com.android.tools.r8.contexts.CompilationContext.createInitialContext(com.android.tools.r8.utils.InternalOptions):34:34 -> E
     2:2:com.android.tools.r8.contexts.CompilationContext lambda$new$0():198 -> E
     1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration lambda$new$1():214:214 -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/om;"}
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection lambda$new$2():228:228 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KJ;"}
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231:231 -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/g10;"}
     2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):58:64 -> H
     2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231 -> H
     9:9:com.android.tools.r8.utils.Reporter reporter():754:754 -> H
@@ -74574,11 +74577,11 @@
     9:9:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231 -> H
     10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):66:70 -> H
     10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231 -> H
-    15:15:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():2124:2124 -> H
+    15:15:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():2130:2130 -> H
     15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> H
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231 -> H
-    16:19:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():2125:2128 -> H
+    16:19:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():2131:2134 -> H
     16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> H
     16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():231 -> H
     20:20:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):74:74 -> H
@@ -74588,21 +74591,21 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel lambda$new$6():236:236 -> J
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/androidapi/f;"}
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():579:579 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GJ;"}
     1:4:void loadApplyMappingSeedMapper():1360:1363 -> L
     5:5:void loadApplyMappingSeedMapper():1362:1362 -> L
     1:1:com.android.tools.r8.utils.InternalOptions options():750:750 -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():587:587 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/g10;"}
     1:1:com.android.tools.r8.utils.Reporter reporter():754:754 -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():766:766 -> P
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l4;"}
     1:1:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():758:758 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$q;"}
     1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():914:914 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yn;"}
     2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():34:34 -> R
     2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():914 -> R
     1:4:boolean validateUnboxedEnumsHaveBeenPruned():928:931 -> S
@@ -74619,7 +74622,7 @@
     2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():950 -> W
     3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():950:950 -> W
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer lambda$new$3(com.android.tools.r8.utils.Timing):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/CJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/GJ;"}
     2:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):255:258 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;)Lcom/android/tools/r8/graph/y;"}
     6:7:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):250:251 -> a
@@ -74645,23 +74648,23 @@
     28:28:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):178:178 -> a
     28:28:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):311 -> a
     29:35:void clearCodeRewritings(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):439:445 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     36:36:void setAppServices(com.android.tools.r8.graph.AppServices):459:459 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l;)V"}
     37:37:void setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):467:467 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)V"}
     38:38:void setStartupProfile(com.android.tools.r8.profile.startup.profile.StartupProfile):475:475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     39:39:void setAssumeInfoCollection(com.android.tools.r8.shaking.AssumeInfoCollection):483:483 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l;)V"}
     40:41:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):573:574 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     42:43:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):620:621 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"}
     44:45:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):650:651 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Ljava/lang/Object;"}
     46:53:boolean setGraphLens(com.android.tools.r8.graph.lens.GraphLens):670:677 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     54:54:boolean com.android.tools.r8.graph.lens.GraphLens.isAppliedLens():0:0 -> a
     54:54:boolean setGraphLens(com.android.tools.r8.graph.lens.GraphLens):677 -> a
     55:55:boolean com.android.tools.r8.graph.lens.GraphLens.isClearCodeRewritingLens():0:0 -> a
@@ -74697,7 +74700,7 @@
     71:71:void setNamingLens(com.android.tools.r8.naming.NamingLens):831:831 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;)V"}
     72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):872:872 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zs;)V"}
     73:73:boolean hasHorizontallyMergedClasses():860:860 -> a
     73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):872 -> a
     74:74:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isEmpty():59:59 -> a
@@ -74709,28 +74712,28 @@
     75:75:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):872 -> a
     76:78:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):872:874 -> a
     79:83:void setVerticallyMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,com.android.tools.r8.classmerging.ClassMergerMode):892:896 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql0;I)V"}
     84:84:void setOpenClosedInterfacesCollection(com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection):906:906 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QU;)V"}
     85:87:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):918:920 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yn;)V"}
     88:88:boolean hasClassHierarchy():938:938 -> a
     88:88:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):969 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/UU;"}
     89:91:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):970:972 -> a
     92:92:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     92:92:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):975 -> a
     93:93:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):973:973 -> a
     94:97:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):983:986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     98:98:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):986 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     99:99:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):986 -> a
     100:105:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):986:991 -> a
     106:107:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1000:1001 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     108:108:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.PrunedItems.getPrunedApp():97:97 -> a
     108:108:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1001 -> a
     109:118:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1001:1010 -> a
@@ -74820,13 +74823,13 @@
     183:184:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1031:1032 -> a
     185:187:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1031:1033 -> a
     188:188:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1057:1057 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/graph/c3;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/graph/c3;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     189:189:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     189:189:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1057 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     190:192:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1056:1058 -> a
     193:198:void lambda$rewriteWithLensAndApplication$10(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1095:1100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     199:199:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     199:199:void lambda$rewriteWithLensAndApplication$10(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1100 -> a
     200:200:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing$TimingMerger.disableSlowestReporting():338:338 -> a
@@ -74859,7 +74862,7 @@
     218:223:void com.android.tools.r8.utils.threads.ThreadTaskUtils.processTasks(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing$TimingMerger,com.android.tools.r8.utils.threads.ThreadTask[]):44:49 -> a
     218:223:void lambda$rewriteWithLensAndApplication$10(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1096 -> a
     224:225:com.android.tools.r8.graph.lens.GraphLens computeNewMemberRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.Timing):1304:1305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/ns;"}
     226:226:boolean com.android.tools.r8.graph.lens.GraphLens.isMemberRebindingLens():0:0 -> a
     226:226:com.android.tools.r8.graph.lens.GraphLens computeNewMemberRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.Timing):1306 -> a
     227:227:boolean com.android.tools.r8.graph.lens.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
@@ -74878,7 +74881,7 @@
     235:235:com.android.tools.r8.graph.lens.GraphLens computeNewMemberRebindingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.Timing):1318:1318 -> a
     236:236:boolean checkForTesting(java.util.function.Supplier):1376:1376 -> a
     237:237:void lambda$verifyOriginalMethodInPosition$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1418:1418 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;)V"}
     238:238:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     238:238:void lambda$verifyOriginalMethodInPosition$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1418 -> a
     239:239:void lambda$verifyOriginalMethodInPosition$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1419:1419 -> a
@@ -74905,13 +74908,13 @@
     14:14:com.android.tools.r8.graph.DexItemFactory dexItemFactory():533:533 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
     15:16:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):613:614 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     17:18:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):642:643 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"}
     19:20:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):743:744 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Ljava/lang/Object;"}
     21:30:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):1069:1078 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     31:31:boolean com.android.tools.r8.graph.lens.GraphLens.isHorizontalClassMergerGraphLens():0:0 -> b
     31:31:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):1078 -> b
     32:33:void rewriteWithLensAndApplication(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):1078:1079 -> b
@@ -74959,7 +74962,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():343:343 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C1;"}
     2:3:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):635:636 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     4:4:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$12(com.android.tools.r8.graph.DexProgramClass):1401:1401 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     5:12:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.ProgramMethod):1409:1416 -> c
@@ -74973,9 +74976,9 @@
     3:3:boolean com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer.isModeled(com.android.tools.r8.graph.DexType):107:107 -> d
     3:3:boolean isModeled(com.android.tools.r8.graph.DexType):246 -> d
     4:5:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):628:629 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     6:6:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():849:849 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xN;"}
     7:7:boolean hasHorizontallyMergedClasses():860:860 -> d
     7:7:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():850 -> d
     8:8:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isEmpty():59:59 -> d
@@ -75013,9 +75016,9 @@
     1:1:boolean canUseInitClass():700:700 -> j
     1:1:void clearApplyMappingSeedMapper():1372:1372 -> k
     1:1:com.android.tools.r8.graph.lens.GraphLens codeLens():657:657 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():559:559 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Je;"}
     2:2:boolean verifyMainThread():240:240 -> m
     2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():559 -> m
     3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():560:560 -> m
@@ -75032,7 +75035,7 @@
     1:1:com.android.tools.r8.profile.art.ArtProfileCollection getArtProfileCollection():463:463 -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f4;"}
     1:1:com.android.tools.r8.optimize.compose.ComposeReferences getComposeReferences():537:537 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Te;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ve;"}
     2:2:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> r
     2:2:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():31 -> r
     2:2:com.android.tools.r8.optimize.compose.ComposeReferences getComposeReferences():537 -> r
@@ -75044,24 +75047,24 @@
     4:4:com.android.tools.r8.optimize.compose.ComposeReferences getComposeReferences():537 -> r
     5:9:com.android.tools.r8.optimize.compose.ComposeReferences getComposeReferences():537:541 -> r
     1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():487:487 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/om;"}
     1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():791:791 -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/p1;"}
     2:2:boolean hasKeepInfo():787:787 -> t
     2:2:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():791 -> t
     3:4:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():791:792 -> t
     1:1:com.android.tools.r8.graph.lens.GraphLens getKotlinMetadataLens():716:716 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():583:583 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KJ;"}
     1:1:com.android.tools.r8.naming.NamingLens getNamingLens():827:827 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/r0;"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile getStartupProfile():471:471 -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cd0;"}
     1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():564:564 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/synthesis/I;"}
     1:1:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses getVerticallyMergedClasses():886:886 -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ql0;"}
 com.android.tools.r8.graph.AppView$1 -> com.android.tools.r8.graph.p:
 # {"id":"sourceFile","fileName":"AppView.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy result -> a
@@ -75071,15 +75074,15 @@
     com.android.tools.r8.graph.DirectMappedDexApplication val$application -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/c3;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens val$appliedLensInModifiedLens -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1102:1102 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1102:1102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1108:1108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1108 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75114,11 +75117,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1237:1237 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1240:1240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.profile.startup.profile.StartupProfile com.android.tools.r8.graph.AppView.getStartupProfile():471:471 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75136,13 +75139,13 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens val$appliedLensInModifiedLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1249:1249 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1253:1253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1253 -> a
     3:5:void run(com.android.tools.r8.utils.Timing):1254:1256 -> a
@@ -75153,13 +75156,13 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens val$appliedLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1266:1266 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1269:1269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods com.android.tools.r8.graph.AppView.getInitializedClassesInInstanceMethods():728:728 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75176,11 +75179,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1132:1132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1135:1135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75200,11 +75203,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1144:1144 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1147:1147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.profile.art.ArtProfileCollection com.android.tools.r8.graph.AppView.getArtProfileCollection():463:463 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1149 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75222,13 +75225,13 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens val$appliedLensInModifiedLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1158:1158 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1161:1161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75250,11 +75253,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1173:1173 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1176:1176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.graph.lens.InitClassLens com.android.tools.r8.graph.AppView.initClassLens():704:704 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75271,11 +75274,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1185:1185 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1188:1188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.graph.AppView.getProguardCompatibilityActions():839:839 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75296,11 +75299,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1200:1200 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1203:1203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet com.android.tools.r8.graph.AppView.getMainDexRootSet():783:783 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75316,11 +75319,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1212:1212 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1215:1215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection com.android.tools.r8.graph.AppView.getOpenClosedInterfacesCollection():901:901 -> a
     2:2:void run(com.android.tools.r8.utils.Timing):1217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75336,11 +75339,11 @@
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.NonIdentityGraphLens):1226:1226 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;)V"}
     1:1:void run(com.android.tools.r8.utils.Timing):1229:1229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     1:1:boolean shouldRun():1234:1234 -> b
     2:2:boolean com.android.tools.r8.graph.AppView.hasRootSet():762:762 -> b
     2:2:boolean shouldRun():1234 -> b
@@ -75352,7 +75355,7 @@
     com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:3:com.android.tools.r8.graph.ApplicationReaderMap getInstance(com.android.tools.r8.utils.InternalOptions):18:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/B;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/B;"}
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
 com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.graph.z:
@@ -75386,13 +75389,13 @@
     com.android.tools.r8.kotlin.Kotlin kotlin -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/g;"}
     com.android.tools.r8.contexts.CompilationContext compilationContext -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ke;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Me;"}
     com.android.tools.r8.utils.RetracerForCodePrinting retracer -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P90;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):46:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/gB;ZZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/iB;ZZZ)V"}
     2:2:com.android.tools.r8.contexts.CompilationContext com.android.tools.r8.contexts.CompilationContext.createInitialContext(com.android.tools.r8.utils.InternalOptions):34:34 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):47 -> <init>
     3:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):47:56 -> <init>
@@ -75404,7 +75407,7 @@
     32:32:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):68:68 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore.getInstance():32:32 -> a
     1:1:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     2:5:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):195:198 -> a
     6:6:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):193:193 -> a
     7:7:void writeIR(com.android.tools.r8.graph.ProgramMethod):186:186 -> a
@@ -75515,11 +75518,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.position.Position diagnosticPosition -> l
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata metadata -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d8;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():62:62 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):157:158 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/xu;)V"}
     3:3:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):152:152 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):168:168 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;IILjava/util/List;Ljava/util/List;Ljava/util/List;)V"}
@@ -75529,7 +75532,7 @@
     6:6:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):186:186 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):168 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):205:205 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;IILjava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/position/Position;Lcom/android/tools/r8/internal/b8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;IILjava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/position/Position;Lcom/android/tools/r8/internal/d8;)V"}
     8:88:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):133:213 -> <init>
     1:1:com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind():223:223 -> G
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
@@ -75551,7 +75554,7 @@
     3:3:void com.android.tools.r8.cf.code.CfInstruction.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):89:89 -> a
     3:3:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):369 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;Lcom/android/tools/r8/internal/B9;)V"}
     4:4:void com.android.tools.r8.cf.code.CfInstruction.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):89:89 -> a
     4:4:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):369 -> a
     5:5:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
@@ -75564,7 +75567,7 @@
     7:7:void com.android.tools.r8.cf.code.CfInstruction.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):90:90 -> a
     7:7:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):369 -> a
     8:8:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/b8;"}
     9:9:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.cf.code.CfInstruction):237:237 -> a
     9:9:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):233 -> a
     10:10:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata.getMetadata(java.lang.Object):38:38 -> a
@@ -75605,7 +75608,7 @@
     29:29:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):381 -> a
     30:30:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):381:381 -> a
     31:35:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):435:439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     36:36:com.android.tools.r8.graph.lens.InitClassLens com.android.tools.r8.graph.AppView.initClassLens():704:704 -> a
     36:36:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):440 -> a
     37:39:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):441:443 -> a
@@ -75627,19 +75630,19 @@
     56:56:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):78:78 -> a
     56:56:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):445 -> a
     57:60:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):456:459 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():616:616 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():615:615 -> a
     61:61:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):460 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():612:612 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():616 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():611:611 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():615 -> a
     62:62:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():616:616 -> a
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():615:615 -> a
     63:63:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):460 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():612:612 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():617 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():611:611 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():616 -> a
     64:64:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():617:617 -> a
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():616:616 -> a
     65:65:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):460 -> a
     66:66:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):461:461 -> a
     67:67:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
@@ -75666,7 +75669,7 @@
     144:144:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):541:541 -> a
     144:144:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):518 -> a
     145:145:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):587:587 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     146:146:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.AppView.codeLens():657:657 -> a
     146:146:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -75675,118 +75678,126 @@
     148:151:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202:205 -> a
     148:151:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635 -> a
     148:151:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    152:152:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):637:637 -> a
+    152:152:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    152:152:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):205 -> a
+    152:152:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635 -> a
     152:152:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    153:153:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):636:636 -> a
+    153:153:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):637:637 -> a
     153:153:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    154:155:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:671 -> a
-    154:155:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    154:155:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    156:169:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:683 -> a
-    156:169:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    156:169:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    170:170:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):682:682 -> a
-    170:170:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    170:170:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
-    171:183:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):601:613 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
-    184:184:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635:635 -> a
-    184:184:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    185:188:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202:205 -> a
-    185:188:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635 -> a
-    185:188:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    189:189:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):637:637 -> a
-    189:189:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    190:190:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):636:636 -> a
+    154:154:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):636:636 -> a
+    154:154:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
+    155:156:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:671 -> a
+    155:156:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    155:156:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
+    157:170:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:683 -> a
+    157:170:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    157:170:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
+    171:171:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):682:682 -> a
+    171:171:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    171:171:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):588 -> a
+    172:184:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):601:613 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
+    185:185:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635:635 -> a
+    185:185:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    186:189:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202:205 -> a
+    186:189:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635 -> a
+    186:189:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    190:190:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    190:190:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):205 -> a
+    190:190:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):635 -> a
     190:190:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    191:192:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:671 -> a
-    191:192:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    191:192:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    193:206:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:683 -> a
-    193:206:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    193:206:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    207:207:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):682:682 -> a
-    207:207:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
-    207:207:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
-    208:218:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):706:716 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
-    219:219:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
-    219:219:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):719 -> a
-    220:220:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):722:722 -> a
-    221:221:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727:727 -> a
+    191:191:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):637:637 -> a
+    191:191:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    192:192:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):636:636 -> a
+    192:192:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    193:194:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:671 -> a
+    193:194:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    193:194:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    195:208:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):670:683 -> a
+    195:208:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    195:208:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    209:209:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):682:682 -> a
+    209:209:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):647 -> a
+    209:209:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):605 -> a
+    210:220:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):706:716 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
+    221:221:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
+    221:221:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):719 -> a
+    222:222:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):722:722 -> a
+    223:223:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727:727 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
-    222:222:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
-    222:222:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727 -> a
+    224:224:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
+    224:224:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    223:223:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
-    223:223:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727 -> a
+    225:225:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
+    225:225:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    224:227:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727:730 -> a
-    228:228:void com.android.tools.r8.cf.code.CfInstruction.registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):102:102 -> a
-    228:228:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):731 -> a
+    226:229:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):727:730 -> a
+    230:230:void com.android.tools.r8.cf.code.CfInstruction.registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):102:102 -> a
+    230:230:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):731 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    229:229:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
-    229:229:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):732 -> a
+    231:231:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
+    231:231:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):732 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    230:230:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
-    230:230:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):732 -> a
+    232:232:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
+    232:232:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):732 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    231:232:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):736:737 -> a
-    233:233:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
-    233:233:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):738 -> a
-    234:234:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
-    234:234:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):738 -> a
+    233:234:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):736:737 -> a
+    235:235:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
+    235:235:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):738 -> a
+    236:236:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
+    236:236:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):738 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    235:237:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):746:748 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
-    238:238:void com.android.tools.r8.cf.code.CfInstruction.registerUseForDesugaring(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ClasspathMethod,java.util.ListIterator):107:107 -> a
-    238:238:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):749 -> a
+    237:239:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):746:748 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
+    240:240:void com.android.tools.r8.cf.code.CfInstruction.registerUseForDesugaring(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ClasspathMethod,java.util.ListIterator):107:107 -> a
+    240:240:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):749 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    239:239:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):751:751 -> a
-    240:240:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):751:751 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Lcom/android/tools/r8/internal/Ya;)V"}
-    241:250:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):758:767 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/az;"}
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.hasProguardConfiguration():228:228 -> a
-    251:251:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):767 -> a
+    241:241:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):751:751 -> a
+    242:242:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):751:751 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;Lcom/android/tools/r8/internal/ab;)V"}
+    243:252:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):758:767 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/cz;"}
+    253:253:boolean com.android.tools.r8.utils.InternalOptions.hasProguardConfiguration():228:228 -> a
+    253:253:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):767 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    252:258:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):768:774 -> a
-    259:259:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexDefinition):874:874 -> a
-    259:259:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):774 -> a
+    254:260:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):768:774 -> a
+    261:261:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexDefinition):874:874 -> a
+    261:261:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):774 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    260:260:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexDefinition):874:874 -> a
-    260:260:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):774 -> a
-    261:283:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):775:797 -> a
-    284:284:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):769:769 -> a
-    285:285:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):846:846 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
-    286:307:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):850:871 -> a
+    262:262:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexDefinition):874:874 -> a
+    262:262:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):774 -> a
+    263:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):775:797 -> a
+    286:286:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):769:769 -> a
+    287:287:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):846:846 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
+    288:309:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):850:871 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
-    308:308:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):929:929 -> a
+    310:310:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):929:929 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)I"}
-    309:309:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):936:936 -> a
-    309:309:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
-    310:310:com.android.tools.r8.cf.code.CfFrameVerifier com.android.tools.r8.cf.code.CfFrameVerifier$Builder.build():445:445 -> a
-    310:310:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):951 -> a
-    310:310:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
-    311:311:com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig com.android.tools.r8.cf.code.CfFrameVerifier$Builder.buildConfig():451:451 -> a
-    311:311:com.android.tools.r8.cf.code.CfFrameVerifier com.android.tools.r8.cf.code.CfFrameVerifier$Builder.build():445 -> a
-    311:311:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):951 -> a
+    311:311:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):936:936 -> a
     311:311:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
     312:312:com.android.tools.r8.cf.code.CfFrameVerifier com.android.tools.r8.cf.code.CfFrameVerifier$Builder.build():445:445 -> a
     312:312:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):951 -> a
     312:312:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
-    313:313:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):952:952 -> a
+    313:313:com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig com.android.tools.r8.cf.code.CfFrameVerifier$Builder.buildConfig():451:451 -> a
+    313:313:com.android.tools.r8.cf.code.CfFrameVerifier com.android.tools.r8.cf.code.CfFrameVerifier$Builder.build():445 -> a
+    313:313:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):951 -> a
     313:313:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
-    314:314:void setStackMapStatus(com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus):263:263 -> a
+    314:314:com.android.tools.r8.cf.code.CfFrameVerifier com.android.tools.r8.cf.code.CfFrameVerifier$Builder.build():445:445 -> a
+    314:314:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):951 -> a
     314:314:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
-    315:315:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):932:932 -> a
-    316:316:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):929:929 -> a
-    317:318:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):958:959 -> a
+    315:315:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus computeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):952:952 -> a
+    315:315:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
+    316:316:void setStackMapStatus(com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus):263:263 -> a
+    316:316:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):930 -> a
+    317:317:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):932:932 -> a
+    318:318:com.android.tools.r8.cf.code.CfFrameVerifier$StackMapStatus getOrComputeStackMapStatus(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):929:929 -> a
+    319:320:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):958:959 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)V"}
-    319:319:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    319:319:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):959 -> a
-    320:320:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):960:960 -> a
+    321:321:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    321:321:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):959 -> a
+    322:322:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):960:960 -> a
     1:1:java.util.List getInstructions():296:296 -> a1
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):380:380 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;)Ljava/util/Collection;"}
@@ -75824,7 +75835,7 @@
     1:1:int getMaxLocals():254:254 -> c1
     1:1:int getMaxStack():250:250 -> d1
     1:2:com.android.tools.r8.ir.code.Position getPreamblePosition():411:412 -> e1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> e1
     3:3:com.android.tools.r8.ir.code.Position getPreamblePosition():412 -> e1
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> e1
@@ -75838,7 +75849,7 @@
     com.android.tools.r8.graph.CfCode asCfCode() -> l0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/G;"}
     1:1:com.android.tools.r8.cf.code.CfInstruction getInstruction(int):292:292 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/B9;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():242:242 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:java.lang.String toString():841:841 -> toString
@@ -75859,21 +75870,21 @@
     com.android.tools.r8.graph.DebugLocalInfo local -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j0;"}
     com.android.tools.r8.cf.code.CfLabel start -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.cf.code.CfLabel end -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():64:64 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):71:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/M9;)V"}
     5:8:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):71:74 -> <init>
     5:8:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/M9;)V"}
     9:9:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):79:79 -> <init>
     1:3:void setEnd(com.android.tools.r8.cf.code.CfLabel):83:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     4:4:com.android.tools.r8.cf.code.CfLabel getEnd():101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     5:5:int acceptCompareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):106:106 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G$a;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/O;)I"}
     6:7:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):110:111 -> a
@@ -75890,7 +75901,7 @@
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocal():93:93 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
     1:1:com.android.tools.r8.cf.code.CfLabel getStart():97:97 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M9;"}
     1:1:java.lang.String toString():118:118 -> toString
 com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.graph.H:
 # {"id":"sourceFile","fileName":"CfCodeDiagnostics.java"}
@@ -75911,18 +75922,18 @@
 com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.graph.I:
 # {"id":"sourceFile","fileName":"CfCodeStackMapValidatingException.java"}
     1:10:com.android.tools.r8.graph.CfCodeDiagnostics invalidTryCatchRange(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch,java.lang.String,com.android.tools.r8.graph.AppView):42:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ya;Ljava/lang/String;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ab;Ljava/lang/String;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H;"}
     11:22:com.android.tools.r8.graph.CfCodeDiagnostics invalidStackMapForInstruction(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):60:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/z9;Ljava/lang/String;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/B9;Ljava/lang/String;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H;"}
 com.android.tools.r8.graph.CfCodeWithLens -> com.android.tools.r8.graph.J:
 # {"id":"sourceFile","fileName":"CfCodeWithLens.java"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yn;"}
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():10:10 -> <clinit>
     1:10:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.CfCode):138:147 -> <init>
     1:10:void <init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.CfCode):15 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vn;Lcom/android/tools/r8/graph/G;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yn;Lcom/android/tools/r8/graph/G;)V"}
     11:11:void <init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.CfCode):16:16 -> <init>
     12:13:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):157:158 -> <init>
     12:13:void <init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType,int,int,java.util.List):25 -> <init>
@@ -75931,7 +75942,7 @@
     14:14:void <init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType,int,int,java.util.List):25 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType,int,int,java.util.List):26:26 -> <init>
     1:3:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):36:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
     4:6:com.android.tools.r8.graph.CfCodeWithLens getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):53:55 -> a
     4:6:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):10 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/i0;"}
@@ -75952,15 +75963,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/graph/G;)V"}
     2:6:void <init>(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.CfCode):72:76 -> <init>
     1:3:int compareIdUniquelyDeterminesEquality(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.cf.code.CfInstruction):54:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/B9;)V"}
     4:21:com.android.tools.r8.utils.structural.StructuralAcceptor labelAcceptor():84:101 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/u;"}
 com.android.tools.r8.graph.CfCompareHelper$1 -> com.android.tools.r8.graph.K:
 # {"id":"sourceFile","fileName":"CfCompareHelper.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels1 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labels2 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:2:void <init>(com.android.tools.r8.graph.CfCompareHelper):86:87 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O;)V"}
     3:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap com.android.tools.r8.graph.CfCompareHelper.getLabelOrdering(com.android.tools.r8.graph.CfCode):61:63 -> <init>
@@ -76053,7 +76064,7 @@
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     1:14:int acceptCompareTo(com.android.tools.r8.graph.CfWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):24:37 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/P;Lcom/android/tools/r8/utils/structural/a;)I"}
     15:15:int acceptCompareTo(com.android.tools.r8.graph.CfWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):31:31 -> a
@@ -76085,17 +76096,17 @@
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):281:281 -> V
     1:1:boolean isSuper():204 -> V
     1:16:boolean areValid(com.android.tools.r8.cf.CfVersion,boolean):120:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Z)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Z)Z"}
     1:1:void setAbstract():160:160 -> b0
     1:1:java.util.List getNames():29:29 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> c
     2:2:java.util.List getNames():29 -> c
     3:3:java.util.List com.android.tools.r8.graph.AccessFlags.getNames():49:49 -> c
     3:3:java.util.List getNames():30 -> c
     4:11:java.util.List getNames():30:37 -> c
     1:1:java.util.List getPredicates():42:42 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> d
     2:2:java.util.List getPredicates():42 -> d
     3:10:java.util.List getPredicates():43:50 -> d
@@ -76144,7 +76155,7 @@
     void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)V"}
     1:22:void visit(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer):66:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/Xg0;)V"}
     23:36:void visit(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer):70:83 -> a
 com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> R8$$REMOVED$$CLASS$$80:
 # {"id":"sourceFile","fileName":"ClassHierarchyTraversal.java"}
@@ -76163,19 +76174,19 @@
     1:3:void <init>(com.android.tools.r8.graph.ClassKind$Factory,java.util.function.Predicate):191:193 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U;Ljava/util/function/Predicate;)V"}
     1:19:com.android.tools.r8.graph.DexProgramClass lambda$static$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.utils.ReachabilitySensitiveValue):44:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/u10;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/y10;)Lcom/android/tools/r8/graph/D2;"}
     20:20:com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.utils.ReachabilitySensitiveValue):220:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/u10;)Lcom/android/tools/r8/graph/E0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/y10;)Lcom/android/tools/r8/graph/E0;"}
     21:21:boolean isOfKind(com.android.tools.r8.graph.DexClass):247:247 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     1:19:com.android.tools.r8.graph.DexClasspathClass lambda$static$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.utils.ReachabilitySensitiveValue):93:111 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/u10;)Lcom/android/tools/r8/graph/I0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/y10;)Lcom/android/tools/r8/graph/I0;"}
     1:19:com.android.tools.r8.graph.DexLibraryClass lambda$static$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.utils.ReachabilitySensitiveValue):139:157 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/u10;)Lcom/android/tools/r8/graph/q2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/y10;)Lcom/android/tools/r8/graph/q2;"}
 com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.U:
 # {"id":"sourceFile","fileName":"ClassKind.java"}
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.utils.ReachabilitySensitiveValue) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/u10;)Lcom/android/tools/r8/graph/E0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/j1;[Lcom/android/tools/r8/graph/j1;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/synthesis/K;Lcom/android/tools/r8/internal/y10;)Lcom/android/tools/r8/graph/E0;"}
 com.android.tools.r8.graph.ClassResolutionResult -> com.android.tools.r8.graph.b0:
 # {"id":"sourceFile","fileName":"ClassResolutionResult.java"}
     com.android.tools.r8.graph.DexClass toAlternativeClass() -> B
@@ -76320,7 +76331,7 @@
     1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():179:179 -> J0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/p4;"}
     1:1:com.android.tools.r8.lightir.LirCode asLirCode():167:167 -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CK;"}
     void clearMetadata() -> L0
     int estimatedDexCodeSizeUpperBoundInBytes() -> M0
     boolean hasExplicitCodeLens() -> N0
@@ -76338,27 +76349,27 @@
     1:1:boolean verifyNoInputReaders():198:198 -> Z0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     1:1:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)V"}
     void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     2:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):45:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     4:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/b8;"}
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/cz;"}
     6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):192:192 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     7:7:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):207:207 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/i0;"}
     8:10:com.android.tools.r8.ir.code.Position newInlineePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position,boolean):212:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/PW;Z)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/TW;Z)Lcom/android/tools/r8/internal/TW;"}
     11:11:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
     11:11:com.android.tools.r8.ir.code.Position newInlineePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position,boolean):214 -> a
     12:19:com.android.tools.r8.ir.code.Position newInlineePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position,boolean):214:221 -> a
@@ -76402,7 +76413,7 @@
     75:75:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.AppView.codeLens():657:657 -> a
     75:75:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):54 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> f0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V5;"}
     1:1:boolean estimatedSizeForInliningAtMost(int):157:157 -> k
@@ -76428,7 +76439,7 @@
     2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):31:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     5:9:boolean localsInfoMapsEqual(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):60:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;)Z"}
     10:20:java.lang.String toString(com.android.tools.r8.graph.DebugLocalInfo$PrintLevel):129:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Ljava/lang/String;"}
     21:21:java.lang.String toString(com.android.tools.r8.graph.DebugLocalInfo$PrintLevel):133:133 -> a
@@ -76480,7 +76491,7 @@
     7:7:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):356 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     8:8:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.UseRegistry.dexItemFactory():42:42 -> a
     8:8:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):356 -> a
     8:8:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):352 -> a
@@ -76489,7 +76500,7 @@
     10:10:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     11:11:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):208 -> a
     12:14:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):208:210 -> a
@@ -76581,7 +76592,7 @@
     107:107:boolean com.android.tools.r8.cf.code.CfInstruction.isReturnVoid():0:0 -> a
     107:107:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):149 -> a
     108:108:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Z"}
     109:109:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     109:109:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):137 -> a
     110:110:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
@@ -76594,9 +76605,9 @@
     113:113:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     113:113:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):159 -> a
     114:119:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):167:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     120:126:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):184:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     127:127:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
     127:127:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):191 -> a
     128:128:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):193:193 -> a
@@ -76613,15 +76624,15 @@
     133:133:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.ObjectToOffsetMapping.dexItemFactory():354:354 -> a
     133:133:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     134:134:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.ObjectToOffsetMapping.dexItemFactory():354:354 -> a
     134:134:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):440 -> a
     135:138:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):440:443 -> a
     139:142:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):420:423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     143:151:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):421:429 -> a
     152:152:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):458:458 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     153:155:com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):463:465 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/a3;"}
     156:156:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):270:270 -> a
@@ -76631,7 +76642,7 @@
     157:157:com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):467 -> a
     158:158:com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):467:467 -> a
     1:1:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):138:138 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Z"}
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> b
     2:2:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):138 -> b
     3:3:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):270:270 -> b
@@ -76656,7 +76667,7 @@
 com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode -> com.android.tools.r8.graph.k0:
 # {"id":"sourceFile","fileName":"DefaultInstanceInitializerCode.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):474:474 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/TW;)V"}
     2:4:com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):480:482 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):474 -> <init>
     5:5:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> <init>
@@ -76667,7 +76678,7 @@
     6:9:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):474 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):474:474 -> <init>
     1:1:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):494:494 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> d
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):494 -> d
     3:3:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.conversion.IRBuilder.getProgramMethod():497:497 -> d
@@ -76683,7 +76694,7 @@
     8:9:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):498:499 -> d
     10:10:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):493:493 -> d
     1:1:java.util.List getInstructionBuilders():491:491 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
 com.android.tools.r8.graph.DefaultUseRegistry -> com.android.tools.r8.graph.m0:
 # {"id":"sourceFile","fileName":"DefaultUseRegistry.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition):9:9 -> <init>
@@ -76821,7 +76832,7 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):136:136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     4:10:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):141:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/I2;)Z"}
     11:11:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
     11:11:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):147 -> a
     12:15:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):150:153 -> a
@@ -77109,13 +77120,13 @@
 com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.x0:
 # {"id":"sourceFile","fileName":"DexApplication.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList dataResourceProviders -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/b;"}
     com.android.tools.r8.utils.Timing timing -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.DexApplicationReadFlags flags -> f
@@ -77123,12 +77134,12 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():24:24 -> <clinit>
     1:7:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):42:48 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     void forEachLibraryType(java.util.function.Consumer) -> a
     1:1:java.util.List classesWithDeterministicOrder(java.util.List):138:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Ljava/util/List;"}
     2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/r4$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/r4$a;"}
     3:3:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():287:287 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/c3;"}
     void forEachProgramType(java.util.function.Consumer) -> b
@@ -77175,17 +77186,17 @@
     java.util.List dataResourceProviders -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/b;"}
     com.android.tools.r8.utils.Timing timing -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.graph.DexApplicationReadFlags flags -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/z0;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():164:164 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):178:178 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     2:18:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):166:182 -> <init>
     19:19:void <init>(com.android.tools.r8.graph.DexApplication):187:187 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)V"}
@@ -77250,13 +77261,13 @@
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     java.util.Set recordWitnesses -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set varHandleWitnesses -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set methodHandlesLookupWitnesses -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:6:void <init>(boolean,boolean,java.util.Set,java.util.Set,java.util.Set):80:85 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;)V"}
     1:1:java.util.Set getMethodHandlesLookupWitnesses():109:109 -> a
     1:1:java.util.Set getVarHandleWitnesses():117:117 -> b
     1:1:boolean hasReadMethodHandlesLookupReferenceFromProgramClass():105:105 -> c
@@ -77268,11 +77279,11 @@
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder recordWitnessesBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder varHandleWitnessesBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder methodHandlesLookupWitnessesBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     1:1:void <init>():22:22 -> <init>
     2:2:void <init>():17:17 -> <init>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> <init>
@@ -77293,9 +77304,9 @@
     com.android.tools.r8.graph.DexApplication application -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/x0;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):28:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/iB;)V"}
     1:1:java.io.PrintStream lambda$write$1(java.io.PrintStream,com.android.tools.r8.graph.DexClass):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/PrintStream;Lcom/android/tools/r8/graph/E0;)Ljava/io/PrintStream;"}
     2:2:void lambda$write$2(java.io.PrintStream):0:0 -> a
@@ -77371,7 +77382,7 @@
     12:12:com.android.tools.r8.graph.DexMethod lambda$specify$0(com.android.tools.r8.graph.DexCallSite):55:55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)Lcom/android/tools/r8/graph/w2;"}
     13:25:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[],java.util.function.Supplier):89:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/D0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/D0;"}
     26:32:com.android.tools.r8.graph.DexCallSite fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[],java.util.function.Supplier):100:106 -> a
     33:34:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):172:173 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/M;)V"}
@@ -77386,7 +77397,7 @@
     44:44:void com.android.tools.r8.graph.DexEncodedArray.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):26:26 -> a
     44:44:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):184 -> a
     45:45:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     46:46:int com.android.tools.r8.graph.ObjectToOffsetMapping.getOffsetFor(com.android.tools.r8.graph.DexCallSite):449:449 -> a
     46:46:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -77487,7 +77498,7 @@
     com.android.tools.r8.graph.DexString sourceFile -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.utils.OptionalBool isResolvable -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.graph.FieldCollection fieldCollection -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/m3;"}
     com.android.tools.r8.graph.MethodCollection methodCollection -> l
@@ -77559,7 +77570,7 @@
     1:1:boolean isRecord():634:634 -> T1
     1:1:java.util.List allFieldsSorted():339:339 -> U0
     1:1:java.lang.Iterable members():232:232 -> U1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hq;"}
     2:2:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> U1
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> U1
     2:2:java.lang.Iterable members():232 -> U1
@@ -77598,12 +77609,12 @@
     3:3:java.util.List com.android.tools.r8.graph.FieldCollection.staticFieldsAsList():135:135 -> W1
     3:3:java.util.List staticFields():399 -> W1
     1:1:java.lang.Iterable classFields():220:220 -> X0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:2:boolean validInterfaceSignatures():863:864 -> X1
     1:1:java.lang.Iterable classMethods():249:249 -> Y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:1:java.lang.Iterable virtualClassMethods():302:302 -> Y1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:1:void clearClassSignature():1028:1028 -> Z0
     1:1:java.lang.Iterable virtualMethods():294:294 -> Z1
     2:2:java.lang.Iterable com.android.tools.r8.graph.MethodCollection.virtualMethods():187:187 -> Z1
@@ -77668,7 +77679,7 @@
     24:24:void com.android.tools.r8.graph.MethodCollection.setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):370:370 -> a
     24:24:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):318 -> a
     25:29:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):323:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/iB;)V"}
     30:30:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):407:407 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     31:31:void com.android.tools.r8.graph.FieldCollection.appendStaticField(com.android.tools.r8.graph.DexEncodedField):139:139 -> a
@@ -77766,7 +77777,7 @@
     136:161:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):945:970 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C3$c;Ljava/util/List;)Ljava/util/List;"}
     162:165:void lambda$applyTypeArguments$12(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):952:955 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/C3$e;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/C3$e;)V"}
     166:166:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():184:184 -> a
     166:166:void lambda$applyTypeArguments$12(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):957 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -77783,7 +77794,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/k5;)V"}
     182:182:void setNestMemberAttributes(java.util.List):1166:1166 -> a
     183:186:boolean isValid(com.android.tools.r8.utils.InternalOptions):1233:1236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():449:450 -> a1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/graph/g1;"}
     3:3:void com.android.tools.r8.graph.FieldCollection.clearInstanceFields():180:180 -> a1
@@ -77802,7 +77813,7 @@
     5:5:com.android.tools.r8.graph.DexClassAndMethod lambda$classMethods$3(com.android.tools.r8.graph.DexEncodedMethod):249:249 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/H0;"}
     6:6:java.lang.Iterable directMethods(java.util.function.Predicate):270:270 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/iC;"}
     7:7:void addVirtualMethods(java.util.Collection):310:310 -> b
     8:8:void com.android.tools.r8.graph.MethodCollection.addVirtualMethods(java.util.Collection):357:357 -> b
     8:8:void addVirtualMethods(java.util.Collection):310 -> b
@@ -77894,7 +77905,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
     4:4:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):385:385 -> d
     5:5:java.lang.Iterable instanceFields(java.util.function.Predicate):433:433 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/iC;"}
     6:6:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):522:522 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/j1;"}
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getVirtualMethod(com.android.tools.r8.graph.DexMethod):216:216 -> d
@@ -78177,7 +78188,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/z2;"}
     2:2:com.android.tools.r8.graph.DexMethodSignature$MethodBased getMethodSignature():0:0 -> x
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     3:3:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():68:68 -> x
     3:3:com.android.tools.r8.graph.DexMethodSignature$MethodBased getMethodSignature():0 -> x
     4:4:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> x
@@ -78235,7 +78246,7 @@
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/Z0;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata metadata -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d8;"}
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():66:66 -> <clinit>
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata.empty():34:34 -> <init>
@@ -78243,7 +78254,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III[Lcom/android/tools/r8/dex/code/z1;[Lcom/android/tools/r8/graph/J0$a;[Lcom/android/tools/r8/graph/J0$b;Lcom/android/tools/r8/graph/W0;)V"}
     2:2:void <init>(int,int,int,com.android.tools.r8.dex.code.DexInstruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):128:128 -> <init>
     3:14:void <init>(int,int,int,com.android.tools.r8.dex.code.DexInstruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):147:158 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(III[Lcom/android/tools/r8/dex/code/z1;[Lcom/android/tools/r8/graph/J0$a;[Lcom/android/tools/r8/graph/J0$b;Lcom/android/tools/r8/graph/W0;Lcom/android/tools/r8/internal/b8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(III[Lcom/android/tools/r8/dex/code/z1;[Lcom/android/tools/r8/graph/J0$a;[Lcom/android/tools/r8/graph/J0$b;Lcom/android/tools/r8/graph/W0;Lcom/android/tools/r8/internal/d8;)V"}
     15:16:boolean com.android.tools.r8.utils.DexDebugUtils.verifySetPositionFramesFollowedByDefaultEvent(com.android.tools.r8.graph.DexDebugInfo):21:22 -> <init>
     15:16:void <init>(int,int,int,com.android.tools.r8.dex.code.DexInstruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):159 -> <init>
     17:18:void <init>(int,int,int,com.android.tools.r8.dex.code.DexInstruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):159:160 -> <init>
@@ -78268,7 +78279,7 @@
     3:9:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):86:92 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     10:10:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/b8;"}
     11:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.DexInstruction):205:205 -> a
     11:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):201 -> a
     12:12:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata.getMetadata(java.lang.Object):38:38 -> a
@@ -78280,25 +78291,25 @@
     13:13:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):201 -> a
     14:14:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
-    15:17:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2721:2723 -> a
+    15:17:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2727:2729 -> a
     15:17:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
     18:18:boolean com.android.tools.r8.graph.DexProgramClass.originatesFromDexResource():456:456 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2723 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2729 -> a
     18:18:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     19:19:boolean com.android.tools.r8.graph.DexProgramClass.originatesFromDexResource():456:456 -> a
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2723 -> a
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2729 -> a
     19:19:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2715:2715 -> a
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2724 -> a
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2721:2721 -> a
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2730 -> a
     20:20:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2496:2496 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2716 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2724 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2502:2502 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2722 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2730 -> a
     21:21:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
-    22:23:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo(com.android.tools.r8.graph.ProgramMethod):2704:2705 -> a
-    22:23:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2717 -> a
-    22:23:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2724 -> a
+    22:23:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo(com.android.tools.r8.graph.ProgramMethod):2710:2711 -> a
+    22:23:boolean com.android.tools.r8.utils.InternalOptions.canUseNativeDexPcInsteadOfDebugInfo(com.android.tools.r8.graph.ProgramMethod):2723 -> a
+    22:23:boolean com.android.tools.r8.utils.InternalOptions.shouldMaterializeLineInfoForNativePcEncoding(com.android.tools.r8.graph.ProgramMethod):2730 -> a
     22:23:boolean lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244 -> a
     24:26:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):307:309 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/W0;)V"}
@@ -78443,16 +78454,16 @@
     179:179:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):82:82 -> a
     179:179:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):495 -> a
     180:186:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):548:554 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     187:192:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):567:572 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     193:193:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
     193:193:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):573 -> a
     194:194:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):575:575 -> a
     195:195:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):580:580 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     196:196:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):585:585 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     197:197:void internalRegisterCodeReferences(com.android.tools.r8.graph.UseRegistry):589:589 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/a6;)V"}
     198:198:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.UseRegistry.getTraversalContinuation():65:65 -> a
@@ -78475,7 +78486,7 @@
     209:209:void internalRegisterCodeReferences(com.android.tools.r8.graph.UseRegistry):599 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     210:239:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):613:642 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     240:241:com.android.tools.r8.graph.DexDebugEntry advanceToOffset(int,com.android.tools.r8.graph.DexDebugEntry,java.util.Iterator):695:696 -> a
     240:241:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):642 -> a
     242:263:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):643:664 -> a
@@ -78483,7 +78494,7 @@
     264:265:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):664 -> a
     266:289:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):667:690 -> a
     290:292:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):767:769 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     293:293:boolean com.android.tools.r8.dex.code.DexInstruction.isDexItemBasedConstString():0:0 -> a
     293:293:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):769 -> a
     294:297:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):769:772 -> a
@@ -78523,7 +78534,7 @@
     329:329:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):866 -> a
     330:332:void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep):867:869 -> a
     333:334:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):882:883 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     335:339:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):890:894 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)V"}
     340:340:boolean com.android.tools.r8.graph.DexDebugEvent.isPositionFrame():0:0 -> a
@@ -78663,15 +78674,15 @@
     boolean epilogueBegin -> d
     java.util.Map locals -> e
     com.android.tools.r8.ir.code.Position position -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():13:13 -> <clinit>
     1:9:void <init>(boolean,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.ir.code.Position):30:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZIZZLcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZIZZLcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/TW;)V"}
     1:30:java.lang.String toString(boolean):47:76 -> a
     31:31:int getLine():84:84 -> a
     1:1:com.android.tools.r8.ir.code.Position getPosition():80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:java.lang.String toString():43:43 -> toString
 com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.M0:
 # {"id":"sourceFile","fileName":"DexDebugEntryBuilder.java"}
@@ -78680,7 +78691,7 @@
     java.util.Map locals -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap arguments -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qy;"}
     com.android.tools.r8.graph.DexDebugEntry pending -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/K0;"}
     java.util.Map canonicalizedLocals -> f
@@ -78790,7 +78801,7 @@
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):20:20 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     4:5:int acceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):67:68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O0;Lcom/android/tools/r8/utils/structural/a;)I"}
     6:6:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73:73 -> a
@@ -78802,7 +78813,7 @@
     8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):73 -> a
     9:9:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
     10:10:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O0;Lcom/android/tools/r8/utils/structural/a;)I"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> c
@@ -78822,7 +78833,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):285:285 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):314:315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     4:6:void com.android.tools.r8.dex.DebugBytecodeWriter.putSleb128(int):54:56 -> a
     4:6:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):315 -> a
     7:7:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):320:320 -> a
@@ -78851,7 +78862,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):124:124 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):139:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     4:5:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):149:150 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):172:172 -> b
@@ -78882,7 +78893,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):677:677 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):719:719 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):724:724 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):755:755 -> b
@@ -78907,7 +78918,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):451:451 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):470:471 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):476:476 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):497:497 -> b
@@ -78932,7 +78943,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):506:506 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):525:526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):531:531 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):552:552 -> b
@@ -78958,7 +78969,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):234:234 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):255:255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):275:275 -> b
@@ -78979,7 +78990,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):568:568 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):585:585 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):585 -> a
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):590:590 -> a
@@ -78995,9 +79006,9 @@
 com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame -> com.android.tools.r8.graph.S0:
 # {"id":"sourceFile","fileName":"DexDebugEvent.java"}
     com.android.tools.r8.ir.code.Position position -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Position):628:629 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame asSetPositionFrame() -> I0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/S0;"}
     int getCompareToId() -> J0
@@ -79006,7 +79017,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):620:620 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:com.android.tools.r8.ir.code.Position lambda$specify$0(com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame):625:625 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/S0;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/S0;)Lcom/android/tools/r8/internal/TW;"}
     3:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):625:625 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):638:638 -> a
@@ -79031,7 +79042,7 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):181:181 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):197:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):202:202 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V0;)V"}
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):223:223 -> b
@@ -79061,7 +79072,7 @@
     3:6:void spec(com.android.tools.r8.utils.structural.StructuralSpecification):358:361 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     7:11:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):390:394 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     12:12:void com.android.tools.r8.dex.DebugBytecodeWriter.putNoIndex():70:70 -> a
     12:12:void com.android.tools.r8.dex.DebugBytecodeWriter.putString(com.android.tools.r8.graph.DexString):84 -> a
     12:12:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):394 -> a
@@ -79107,7 +79118,7 @@
     27:27:void com.android.tools.r8.dex.DebugBytecodeWriter.putString(com.android.tools.r8.graph.DexString):87 -> a
     27:27:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):397 -> a
     28:29:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):404:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     30:30:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     30:30:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):405 -> a
     31:36:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):407:412 -> a
@@ -79136,18 +79147,18 @@
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.ArrayList arguments -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap lastKnownLocals -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pendingLocals -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     com.android.tools.r8.ir.code.Position preamblePosition -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean pendingLocalChanges -> h
     int emittedPc -> i
     com.android.tools.r8.ir.code.Position emittedPosition -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap emittedLocals -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     boolean isComposing -> l
@@ -79157,10 +79168,10 @@
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):49:77 -> <init>
     1:13:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):266:278 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;ILcom/android/tools/r8/internal/PW;Ljava/util/List;Lcom/android/tools/r8/graph/B1;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;ILcom/android/tools/r8/internal/TW;Ljava/util/List;Lcom/android/tools/r8/graph/B1;Z)V"}
     14:14:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     14:14:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):279 -> a
     15:15:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):277:277 -> a
@@ -79183,7 +79194,7 @@
     28:40:void addDefaultEventWithAdvancePcIfNecessary(int,int,java.util.List,com.android.tools.r8.graph.DexItemFactory):301:313 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/List;Lcom/android/tools/r8/graph/B1;)V"}
     41:41:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):324:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;)V"}
     42:47:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):75:80 -> a
     42:47:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):324 -> a
     48:53:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):90:95 -> a
@@ -79345,9 +79356,9 @@
     14:14:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):151:151 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     15:15:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     16:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):180:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     19:19:void com.android.tools.r8.dex.DebugBytecodeWriter.putNoIndex():70:70 -> a
     19:19:void com.android.tools.r8.dex.DebugBytecodeWriter.putString(com.android.tools.r8.graph.DexString):84 -> a
     19:19:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):183 -> a
@@ -79386,7 +79397,7 @@
     1:2:int estimatedWriteSize():387:388 -> D0
     1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):275:275 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     2:2:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):277 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection):376 -> a
@@ -79398,7 +79409,7 @@
     6:7:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):381 -> a
     8:9:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):381:382 -> a
     10:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):401:403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     13:13:void com.android.tools.r8.dex.DebugBytecodeWriter.putNoIndex():70:70 -> a
     13:13:void com.android.tools.r8.dex.DebugBytecodeWriter.putString(com.android.tools.r8.graph.DexString):84 -> a
     13:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):404 -> a
@@ -79430,11 +79441,11 @@
 # {"id":"sourceFile","fileName":"DexDebugInfoForWriting.java"}
     int estimatedWriteSize() -> D0
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;)V"}
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/u;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
 com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.a1:
 # {"id":"sourceFile","fileName":"DexDebugPositionState.java"}
     int currentPc -> a
@@ -79443,7 +79454,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean isCurrentMethodD8R8Synthesized -> d
     com.android.tools.r8.ir.code.Position currentPosition -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):33:33 -> <init>
@@ -79486,7 +79497,7 @@
     22:22:int getCurrentLine():101:101 -> a
     1:1:int getCurrentPc():97:97 -> b
     1:4:com.android.tools.r8.ir.code.Position getPosition():105:108 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     5:5:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> c
     5:5:com.android.tools.r8.ir.code.Position getPosition():109 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -79673,7 +79684,10 @@
     1:4:void <clinit>():28:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):67:67 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/g3;Lcom/android/tools/r8/graph/C3$e;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/graph/N2;Lcom/android/tools/r8/androidapi/f;ZZ)V"}
-    2:40:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):35:73 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):35:40 -> <init>
+    8:8:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):41 -> <init>
+    9:41:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):41:73 -> <init>
     1:1:java.lang.String toSmaliString():154:154 -> E0
     1:1:java.lang.String toSourceString():159:159 -> F0
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> I0
@@ -79681,7 +79695,9 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:boolean isStatic():223:223 -> S0
-    1:1:void clearKotlinInfo():129:129 -> U0
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> U0
+    1:1:void clearKotlinInfo():129 -> U0
+    2:2:void clearKotlinInfo():129:129 -> U0
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> V0
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():109 -> V0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/androidapi/f;"}
@@ -79691,36 +79707,41 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     7:7:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):119:119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/v;)V"}
-    8:8:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):144:144 -> a
+    8:8:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:138 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/G;)V"}
+    9:9:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    9:9:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138 -> a
+    10:11:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
+    12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):144:144 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
-    9:10:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):133:134 -> a
-    9:10:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):144 -> a
-    11:11:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):182:182 -> a
-    11:11:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):28 -> a
+    13:14:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):133:134 -> a
+    13:14:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):144 -> a
+    15:15:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):182:182 -> a
+    15:15:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/B5;"}
-    12:12:java.lang.Object apply(java.util.function.Function,java.util.function.Function):188:188 -> a
-    13:16:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):201:204 -> a
+    16:16:java.lang.Object apply(java.util.function.Function,java.util.function.Function):188:188 -> a
+    17:20:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):201:204 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)Lcom/android/tools/r8/graph/A5;"}
-    17:19:void setStaticValue(com.android.tools.r8.graph.DexValue):253:255 -> a
+    21:23:void setStaticValue(com.android.tools.r8.graph.DexValue):253:255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;)V"}
-    20:27:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):276:283 -> a
+    24:31:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):276:283 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/g1;"}
-    28:28:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):281:281 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheckIf(boolean):494:494 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):281 -> a
+    32:32:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):281:281 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheckIf(boolean):494:494 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:31:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):284:285 -> a
-    32:32:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):325:325 -> a
+    34:35:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):284:285 -> a
+    36:36:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):325:325 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/graph/g1$a;"}
-    33:33:boolean getIsInlinableByJavaC():337:337 -> a
-    33:33:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):342 -> a
+    37:37:boolean getIsInlinableByJavaC():337:337 -> a
+    37:37:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):342 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Z"}
-    34:34:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):345:345 -> a
-    35:35:boolean isFinal():214:214 -> a
-    35:35:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):345 -> a
-    36:45:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):348:357 -> a
-    46:46:void markAsInlinableByJavaC():333:333 -> a
-    46:46:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):360 -> a
+    38:38:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):345:345 -> a
+    39:39:boolean isFinal():214:214 -> a
+    39:39:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):345 -> a
+    40:49:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):348:357 -> a
+    50:50:void markAsInlinableByJavaC():333:333 -> a
+    50:50:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):360 -> a
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():104:104 -> a1
     1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():28 -> a1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/g;"}
@@ -79766,7 +79787,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():124:124 -> t0
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():28 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     1:1:java.lang.String toString():149:149 -> toString
     1:1:void clearGenericSignature():317:317 -> z
 com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.g1$a:
@@ -79796,47 +79817,50 @@
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():386:386 -> <clinit>
     1:1:void <init>(boolean):405:405 -> <init>
-    2:8:void <init>(boolean):389:395 -> <init>
-    9:20:void <init>(boolean):395:406 -> <init>
-    21:21:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):409:409 -> <init>
+    2:4:void <init>(boolean):389:391 -> <init>
+    5:5:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    5:5:void <init>(boolean):392 -> <init>
+    6:9:void <init>(boolean):392:395 -> <init>
+    10:21:void <init>(boolean):395:406 -> <init>
+    22:22:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):409:409 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/g1;)V"}
-    22:28:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):389:395 -> <init>
-    29:46:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):395:412 -> <init>
-    47:47:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.copy():53:53 -> <init>
-    47:47:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412 -> <init>
-    48:48:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.copy():53:53 -> <init>
-    48:48:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    23:25:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):389:391 -> <init>
+    26:26:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    26:26:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):392 -> <init>
+    27:30:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):392:395 -> <init>
+    31:48:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):395:412 -> <init>
     49:49:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.copy():53:53 -> <init>
     49:49:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412 -> <init>
-    50:51:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412:413 -> <init>
-    52:52:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> <init>
-    52:52:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):414 -> <init>
-    53:56:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):414:417 -> <init>
-    57:57:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> <init>
-    57:57:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():109 -> <init>
-    57:57:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):418 -> <init>
-    58:60:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):418:420 -> <init>
-    61:61:boolean com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo.isMutableOptimizationInfo():0:0 -> <init>
-    61:61:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):420 -> <init>
-    62:62:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):421:421 -> <init>
-    63:67:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.mutableCopy():68:72 -> <init>
-    63:67:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):421 -> <init>
-    68:68:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):422:422 -> <init>
-    69:69:boolean com.android.tools.r8.graph.DexEncodedField.isDeprecated():91:91 -> <init>
-    69:69:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):423 -> <init>
-    70:71:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):423:424 -> <init>
+    50:50:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.copy():53:53 -> <init>
+    50:50:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    51:51:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.copy():53:53 -> <init>
+    51:51:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412 -> <init>
+    52:53:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):412:413 -> <init>
+    54:54:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> <init>
+    54:54:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):414 -> <init>
+    55:58:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):414:417 -> <init>
+    59:59:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> <init>
+    59:59:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():109 -> <init>
+    59:59:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):418 -> <init>
+    60:62:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):418:420 -> <init>
+    63:63:boolean com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo.isMutableOptimizationInfo():0:0 -> <init>
+    63:63:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):420 -> <init>
+    64:64:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):421:421 -> <init>
+    65:69:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.mutableCopy():68:72 -> <init>
+    65:69:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):421 -> <init>
+    70:70:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):422:422 -> <init>
+    71:71:boolean com.android.tools.r8.graph.DexEncodedField.isDeprecated():91:91 -> <init>
+    71:71:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):423 -> <init>
+    72:73:void <init>(boolean,com.android.tools.r8.graph.DexEncodedField):423:424 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedField$Builder apply(java.util.function.Consumer):428:428 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/g1$a;"}
     2:3:void lambda$clearDynamicType$0(com.android.tools.r8.graph.DexEncodedField):440:441 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     4:4:com.android.tools.r8.graph.DexEncodedField$Builder setField(com.android.tools.r8.graph.DexField):459:459 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/g1$a;"}
-    5:20:com.android.tools.r8.graph.DexEncodedField build():500:515 -> a
+    5:23:com.android.tools.r8.graph.DexEncodedField build():500:518 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/g1;"}
-    21:22:void com.android.tools.r8.graph.DexEncodedField.setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
-    21:22:com.android.tools.r8.graph.DexEncodedField build():515 -> a
-    23:25:com.android.tools.r8.graph.DexEncodedField build():516:518 -> a
     1:1:com.android.tools.r8.graph.DexEncodedField$Builder modifyAccessFlags(java.util.function.Consumer):433:433 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)V"}
     2:2:com.android.tools.r8.graph.DexEncodedField$Builder clearDynamicType():438:438 -> b
@@ -79886,7 +79910,7 @@
     1:1:com.android.tools.r8.graph.DexReference getReference():13:13 -> getReference
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/F2;"}
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     void clearGenericSignature() -> z
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.j1:
 # {"id":"sourceFile","fileName":"DexEncodedMethod.java"}
@@ -79904,24 +79928,24 @@
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/h;"}
     com.android.tools.r8.cf.CfVersion classFileVersion -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForCode -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/f;"}
     com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinMemberInfo -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/c0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/d0;"}
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature genericSignature -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C3$g;"}
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap parameterInfo -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cz;"}
     boolean obsolete -> t
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/j1;"}
     com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j1;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap NO_PARAMETER_INFO -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qy;"}
     boolean $assertionsDisabled -> x
     1:48:void <clinit>():85:132 -> <clinit>
     49:49:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> <clinit>
@@ -79929,14 +79953,17 @@
     50:51:void <clinit>():137:137 -> <clinit>
     54:56:void <clinit>():140:142 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):227:227 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G4;Lcom/android/tools/r8/graph/C3$g;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/graph/u5;Lcom/android/tools/r8/graph/i0;Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/ir/optimize/info/h;Z)V"}
-    2:8:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):152:158 -> <init>
-    9:9:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):162 -> <init>
-    10:86:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):162:238 -> <init>
-    87:87:boolean supportsPendingInlineFrame():797:797 -> <init>
-    87:87:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):239 -> <init>
-    88:91:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):239:242 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G4;Lcom/android/tools/r8/graph/C3$g;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/graph/u5;Lcom/android/tools/r8/graph/i0;Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/ir/optimize/info/h;Z)V"}
+    2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):152:152 -> <init>
+    3:3:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):158 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):158:158 -> <init>
+    5:5:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):162 -> <init>
+    6:82:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):162:238 -> <init>
+    83:83:boolean supportsPendingInlineFrame():797:797 -> <init>
+    83:83:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):239 -> <init>
+    84:87:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):239:242 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():339:339 -> A1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B2;"}
     2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> A1
@@ -79970,7 +79997,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1;"}
     1:2:boolean isInstanceInitializer():459:460 -> K1
     1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():347:347 -> L1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean isNative():442:442 -> M1
     1:1:boolean hasAnyAnnotations():900:900 -> N0
     2:2:boolean hasParameterAnnotations():932:932 -> N0
@@ -79988,7 +80015,9 @@
     1:2:boolean isPublicMethod():519:520 -> S1
     1:2:boolean isStaticMember():554:555 -> T0
     1:2:boolean isSyntheticMethod():598:599 -> T1
-    1:1:void clearKotlinInfo():623:623 -> U0
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> U0
+    1:1:void clearKotlinInfo():623 -> U0
+    2:2:void clearKotlinInfo():623:623 -> U0
     1:2:boolean isVirtualMethod():485:486 -> U1
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> V0
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():1343 -> V0
@@ -80006,7 +80035,7 @@
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setStaticSource(com.android.tools.r8.graph.DexMethod):118:118 -> a
     1:1:void lambda$toForwardingMethod$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Mq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Oq;)V"}
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setStaticSource(com.android.tools.r8.graph.DexMethod):119:119 -> a
     2:2:void lambda$toForwardingMethod$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1256 -> a
     3:4:void lambda$toForwardingMethod$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1258:1259 -> a
@@ -80023,291 +80052,294 @@
     29:35:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):307:313 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;Lcom/android/tools/r8/utils/structural/o;)V"}
     36:39:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):351:354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;)V"}
     40:46:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):353:359 -> a
     47:52:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):358:363 -> a
     53:53:java.lang.Object apply(java.util.function.Function,java.util.function.Function):382:382 -> a
     54:55:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexProgramClass):396:397 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/C5;"}
-    56:57:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):636:637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/c0;)V"}
-    58:101:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):648:691 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bm0;)Z"}
-    102:105:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
-    106:109:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
-    110:113:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
-    114:146:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):655:687 -> a
-    147:166:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):696:715 -> a
+    56:56:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):636:636 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/d0;)V"}
+    57:57:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    57:57:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):636 -> a
+    58:59:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):636:637 -> a
+    60:103:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):648:691 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fm0;)Z"}
+    104:107:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
+    108:111:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
+    112:115:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
+    116:148:boolean isInliningCandidate(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):655:687 -> a
+    149:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):696:715 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/O;)Z"}
-    167:167:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):712:712 -> a
-    168:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
-    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
-    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
-    171:189:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:718 -> a
-    190:199:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):727:736 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;Lcom/android/tools/r8/internal/az;)V"}
-    200:202:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):740:742 -> a
+    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):712:712 -> a
+    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
+    171:171:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
+    172:172:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
+    173:191:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:718 -> a
+    192:201:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):727:736 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;Lcom/android/tools/r8/internal/cz;)V"}
+    202:204:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):740:742 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;)V"}
-    203:203:boolean isDexEncodedMethod():1308:1308 -> a
-    203:203:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):743 -> a
-    204:204:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):743:743 -> a
-    205:220:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):741:756 -> a
-    221:221:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):745:745 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/internal/PW;)V"}
-    222:222:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
-    222:222:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749 -> a
+    205:205:boolean isDexEncodedMethod():1308:1308 -> a
+    205:205:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):743 -> a
+    206:206:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):743:743 -> a
+    207:222:boolean verifyPendingInlinePositionFoundInCode(com.android.tools.r8.graph.Code):741:756 -> a
+    223:223:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):745:745 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/internal/TW;)V"}
+    224:224:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
+    224:224:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    223:223:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
-    223:223:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749 -> a
-    224:225:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749:750 -> a
-    226:226:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():89:89 -> a
-    226:226:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):753 -> a
-    227:227:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):780:780 -> a
+    225:225:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
+    225:225:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749 -> a
+    226:227:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):749:750 -> a
+    228:228:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():89:89 -> a
+    228:228:void lambda$verifyPendingInlinePositionFoundInCode$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Position):753 -> a
+    229:229:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):780:780 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
-    228:233:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):829:834 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
-    234:234:com.android.tools.r8.graph.DexMethod getPendingInlineFrame():805:805 -> a
-    234:234:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):835 -> a
-    235:235:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):835:835 -> a
-    236:236:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> a
-    236:236:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836 -> a
+    230:235:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):829:834 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
+    236:236:com.android.tools.r8.graph.DexMethod getPendingInlineFrame():805:805 -> a
+    236:236:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):835 -> a
+    237:237:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):835:835 -> a
+    238:238:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> a
+    238:238:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:237:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):291:291 -> a
-    237:237:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836 -> a
-    238:239:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836:837 -> a
-    240:242:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):871:873 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)V"}
-    243:251:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):887:895 -> a
+    239:239:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):291:291 -> a
+    239:239:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836 -> a
+    240:241:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPositionWithCallerPosition(com.android.tools.r8.ir.code.Position):836:837 -> a
+    242:244:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):871:873 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)V"}
+    245:253:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):887:895 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;)Ljava/lang/String;"}
-    252:252:void rewriteAllAnnotations(java.util.function.BiFunction):913:913 -> a
-    253:253:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
-    253:253:void rewriteAllAnnotations(java.util.function.BiFunction):912 -> a
-    254:255:void rewriteAllAnnotations(java.util.function.BiFunction):915:916 -> a
-    256:256:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):936:936 -> a
-    256:256:void rewriteAllAnnotations(java.util.function.BiFunction):914 -> a
-    257:260:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1001:1004 -> a
+    254:254:void rewriteAllAnnotations(java.util.function.BiFunction):913:913 -> a
+    255:255:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
+    255:255:void rewriteAllAnnotations(java.util.function.BiFunction):912 -> a
+    256:257:void rewriteAllAnnotations(java.util.function.BiFunction):915:916 -> a
+    258:258:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):936:936 -> a
+    258:258:void rewriteAllAnnotations(java.util.function.BiFunction):914 -> a
+    259:262:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1001:1004 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;ILcom/android/tools/r8/graph/y;)V"}
-    261:261:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():246:246 -> a
-    261:261:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1004 -> a
-    262:267:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1004:1009 -> a
-    268:274:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1014:1020 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yK;"}
-    275:286:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1018:1029 -> a
-    287:295:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1026:1034 -> a
-    296:304:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1031:1039 -> a
-    305:317:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1037:1049 -> a
-    318:318:int getNumberOfArguments():206:206 -> a
-    318:318:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1051 -> a
-    319:319:com.android.tools.r8.graph.DexType getArgumentType(int):198:198 -> a
-    319:319:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1052 -> a
-    320:351:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1053:1084 -> a
-    352:360:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1083:1091 -> a
-    361:366:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1095:1100 -> a
+    263:263:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():246:246 -> a
+    263:263:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1004 -> a
+    264:269:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1004:1009 -> a
+    270:276:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1014:1020 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/CK;"}
+    277:288:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1018:1029 -> a
+    289:297:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1026:1034 -> a
+    298:306:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1031:1039 -> a
+    307:319:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1037:1049 -> a
+    320:320:int getNumberOfArguments():206:206 -> a
+    320:320:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1051 -> a
+    321:321:com.android.tools.r8.graph.DexType getArgumentType(int):198:198 -> a
+    321:321:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1052 -> a
+    322:353:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1053:1084 -> a
+    354:362:com.android.tools.r8.lightir.LirCode toLirCodeThatLogsError(com.android.tools.r8.graph.AppView):1083:1091 -> a
+    363:368:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1095:1100 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/G;"}
-    367:378:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1098:1109 -> a
-    379:387:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1106:1114 -> a
-    388:396:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1111:1119 -> a
-    397:401:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1117:1121 -> a
-    402:403:boolean isStaticMember():554:555 -> a
-    402:403:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1122 -> a
-    404:417:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1126:1139 -> a
-    418:419:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1144:1145 -> a
+    369:380:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1098:1109 -> a
+    381:389:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1106:1114 -> a
+    390:398:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1111:1119 -> a
+    399:403:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1117:1121 -> a
+    404:405:boolean isStaticMember():554:555 -> a
+    404:405:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1122 -> a
+    406:419:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1126:1139 -> a
+    420:421:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1144:1145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/j1;"}
-    420:420:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151:1151 -> a
+    422:422:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151:1151 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/B1;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/j1;"}
-    421:423:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1179:1181 -> a
-    421:423:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
-    424:424:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
-    424:424:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1181 -> a
-    424:424:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
-    425:436:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1182:1193 -> a
-    425:436:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
-    437:447:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1155:1165 -> a
+    423:425:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1179:1181 -> a
+    423:425:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
+    426:426:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
+    426:426:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1181 -> a
+    426:426:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
+    427:438:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodHelper(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):1182:1193 -> a
+    427:438:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1151 -> a
+    439:449:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1155:1165 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1$a;)V"}
-    448:448:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1161:1161 -> a
-    449:449:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1159:1159 -> a
-    450:450:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156:1156 -> a
-    451:451:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1663:1663 -> a
-    451:451:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
-    452:452:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1663:1663 -> a
-    452:452:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    453:453:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1663:1663 -> a
+    450:450:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1161:1161 -> a
+    451:451:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1159:1159 -> a
+    452:452:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156:1156 -> a
+    453:453:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1674:1674 -> a
     453:453:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
-    454:454:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156:1156 -> a
-    455:455:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1669:1669 -> a
-    455:455:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
+    454:454:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1674:1674 -> a
+    454:454:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    456:456:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1669:1669 -> a
-    456:456:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
-    457:457:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1670:1670 -> a
+    455:455:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1674:1674 -> a
+    455:455:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
+    456:456:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156:1156 -> a
+    457:457:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1680:1680 -> a
     457:457:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    458:460:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1169:1171 -> a
-    461:478:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1204:1221 -> a
+    458:458:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1680:1680 -> a
+    458:458:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setInlineFrame(com.android.tools.r8.graph.DexMethod,boolean):1681:1681 -> a
+    459:459:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1156 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    460:462:void lambda$toTypeSubstitutedMethodAsInlining$7(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod$Builder):1169:1171 -> a
+    463:480:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1204:1221 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/C5;"}
-    479:479:void lambda$toPrivateSyntheticMethod$9(com.android.tools.r8.graph.DexEncodedMethod$Builder):1213:1213 -> a
+    481:481:void lambda$toPrivateSyntheticMethod$9(com.android.tools.r8.graph.DexEncodedMethod$Builder):1213:1213 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1$a;)V"}
-    480:483:void lambda$toPrivateSyntheticMethod$8(com.android.tools.r8.graph.MethodAccessFlags):1215:1218 -> a
+    482:485:void lambda$toPrivateSyntheticMethod$8(com.android.tools.r8.graph.MethodAccessFlags):1215:1218 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)V"}
-    484:484:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1230:1230 -> a
+    486:486:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1230:1230 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/E0;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/j1;"}
-    485:485:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):344:344 -> a
-    485:485:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1230 -> a
-    486:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1231:1242 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1242 -> a
-    499:499:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1247:1247 -> a
-    500:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1246:1269 -> a
-    524:524:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1544:1544 -> a
-    524:524:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1268 -> a
-    525:526:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1270:1271 -> a
-    527:527:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1251:1251 -> a
+    487:487:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):344:344 -> a
+    487:487:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1230 -> a
+    488:499:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1231:1242 -> a
+    500:500:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
+    500:500:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1242 -> a
+    501:501:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1247:1247 -> a
+    502:525:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1246:1269 -> a
+    526:526:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1544:1544 -> a
+    526:526:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1268 -> a
+    527:528:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1270:1271 -> a
+    529:529:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1251:1251 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1$a;)V"}
-    528:528:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-    528:528:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1251 -> a
-    529:529:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1253:1253 -> a
-    530:530:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1252:1252 -> a
-    531:531:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175:175 -> a
-    531:531:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    532:545:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):240:253 -> a
-    532:545:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    532:545:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    546:546:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
-    546:546:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):258 -> a
-    546:546:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    546:546:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    547:557:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):259:269 -> a
-    547:557:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    547:557:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    558:558:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):268:268 -> a
-    558:558:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    558:558:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    559:559:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
-    559:559:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):268 -> a
-    559:559:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    559:559:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    560:560:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.createNoDebugLocal(int,com.android.tools.r8.ir.analysis.type.TypeElement):200:200 -> a
-    560:560:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):270 -> a
+    530:530:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
+    530:530:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1251 -> a
+    531:531:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1253:1253 -> a
+    532:532:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1252:1252 -> a
+    533:533:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175:175 -> a
+    533:533:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    534:547:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):240:253 -> a
+    534:547:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    534:547:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    548:548:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
+    548:548:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):258 -> a
+    548:548:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    548:548:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    549:559:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):259:269 -> a
+    549:559:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    549:559:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    560:560:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):268:268 -> a
     560:560:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     560:560:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    561:562:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):271:272 -> a
-    561:562:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    561:562:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    563:563:java.lang.Integer com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(com.android.tools.r8.ir.code.Value,int):54:54 -> a
-    563:563:java.lang.Object com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(java.lang.Object,int):32 -> a
-    563:563:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):272 -> a
-    563:563:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    563:563:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    564:564:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):273:273 -> a
-    564:564:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    564:564:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    565:565:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():351:351 -> a
-    565:565:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):276 -> a
+    561:561:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
+    561:561:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):268 -> a
+    561:561:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    561:561:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    562:562:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.createNoDebugLocal(int,com.android.tools.r8.ir.analysis.type.TypeElement):200:200 -> a
+    562:562:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):270 -> a
+    562:562:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    562:562:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    563:564:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):271:272 -> a
+    563:564:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    563:564:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    565:565:java.lang.Integer com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(com.android.tools.r8.ir.code.Value,int):54:54 -> a
+    565:565:java.lang.Object com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(java.lang.Object,int):32 -> a
+    565:565:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):272 -> a
     565:565:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     565:565:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    566:568:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):277:279 -> a
-    566:568:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    566:568:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    569:569:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInvokeInstruction(int,com.android.tools.r8.graph.DexMethod,java.util.List):726:726 -> a
-    569:569:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInvokeSuper(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):743 -> a
-    569:569:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):279 -> a
-    569:569:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    569:569:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    570:575:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):282:287 -> a
-    570:575:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    570:575:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    576:576:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.createNoDebugLocal(int,com.android.tools.r8.ir.analysis.type.TypeElement):200:200 -> a
-    576:576:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):286 -> a
-    576:576:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    576:576:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    577:577:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):288:288 -> a
-    577:577:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
-    577:577:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    578:578:java.lang.Integer com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(com.android.tools.r8.ir.code.Value,int):54:54 -> a
-    578:578:java.lang.Object com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(java.lang.Object,int):32 -> a
-    578:578:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):288 -> a
+    566:566:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):273:273 -> a
+    566:566:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    566:566:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    567:567:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():351:351 -> a
+    567:567:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):276 -> a
+    567:567:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    567:567:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    568:570:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):277:279 -> a
+    568:570:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    568:570:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    571:571:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInvokeInstruction(int,com.android.tools.r8.graph.DexMethod,java.util.List):726:726 -> a
+    571:571:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInvokeSuper(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):743 -> a
+    571:571:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):279 -> a
+    571:571:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    571:571:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    572:577:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):282:287 -> a
+    572:577:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    572:577:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    578:578:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.createNoDebugLocal(int,com.android.tools.r8.ir.analysis.type.TypeElement):200:200 -> a
+    578:578:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):286 -> a
     578:578:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     578:578:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    579:579:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289:289 -> a
+    579:579:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):288:288 -> a
     579:579:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     579:579:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    580:580:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):478:478 -> a
-    580:580:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addReturn(java.lang.Object):779 -> a
-    580:580:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289 -> a
+    580:580:java.lang.Integer com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(com.android.tools.r8.ir.code.Value,int):54:54 -> a
+    580:580:java.lang.Object com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy.defineValue(java.lang.Object,int):32 -> a
+    580:580:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):288 -> a
     580:580:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     580:580:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    581:581:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):477:477 -> a
-    581:581:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addReturn(java.lang.Object):779 -> a
-    581:581:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289 -> a
+    581:581:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289:289 -> a
     581:581:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     581:581:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    582:582:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):292:292 -> a
+    582:582:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):478:478 -> a
+    582:582:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addReturn(java.lang.Object):779 -> a
+    582:582:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289 -> a
     582:582:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     582:582:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    583:583:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):246:246 -> a
+    583:583:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):477:477 -> a
+    583:583:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addReturn(java.lang.Object):779 -> a
+    583:583:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):289 -> a
     583:583:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     583:583:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    584:584:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175:175 -> a
+    584:584:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):292:292 -> a
+    584:584:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
     584:584:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
-    585:602:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1250:1267 -> a
-    603:606:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1276:1279 -> a
+    585:585:com.android.tools.r8.lightir.LirCode com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.buildLir(com.android.tools.r8.graph.AppView):246:246 -> a
+    585:585:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175 -> a
+    585:585:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    586:586:com.android.tools.r8.graph.Code com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.build(com.android.tools.r8.graph.AppView):175:175 -> a
+    586:586:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1266 -> a
+    587:604:void lambda$toForwardingMethod$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1250:1267 -> a
+    605:608:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1276:1279 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/j1;"}
-    607:607:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):344:344 -> a
-    607:607:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1279 -> a
-    608:608:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280:1280 -> a
-    609:609:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
-    609:609:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280 -> a
-    610:610:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
-    610:610:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    609:609:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexItemFactory):344:344 -> a
+    609:609:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1279 -> a
+    610:610:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280:1280 -> a
     611:611:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
     611:611:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280 -> a
-    612:612:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1282:1282 -> a
-    613:613:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():208:208 -> a
-    613:613:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1283 -> a
-    614:614:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1409:1409 -> a
-    614:614:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1286 -> a
-    615:617:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1287:1289 -> a
-    618:618:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
-    618:618:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1289 -> a
+    612:612:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
+    612:612:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    619:619:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1290:1290 -> a
-    620:620:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1572:1572 -> a
-    620:620:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1290 -> a
-    621:621:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
-    621:621:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1292 -> a
-    622:623:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setNonStaticSource(com.android.tools.r8.graph.DexMethod):105:106 -> a
-    622:623:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1293 -> a
-    624:625:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1294:1295 -> a
-    626:631:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1291:1296 -> a
-    632:632:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
-    632:632:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1296 -> a
+    613:613:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
+    613:613:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1280 -> a
+    614:614:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1282:1282 -> a
+    615:615:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():208:208 -> a
+    615:615:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1283 -> a
+    616:616:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1409:1409 -> a
+    616:616:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1286 -> a
+    617:619:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1287:1289 -> a
+    620:620:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
+    620:620:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    633:633:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
-    633:633:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1296 -> a
+    621:621:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1290:1290 -> a
+    622:622:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1572:1572 -> a
+    622:622:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1290 -> a
+    623:623:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
+    623:623:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1292 -> a
+    624:625:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setNonStaticSource(com.android.tools.r8.graph.DexMethod):105:106 -> a
+    624:625:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1293 -> a
+    626:627:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1294:1295 -> a
+    628:633:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1291:1296 -> a
+    634:634:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
+    634:634:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1296 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    634:634:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297:1297 -> a
-    635:635:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1329:1329 -> a
-    635:635:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297 -> a
+    635:635:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
+    635:635:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1296 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    636:636:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
-    636:636:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297 -> a
-    637:637:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1298:1298 -> a
-    638:639:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1355:1356 -> a
+    636:636:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297:1297 -> a
+    637:637:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1329:1329 -> a
+    637:637:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    638:638:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
+    638:638:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1297 -> a
+    639:639:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1298:1298 -> a
+    640:641:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1355:1356 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/w;)V"}
-    640:645:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1365:1370 -> a
+    642:647:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1365:1370 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)V"}
-    646:646:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1329:1329 -> a
-    646:646:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1371 -> a
-    647:647:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1371:1371 -> a
+    648:648:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1329:1329 -> a
+    648:648:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1371 -> a
+    649:649:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1371:1371 -> a
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1324:1325 -> a1
     1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():85 -> a1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/g;"}
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setNonStaticSource(com.android.tools.r8.graph.DexMethod):105:105 -> b
     1:1:void lambda$toForwardingMethod$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1262 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Mq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Oq;)V"}
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setNonStaticSource(com.android.tools.r8.graph.DexMethod):106:106 -> b
     2:2:void lambda$toForwardingMethod$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1262 -> b
     3:4:void lambda$toForwardingMethod$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1264:1265 -> b
@@ -80316,12 +80348,12 @@
     6:8:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):131:133 -> b
     6:8:void lambda$toForwardingMethod$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1263 -> b
     9:9:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/db;"}
     10:12:boolean isAtLeastAsVisibleAsOtherInSameHierarchy(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):561:563 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Z"}
     13:25:boolean isAtLeastAsVisibleAsOtherInSameHierarchy(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):562:574 -> b
     26:28:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):865:867 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)V"}
     29:29:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$5(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):913:913 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/r0;)Lcom/android/tools/r8/graph/r0;"}
     1:1:com.android.tools.r8.graph.DexMethod lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):272:272 -> c
@@ -80355,7 +80387,7 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1329:1329 -> m1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/androidapi/f;"}
     1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():850:852 -> n1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/db;"}
     1:2:com.android.tools.r8.graph.Code getCode():845:846 -> o1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/i0;"}
     1:3:com.android.tools.r8.graph.DexWritableCode getDexWritableCodeOrNull():1391:1393 -> p1
@@ -80365,12 +80397,12 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():260:260 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():618:618 -> r1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/c0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/d0;"}
     1:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMutableOptimizationInfo():1348:1350 -> s1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/w;"}
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():618:618 -> t0
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():85 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     1:1:int getNumberOfArguments():206:206 -> t1
     1:1:java.lang.String toString():775:775 -> toString
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1324:1325 -> u1
@@ -80380,7 +80412,7 @@
     1:1:com.android.tools.r8.graph.DexTypeList getParameters():326:326 -> w1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/K2;"}
     1:9:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPosition():815:823 -> x1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     10:10:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> x1
     10:10:com.android.tools.r8.ir.code.Position getPendingInlineFrameAsPosition():823 -> x1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -80416,7 +80448,7 @@
     com.android.tools.r8.graph.DexAnnotationSet annotations -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/u0;"}
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/u5;"}
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> h
@@ -80424,9 +80456,9 @@
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/h;"}
     com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinInfo -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/c0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/d0;"}
     com.android.tools.r8.cf.CfVersion classFileVersion -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForDefinition -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/f;"}
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForCode -> m
@@ -80445,55 +80477,61 @@
     2:4:void <init>(boolean):1429:1431 -> <init>
     5:5:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> <init>
     5:5:void <init>(boolean):1432 -> <init>
-    6:11:void <init>(boolean):1432:1437 -> <init>
-    12:27:void <init>(boolean):1437:1452 -> <init>
-    28:28:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1455:1455 -> <init>
+    6:8:void <init>(boolean):1432:1434 -> <init>
+    9:9:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    9:9:void <init>(boolean):1435 -> <init>
+    10:12:void <init>(boolean):1435:1437 -> <init>
+    13:28:void <init>(boolean):1437:1452 -> <init>
+    29:29:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1455:1455 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Z)V"}
-    29:31:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1429:1431 -> <init>
-    32:32:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> <init>
-    32:32:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1432 -> <init>
-    33:59:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1432:1458 -> <init>
-    60:60:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> <init>
-    60:60:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458 -> <init>
-    61:61:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> <init>
-    61:61:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    30:32:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1429:1431 -> <init>
+    33:33:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> <init>
+    33:33:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1432 -> <init>
+    34:36:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1432:1434 -> <init>
+    37:37:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    37:37:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1435 -> <init>
+    38:61:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1435:1458 -> <init>
     62:62:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> <init>
     62:62:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458 -> <init>
-    63:66:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458:1461 -> <init>
-    67:67:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getPendingInlineFrame():805:805 -> <init>
-    67:67:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1462 -> <init>
-    68:68:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1462:1462 -> <init>
-    69:69:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> <init>
-    69:69:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1463 -> <init>
-    70:70:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1463:1463 -> <init>
-    71:71:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> <init>
-    71:71:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1464 -> <init>
-    72:72:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1464:1464 -> <init>
-    73:74:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
-    73:74:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1466 -> <init>
-    75:75:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1466:1466 -> <init>
-    76:77:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
-    76:77:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467 -> <init>
-    78:78:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467:1467 -> <init>
-    79:79:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mutableCopy():867:867 -> <init>
-    79:79:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467 -> <init>
-    80:81:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
-    80:81:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1468 -> <init>
-    82:82:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1468:1468 -> <init>
-    83:83:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> <init>
-    83:83:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1469 -> <init>
-    84:86:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1469:1471 -> <init>
-    87:87:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():250:250 -> <init>
-    87:87:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1472 -> <init>
-    88:96:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1472:1480 -> <init>
-    97:97:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.withParameterCount(int):198:198 -> <init>
-    97:97:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480 -> <init>
+    63:63:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> <init>
+    63:63:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    100:109:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.withParameterCount(int):201:210 -> <init>
-    100:109:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480 -> <init>
-    110:110:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480:1480 -> <init>
-    111:111:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1476:1476 -> <init>
+    64:64:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> <init>
+    64:64:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458 -> <init>
+    65:68:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1458:1461 -> <init>
+    69:69:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getPendingInlineFrame():805:805 -> <init>
+    69:69:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1462 -> <init>
+    70:70:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1462:1462 -> <init>
+    71:71:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> <init>
+    71:71:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1463 -> <init>
+    72:72:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1463:1463 -> <init>
+    73:73:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> <init>
+    73:73:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1464 -> <init>
+    74:74:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1464:1464 -> <init>
+    75:76:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
+    75:76:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1466 -> <init>
+    77:77:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1466:1466 -> <init>
+    78:79:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
+    78:79:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467 -> <init>
+    80:80:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467:1467 -> <init>
+    81:81:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mutableCopy():867:867 -> <init>
+    81:81:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1467 -> <init>
+    82:83:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> <init>
+    82:83:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1468 -> <init>
+    84:84:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1468:1468 -> <init>
+    85:85:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> <init>
+    85:85:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1469 -> <init>
+    86:88:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1469:1471 -> <init>
+    89:89:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():250:250 -> <init>
+    89:89:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1472 -> <init>
+    90:98:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1472:1480 -> <init>
+    99:99:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.withParameterCount(int):198:198 -> <init>
+    99:99:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    102:111:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.withParameterCount(int):201:210 -> <init>
+    102:111:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480 -> <init>
+    112:112:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1480:1480 -> <init>
+    113:113:void <init>(boolean,com.android.tools.r8.graph.DexEncodedMethod):1476:1476 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder apply(java.util.function.Consumer):1485:1485 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/j1$a;"}
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder applyIf(boolean,java.util.function.Consumer):1490:1490 -> a
@@ -80509,31 +80547,31 @@
     9:9:com.android.tools.r8.graph.DexEncodedMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):1525:1525 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/j1$a;"}
     10:11:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1536:1537 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QU;)Lcom/android/tools/r8/graph/j1$a;"}
-    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1654:1654 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;)Lcom/android/tools/r8/graph/j1$a;"}
+    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1665:1665 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/graph/j1$a;"}
     13:13:com.android.tools.r8.graph.DexEncodedMethod$Builder addBuildConsumer(java.util.function.Consumer):1510:1510 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1654 -> a
-    14:15:void lambda$modifyOptimizationInfo$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyOptimizationInfo(java.util.function.BiConsumer):1665 -> a
+    14:15:void lambda$modifyOptimizationInfo$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod):1667:1668 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/j1;)V"}
-    16:16:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1675:1675 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(com.android.tools.r8.graph.Code):1686:1686 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;)Lcom/android/tools/r8/graph/j1$a;"}
-    17:17:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(java.util.function.Function):1680:1680 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod$Builder setCode(java.util.function.Function):1691:1691 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/graph/j1$a;"}
-    18:18:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/graph/j1$a;"}
-    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)Lcom/android/tools/r8/graph/j1$a;"}
-    20:26:com.android.tools.r8.graph.DexEncodedMethod build():1729:1735 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)Lcom/android/tools/r8/graph/j1$a;"}
+    20:26:com.android.tools.r8.graph.DexEncodedMethod build():1740:1746 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1;"}
-    27:53:com.android.tools.r8.graph.DexEncodedMethod build():1733:1759 -> a
+    27:53:com.android.tools.r8.graph.DexEncodedMethod build():1744:1770 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder modifyAccessFlags(java.util.function.Consumer):1515:1515 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/j1$a;"}
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;)Lcom/android/tools/r8/graph/j1$a;"}
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder disableAndroidApiLevelCheck():1724:1724 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder disableAndroidApiLevelCheck():1735:1735 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1$a;"}
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1714:1714 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1725:1725 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1$a;"}
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.k1:
 # {"id":"sourceFile","fileName":"DexEncodedMethod.java"}
@@ -80587,11 +80625,11 @@
     4:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     5:5:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     6:6:int acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):200:200 -> a
     6:6:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):75 -> a
     7:7:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     8:8:com.android.tools.r8.graph.ProgramField lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/A5;"}
     9:9:java.lang.Object apply(java.util.function.Function,java.util.function.Function):118:118 -> a
@@ -81037,7 +81075,7 @@
     com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> Y3
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.List libraryMembersCollection -> Y4
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> Y5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/n2;"}
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
@@ -81068,7 +81106,7 @@
     com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> a5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
     com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> a6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     java.util.Map markers -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
@@ -81147,7 +81185,7 @@
     com.android.tools.r8.graph.DexType annotationDefault -> f5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.Map libraryMethodsNonNullParamOrThrow -> f6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map methods -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.graph.DexString formatMethodName -> g0
@@ -81178,9 +81216,9 @@
     com.android.tools.r8.graph.DexType annotationEnclosingMethod -> h5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.Set libraryMethodsReturningNonNull -> h6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexString trimName -> i0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> i1
@@ -81194,9 +81232,9 @@
     com.android.tools.r8.graph.DexType annotationInnerClass -> i5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> i6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexString valueOfMethodName -> j0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString valueString -> j1
@@ -81204,14 +81242,14 @@
     com.android.tools.r8.graph.DexType objectsType -> j2
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.List typeSpecificBuffers -> j3
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> j4
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/m2;"}
     com.android.tools.r8.graph.DexType annotationMemberClasses -> j5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.Set libraryTypesAssumedToBePresent -> j6
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexString valuesMethodName -> k0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString kindString -> k1
@@ -81219,15 +81257,15 @@
     com.android.tools.r8.graph.DexType collectionsType -> k2
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.List multiDexTypes -> k3
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> k4
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1$a;"}
     com.android.tools.r8.graph.DexType annotationMethodParameters -> k5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.Set libraryClassesWithoutStaticInitialization -> k6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexString toStringMethodName -> l0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString versionHashString -> l1
@@ -81242,7 +81280,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean skipNameValidationForTesting -> l6
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.graph.DexString internMethodName -> m0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString apiLevelString -> m1
@@ -81303,7 +81341,7 @@
     com.android.tools.r8.graph.DexType annotationRecord -> p5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.util.List MULTIDEX_PREFIXES -> p6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Map setInlineFrames -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.graph.DexString finalizeMethodName -> q0
@@ -81319,7 +81357,7 @@
     com.android.tools.r8.graph.DexString annotationRecordComponentNames -> q5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     java.util.List MULTIDEX_SUFFIXES -> q6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.DexDebugEvent$Default zeroChangeDefaultEvent -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/O0$b;"}
     com.android.tools.r8.graph.DexString ordinalMethodName -> r0
@@ -81335,7 +81373,7 @@
     com.android.tools.r8.graph.DexString annotationRecordComponentTypes -> r5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     java.util.List MULTIDEX_INSTRUMENTATION -> r6
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.DexDebugEvent$Default oneChangeDefaultEvent -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/O0$b;"}
     com.android.tools.r8.graph.DexString nameMethodName -> s0
@@ -81378,7 +81416,7 @@
     com.android.tools.r8.graph.DexString annotationRecordComponentAnnotations -> u5
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HI;"}
     com.android.tools.r8.graph.DexString getNameName -> v0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString lookupString -> v1
@@ -81758,7 +81796,7 @@
     78:79:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2893:2894 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/H2;)Ljava/util/Optional;"}
     80:81:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate,java.util.function.Consumer):2922:2923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/vu;Ljava/util/function/Predicate;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/xu;Ljava/util/function/Predicate;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/w2;"}
     82:83:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2932:2933 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/w2;"}
     84:84:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
@@ -81766,7 +81804,7 @@
     85:87:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2935:2937 -> a
     88:88:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2933:2933 -> a
     89:97:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function,java.util.function.Consumer):2967:2975 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/vu;Ljava/util/function/Function;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/xu;Ljava/util/function/Function;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/w2;"}
     98:105:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function,java.util.function.Consumer):2974:2981 -> a
     106:106:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory$FreshInstanceInitializerCandidate.createProto():2956:2956 -> a
     106:106:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function,java.util.function.Consumer):2982 -> a
@@ -81830,11 +81868,11 @@
     205:207:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):3316:3318 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/graph/O0$c;"}
     208:210:com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame createPositionFrame(com.android.tools.r8.ir.code.Position):3323:3325 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/graph/S0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/graph/S0;"}
     211:211:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):3335:3335 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     212:215:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):3368:3371 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     216:216:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayElementType(com.android.tools.r8.graph.DexItemFactory):524:524 -> a
     216:216:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):3375 -> a
     217:217:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):3375:3375 -> a
@@ -81850,7 +81888,7 @@
     225:225:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):3374 -> a
     226:253:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):3378:3405 -> a
     254:259:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):3382:3387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/K30;"}
     260:264:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):518:522 -> a
     260:264:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):3388 -> a
     265:265:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
@@ -81864,7 +81902,7 @@
     268:273:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):3388:3393 -> a
     274:288:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):3389:3403 -> a
     289:289:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):3410:3410 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/zA;"}
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):361:361 -> b
     1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2936 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -81886,9 +81924,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     16:18:void clearTypeElementsCache():3339:3341 -> b
     19:20:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):3413:3414 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/zA;"}
     1:10:java.util.List createMultiDexTypes():553:562 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     11:17:com.android.tools.r8.graph.DexMethod getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):923:929 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/w2;"}
     18:18:com.android.tools.r8.graph.DexMethod getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):926:926 -> c
@@ -82090,7 +82128,7 @@
     com.android.tools.r8.graph.DexMethod referenceUpdater -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     java.util.Set updaters -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:15:void <init>(com.android.tools.r8.graph.DexItemFactory):2213:2227 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object,java.lang.Object,java.lang.Object):109:109 -> <init>
@@ -82134,7 +82172,7 @@
 com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.graph.E1:
 # {"id":"sourceFile","fileName":"DexItemFactory.java"}
     java.util.List bufferCovariantMethods -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1823:1834 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
 com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.F1:
@@ -82198,9 +82236,9 @@
     com.android.tools.r8.graph.DexMethod newInstance -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     java.util.Set getMembers -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set getNames -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):1924:1924 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     2:59:void <init>(com.android.tools.r8.graph.DexItemFactory):1906:1963 -> <init>
@@ -82586,7 +82624,7 @@
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.h2:
 # {"id":"sourceFile","fileName":"DexItemFactory.java"}
     java.util.Map boxedFieldTypeToPrimitiveType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:20:void <init>(com.android.tools.r8.graph.DexItemFactory):2176:2195 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.i2:
@@ -82678,11 +82716,11 @@
     com.android.tools.r8.graph.DexMethod toString -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     java.util.Set appendMethods -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set appendPrimitiveMethods -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set constructorMethods -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.graph.DexItemFactory this$0 -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     boolean $assertionsDisabled -> w
@@ -82850,7 +82888,7 @@
     com.android.tools.r8.graph.DexMember withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/r2;"}
     1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/jC;"}
     2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     3:3:boolean verifyReferencedBaseTypesMatches(java.util.function.Predicate,com.android.tools.r8.graph.DexItemFactory):77:77 -> a
@@ -82938,7 +82976,7 @@
     9:9:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexMethod(com.android.tools.r8.graph.DexMethod):50 -> a
     9:9:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):80 -> a
     10:10:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     11:11:int acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):75:75 -> a
     11:11:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):90 -> a
     12:17:com.android.tools.r8.graph.DexType getArgumentType(int,boolean):100:105 -> a
@@ -83045,9 +83083,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:boolean isMethodHandle():313:313 -> K0
     1:1:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:4:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):240:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ss;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/y2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/us;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/y2;"}
     5:5:java.lang.String com.android.tools.r8.org.objectweb.asm.Handle.getOwner():125:125 -> a
     5:5:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):243 -> a
     6:6:java.lang.String com.android.tools.r8.org.objectweb.asm.Handle.getName():134:134 -> a
@@ -83101,7 +83139,7 @@
     35:35:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):291 -> a
     36:36:boolean isMethodHandle():313:313 -> a
     36:36:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/internal/ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/internal/us;"}
     37:51:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):354:368 -> a
     52:52:boolean isFieldHandle():309:309 -> a
     52:52:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):368 -> a
@@ -83161,7 +83199,7 @@
     1:13:void <clinit>():38:50 -> <clinit>
     1:2:void <init>(java.lang.String,int,short):54:55 -> <init>
     1:28:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ss;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/x2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/us;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/x2;"}
     29:33:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):128:132 -> a
     34:47:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):117:130 -> a
     48:48:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126:126 -> a
@@ -83187,7 +83225,7 @@
     2:2:boolean isMethodType():143 -> h
     3:3:boolean isMethodType():144:144 -> h
     1:16:com.android.tools.r8.ir.code.InvokeType toInvokeType():188:203 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     17:17:com.android.tools.r8.ir.code.InvokeType toInvokeType():201:201 -> i
     18:18:com.android.tools.r8.ir.code.InvokeType toInvokeType():199:199 -> i
     19:19:com.android.tools.r8.ir.code.InvokeType toInvokeType():197:197 -> i
@@ -83277,20 +83315,23 @@
     boolean $assertionsDisabled -> C
     com.android.tools.r8.ProgramResource$Kind originKind -> u
     com.android.tools.r8.cf.CfVersion initialClassFileVersion -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean deprecated -> w
     com.android.tools.r8.kotlin.KotlinClassLevelInfo kotlinInfo -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p;"}
     com.android.tools.r8.utils.ReachabilitySensitiveValue reachabilitySensitive -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y10;"}
     com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier checksumSupplier -> z
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2$a;"}
     1:9:void <clinit>():43:51 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue,com.android.tools.r8.synthesis.SyntheticMarker):86:86 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/I4$a;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/u10;Lcom/android/tools/r8/synthesis/K;)V"}
-    2:58:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue,com.android.tools.r8.synthesis.SyntheticMarker):54:110 -> <init>
-    59:59:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue):135:135 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/I4$a;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/u10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/I4$a;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/y10;Lcom/android/tools/r8/synthesis/K;)V"}
+    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue,com.android.tools.r8.synthesis.SyntheticMarker):54:55 -> <init>
+    4:4:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue,com.android.tools.r8.synthesis.SyntheticMarker):56 -> <init>
+    5:59:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue,com.android.tools.r8.synthesis.SyntheticMarker):56:110 -> <init>
+    60:60:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.utils.ReachabilitySensitiveValue):135:135 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/Q;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/K2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j5;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/e3;Ljava/util/List;Lcom/android/tools/r8/graph/C3$b;Lcom/android/tools/r8/graph/u0;[Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/I4$a;ZLcom/android/tools/r8/graph/D2$a;Lcom/android/tools/r8/internal/y10;)V"}
     1:1:java.lang.String toSourceString():525:525 -> F0
     com.android.tools.r8.utils.structural.StructuralItem self() -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
@@ -83304,7 +83345,7 @@
     7:7:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71:71 -> a
     7:7:void lambda$collectIndexedItems$27(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):487 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/graph/C5;)V"}
     8:9:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71:72 -> a
     8:9:void lambda$collectIndexedItems$27(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):487 -> a
     10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isObsolete():179:179 -> a
@@ -83327,7 +83368,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     57:57:com.android.tools.r8.graph.FieldCollection com.android.tools.r8.graph.DexClass.getFieldCollection():240:240 -> a
     57:57:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):409 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     58:58:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):409:409 -> a
     59:59:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.FieldCollection.traverse(java.util.function.Function):67:67 -> a
     59:59:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):409 -> a
@@ -83337,22 +83378,22 @@
     61:61:boolean lambda$forEachProgramInstanceInitializerMatching$18(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):334:334 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/j1;)Z"}
     62:62:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$20(java.util.function.Function,com.android.tools.r8.graph.DexClassAndField):409:409 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Oh0;"}
     63:63:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.BiFunction,com.android.tools.r8.graph.DexClassAndField,java.lang.Object):415:415 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/F0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/F0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     64:64:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$24(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):432:432 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Oh0;"}
     65:65:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):443:443 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Oh0;"}
     66:66:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.MethodCollection.traverse(java.util.function.Function):122:122 -> a
     66:66:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):444 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     67:67:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.MethodCollection.traverse(java.util.function.Function):122:122 -> a
     67:67:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):444 -> a
     68:70:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$25(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):446:448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Function;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Function;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Oh0;"}
     71:78:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):465:472 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/internal/BJ;)V"}
     79:79:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):428:428 -> a
     79:79:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):473 -> a
     80:85:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):475:480 -> a
@@ -83459,14 +83500,16 @@
     182:182:void addExtraInterfacesToSignatureIfPresent(java.util.List,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
     182:182:void addExtraInterfaces(java.util.List,com.android.tools.r8.graph.DexItemFactory):768 -> a
     183:184:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):823:824 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)V"}
     185:185:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):845:845 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/graph/d1;)Ljava/lang/Iterable;"}
     186:186:java.util.Iterator lambda$asProgramClasses$31(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):846:846 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/graph/d1;)Ljava/util/Iterator;"}
     187:187:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):879:879 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)J"}
-    1:1:void clearKotlinInfo():587:587 -> a2
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a2
+    1:1:void clearKotlinInfo():587 -> a2
+    2:2:void clearKotlinInfo():587:587 -> a2
     1:1:com.android.tools.r8.graph.DexClass asClass():0:0 -> asClass
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/E0;"}
     2:2:com.android.tools.r8.graph.DexProgramClass asClass():0:0 -> asClass
@@ -83479,7 +83522,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/I2;"}
     4:4:com.android.tools.r8.graph.FieldCollection com.android.tools.r8.graph.DexClass.getFieldCollection():240:240 -> b
     4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.BiFunction,java.lang.Object):414 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.BiFunction,java.lang.Object):414:414 -> b
     6:6:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.FieldCollection.traverse(java.util.function.BiFunction,java.lang.Object):73:73 -> b
     6:6:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.BiFunction,java.lang.Object):415 -> b
@@ -83500,7 +83543,7 @@
     13:13:void lambda$forEachProgramDirectMethodMatching$17(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1;)V"}
     14:14:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramInstanceFields$22(java.util.function.Function,com.android.tools.r8.graph.DexClassAndField):420:420 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Oh0;"}
     15:21:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):503:509 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     22:22:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):126:126 -> b
@@ -83538,7 +83581,7 @@
     62:64:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):678 -> b
     62:64:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):663 -> b
     1:1:java.lang.Iterable directProgramMethods():297:297 -> b2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):236:236 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:void lambda$forEachProgramInstanceField$9(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):261:261 -> c
@@ -83550,7 +83593,7 @@
     5:5:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):386:386 -> c
     5:5:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):377 -> c
     6:6:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):432:432 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     7:7:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.MethodCollection.traverse(java.util.function.Function):122:122 -> c
     7:7:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):432 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -83588,7 +83631,7 @@
     3:3:void lambda$forEachProgramVirtualMethodMatching$19(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):344:344 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():832:832 -> d2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/db;"}
     1:1:com.android.tools.r8.graph.DexDefinition getDefinition():0:0 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/b1;"}
     2:2:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):238:238 -> e
@@ -83618,7 +83661,7 @@
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):362:362 -> f2
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():358 -> f2
     1:1:com.android.tools.r8.cf.CfVersion lambda$specify$5(com.android.tools.r8.graph.DexProgramClass):240:240 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/db;"}
     2:2:com.android.tools.r8.graph.ProgramMethod lambda$virtualProgramMethods$15(com.android.tools.r8.graph.DexEncodedMethod):305:305 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/C5;"}
     3:3:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):333:333 -> g
@@ -83663,34 +83706,39 @@
     4:4:void acceptProgramClassInitializer(java.util.function.Consumer):353:353 -> j
     1:1:boolean hasMethodsOrFields():695:695 -> j2
     1:1:void forEachProgramDirectMethod(java.util.function.Consumer):318:318 -> k
-    1:1:boolean originatesFromClassResource():460:460 -> k2
+    1:1:com.android.tools.r8.utils.ReachabilitySensitiveValue getReachabilitySensitiveValue():217:217 -> k2
+    1:1:boolean isReachabilitySensitive():213 -> k2
+    2:2:boolean isReachabilitySensitive():213:213 -> k2
+    3:3:boolean com.android.tools.r8.utils.ReachabilitySensitiveValue.isEnabled():16:16 -> k2
+    3:3:boolean isReachabilitySensitive():213 -> k2
     1:1:void forEachProgramInstanceField(java.util.function.Consumer):261:261 -> l
-    1:1:java.lang.Iterable programInstanceInitializers():314:314 -> l2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+    1:1:boolean originatesFromClassResource():460:460 -> l2
     1:1:void forEachProgramField(java.util.function.Consumer):252:252 -> m
     1:1:void forEachProgramMember(java.util.function.Consumer):278 -> m
     2:2:void forEachProgramMember(java.util.function.Consumer):279:279 -> m
     3:3:java.lang.Iterable directProgramMethods(java.util.function.Predicate):301:301 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/jC;"}
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> m
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):738 -> m
     4:4:java.lang.Iterable directProgramMethods(java.util.function.Predicate):301 -> m
     5:5:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):739:739 -> m
     5:5:java.lang.Iterable directProgramMethods(java.util.function.Predicate):301 -> m
-    1:1:java.lang.Iterable programMethods():293:293 -> m2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fq;"}
-    2:2:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> m2
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> m2
-    2:2:java.lang.Iterable programMethods():293 -> m2
+    1:1:java.lang.Iterable programInstanceInitializers():314:314 -> m2
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:1:void forEachProgramMethod(java.util.function.Consumer):283:283 -> n
     2:2:java.lang.Iterable virtualProgramMethods(java.util.function.Predicate):310:310 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/jC;"}
     3:3:java.lang.Iterable virtualProgramMethods(java.util.function.Predicate):309:309 -> n
-    1:1:java.lang.Iterable virtualProgramMethods():305:305 -> n2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+    1:1:java.lang.Iterable programMethods():293:293 -> n2
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hq;"}
+    2:2:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> n2
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> n2
+    2:2:java.lang.Iterable programMethods():293 -> n2
     1:1:void forEachProgramStaticMethod(java.util.function.Consumer):274:274 -> o
     1:1:com.android.tools.r8.graph.ClassKind getKind():577:577 -> o1
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V;"}
+    1:1:java.lang.Iterable virtualProgramMethods():305:305 -> o2
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():222:222 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:java.lang.String toString():520:520 -> toString
@@ -83756,7 +83804,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     5:5:java.lang.Iterable getTypes():84:84 -> a
     5:5:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/jC;"}
     6:6:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
     6:6:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
     6:6:java.lang.Iterable getTypes():84 -> a
@@ -83770,7 +83818,7 @@
     10:17:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):138:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r0;)Ljava/lang/String;"}
     18:18:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):164:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     19:19:int com.android.tools.r8.graph.ObjectToOffsetMapping.getOffsetFor(com.android.tools.r8.graph.DexProto):429:429 -> a
     19:19:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -83862,7 +83910,7 @@
     7:7:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitDexString(com.android.tools.r8.graph.DexString):72:72 -> a
     7:7:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):182 -> a
     8:8:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     9:9:int acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):177:177 -> a
     9:9:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):192 -> a
     10:26:int decodePrefix(char[]):285:301 -> a
@@ -83971,7 +84019,7 @@
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/I2;"}
     java.util.List OLD_SYNTHESIZED_NAMES -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> j
     1:16:void <clinit>():32:47 -> <clinit>
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):172:172 -> <clinit>
@@ -84017,11 +84065,11 @@
     3:3:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     3:3:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):32 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/aj0;"}
     5:5:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     6:6:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     7:7:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):123:123 -> a
     7:7:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):139 -> a
     8:9:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):176:177 -> a
@@ -84091,7 +84139,7 @@
     1:1:boolean isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement toTypeElement(com.android.tools.r8.graph.AppView):93:93 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     3:3:com.android.tools.r8.ir.analysis.type.TypeElement toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> b
     3:3:com.android.tools.r8.ir.analysis.type.TypeElement toTypeElement(com.android.tools.r8.graph.AppView):93 -> b
     4:4:int compareTo(com.android.tools.r8.graph.DexReference):102:102 -> b
@@ -84217,9 +84265,9 @@
 # {"id":"sourceFile","fileName":"DexTypeAnnotation.java"}
     int typeRef -> f
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ej0;"}
     1:3:void <init>(int,com.android.tools.r8.graph.DexEncodedAnnotation,int,com.android.tools.r8.org.objectweb.asm.TypePath):20:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/e1;ILcom/android/tools/r8/internal/aj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/e1;ILcom/android/tools/r8/internal/ej0;)V"}
     com.android.tools.r8.graph.DexTypeAnnotation asTypeAnnotation() -> G0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/J2;"}
     boolean isTypeAnnotation() -> J0
@@ -84305,7 +84353,7 @@
     3:3:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,java.lang.Iterable):23 -> a
     4:5:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,java.lang.Iterable):23:24 -> a
     6:13:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):40:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/graph/I2;"}
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):511:511 -> a
     14:14:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -84327,7 +84375,7 @@
     54:54:boolean isTypeAccessibleInMethodContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):96 -> a
     55:55:boolean isTypeAccessibleInMethodContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):96:96 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement lambda$computeLeastUpperBound$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):23:23 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
 com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.N2:
 # {"id":"sourceFile","fileName":"DexValue.java"}
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> b
@@ -84464,11 +84512,11 @@
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.M2:
 # {"id":"sourceFile","fileName":"DexValue.java"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1437:1437 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1452:1453 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     void sort() -> A1
     1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1312:1312 -> B1
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1437 -> B1
@@ -84697,12 +84745,12 @@
 com.android.tools.r8.graph.DexValue$DexValueConstDynamic -> com.android.tools.r8.graph.O2:
 # {"id":"sourceFile","fileName":"DexValue.java"}
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference value -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ug;"}
     1:2:void <init>(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference):2194:2195 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ug;)V"}
     void sort() -> A1
     1:1:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference getValue():2224:2224 -> B1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ug;"}
     1:1:java.lang.Object asAsmEncodedObject():2277:2277 -> G0
     com.android.tools.r8.utils.structural.StructuralItem self() -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
@@ -85266,7 +85314,7 @@
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/X;)V"}
     com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory) -> a
@@ -85276,7 +85324,7 @@
     com.android.tools.r8.graph.DexWritableCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.AppView,boolean) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/y;Z)Lcom/android/tools/r8/graph/b3;"}
     void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/r;)V"}
     1:17:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):33:49 -> a
@@ -85335,17 +85383,17 @@
     java.util.Map codeOwners -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap programOrClasspathClasses -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap libraryClasses -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection programClasses -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection classpathClasses -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nu;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):53:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/lu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/nu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     2:26:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):33:57 -> <init>
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/c3;"}
@@ -85375,7 +85423,7 @@
 com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.c3$a:
 # {"id":"sourceFile","fileName":"DirectMappedDexApplication.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableCollection classpathClasses -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nu;"}
     java.util.Map libraryClasses -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     java.util.List pendingClasspathClasses -> j
@@ -85416,7 +85464,7 @@
     17:17:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):288 -> a
     18:18:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):288:288 -> a
     19:19:void lambda$replaceLibraryClasses$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexLibraryClass):287:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/q2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/q2;)V"}
     20:23:boolean addAll(java.util.Map,java.lang.Iterable):328:331 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/lang/Iterable;)Z"}
     1:1:com.android.tools.r8.graph.DexApplication build():204:204 -> b
@@ -85485,14 +85533,14 @@
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):281:281 -> R
     1:1:boolean isVolatile():117 -> R
     1:1:java.util.List getNames():21:21 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> c
     2:2:java.util.List getNames():21 -> c
     3:3:java.util.List com.android.tools.r8.graph.AccessFlags.getNames():49:49 -> c
     3:3:java.util.List getNames():22 -> c
     4:8:java.util.List getNames():22:26 -> c
     1:1:java.util.List getPredicates():31:31 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> d
     2:2:java.util.List getPredicates():31 -> d
     3:7:java.util.List getPredicates():32:36 -> d
@@ -85541,9 +85589,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/k3;Lcom/android/tools/r8/graph/k3;)Lcom/android/tools/r8/graph/l1;"}
     13:24:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):86:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/j3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/j3;"}
     25:25:com.android.tools.r8.graph.FieldAccessInfoImpl lambda$rewrittenWithLens$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/k3;)Lcom/android/tools/r8/graph/k3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/k3;)Lcom/android/tools/r8/graph/k3;"}
     26:42:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoImpl.rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):375:391 -> a
     26:42:com.android.tools.r8.graph.FieldAccessInfoImpl lambda$rewrittenWithLens$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):91 -> a
     43:43:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.GraphLens.lookupField(com.android.tools.r8.graph.DexField):333:333 -> a
@@ -85641,14 +85689,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/g1;[Lcom/android/tools/r8/graph/g1;)V"}
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseStaticFields(com.android.tools.r8.graph.DexClass,java.util.function.Function):113:113 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     2:2:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):76 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.Function):99:99 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):79 -> a
     4:4:com.android.tools.r8.utils.TraversalContinuation traverseStaticFields(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):121:121 -> a
     4:4:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     5:5:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseInstanceOrStaticFields(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField[],java.util.function.BiFunction,java.lang.Object):145 -> a
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseStaticFields(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):121 -> a
@@ -85679,7 +85727,7 @@
     17:17:com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):107 -> a
     17:17:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):92 -> a
     18:21:com.android.tools.r8.utils.TraversalContinuation traverseInstanceOrStaticFields(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField[],java.util.function.Function):128:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;[Lcom/android/tools/r8/graph/g1;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;[Lcom/android/tools/r8/graph/g1;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     22:22:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     22:22:com.android.tools.r8.utils.TraversalContinuation traverseInstanceOrStaticFields(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField[],java.util.function.Function):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -85716,7 +85764,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/g1;Ljava/util/function/Function;Ljava/util/function/Predicate;Ljava/util/function/Consumer;)[Lcom/android/tools/r8/graph/g1;"}
     81:81:com.android.tools.r8.graph.DexEncodedField[] replaceFieldsHelper(com.android.tools.r8.graph.DexEncodedField[],java.util.function.Function,java.util.function.Predicate,java.util.function.Consumer):308:308 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.Function):99:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):173:173 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     3:5:com.android.tools.r8.graph.DexEncodedField[] appendFieldHelper(com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField):255:257 -> b
@@ -85770,7 +85818,7 @@
     10:10:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):67:67 -> a
     10:10:void forEachField(java.util.function.Consumer):54 -> a
     11:12:com.android.tools.r8.utils.TraversalContinuation lambda$forEachField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClassAndField):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Oh0;"}
     13:17:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):114:118 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     18:18:java.util.List allFieldsSorted():205:205 -> a
@@ -85781,7 +85829,7 @@
     23:23:void lambda$allFieldsSorted$2(java.util.List,com.android.tools.r8.graph.DexClassAndField):206:206 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/F0;)V"}
     24:24:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$3(com.android.tools.r8.graph.DexClassAndField):212:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/internal/Oh0;"}
     25:25:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> a
     25:25:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$3(com.android.tools.r8.graph.DexClassAndField):212 -> a
     1:1:void lambda$verify$1(com.android.tools.r8.graph.DexClassAndField):101:101 -> b
@@ -85810,9 +85858,9 @@
     void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/g1;)V"}
     com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     void appendStaticField(com.android.tools.r8.graph.DexEncodedField) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     void clearStaticFields() -> b
@@ -85821,7 +85869,7 @@
     void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/g1;)V"}
     com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.Function) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     java.util.List instanceFieldsAsList() -> c
     com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/g1;"}
@@ -85839,11 +85887,11 @@
 com.android.tools.r8.graph.FieldMapBacking -> com.android.tools.r8.graph.o3:
 # {"id":"sourceFile","fileName":"FieldMapBacking.java"}
     java.util.SortedMap fieldMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(java.util.SortedMap):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void lambda$verify$0(com.android.tools.r8.graph.DexFieldSignature,com.android.tools.r8.graph.DexEncodedField):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/m1;Lcom/android/tools/r8/graph/g1;)V"}
     2:2:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexFieldSignature.getName():31:31 -> a
@@ -85859,7 +85907,7 @@
     5:5:void lambda$verify$0(com.android.tools.r8.graph.DexFieldSignature,com.android.tools.r8.graph.DexEncodedField):46 -> a
     6:6:void lambda$verify$0(com.android.tools.r8.graph.DexFieldSignature,com.android.tools.r8.graph.DexEncodedField):46:46 -> a
     7:7:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     8:12:com.android.tools.r8.utils.TraversalContinuation traverseFieldsThatMatches(com.android.tools.r8.graph.DexClass,java.util.function.Function,java.util.function.Predicate):97:101 -> a
     8:12:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):54 -> a
     13:13:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
@@ -85867,7 +85915,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.Function):54 -> a
     14:14:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     15:15:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     15:15:com.android.tools.r8.utils.TraversalContinuation traverseFieldsThatMatches(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.util.function.Predicate,java.lang.Object):116 -> a
     15:15:com.android.tools.r8.utils.TraversalContinuation traverse(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,java.lang.Object):62 -> a
@@ -85915,7 +85963,7 @@
     61:62:void lambda$setFieldsInPoolHelper$2(java.util.function.Predicate,java.util.SortedMap,com.android.tools.r8.graph.DexFieldSignature,com.android.tools.r8.graph.DexEncodedField):280:281 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/SortedMap;Lcom/android/tools/r8/graph/m1;Lcom/android/tools/r8/graph/g1;)V"}
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.Function):68:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     2:6:com.android.tools.r8.utils.TraversalContinuation traverseFieldsThatMatches(com.android.tools.r8.graph.DexClass,java.util.function.Function,java.util.function.Predicate):97:101 -> b
     2:6:com.android.tools.r8.utils.TraversalContinuation traverseInstanceFields(com.android.tools.r8.graph.DexClass,java.util.function.Function):68 -> b
     7:7:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> b
@@ -86056,7 +86104,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3;)V"}
     11:58:void addResolutionResult(com.android.tools.r8.graph.FieldResolutionResult):520:567 -> a
     59:61:void lambda$addResolutionResult$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):524:526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/y3$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/y3$a;)V"}
     62:67:void lambda$addResolutionResult$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):525:530 -> a
     68:71:void lambda$addResolutionResult$2(java.util.List,com.android.tools.r8.graph.FieldResolutionResult$SingleLibraryFieldResolutionResult):533:536 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/z3;)V"}
@@ -86077,7 +86125,7 @@
 # {"id":"sourceFile","fileName":"FieldResolutionResult.java"}
     1:1:void <init>():460:460 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):465:465 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     2:2:void visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):473:473 -> a
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/U5;"}
@@ -86102,7 +86150,7 @@
     8:12:void <init>(com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,java.util.List,java.util.List):351:355 -> <init>
     13:20:void <init>(com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,java.util.List,java.util.List):353:360 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):391:391 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     2:6:void visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):409:413 -> a
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/U5;"}
@@ -86149,7 +86197,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/g1;)V"}
     1:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):44:45 -> a
     1:2:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     3:3:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43:43 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):206 -> a
     4:4:com.android.tools.r8.graph.DexClass getInitialResolutionHolder():175:175 -> a
@@ -86205,13 +86253,13 @@
 com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.C3:
 # {"id":"sourceFile","fileName":"GenericSignature.java"}
     java.util.List EMPTY_TYPE_PARAMS -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List EMPTY_TYPE_ARGUMENTS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List EMPTY_SUPER_INTERFACES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List EMPTY_TYPE_SIGNATURES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature NO_FIELD_TYPE_SIGNATURE -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C3$c;"}
     1:1:void <clinit>():104:104 -> <clinit>
@@ -86669,7 +86717,7 @@
     101:101:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
     102:102:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
     103:106:void lambda$createForSingleClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):191:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Bm0;)V"}
     107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.EnclosingMethodAttribute.getEnclosingType():68:68 -> a
     107:107:void lambda$createForSingleClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -87456,7 +87504,7 @@
     27:27:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
     28:28:java.lang.Iterable getSuperinterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinitionSupplier):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/iC;"}
     29:29:java.lang.Iterable getSuperinterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinitionSupplier):140:140 -> a
     30:30:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     30:30:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):576 -> a
@@ -87538,19 +87586,19 @@
     1:1:boolean isInvalidCode(com.android.tools.r8.graph.Code):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i0;)Z"}
     2:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):36:36 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     5:9:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):51:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     boolean computeEquals(java.lang.Object) -> c
     1:1:java.lang.String toString():46:46 -> toString
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.c4:
 # {"id":"sourceFile","fileName":"JarApplicationReader.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.concurrent.ConcurrentHashMap asmObjectTypeCache -> b
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
     java.util.concurrent.ConcurrentHashMap stringCache -> d
@@ -87563,16 +87611,16 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexApplicationReadFlags$Builder):35:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/y0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/y0;)V"}
     2:13:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexApplicationReadFlags$Builder):27:38 -> <init>
     14:14:com.android.tools.r8.graph.DexApplicationReadFlags$Builder com.android.tools.r8.graph.DexApplicationReadFlags.builder():72:72 -> <init>
     14:14:void <init>(com.android.tools.r8.utils.InternalOptions):42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     15:15:void <init>(com.android.tools.r8.utils.InternalOptions):42:42 -> <init>
     1:3:void addKeepDeclaration(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):46:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aF;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mF;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.Type getAsmObjectType(java.lang.String):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     5:5:com.android.tools.r8.graph.DexItemFactory getFactory():64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
     6:13:com.android.tools.r8.graph.DexTypeList getTypeListFromNames(java.lang.String[]):87:94 -> a
@@ -87628,7 +87676,7 @@
     56:56:void lambda$checkClassForMethodHandlesLookup$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.InnerClassAttribute):222 -> a
     57:58:void lambda$checkClassForMethodHandlesLookup$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.InnerClassAttribute):222:223 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.Type getAsmType(java.lang.String):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     2:3:void addVarHandleWitness(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClassKind):178:179 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/V;)V"}
     4:4:com.android.tools.r8.graph.DexApplicationReadFlags$Builder com.android.tools.r8.graph.DexApplicationReadFlags$Builder.addVarHandleWitness(com.android.tools.r8.graph.DexType):42:42 -> b
@@ -87688,11 +87736,11 @@
     9:9:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):101 -> a
     10:14:void internalRead(com.android.tools.r8.origin.Origin,byte[]):110:114 -> a
     10:14:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):101 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaring():641:641 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaring():640:640 -> a
     15:15:void internalRead(com.android.tools.r8.origin.Origin,byte[]):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):101 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaring():641:641 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaring():640:640 -> a
     16:16:void internalRead(com.android.tools.r8.origin.Origin,byte[]):115 -> a
     16:16:void lambda$read$0(com.android.tools.r8.origin.Origin,byte[]):101 -> a
     17:22:void internalRead(com.android.tools.r8.origin.Origin,byte[]):115:120 -> a
@@ -87779,20 +87827,20 @@
     65:65:void lambda$createAnnotationVisitor$1(java.util.List,java.util.function.BiFunction,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):186:186 -> a
     66:66:void lambda$createAnnotationVisitor$1(java.util.List,java.util.function.BiFunction,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):185:185 -> a
     67:69:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createTypeAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader,int,com.android.tools.r8.org.objectweb.asm.TypePath):199:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZLjava/util/List;Lcom/android/tools/r8/graph/c4;ILcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/graph/d4;"}
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZLjava/util/List;Lcom/android/tools/r8/graph/c4;ILcom/android/tools/r8/internal/ej0;)Lcom/android/tools/r8/graph/d4;"}
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     70:70:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createTypeAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader,int,com.android.tools.r8.org.objectweb.asm.TypePath):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createTypeAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader,int,com.android.tools.r8.org.objectweb.asm.TypePath):201 -> a
     72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createTypeAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader,int,com.android.tools.r8.org.objectweb.asm.TypePath):204:204 -> a
     73:73:com.android.tools.r8.graph.DexAnnotation lambda$createTypeAnnotationVisitor$2(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.Integer,com.android.tools.r8.graph.DexEncodedAnnotation):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/Integer;Lcom/android/tools/r8/graph/e1;)Lcom/android/tools/r8/graph/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/Integer;Lcom/android/tools/r8/graph/e1;)Lcom/android/tools/r8/graph/r0;"}
     74:75:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):221:222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/c4;)Lcom/android/tools/r8/graph/e1;"}
     76:82:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):221:227 -> a
     83:93:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):627:637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/u0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/u0;"}
     94:94:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):628:628 -> a
     1:1:void read(com.android.tools.r8.origin.Origin,byte[]):101:101 -> b
     2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):231:231 -> b
@@ -87856,7 +87904,7 @@
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/i4;"}
     com.android.tools.r8.cf.CfVersion version -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean deprecated -> i
     com.android.tools.r8.graph.DexType type -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -87913,9 +87961,9 @@
     41:41:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):337:337 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Q;Ljava/lang/String;)Ljava/lang/String;"}
     42:42:java.lang.String illegalClassFilePostfix(com.android.tools.r8.cf.CfVersion):343:343 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)Ljava/lang/String;"}
     43:45:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):348:350 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Q;Ljava/lang/String;Lcom/android/tools/r8/internal/bb;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Q;Ljava/lang/String;Lcom/android/tools/r8/internal/db;Ljava/lang/String;)Ljava/lang/String;"}
     46:85:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:415 -> a
     86:86:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):414:414 -> a
     87:92:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386:391 -> a
@@ -87934,20 +87982,20 @@
     105:108:void visitSource(java.lang.String,java.lang.String):426 -> a
     109:109:void visitSource(java.lang.String,java.lang.String):425:425 -> a
     110:111:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):434:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
     112:112:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.JarClassFileReader.createFieldAccessFlags(int):163:163 -> a
     112:112:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):435 -> a
     113:119:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):436:442 -> a
     120:127:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):448:455 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     128:128:boolean shouldReadKeepAnnotations():461:461 -> a
     128:128:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):467 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-    129:129:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isExtractedAnnotation(java.lang.String):105:105 -> a
-    129:129:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isClassKeepAnnotation(java.lang.String,boolean):93 -> a
+    129:129:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isExtractedAnnotation(java.lang.String):107:107 -> a
+    129:129:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isClassKeepAnnotation(java.lang.String,boolean):95 -> a
     129:129:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):467 -> a
-    130:130:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):109:109 -> a
-    130:130:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isClassKeepAnnotation(java.lang.String,boolean):93 -> a
+    130:130:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):111:111 -> a
+    130:130:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isClassKeepAnnotation(java.lang.String,boolean):95 -> a
     130:130:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):467 -> a
     131:132:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):468:469 -> a
     133:133:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext.fromName(java.lang.String):71:71 -> a
@@ -88037,12 +88085,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;)Lcom/android/tools/r8/graph/D2$a;"}
     276:279:java.util.List getAnnotations():614:617 -> a
     276:279:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):486 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     280:280:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):486:486 -> a
     281:281:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):485:485 -> a
     1:3:void visitNestMember(java.lang.String):330:332 -> b
     4:6:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):356:358 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/U10;"}
     1:3:void visitPermittedSubclass(java.lang.String):363:365 -> c
     1:3:void checkName(java.lang.String):595:597 -> d
 com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.f4:
@@ -88077,8 +88125,8 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor.shouldReadKeepAnnotations():461:461 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):676 -> a
-    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):109:109 -> a
-    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isFieldKeepAnnotation(java.lang.String,boolean):97 -> a
+    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):111:111 -> a
+    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isFieldKeepAnnotation(java.lang.String,boolean):99 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):677 -> a
     5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):678:679 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext.fromName(java.lang.String):71:71 -> a
@@ -88188,7 +88236,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)Lcom/android/tools/r8/graph/N2;"}
     142:145:java.util.List getAnnotations():783:786 -> a
     142:145:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):707 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     146:146:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):707:707 -> a
     147:147:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):706:706 -> a
 com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.g4:
@@ -88252,8 +88300,8 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor.shouldReadKeepAnnotations():461:461 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):844 -> a
-    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):109:109 -> a
-    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isMethodKeepAnnotation(java.lang.String,boolean):101 -> a
+    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):111:111 -> a
+    4:4:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isMethodKeepAnnotation(java.lang.String,boolean):103 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):845 -> a
     5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):846:847 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext.fromName(java.lang.String):71:71 -> a
@@ -88281,11 +88329,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     67:67:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):902:902 -> a
     68:68:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):922:922 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     69:69:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):930:930 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):938:938 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     2:12:void visitParameter(java.lang.String,int):943:953 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     13:13:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> b
@@ -88364,7 +88412,7 @@
     53:53:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> c
     53:53:void visitEnd():999 -> c
     54:62:void visitEnd():996:1004 -> c
-    63:63:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> c
+    63:63:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> c
     63:63:void visitEnd():1005 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:65:void visitEnd():1005:1006 -> c
@@ -88373,13 +88421,13 @@
     67:67:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> c
     67:67:void visitEnd():1007 -> c
     68:69:void visitEnd():1007:1008 -> c
-    70:70:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> c
+    70:70:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> c
     70:70:void visitEnd():1009 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:71:void visitEnd():1009:1009 -> c
-    72:72:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setDeprecated(boolean):1704:1704 -> c
+    72:72:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setDeprecated(boolean):1715:1715 -> c
     72:72:void visitEnd():1010 -> c
-    73:73:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.disableParameterAnnotationListCheck():1719:1719 -> c
+    73:73:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.disableParameterAnnotationListCheck():1730:1730 -> c
     73:73:void visitEnd():1011 -> c
     74:76:void visitEnd():1012:1014 -> c
     77:77:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> c
@@ -88395,7 +88443,7 @@
     106:108:void visitEnd():1030 -> c
     109:112:java.util.List getAnnotations():1035:1038 -> c
     109:112:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):914 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     113:113:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):914:914 -> c
     114:114:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):913:913 -> c
 com.android.tools.r8.graph.JarClassFileReader$CreateRecordComponentVisitor -> com.android.tools.r8.graph.h4:
@@ -88434,7 +88482,7 @@
     5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):1224:1224 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):1223:1223 -> a
     7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1231:1231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     8:15:void visitEnd():1236:1243 -> a
     16:16:void visitEnd():1237:1237 -> a
 com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.i4:
@@ -88455,95 +88503,87 @@
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/i4;"}
     boolean $assertionsDisabled -> i
-    1:1:void <clinit>():104:104 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):112:116 -> <init>
+    1:1:void <clinit>():101:101 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):109:113 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/i4;Lcom/android/tools/r8/graph/c4;)V"}
-    1:1:int computeHashCode():231:231 -> G0
-    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():150:150 -> H0
+    1:1:int computeHashCode():223:223 -> G0
+    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():147:147 -> H0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/P;"}
     com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> J0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/p4;"}
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():256:256 -> M0
-    1:1:boolean hasMonitorInstructions():246:246 -> O0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():248:248 -> M0
+    1:1:boolean hasMonitorInstructions():238:238 -> O0
     boolean isCfCode() -> P0
     boolean isCfWritableCode() -> Q0
-    1:1:boolean isEmptyVoidMethod():241:241 -> T0
-    1:1:boolean verifyNoInputReaders():1212:1212 -> Z0
+    1:1:boolean isEmptyVoidMethod():233:233 -> T0
+    1:1:boolean verifyNoInputReaders():1183:1183 -> Z0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:2:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):191:192 -> a
+    1:2:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):183:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/i0;"}
-    3:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):264:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
-    4:5:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):276:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
-    6:6:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):289:289 -> a
+    3:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):256:256 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
+    4:5:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):268:269 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
+    6:6:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):281:281 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
-    7:7:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
-    8:8:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):310:310 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+    7:7:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):286:286 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
+    8:8:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):302:302 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     9:9:java.lang.String com.android.tools.r8.graph.CfCode.toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):846:846 -> a
-    9:9:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):310 -> a
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1231:1231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/az;"}
-    1:5:void internalParseCode():154:158 -> a1
-    6:6:com.android.tools.r8.utils.ReachabilitySensitiveValue com.android.tools.r8.graph.DexProgramClass.getReachabilitySensitiveValue():217:217 -> a1
-    6:6:void internalParseCode():161 -> a1
-    7:7:void internalParseCode():162:162 -> a1
-    8:8:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1184:1184 -> a1
-    8:8:void internalParseCode():163 -> a1
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():904:904 -> a1
-    9:9:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1184 -> a1
-    9:9:void internalParseCode():163 -> a1
+    9:9:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):302 -> a
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1202:1202 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/cz;"}
+    1:4:void internalParseCode():151:154 -> a1
+    5:5:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader):1175:1175 -> a1
+    5:5:void internalParseCode():155 -> a1
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():910:910 -> a1
+    6:6:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader):1175 -> a1
+    6:6:void internalParseCode():155 -> a1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():904:904 -> a1
-    10:10:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1184 -> a1
-    10:10:void internalParseCode():163 -> a1
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a1
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():904 -> a1
-    11:11:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1184 -> a1
-    11:11:void internalParseCode():163 -> a1
-    12:23:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1187:1198 -> a1
-    12:23:void internalParseCode():163 -> a1
-    24:24:boolean com.android.tools.r8.utils.ReachabilitySensitiveValue.isEnabled():16:16 -> a1
-    24:24:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1198 -> a1
-    24:24:void internalParseCode():163 -> a1
-    25:33:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ReachabilitySensitiveValue):1199:1207 -> a1
-    25:33:void internalParseCode():163 -> a1
-    34:34:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):210:210 -> a1
-    34:34:void internalParseCode():166 -> a1
-    35:35:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):314:314 -> a1
-    35:35:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):213 -> a1
-    35:35:void internalParseCode():166 -> a1
-    36:41:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):213:218 -> a1
-    36:41:void internalParseCode():166 -> a1
-    42:42:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a1
-    42:42:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):218 -> a1
-    42:42:void internalParseCode():166 -> a1
-    43:43:void internalParseCode():179:179 -> a1
-    44:47:void internalParseCode():168:171 -> a1
-    48:48:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):210:210 -> a1
-    48:48:void internalParseCode():174 -> a1
-    49:49:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):314:314 -> a1
-    49:49:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):213 -> a1
-    49:49:void internalParseCode():174 -> a1
-    50:55:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):213:218 -> a1
-    50:55:void internalParseCode():174 -> a1
-    56:56:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a1
-    56:56:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):218 -> a1
-    56:56:void internalParseCode():174 -> a1
-    57:57:void internalParseCode():181:181 -> a1
-    58:64:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1217:1223 -> a1
-    58:64:void internalParseCode():181 -> a1
-    65:65:void internalParseCode():176:176 -> a1
-    1:1:boolean computeEquals(java.lang.Object):236:236 -> c
-    1:1:int getEstimatedSizeForInliningIfLessThanOrEquals(int):251:251 -> l
-    1:2:com.android.tools.r8.graph.CfCode asCfCode():141:142 -> l0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():910:910 -> a1
+    7:7:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader):1175 -> a1
+    7:7:void internalParseCode():155 -> a1
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a1
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseInputStackMaps():910 -> a1
+    8:8:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader):1175 -> a1
+    8:8:void internalParseCode():155 -> a1
+    9:9:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader):1178:1178 -> a1
+    9:9:void internalParseCode():155 -> a1
+    10:10:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):202:202 -> a1
+    10:10:void internalParseCode():158 -> a1
+    11:11:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):306:306 -> a1
+    11:11:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):205 -> a1
+    11:11:void internalParseCode():158 -> a1
+    12:17:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):205:210 -> a1
+    12:17:void internalParseCode():158 -> a1
+    18:18:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a1
+    18:18:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):210 -> a1
+    18:18:void internalParseCode():158 -> a1
+    19:19:void internalParseCode():171:171 -> a1
+    20:23:void internalParseCode():160:163 -> a1
+    24:24:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):202:202 -> a1
+    24:24:void internalParseCode():166 -> a1
+    25:25:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):306:306 -> a1
+    25:25:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):205 -> a1
+    25:25:void internalParseCode():166 -> a1
+    26:31:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):205:210 -> a1
+    26:31:void internalParseCode():166 -> a1
+    32:32:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a1
+    32:32:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):210 -> a1
+    32:32:void internalParseCode():166 -> a1
+    33:33:void internalParseCode():173:173 -> a1
+    34:40:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1188:1194 -> a1
+    34:40:void internalParseCode():173 -> a1
+    41:41:void internalParseCode():168:168 -> a1
+    1:1:boolean computeEquals(java.lang.Object):228:228 -> c
+    1:1:int getEstimatedSizeForInliningIfLessThanOrEquals(int):243:243 -> l
+    1:2:com.android.tools.r8.graph.CfCode asCfCode():138:139 -> l0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/G;"}
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):231:231 -> l0
-    3:3:com.android.tools.r8.graph.CfCode asCfCode():142 -> l0
-    4:5:com.android.tools.r8.graph.CfCode asCfCode():144:145 -> l0
-    1:1:java.lang.String toString():305:305 -> toString
+    3:3:com.android.tools.r8.graph.CfCode asCfCode():139 -> l0
+    4:5:com.android.tools.r8.graph.CfCode asCfCode():141:142 -> l0
+    1:1:java.lang.String toString():297:297 -> toString
 com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.k4:
 # {"id":"sourceFile","fileName":"LazyCfCode.java"}
     com.android.tools.r8.graph.DexClass clazz -> c
@@ -88557,35 +88597,34 @@
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l4;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap constantDynamicSymbolicReferences -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H20;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.ClassVisitor.<init>(int):58:58 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):348 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):340 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/m4;Lcom/android/tools/r8/graph/c4;ZLcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/l4;)V"}
-    2:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):349:354 -> <init>
-    1:17:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:383 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
-    1:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getConstantDynamicSymbolicReferences():358:361 -> b
+    2:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):341:346 -> <init>
+    1:17:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):359:375 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
+    1:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getConstantDynamicSymbolicReferences():350:353 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t1;"}
 com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.graph.l4:
 # {"id":"sourceFile","fileName":"LazyCfCode.java"}
-    boolean lineInfo -> a
-    boolean localInfo -> b
-    int asmReaderOptions -> c
-    1:4:void <init>(boolean,boolean,int):201:204 -> <init>
+    int asmReaderOptions -> a
+    1:4:void <init>(boolean,boolean,int):193:196 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
 com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.m4:
 # {"id":"sourceFile","fileName":"LazyCfCode.java"}
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/i4;"}
     int methodIndex -> b
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):321:321 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):313:313 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i4;)V"}
-    2:5:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):319:322 -> <init>
-    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):317:317 -> apply
-    2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):327:327 -> apply
-    2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):317 -> apply
+    2:5:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):311:314 -> <init>
+    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):309:309 -> apply
+    2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):319:319 -> apply
+    2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):309 -> apply
 com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.n4:
 # {"id":"sourceFile","fileName":"LazyCfCode.java"}
-    1:1:void <init>(java.lang.String):108:108 -> <init>
+    1:1:void <init>(java.lang.String):105:105 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
 com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.o4:
 # {"id":"sourceFile","fileName":"LazyCfCode.java"}
@@ -88607,9 +88646,9 @@
     java.util.Map canonicalDebugLocalInfo -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.cf.code.CfLabel currentLabel -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M9;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList framesWithIncompleteUninitializedNew -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     java.util.Map labelMap -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map labelToNewMap -> p
@@ -88623,287 +88662,287 @@
     int maxLine -> u
     java.util.function.Supplier constantDynamicSymbolicReferencesSupplier -> v
     boolean $assertionsDisabled -> w
-    1:1:void <clinit>():390:390 -> <clinit>
+    1:1:void <clinit>():382:382 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):71:71 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):420 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):412 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/p4;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/l4;Ljava/util/function/Supplier;)V"}
-    2:25:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):400:423 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):392:415 -> <init>
     26:26:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> <init>
-    26:26:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):424 -> <init>
+    26:26:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):416 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> <init>
-    27:27:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):424 -> <init>
-    28:32:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):424:428 -> <init>
+    27:27:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):416 -> <init>
+    28:32:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions,java.util.function.Supplier):416:420 -> <init>
     1:1:com.android.tools.r8.graph.DebugLocalInfo lambda$canonicalize$1(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.DebugLocalInfo):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/graph/j0;"}
-    2:3:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):432:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)V"}
+    2:3:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):424:425 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)V"}
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    4:4:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):433 -> a
-    5:5:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):434:434 -> a
-    6:7:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):520:521 -> a
-    8:10:void parseLocals(int,java.lang.Object[],com.android.tools.r8.cf.code.CfFrame$Builder):534:536 -> a
-    8:10:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):522 -> a
-    11:18:boolean parseStack(int,java.lang.Object[],com.android.tools.r8.cf.code.CfFrame$Builder):541:548 -> a
-    11:18:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):523 -> a
+    4:4:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):425 -> a
+    5:5:void addInstruction(com.android.tools.r8.cf.code.CfInstruction):426:426 -> a
+    6:7:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):512:513 -> a
+    8:10:void parseLocals(int,java.lang.Object[],com.android.tools.r8.cf.code.CfFrame$Builder):526:528 -> a
+    8:10:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):514 -> a
+    11:18:boolean parseStack(int,java.lang.Object[],com.android.tools.r8.cf.code.CfFrame$Builder):533:540 -> a
+    11:18:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):515 -> a
     19:19:boolean com.android.tools.r8.cf.code.CfFrame$Builder.hasIncompleteUninitializedNew():395:395 -> a
-    19:19:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):526 -> a
-    20:22:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):527:529 -> a
-    23:27:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):557:561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/i9$a;)Lcom/android/tools/r8/internal/Sq;"}
+    19:19:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):518 -> a
+    20:22:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):519:521 -> a
+    23:27:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):549:553 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/k9$a;)Lcom/android/tools/r8/internal/Uq;"}
     28:28:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> a
-    28:28:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):561 -> a
+    28:28:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):553 -> a
     29:29:com.android.tools.r8.cf.code.CfFrame$Builder com.android.tools.r8.cf.code.CfFrame$Builder.setHasIncompleteUninitializedNew():399:399 -> a
-    29:29:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):563 -> a
+    29:29:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):555 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):564:564 -> a
+    30:30:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):556:556 -> a
     31:31:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> a
-    31:31:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):564 -> a
-    32:37:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):565:570 -> a
-    38:38:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):568:568 -> a
-    39:40:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):598:599 -> a
+    31:31:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):556 -> a
+    32:37:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):557:562 -> a
+    38:38:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):560:560 -> a
+    39:40:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):590:591 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/graph/I2;"}
-    41:41:void visitInsn(int):765:765 -> a
-    42:42:void visitInsn(int):750:750 -> a
-    43:43:void visitInsn(int):747:747 -> a
-    44:44:void visitInsn(int):744:744 -> a
-    45:45:void visitInsn(int):741:741 -> a
-    46:46:void visitInsn(int):738:738 -> a
-    47:47:void visitInsn(int):735:735 -> a
-    48:48:void visitInsn(int):732:732 -> a
-    49:49:void visitInsn(int):725:725 -> a
-    50:50:void visitInsn(int):708:708 -> a
-    51:51:void visitInsn(int):694:694 -> a
-    52:52:void visitInsn(int):688:688 -> a
-    53:53:void visitInsn(int):666:666 -> a
-    54:54:void visitInsn(int):655:655 -> a
-    55:55:void visitInsn(int):645:645 -> a
-    56:58:void visitInsn(int):633:635 -> a
-    59:59:void visitInsn(int):633:633 -> a
-    60:62:void visitInsn(int):627:629 -> a
-    63:63:void visitInsn(int):627:627 -> a
-    64:64:void visitInsn(int):622:622 -> a
-    65:65:void visitInsn(int):618:618 -> a
-    66:66:void visitInsn(int):609:609 -> a
-    67:223:void visitInsn(int):606:762 -> a
-    224:224:void visitInsn(int):759:759 -> a
-    225:225:void visitInsn(int):756:756 -> a
-    226:226:void visitInsn(int):753:753 -> a
-    227:227:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):835:835 -> a
+    41:41:void visitInsn(int):757:757 -> a
+    42:42:void visitInsn(int):742:742 -> a
+    43:43:void visitInsn(int):739:739 -> a
+    44:44:void visitInsn(int):736:736 -> a
+    45:45:void visitInsn(int):733:733 -> a
+    46:46:void visitInsn(int):730:730 -> a
+    47:47:void visitInsn(int):727:727 -> a
+    48:48:void visitInsn(int):724:724 -> a
+    49:49:void visitInsn(int):717:717 -> a
+    50:50:void visitInsn(int):700:700 -> a
+    51:51:void visitInsn(int):686:686 -> a
+    52:52:void visitInsn(int):680:680 -> a
+    53:53:void visitInsn(int):658:658 -> a
+    54:54:void visitInsn(int):647:647 -> a
+    55:55:void visitInsn(int):637:637 -> a
+    56:58:void visitInsn(int):625:627 -> a
+    59:59:void visitInsn(int):625:625 -> a
+    60:62:void visitInsn(int):619:621 -> a
+    63:63:void visitInsn(int):619:619 -> a
+    64:64:void visitInsn(int):614:614 -> a
+    65:65:void visitInsn(int):610:610 -> a
+    66:66:void visitInsn(int):601:601 -> a
+    67:223:void visitInsn(int):598:754 -> a
+    224:224:void visitInsn(int):751:751 -> a
+    225:225:void visitInsn(int):748:748 -> a
+    226:226:void visitInsn(int):745:745 -> a
+    227:227:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):827:827 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
-    228:228:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):833:833 -> a
-    229:229:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):831:831 -> a
-    230:230:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):829:829 -> a
-    231:231:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):827:827 -> a
-    232:232:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):825:825 -> a
-    233:233:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):823:823 -> a
-    234:234:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):821:821 -> a
-    235:235:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):819:819 -> a
-    236:240:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):906:910 -> a
-    241:241:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):915:915 -> a
+    228:228:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):825:825 -> a
+    229:229:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):823:823 -> a
+    230:230:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):821:821 -> a
+    231:231:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):819:819 -> a
+    232:232:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):817:817 -> a
+    233:233:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):815:815 -> a
+    234:234:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):813:813 -> a
+    235:235:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):811:811 -> a
+    236:240:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):898:902 -> a
+    241:241:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):907:907 -> a
     242:242:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):117:117 -> a
-    242:242:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):915 -> a
+    242:242:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):907 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     243:243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):117:117 -> a
-    243:243:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):915 -> a
-    244:244:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):916:916 -> a
+    243:243:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):907 -> a
+    244:244:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):908:908 -> a
     245:245:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> a
-    245:245:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):916 -> a
+    245:245:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):908 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     246:246:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():64:64 -> a
-    246:246:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):916 -> a
-    247:250:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):916:919 -> a
-    251:251:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):917:917 -> a
-    252:261:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):924:933 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
-    262:292:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):938:968 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
-    293:297:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):962:966 -> a
-    298:298:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):958:958 -> a
-    299:301:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1002:1004 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
-    302:325:void visitLdcInsn(java.lang.Object):1009:1032 -> a
-    326:335:void visitLdcInsn(java.lang.Object):1030:1039 -> a
-    336:343:void visitLdcInsn(java.lang.Object):1038:1045 -> a
-    344:344:void visitIincInsn(int,int):1051:1051 -> a
-    345:350:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1056:1061 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
-    351:355:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1066:1070 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
-    356:356:void visitMultiANewArrayInsn(java.lang.String,int):1075:1075 -> a
+    246:246:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):908 -> a
+    247:250:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):908:911 -> a
+    251:251:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):909:909 -> a
+    252:261:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):916:925 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
+    262:292:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):930:960 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
+    293:297:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):954:958 -> a
+    298:298:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):950:950 -> a
+    299:301:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):994:996 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
+    302:325:void visitLdcInsn(java.lang.Object):1001:1024 -> a
+    326:335:void visitLdcInsn(java.lang.Object):1022:1031 -> a
+    336:343:void visitLdcInsn(java.lang.Object):1030:1037 -> a
+    344:344:void visitIincInsn(int,int):1043:1043 -> a
+    345:350:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1048:1053 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
+    351:355:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1058:1062 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
+    356:356:void visitMultiANewArrayInsn(java.lang.String,int):1067:1067 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    357:357:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    357:357:void visitMultiANewArrayInsn(java.lang.String,int):1076 -> a
+    357:357:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    357:357:void visitMultiANewArrayInsn(java.lang.String,int):1068 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    358:358:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    358:358:void visitMultiANewArrayInsn(java.lang.String,int):1076 -> a
-    359:389:void visitMultiANewArrayInsn(java.lang.String,int):1076:1106 -> a
+    358:358:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    358:358:void visitMultiANewArrayInsn(java.lang.String,int):1068 -> a
+    359:389:void visitMultiANewArrayInsn(java.lang.String,int):1068:1098 -> a
     390:393:boolean com.android.tools.r8.utils.DescriptorUtils.isPrimitiveDescriptor(java.lang.String):268:271 -> a
-    390:393:void visitMultiANewArrayInsn(java.lang.String,int):1106 -> a
-    394:394:void visitMultiANewArrayInsn(java.lang.String,int):1109:1109 -> a
-    395:399:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):906:910 -> a
-    395:399:void visitMultiANewArrayInsn(java.lang.String,int):1107 -> a
-    400:401:void visitMultiANewArrayInsn(java.lang.String,int):1112:1113 -> a
-    402:406:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):906:910 -> a
-    402:406:void visitMultiANewArrayInsn(java.lang.String,int):1113 -> a
+    390:393:void visitMultiANewArrayInsn(java.lang.String,int):1098 -> a
+    394:394:void visitMultiANewArrayInsn(java.lang.String,int):1101:1101 -> a
+    395:399:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):898:902 -> a
+    395:399:void visitMultiANewArrayInsn(java.lang.String,int):1099 -> a
+    400:401:void visitMultiANewArrayInsn(java.lang.String,int):1104:1105 -> a
+    402:406:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):898:902 -> a
+    402:406:void visitMultiANewArrayInsn(java.lang.String,int):1105 -> a
     407:407:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getType(java.lang.String):177:177 -> a
-    407:407:void visitMultiANewArrayInsn(java.lang.String,int):1115 -> a
-    408:422:void visitMultiANewArrayInsn(java.lang.String,int):1115:1129 -> a
-    423:423:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1136:1136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
-    424:427:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1135:1138 -> a
-    428:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1144:1150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
-    435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1146:1152 -> a
-    442:442:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1151:1151 -> a
-    443:443:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):1157:1157 -> a
+    407:407:void visitMultiANewArrayInsn(java.lang.String,int):1107 -> a
+    408:422:void visitMultiANewArrayInsn(java.lang.String,int):1107:1121 -> a
+    423:423:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1128:1128 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
+    424:427:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1127:1130 -> a
+    428:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1136:1142 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
+    435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1138:1144 -> a
+    442:442:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1143:1143 -> a
+    443:443:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):1149:1149 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/graph/j0;"}
-    1:7:void visitCode():440:446 -> b
+    1:7:void visitCode():432:438 -> b
     8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> b
-    8:8:void visitCode():446 -> b
-    9:11:void visitCode():446:448 -> b
-    12:12:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):575:575 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/K9;"}
-    13:27:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):579:593 -> b
+    8:8:void visitCode():438 -> b
+    9:11:void visitCode():438:440 -> b
+    12:12:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):567:567 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/M9;"}
+    13:27:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):571:585 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/graph/I2;"}
-    28:28:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):796:796 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oN;"}
-    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):794:794 -> b
-    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):791:791 -> b
-    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):788:788 -> b
-    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):785:785 -> b
-    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):782:782 -> b
-    34:37:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):776:779 -> b
-    38:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):773:773 -> b
-    39:40:void visitIntInsn(int,int):808:809 -> b
-    41:45:void visitIntInsn(int,int):808:812 -> b
-    46:46:void visitIntInsn(int,int):805:805 -> b
-    47:52:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1162:1167 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
-    53:53:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1165:1165 -> b
-    1:10:void visitEnd():453:462 -> c
-    11:16:com.android.tools.r8.position.Position getDiagnosticPosition():506:511 -> c
-    11:16:void visitEnd():462 -> c
-    17:17:com.android.tools.r8.position.Position getDiagnosticPosition():507:507 -> c
-    17:17:void visitEnd():462 -> c
-    18:18:void visitEnd():462:462 -> c
-    19:19:void finalizeFramesWithIncompleteUninitializedNew():477:477 -> c
-    19:19:void visitEnd():464 -> c
+    28:28:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):788:788 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/sN;"}
+    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):786:786 -> b
+    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):783:783 -> b
+    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):780:780 -> b
+    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):777:777 -> b
+    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):774:774 -> b
+    34:37:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):768:771 -> b
+    38:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):765:765 -> b
+    39:40:void visitIntInsn(int,int):800:801 -> b
+    41:45:void visitIntInsn(int,int):800:804 -> b
+    46:46:void visitIntInsn(int,int):797:797 -> b
+    47:52:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1154:1159 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
+    53:53:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1157:1157 -> b
+    1:10:void visitEnd():445:454 -> c
+    11:16:com.android.tools.r8.position.Position getDiagnosticPosition():498:503 -> c
+    11:16:void visitEnd():454 -> c
+    17:17:com.android.tools.r8.position.Position getDiagnosticPosition():499:499 -> c
+    17:17:void visitEnd():454 -> c
+    18:18:void visitEnd():454:454 -> c
+    19:19:void finalizeFramesWithIncompleteUninitializedNew():469:469 -> c
+    19:19:void visitEnd():456 -> c
     20:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():130:130 -> c
     20:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():122 -> c
-    20:20:void finalizeFramesWithIncompleteUninitializedNew():477 -> c
+    20:20:void finalizeFramesWithIncompleteUninitializedNew():469 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    20:20:void visitEnd():464 -> c
-    21:21:void finalizeFramesWithIncompleteUninitializedNew():477:477 -> c
-    21:21:void visitEnd():464 -> c
+    20:20:void visitEnd():456 -> c
+    21:21:void finalizeFramesWithIncompleteUninitializedNew():469:469 -> c
+    21:21:void visitEnd():456 -> c
     22:22:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():43:43 -> c
     22:22:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():29 -> c
-    22:22:void finalizeFramesWithIncompleteUninitializedNew():477 -> c
-    22:22:void visitEnd():464 -> c
-    23:27:void finalizeFramesWithIncompleteUninitializedNew():477:481 -> c
-    23:27:void visitEnd():464 -> c
+    22:22:void finalizeFramesWithIncompleteUninitializedNew():469 -> c
+    22:22:void visitEnd():456 -> c
+    23:27:void finalizeFramesWithIncompleteUninitializedNew():469:473 -> c
+    23:27:void visitEnd():456 -> c
     28:28:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.cf.code.CfFrame.getLocals():136:136 -> c
-    28:28:void finalizeFramesWithIncompleteUninitializedNew():481 -> c
+    28:28:void finalizeFramesWithIncompleteUninitializedNew():473 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:void visitEnd():464 -> c
+    28:28:void visitEnd():456 -> c
     29:29:com.android.tools.r8.cf.code.CfFrame$Builder com.android.tools.r8.cf.code.CfFrame$Builder.setLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):419:419 -> c
-    29:29:void finalizeFramesWithIncompleteUninitializedNew():481 -> c
+    29:29:void finalizeFramesWithIncompleteUninitializedNew():473 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:29:void visitEnd():464 -> c
-    30:33:void finalizeFramesWithIncompleteUninitializedNew():482:485 -> c
-    30:33:void visitEnd():464 -> c
+    29:29:void visitEnd():456 -> c
+    30:33:void finalizeFramesWithIncompleteUninitializedNew():474:477 -> c
+    30:33:void visitEnd():456 -> c
     34:34:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.frame.UninitializedNew.getUninitializedLabel():39:39 -> c
-    34:34:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):500 -> c
+    34:34:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):492 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:void finalizeFramesWithIncompleteUninitializedNew():485 -> c
-    34:34:void visitEnd():464 -> c
-    35:36:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):501:502 -> c
-    35:36:void finalizeFramesWithIncompleteUninitializedNew():485 -> c
-    35:36:void visitEnd():464 -> c
+    34:34:void finalizeFramesWithIncompleteUninitializedNew():477 -> c
+    34:34:void visitEnd():456 -> c
+    35:36:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):493:494 -> c
+    35:36:void finalizeFramesWithIncompleteUninitializedNew():477 -> c
+    35:36:void visitEnd():456 -> c
     37:37:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> c
-    37:37:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):502 -> c
-    37:37:void finalizeFramesWithIncompleteUninitializedNew():485 -> c
-    37:37:void visitEnd():464 -> c
-    38:38:void finalizeFramesWithIncompleteUninitializedNew():485:485 -> c
-    38:38:void visitEnd():464 -> c
+    37:37:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):494 -> c
+    37:37:void finalizeFramesWithIncompleteUninitializedNew():477 -> c
+    37:37:void visitEnd():456 -> c
+    38:38:void finalizeFramesWithIncompleteUninitializedNew():477:477 -> c
+    38:38:void visitEnd():456 -> c
     39:39:java.util.Deque com.android.tools.r8.cf.code.CfFrame.getStack():145:145 -> c
-    39:39:void finalizeFramesWithIncompleteUninitializedNew():488 -> c
-    39:39:void visitEnd():464 -> c
-    40:42:void finalizeFramesWithIncompleteUninitializedNew():488:490 -> c
-    40:42:void visitEnd():464 -> c
+    39:39:void finalizeFramesWithIncompleteUninitializedNew():480 -> c
+    39:39:void visitEnd():456 -> c
+    40:42:void finalizeFramesWithIncompleteUninitializedNew():480:482 -> c
+    40:42:void visitEnd():456 -> c
     43:43:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.frame.UninitializedNew.getUninitializedLabel():39:39 -> c
-    43:43:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):500 -> c
+    43:43:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):492 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:43:void finalizeFramesWithIncompleteUninitializedNew():490 -> c
-    43:43:void visitEnd():464 -> c
-    44:45:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):501:502 -> c
-    44:45:void finalizeFramesWithIncompleteUninitializedNew():490 -> c
-    44:45:void visitEnd():464 -> c
+    43:43:void finalizeFramesWithIncompleteUninitializedNew():482 -> c
+    43:43:void visitEnd():456 -> c
+    44:45:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):493:494 -> c
+    44:45:void finalizeFramesWithIncompleteUninitializedNew():482 -> c
+    44:45:void visitEnd():456 -> c
     46:46:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):135:135 -> c
-    46:46:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):502 -> c
-    46:46:void finalizeFramesWithIncompleteUninitializedNew():490 -> c
-    46:46:void visitEnd():464 -> c
-    47:52:void finalizeFramesWithIncompleteUninitializedNew():490:495 -> c
-    47:52:void visitEnd():464 -> c
-    53:56:void visitEnd():465:468 -> c
-    57:62:com.android.tools.r8.position.Position getDiagnosticPosition():506:511 -> c
-    57:62:void visitEnd():473 -> c
+    46:46:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):494 -> c
+    46:46:void finalizeFramesWithIncompleteUninitializedNew():482 -> c
+    46:46:void visitEnd():456 -> c
+    47:52:void finalizeFramesWithIncompleteUninitializedNew():482:487 -> c
+    47:52:void visitEnd():456 -> c
+    53:56:void visitEnd():457:460 -> c
+    57:62:com.android.tools.r8.position.Position getDiagnosticPosition():498:503 -> c
+    57:62:void visitEnd():465 -> c
     63:63:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata.empty():34:34 -> c
     63:63:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194 -> c
-    63:63:void visitEnd():473 -> c
+    63:63:void visitEnd():465 -> c
     64:64:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):186:186 -> c
-    64:64:void visitEnd():473 -> c
-    65:65:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):222:222 -> c
-    65:65:void visitEnd():465 -> c
-    66:66:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):222:222 -> c
-    66:66:void visitEnd():465 -> c
+    64:64:void visitEnd():465 -> c
+    65:65:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):214:214 -> c
+    65:65:void visitEnd():457 -> c
+    66:66:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):214:214 -> c
+    66:66:void visitEnd():457 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    67:67:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):222:222 -> c
-    67:67:void visitEnd():465 -> c
-    68:68:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):223:223 -> c
-    68:68:void visitEnd():465 -> c
+    67:67:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):214:214 -> c
+    67:67:void visitEnd():457 -> c
+    68:68:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):215:215 -> c
+    68:68:void visitEnd():457 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):223:223 -> c
-    69:69:void visitEnd():465 -> c
-    70:70:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):224:224 -> c
-    70:70:void visitEnd():465 -> c
+    69:69:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):215:215 -> c
+    69:69:void visitEnd():457 -> c
+    70:70:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):216:216 -> c
+    70:70:void visitEnd():457 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:72:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):225:226 -> c
-    71:72:void visitEnd():465 -> c
-    73:73:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):575:575 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/K9;"}
-    74:94:void visitTypeInsn(int,java.lang.String):880:900 -> c
-    95:95:void visitTypeInsn(int,java.lang.String):894:894 -> c
-    96:96:void visitTypeInsn(int,java.lang.String):891:891 -> c
-    97:101:void visitTypeInsn(int,java.lang.String):884:888 -> c
-    102:102:com.android.tools.r8.ir.code.IfType ifType(int):996:996 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bu;"}
-    103:103:com.android.tools.r8.ir.code.IfType ifType(int):994:994 -> c
-    104:104:com.android.tools.r8.ir.code.IfType ifType(int):991:991 -> c
-    105:105:com.android.tools.r8.ir.code.IfType ifType(int):988:988 -> c
-    106:106:com.android.tools.r8.ir.code.IfType ifType(int):985:985 -> c
-    107:107:com.android.tools.r8.ir.code.IfType ifType(int):982:982 -> c
-    108:108:com.android.tools.r8.ir.code.IfType ifType(int):978:978 -> c
-    109:112:void visitMaxs(int,int):1173:1176 -> c
-    1:1:void visitVarInsn(int,int):869:869 -> d
-    2:2:void visitVarInsn(int,int):861:861 -> d
-    3:3:void visitVarInsn(int,int):857:857 -> d
-    4:8:void visitVarInsn(int,int):849:853 -> d
-    9:38:void visitVarInsn(int,int):845:874 -> d
-    39:39:void visitVarInsn(int,int):865:865 -> d
+    71:72:void com.android.tools.r8.graph.LazyCfCode.setCode(com.android.tools.r8.graph.CfCode):217:218 -> c
+    71:72:void visitEnd():457 -> c
+    73:73:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):567:567 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/M9;"}
+    74:94:void visitTypeInsn(int,java.lang.String):872:892 -> c
+    95:95:void visitTypeInsn(int,java.lang.String):886:886 -> c
+    96:96:void visitTypeInsn(int,java.lang.String):883:883 -> c
+    97:101:void visitTypeInsn(int,java.lang.String):876:880 -> c
+    102:102:com.android.tools.r8.ir.code.IfType ifType(int):988:988 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/du;"}
+    103:103:com.android.tools.r8.ir.code.IfType ifType(int):986:986 -> c
+    104:104:com.android.tools.r8.ir.code.IfType ifType(int):983:983 -> c
+    105:105:com.android.tools.r8.ir.code.IfType ifType(int):980:980 -> c
+    106:106:com.android.tools.r8.ir.code.IfType ifType(int):977:977 -> c
+    107:107:com.android.tools.r8.ir.code.IfType ifType(int):974:974 -> c
+    108:108:com.android.tools.r8.ir.code.IfType ifType(int):970:970 -> c
+    109:112:void visitMaxs(int,int):1165:1168 -> c
+    1:1:void visitVarInsn(int,int):861:861 -> d
+    2:2:void visitVarInsn(int,int):853:853 -> d
+    3:3:void visitVarInsn(int,int):849:849 -> d
+    4:8:void visitVarInsn(int,int):841:845 -> d
+    9:38:void visitVarInsn(int,int):837:866 -> d
+    39:39:void visitVarInsn(int,int):857:857 -> d
 com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.r4:
 # {"id":"sourceFile","fileName":"LazyLoadedDexApplication.java"}
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qY;"}
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xd;"}
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DJ;"}
     java.util.List keepDeclarations -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.LibraryClassCollection,java.util.List,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):48:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/mY;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/zJ;Ljava/util/List;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/graph/z0;Lcom/android/tools/r8/internal/qY;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xd;Lcom/android/tools/r8/internal/DJ;Ljava/util/List;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     1:1:void forEachLibraryType(java.util.function.Consumer):72:72 -> a
     2:2:java.lang.Iterable com.android.tools.r8.utils.ClassMap.getAllClassProviderTypes():167:167 -> a
     2:2:void forEachLibraryType(java.util.function.Consumer):72 -> a
@@ -88914,14 +88953,14 @@
     7:7:java.lang.Iterable com.android.tools.r8.utils.ClassMap.getAllClassProviderTypes():171:171 -> a
     7:7:void forEachLibraryType(java.util.function.Consumer):72 -> a
     8:21:com.android.tools.r8.com.google.common.collect.ImmutableMap fillPrioritizedClasses(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):214:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Ljava/util/function/Function;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Ljava/util/function/Function;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Du;"}
     22:22:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     22:22:com.android.tools.r8.com.google.common.collect.ImmutableMap fillPrioritizedClasses(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):229 -> a
     23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap fillPrioritizedClasses(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):231:231 -> a
     24:29:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):218:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/yu;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/Au;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     30:43:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):237:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Set;)V"}
     1:1:void forEachProgramType(java.util.function.Consumer):67:67 -> b
     2:2:java.lang.Iterable com.android.tools.r8.utils.ClassMap.getAllTypes():163:163 -> b
     2:2:void forEachProgramType(java.util.function.Consumer):67 -> b
@@ -88961,24 +89000,24 @@
 com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.q4:
 # {"id":"sourceFile","fileName":"LazyLoadedDexApplication.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap programClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap classpathClasses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap libraryClasses -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():120:120 -> <clinit>
     1:21:void <init>(com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.utils.InternalOptions):133:153 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zJ;Lcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/mY;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DJ;Lcom/android/tools/r8/internal/xd;Lcom/android/tools/r8/internal/qY;Lcom/android/tools/r8/internal/iB;)V"}
     22:22:boolean com.android.tools.r8.utils.ClassMap.isFullyLoaded():250:250 -> <init>
     22:22:void <init>(com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.utils.InternalOptions):154 -> <init>
     23:50:void <init>(com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.utils.InternalOptions):154:181 -> <init>
     1:1:boolean lambda$new$1(com.android.tools.r8.graph.DexType):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     2:4:boolean lambda$new$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):139:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/I2;)Z"}
     5:8:com.android.tools.r8.graph.DexClass lambda$new$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexType):184:187 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
     9:13:com.android.tools.r8.graph.DexClass lambda$new$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexType):186:190 -> a
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
@@ -88987,12 +89026,12 @@
 com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.r4$a:
 # {"id":"sourceFile","fileName":"LazyLoadedDexApplication.java"}
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xd;"}
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DJ;"}
     java.util.List keepDeclarations -> j
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):267:267 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):264:264 -> <init>
     3:3:com.android.tools.r8.utils.ClasspathClassCollection com.android.tools.r8.utils.ClasspathClassCollection.empty():23:23 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):268 -> <init>
@@ -89101,7 +89140,7 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClassAndMethod):14:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/H0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/H0;)V"}
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer):39:39 -> a
     boolean isLambdaTarget() -> m
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
@@ -89221,9 +89260,9 @@
 # {"id":"sourceFile","fileName":"MemberResolutionResult.java"}
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.graph.FieldResolutionResult asFieldResolutionResult() -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y3;"}
     com.android.tools.r8.graph.MethodResolutionResult asMethodResolutionResult() -> f
@@ -89264,14 +89303,14 @@
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):281:281 -> b0
     1:1:boolean isSynchronized():136 -> b0
     1:1:java.util.List getNames():32:32 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> c
     2:2:java.util.List getNames():32 -> c
     3:3:java.util.List com.android.tools.r8.graph.AccessFlags.getNames():49:49 -> c
     3:3:java.util.List getNames():33 -> c
     4:11:java.util.List getNames():33:40 -> c
     1:1:java.util.List getPredicates():45:45 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> d
     2:2:java.util.List getPredicates():45 -> d
     3:10:java.util.List getPredicates():46:53 -> d
@@ -89456,7 +89495,7 @@
     2:3:void replaceVirtualMethods(java.util.function.Function):371:372 -> f
     1:1:int numberOfVirtualMethods():65:65 -> g
     2:3:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):75:76 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> g
     4:4:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):77 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -89544,7 +89583,7 @@
     20:20:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):348 -> a
     21:21:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):349:349 -> a
     22:24:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$4(com.android.tools.r8.graph.DexEncodedMethod):376:378 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:boolean hasVirtualMethods(java.util.function.Predicate):105:105 -> b
     2:2:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):131:131 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
@@ -89633,7 +89672,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/j1;)V"}
     1:1:void forEachMethod(java.util.function.Consumer,java.util.function.Predicate):57:57 -> a
     2:5:com.android.tools.r8.utils.TraversalContinuation lambda$forEachMethod$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):59:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Oh0;"}
     6:6:void forEachDirectMethod(java.util.function.Consumer):67:67 -> a
     void addMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
@@ -89671,7 +89710,7 @@
     void replaceVirtualMethods(java.util.function.Function) -> f
     int numberOfVirtualMethods() -> g
     com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function) -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     int size() -> h
     boolean verify() -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -89702,7 +89741,7 @@
     9:9:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethodSignature):134:134 -> a
     9:9:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):130 -> a
     10:14:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$3(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):141:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/Oh0;"}
     15:15:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):152:152 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/j1;"}
     16:16:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
@@ -89755,7 +89794,7 @@
     49:49:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):329:329 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Function;)Lcom/android/tools/r8/graph/j1;"}
     50:50:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":65,"2":66,"3":67},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":65,"2":66,"3":67},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     51:56:com.android.tools.r8.graph.DexEncodedMethod replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,java.util.function.Predicate):343:348 -> a
     51:56:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):329 -> a
     57:57:void replace(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexEncodedMethod):60:60 -> a
@@ -89801,7 +89840,7 @@
     71:71:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Function;)Lcom/android/tools/r8/graph/j1;"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":372,"2":373,"3":374},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":372,"2":373,"3":374},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     358:358:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):357:357 -> b
     359:359:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> b
     359:359:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):358 -> b
@@ -89879,7 +89918,7 @@
     415:415:void lambda$setVirtualMethods$6(java.util.SortedMap,com.android.tools.r8.graph.DexEncodedMethod):265:265 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):0:0 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/j1;"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     2:2:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethodSignature):223:223 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):219 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):219:219 -> c
@@ -89919,7 +89958,7 @@
     2:3:int numberOfMethodsMatching(java.util.function.Predicate):89:90 -> g
     2:3:int numberOfVirtualMethods():84 -> g
     4:5:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):104:105 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     6:6:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> g
     6:6:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):106 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -90278,7 +90317,7 @@
     8:8:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult createSingleResolutionResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):279 -> a
     9:14:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult createSingleResolutionResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):280:285 -> a
     com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean isNoSuchMethodErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Z"}
     com.android.tools.r8.graph.DexClassAndMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
@@ -90329,10 +90368,10 @@
     1:1:void <clinit>():1249:1249 -> <clinit>
     1:1:void <init>():1251:1251 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1258:1258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     2:2:void visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1279:1279 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):1264:1264 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     boolean isVirtualTarget() -> x
 com.android.tools.r8.graph.MethodResolutionResult$Builder -> com.android.tools.r8.graph.R4:
 # {"id":"sourceFile","fileName":"MethodResolutionResult.java"}
@@ -90407,10 +90446,10 @@
     1:2:void <init>(java.util.Collection):1293:1294 -> <init>
     1:2:void forEachFailureDependency(java.util.function.Consumer,java.util.function.Consumer):1310:1311 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1318:1318 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     4:4:void visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1343:1343 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):1324:1324 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     boolean isFailedResolution() -> h
     com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult asFailedResolution() -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/U4$a;"}
@@ -90439,20 +90478,20 @@
     2:2:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
     2:2:void lambda$isIllegalAccessErrorResult$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):1479 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/I2;)V"}
     3:3:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
     3:3:void lambda$isIllegalAccessErrorResult$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):1479 -> a
     4:5:void lambda$isIllegalAccessErrorResult$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):1479:1480 -> a
     6:27:boolean isIllegalAccessErrorResult(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1472:1493 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Z"}
     28:29:void lambda$isIllegalAccessErrorResult$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass):1483:1484 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;)V"}
     30:30:void lambda$isIllegalAccessErrorResult$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass):1482:1482 -> a
     31:36:void lambda$isIllegalAccessErrorResult$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexEncodedMethod):1486:1491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/j1;)V"}
     37:37:void lambda$isIllegalAccessErrorResult$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexEncodedMethod):1488:1488 -> a
     38:38:void lambda$verifyInvalidSymbolicReference$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):1521:1521 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/j1;)V"}
     39:39:void com.android.tools.r8.utils.BooleanBox.and(boolean):52:52 -> a
     39:39:void lambda$verifyInvalidSymbolicReference$4(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):1520 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -90492,7 +90531,7 @@
     1:5:void <init>(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,java.util.List,java.util.List,java.util.List):1541:1545 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1551:1551 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1568:1568 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H0;"}
     3:3:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1580:1580 -> a
@@ -90508,7 +90547,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/graph/y4;"}
     8:15:void visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1635:1642 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):1557:1557 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1586:1586 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/graph/H0;"}
     1:1:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1574:1574 -> c
@@ -90615,13 +90654,13 @@
     28:28:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder,com.android.tools.r8.graph.DexProgramClass):749:749 -> a
     29:30:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):44:45 -> a
     29:30:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     31:31:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43:43 -> a
     31:31:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):504 -> a
     32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainMethod():66:66 -> a
     32:32:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Consumer):905 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/j;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/D4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/j;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/D4;"}
     33:35:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Consumer):905:907 -> a
     36:37:com.android.tools.r8.graph.DexClass definitionForHelper(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):544:545 -> a
     36:37:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Consumer):907 -> a
@@ -90634,7 +90673,7 @@
     57:57:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Consumer):1006:1006 -> a
     57:57:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer,java.util.function.Consumer):915 -> a
     58:60:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):317:319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/ir/optimize/info/h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/ir/optimize/info/h;"}
     61:61:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
     61:61:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1360 -> a
     61:61:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):319 -> a
@@ -90646,7 +90685,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:67:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):322:324 -> a
     68:80:com.android.tools.r8.graph.DispatchTargetLookupResult lookupDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):329:341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/d3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/d3;"}
     81:81:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
     81:81:com.android.tools.r8.graph.DispatchTargetLookupResult lookupDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):341 -> a
     82:83:com.android.tools.r8.graph.DispatchTargetLookupResult lookupDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):341:342 -> a
@@ -90779,7 +90818,7 @@
     163:165:com.android.tools.r8.graph.DispatchTargetLookupResult lookupDirectDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):366 -> a
     163:165:com.android.tools.r8.graph.DispatchTargetLookupResult lookupDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):331 -> a
     166:178:com.android.tools.r8.graph.DispatchTargetLookupResult lookupVirtualDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramMethod):413:425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/MB;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/d3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/OB;Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/d3;"}
     179:194:com.android.tools.r8.graph.DispatchTargetLookupResult lookupVirtualDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramMethod):420:435 -> a
     195:195:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer com.android.tools.r8.graph.AppView.libraryMethodOptimizer():579:579 -> a
     195:195:com.android.tools.r8.graph.DispatchTargetLookupResult lookupVirtualDispatchTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramMethod):436 -> a
@@ -90829,7 +90868,7 @@
     285:287:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):726:728 -> a
     288:335:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):725:772 -> a
     336:337:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder,com.android.tools.r8.ir.desugar.LambdaDescriptor):753:754 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/B4;Lcom/android/tools/r8/internal/RI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/B4;Lcom/android/tools/r8/internal/VI;)V"}
     338:345:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder,com.android.tools.r8.ir.desugar.LambdaDescriptor):753:760 -> a
     346:353:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder,com.android.tools.r8.ir.desugar.LambdaDescriptor):756:763 -> a
     354:354:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder.addLambdaTarget(com.android.tools.r8.graph.LookupLambdaTarget):178:178 -> a
@@ -90844,9 +90883,9 @@
     385:385:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):801 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     386:386:com.android.tools.r8.graph.InstantiatedSubTypeInfo instantiatedSubTypeInfoForInstantiatedType(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Box):811:811 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/k7;)Lcom/android/tools/r8/graph/a4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/m7;)Lcom/android/tools/r8/graph/a4;"}
     387:395:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):812:820 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     396:396:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
     396:396:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):820 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -90854,7 +90893,7 @@
     397:397:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):820 -> a
     398:398:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):823:823 -> a
     399:399:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):814:814 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/D2;)V"}
     400:400:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):839:839 -> a
     400:400:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):815 -> a
     401:402:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):839:840 -> a
@@ -90937,7 +90976,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMember getResolvedMember():290 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/h1;"}
     2:5:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):510:513 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     6:9:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):591:594 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/graph/H0;"}
     10:10:com.android.tools.r8.graph.DexClassAndMethod getResolutionPair():477:477 -> b
@@ -90973,7 +91012,7 @@
     1:1:void <init>():1842:1842 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1851 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1868:1868 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H0;"}
     3:3:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1880:1880 -> a
@@ -90989,7 +91028,7 @@
     8:8:void visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1935:1935 -> a
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> b
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):1857 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UU;"}
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1886:1886 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/graph/H0;"}
     1:1:com.android.tools.r8.graph.DexClassAndMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1874:1874 -> c
@@ -91056,7 +91095,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/shaking/i;)V"}
     1:1:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseInstantiatedSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Function,java.util.function.Function,com.android.tools.r8.graph.AppInfo):205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/android/tools/r8/graph/h;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/android/tools/r8/graph/h;)Lcom/android/tools/r8/internal/Oh0;"}
     2:20:com.android.tools.r8.utils.TraversalContinuation traverseInstantiatedSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Function,java.util.function.Function,com.android.tools.r8.graph.AppInfo):206:224 -> a
     21:21:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     21:21:com.android.tools.r8.utils.TraversalContinuation traverseInstantiatedSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Function,java.util.function.Function,com.android.tools.r8.graph.AppInfo):224 -> a
@@ -91065,7 +91104,7 @@
     31:31:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder builder(boolean,com.android.tools.r8.shaking.GraphReporter):74:74 -> a
     31:31:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):156 -> a
     31:31:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl lambda$rewrittenWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/o5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/o5;"}
     32:32:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):157:157 -> a
     32:32:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl lambda$rewrittenWithLens$0(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):151 -> a
     33:38:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:332 -> a
@@ -91085,17 +91124,17 @@
     65:65:boolean lambda$withoutPrunedItems$1(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.DexEncodedMethod):170:170 -> a
     66:66:void forEachClassWithKnownAllocationSites(java.util.function.BiConsumer):138:138 -> a
     67:67:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):149:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/o5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/o5;"}
     68:68:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.AppInfo):185:185 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/h;)V"}
     69:70:com.android.tools.r8.utils.TraversalContinuation lambda$forEachInstantiatedSubType$2(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):188:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Oh0;"}
     71:72:com.android.tools.r8.utils.TraversalContinuation lambda$forEachInstantiatedSubType$3(java.util.function.Consumer,com.android.tools.r8.ir.desugar.LambdaDescriptor):192:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/RI;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/VI;)Lcom/android/tools/r8/internal/Oh0;"}
     73:77:void lambda$traverseInstantiatedSubtypes$4(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType,java.util.Set):210:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
     78:82:com.android.tools.r8.utils.TraversalContinuation lambda$traverseInstantiatedSubtypes$5(java.util.function.Function,com.android.tools.r8.utils.WorkList,java.util.function.Function,com.android.tools.r8.graph.DexClass):235:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/xm0;Ljava/util/function/Function;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/Bm0;Ljava/util/function/Function;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Oh0;"}
     83:83:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     83:83:com.android.tools.r8.utils.TraversalContinuation lambda$traverseInstantiatedSubtypes$5(java.util.function.Function,com.android.tools.r8.utils.WorkList,java.util.function.Function,com.android.tools.r8.graph.DexClass):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -91146,7 +91185,7 @@
     25:25:java.util.List lambda$recordInstantiatedLambdaInterface$1(com.android.tools.r8.graph.DexType):413:413 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/List;"}
     26:26:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):413:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/h;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/h;)V"}
     27:29:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):432:434 -> a
     27:29:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):414 -> a
     30:40:void repopulateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier):418:428 -> a
@@ -91163,11 +91202,11 @@
     62:64:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):432:434 -> a
     62:64:void populateInstantiatedHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):469 -> a
     65:108:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder rewrittenWithLens(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):483:526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o5;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/n5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o5;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/n5;"}
     109:115:void lambda$rewrittenWithLens$6(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):486:492 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;)V"}
     116:128:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):496:508 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)V"}
     129:132:java.util.Set com.android.tools.r8.utils.LensUtils.rewrittenWithRenamedSignature(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):102:105 -> a
     129:132:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):510 -> a
     133:138:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):1399:1404 -> a
@@ -91177,7 +91216,7 @@
     139:139:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):510 -> a
     140:140:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):509:509 -> a
     141:149:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.DexType,java.util.List):528:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     150:152:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass,java.util.Set):546:548 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)V"}
     153:158:void lambda$validate$12(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType,java.util.List):558:563 -> a
@@ -91220,25 +91259,25 @@
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BJ;"}
     com.android.tools.r8.graph.DexProgramClass[] classes -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap protos -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap types -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap methods -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap fields -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap strings -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap callSites -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap methodHandles -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     java.util.Map protoToShorty -> m
     com.android.tools.r8.graph.DexString firstJumboString -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -91247,7 +91286,7 @@
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():37:37 -> <clinit>
     1:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Set,java.util.Map,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,int,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):80:110 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/xJ;Ljava/util/Set;Ljava/util/Map;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;ILcom/android/tools/r8/internal/yd0;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/internal/BJ;Ljava/util/Set;Ljava/util/Map;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;ILcom/android/tools/r8/internal/Cd0;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/internal/ph0;)V"}
     32:32:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap createSortedMap(java.util.Collection,java.util.Comparator,java.util.function.Consumer):193:193 -> <init>
     32:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Set,java.util.Map,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,int,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):110 -> <init>
     33:40:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Set,java.util.Map,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,java.util.Collection,int,com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):110:117 -> <init>
@@ -91288,7 +91327,7 @@
     29:29:void failOnOverflow(com.android.tools.r8.graph.DexItem):188:188 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;)V"}
     30:31:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap createSortedMap(java.util.Collection,java.util.Comparator,java.util.function.Consumer,int):201:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/Comparator;Ljava/util/function/Consumer;I)Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/Comparator;Ljava/util/function/Consumer;I)Lcom/android/tools/r8/internal/Q20;"}
     32:32:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():140:140 -> a
     32:32:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap createSortedMap(java.util.Collection,java.util.Comparator,java.util.function.Consumer,int):202 -> a
     33:35:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap createSortedMap(java.util.Collection,java.util.Comparator,java.util.function.Consumer,int):205:207 -> a
@@ -91302,9 +91341,9 @@
     46:48:int lambda$sortClassesLegacy$1(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):273:275 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q5;Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)I"}
     49:49:void addClassesFromStartupProfile(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.profile.startup.profile.StartupProfile):298:298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/LinkedHashSet;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/LinkedHashSet;Lcom/android/tools/r8/internal/Cd0;)V"}
     50:50:void lambda$addClassesFromStartupProfile$2(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.profile.startup.profile.StartupProfileRule):300:300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/LinkedHashSet;Lcom/android/tools/r8/internal/Gd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/LinkedHashSet;Lcom/android/tools/r8/internal/Kd0;)V"}
     51:51:com.android.tools.r8.graph.DexItemFactory dexItemFactory():354:354 -> a
     51:51:void lambda$addClassesFromStartupProfile$2(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.profile.startup.profile.StartupProfileRule):300 -> a
     52:62:void lambda$addClassesFromStartupProfile$2(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.profile.startup.profile.StartupProfileRule):300:310 -> a
@@ -91319,7 +91358,7 @@
     88:88:void lambda$addClassAfterParentClasses$6(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):344:344 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/LinkedHashSet;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     89:89:java.util.Collection keysOrEmpty(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):350:350 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)Ljava/util/Collection;"}
     90:91:int getOffsetFor(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):423:424 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Y3;Lcom/android/tools/r8/internal/t1;)I"}
     1:1:void lambda$addRemainingClassesInSortedOrder$4(java.util.Set,java.util.LinkedHashSet,com.android.tools.r8.graph.DexProgramClass):325:325 -> b
@@ -91340,7 +91379,7 @@
     com.android.tools.r8.graph.AppInfo appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/h;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.graph.AppInfo):231:231 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppInfo):229:232 -> <init>
@@ -91421,7 +91460,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:void forEachReference(java.util.function.Consumer):49:49 -> a
     4:4:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:com.android.tools.r8.graph.OriginalFieldWitness lambda$specify$1(com.android.tools.r8.graph.OriginalFieldWitness):22:22 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t5;)Lcom/android/tools/r8/graph/t5;"}
     2:3:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):85:85 -> b
@@ -91588,7 +91627,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/A5;"}
     1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():100:100 -> t0
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():13 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     2:2:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> t0
     2:2:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():100 -> t0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -91600,7 +91639,7 @@
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/h1;"}
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     1:1:void clearGenericSignature():27:27 -> z
 com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.C5:
 # {"id":"sourceFile","fileName":"ProgramMethod.java"}
@@ -91610,23 +91649,14 @@
     2:2:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)V"}
     1:1:boolean isReachabilitySensitive():184:184 -> I
-    2:2:com.android.tools.r8.utils.ReachabilitySensitiveValue com.android.tools.r8.graph.DexProgramClass.getReachabilitySensitiveValue():217:217 -> I
-    2:2:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213 -> I
-    2:2:boolean isReachabilitySensitive():184 -> I
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213:213 -> I
-    3:3:boolean isReachabilitySensitive():184 -> I
-    4:4:boolean com.android.tools.r8.utils.ReachabilitySensitiveValue.isEnabled():16:16 -> I
-    4:4:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213 -> I
-    4:4:boolean isReachabilitySensitive():184 -> I
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> P
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     1:1:com.android.tools.r8.graph.DexClass getHolder():24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/E0;"}
     2:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Dt;"}
     3:4:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):42:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexClassAndMember.getHolder():47:47 -> a
     5:5:com.android.tools.r8.graph.DexProgramClass getHolder():173 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D2;"}
@@ -91646,16 +91676,19 @@
     17:17:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):194 -> a
     18:21:boolean keepLocals(com.android.tools.r8.graph.AppView):202:205 -> a
     18:21:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):195 -> a
-    22:24:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):196:198 -> a
-    25:26:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):210:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/C5;"}
-    27:27:boolean com.android.tools.r8.graph.DexEncodedMethod.isObsolete():179:179 -> a
-    27:27:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):211 -> a
+    22:22:boolean isReachabilitySensitive():184:184 -> a
+    22:22:boolean keepLocals(com.android.tools.r8.graph.AppView):205 -> a
+    22:22:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):195 -> a
+    23:25:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):196:198 -> a
+    26:27:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):210:211 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/C5;"}
+    28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.isObsolete():179:179 -> a
+    28:28:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):212:212 -> a
-    29:30:boolean verifyIsConsistentWithLookup(com.android.tools.r8.graph.DexDefinitionSupplier):219:220 -> a
-    29:30:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):212 -> a
-    31:31:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):215:215 -> a
+    29:29:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):212:212 -> a
+    30:31:boolean verifyIsConsistentWithLookup(com.android.tools.r8.graph.DexDefinitionSupplier):219:220 -> a
+    30:31:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):212 -> a
+    32:32:com.android.tools.r8.graph.ProgramMethod rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier):215:215 -> a
     1:8:boolean canBeConvertedToAbstractMethod(com.android.tools.r8.graph.AppView):84:91 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     9:9:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isFailedMethodResolutionTarget(com.android.tools.r8.graph.DexMethod):594:594 -> b
@@ -91759,7 +91792,7 @@
     boolean isProgramMember() -> r0
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():180:180 -> t0
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():24 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/Q;"}
     2:2:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> t0
     2:2:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():180 -> t0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -92030,9 +92063,9 @@
 com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.P5:
 # {"id":"sourceFile","fileName":"SmaliWriter.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/iB;)V"}
     1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)Ljava/lang/String;"}
     11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:33 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/io/PrintStream;)V"}
@@ -92113,7 +92146,7 @@
     com.android.tools.r8.graph.DexItemFactory factory -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     java.util.Set NO_DIRECT_SUBTYPE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F40;"}
     boolean $assertionsDisabled -> f
     1:8:void <clinit>():25:32 -> <clinit>
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <clinit>
@@ -92291,11 +92324,11 @@
     7:7:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):47 -> a
     8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):48:48 -> a
     9:9:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     10:10:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     12:12:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):90 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -92320,9 +92353,9 @@
     22:22:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):205 -> a
     23:23:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):204:204 -> a
     24:24:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     25:26:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):236:237 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     27:27:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.dexItemFactory():69:69 -> a
     27:27:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -92338,7 +92371,7 @@
     37:38:com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):254:255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/a3;"}
     39:39:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):265:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)I"}
     1:1:void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod):0:0 -> c
@@ -92395,26 +92428,26 @@
     7:7:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     7:7:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):53 -> a
     8:10:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):66:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     11:16:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):80:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     17:17:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
     17:17:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):86 -> a
     18:18:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):88:88 -> a
     19:19:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/dex/M;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     20:20:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):162:162 -> a
     20:20:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):180 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)I"}
     21:21:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):180:180 -> a
     22:22:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):236:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     23:26:void writeCf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):259:262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     27:30:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):274:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;Ljava/nio/ShortBuffer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;Ljava/nio/ShortBuffer;)V"}
     31:31:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     32:32:com.android.tools.r8.graph.DexWritableCode$DexWritableCacheKey getCacheLookupKey(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):297:297 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/a3;"}
     33:33:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):162:162 -> a
@@ -92447,19 +92480,19 @@
 com.android.tools.r8.graph.ThrowNullCode$ThrowNullSourceCode -> com.android.tools.r8.graph.W5:
 # {"id":"sourceFile","fileName":"ThrowNullCode.java"}
     1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):309:312 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;)V"}
     5:5:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):313 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):314:314 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):308:308 -> <init>
     1:1:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):318:318 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):1226:1226 -> d
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):318 -> d
     1:1:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> e
     1:1:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):318 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1986:1986 -> e
     2:2:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):318 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -92471,7 +92504,7 @@
     8:8:void com.android.tools.r8.ir.conversion.IRBuilder.addThrow(int):1991:1991 -> e
     8:8:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):318 -> e
     1:1:java.util.List getInstructionBuilders():318:318 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
 com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.Y5:
 # {"id":"sourceFile","fileName":"TopDownClassHierarchyTraversal.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
@@ -92514,7 +92547,7 @@
     com.android.tools.r8.graph.Definition context -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E5;"}
     com.android.tools.r8.utils.TraversalContinuation continuation -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oh0;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition):32:32 -> <init>
@@ -92540,9 +92573,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:18:void doBreak():46:47 -> a
     19:19:void registerInliningPosition(com.android.tools.r8.ir.code.Position):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     20:20:void registerInstanceFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Z7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/b8;)V"}
     21:21:void registerInstanceFieldReadInstruction(com.android.tools.r8.dex.code.CfOrDexInstanceFieldRead):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/b;)V"}
     22:22:void registerStaticFieldReadInstruction(com.android.tools.r8.dex.code.CfOrDexStaticFieldRead):146:146 -> a
@@ -92581,14 +92614,14 @@
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens():51:51 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     2:3:com.android.tools.r8.graph.DexClassAndMethod getMethodContext():60:61 -> b
     2:3:com.android.tools.r8.graph.lens.GraphLens getCodeLens():52 -> b
     4:4:com.android.tools.r8.graph.lens.GraphLens getCodeLens():52:52 -> b
     5:5:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):117:117 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     6:6:void registerStaticFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):142:142 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Z7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/b8;)V"}
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:void registerRecordFieldValues(com.android.tools.r8.graph.DexField[]):75:75 -> c
@@ -92690,7 +92723,7 @@
     32:32:void com.android.tools.r8.graph.DexEncodedMember.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):110:110 -> a
     32:32:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):98 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.fc:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.hc:
 # {"id":"sourceFile","fileName":"ClassInitializerAssertionEnablingAnalysis.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -92700,11 +92733,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     java.util.List assertionHandlers -> d
     java.util.List javacInstructionSequence -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List r8InstructionSequence -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List jacocoInstructionSequence -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:10:void <clinit>():153:162 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):45:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -92794,7 +92827,7 @@
     103:103:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):95 -> a
     104:104:boolean hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):217:217 -> a
     104:104:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):94 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.on:
 # {"id":"sourceFile","fileName":"EnqueuerAnalysis.java"}
     1:1:void <init>():19:19 -> <init>
     1:1:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):23:23 -> a
@@ -92818,20 +92851,20 @@
     10:10:void notifyFailedMethodResolutionTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.EnqueuerWorklist):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     11:11:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/ph0;)V"}
     12:12:void done(com.android.tools.r8.shaking.Enqueuer):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.pn:
 # {"id":"sourceFile","fileName":"EnqueuerCheckCastAnalysis.java"}
     void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)V"}
     void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.on:
+com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.qn:
 # {"id":"sourceFile","fileName":"EnqueuerExceptionGuardAnalysis.java"}
     void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.pn:
+com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.rn:
 # {"id":"sourceFile","fileName":"EnqueuerFieldAccessAnalysis.java"}
     void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/G0;)V"}
@@ -92841,11 +92874,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):26:26 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.sn:
 # {"id":"sourceFile","fileName":"EnqueuerInstanceOfAnalysis.java"}
     void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.rn:
+com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.internal.tn:
 # {"id":"sourceFile","fileName":"EnqueuerInvokeAnalysis.java"}
     void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
@@ -92857,9 +92890,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
     void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.EnqueuerTypeAccessAnalysis -> com.android.tools.r8.internal.sn:
+com.android.tools.r8.graph.analysis.EnqueuerTypeAccessAnalysis -> com.android.tools.r8.internal.un:
 # {"id":"sourceFile","fileName":"EnqueuerTypeAccessAnalysis.java"}
-com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.es:
+com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.gs:
 # {"id":"sourceFile","fileName":"GetArrayOfMissingTypeVerifyErrorWorkaround.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -92890,7 +92923,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):111:111 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Lv:
 # {"id":"sourceFile","fileName":"InitializedClassesInInstanceMethodsAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -92907,7 +92940,7 @@
     20:20:void com.android.tools.r8.graph.AppView.setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):733:733 -> a
     20:20:void done(com.android.tools.r8.shaking.Enqueuer):123 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Kv:
 # {"id":"sourceFile","fileName":"InitializedClassesInInstanceMethodsAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -92932,33 +92965,33 @@
     9:9:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):40 -> a
     10:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):45:53 -> a
     19:21:com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):58:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Kv;"}
     22:23:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):64:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     24:25:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):72:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     26:26:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):72:72 -> a
     1:2:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):68:69 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.dC:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.fC:
 # {"id":"sourceFile","fileName":"InvokeVirtualToInterfaceVerifyErrorWorkaround.java"}
     com.android.tools.r8.graph.DexType androidHardwareCamera2CameraDeviceType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):37:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/M;)V"}
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):59:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:boolean isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):68:68 -> a
     2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):59 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     3:3:boolean isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):59 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     4:4:boolean isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):69 -> a
     4:4:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):59 -> a
     5:5:boolean isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):70:70 -> a
@@ -92976,10 +93009,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):83:83 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.graph.analysis.ResourceAccessAnalysis -> com.android.tools.r8.internal.h50:
+com.android.tools.r8.graph.analysis.ResourceAccessAnalysis -> com.android.tools.r8.internal.l50:
 # {"id":"sourceFile","fileName":"ResourceAccessAnalysis.java"}
     com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState resourceShrinkerState -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q10;"}
     java.util.Map fieldToValueMapping -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.graph.AppView appView -> c
@@ -93042,7 +93075,7 @@
     34:34:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):106 -> a
     35:42:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):108:115 -> a
     43:57:void analyzeClassInitializer(com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder,com.android.tools.r8.graph.ProgramMethod):154:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f50;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j50;Lcom/android/tools/r8/graph/C5;)V"}
     58:58:boolean com.android.tools.r8.ir.code.Instruction.isResourceConstNumber():0:0 -> a
     58:58:void analyzeClassInitializer(com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder,com.android.tools.r8.graph.ProgramMethod):169 -> a
     59:59:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
@@ -93065,7 +93098,7 @@
     95:96:void analyzeClassInitializer(com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder,com.android.tools.r8.graph.ProgramMethod):202 -> a
     97:97:void analyzeClassInitializer(com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder,com.android.tools.r8.graph.ProgramMethod):170:170 -> a
     98:98:void analyzeStaticFields(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/f50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/j50;)V"}
     99:99:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):403:403 -> a
     99:99:void analyzeStaticFields(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder):209 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93074,7 +93107,7 @@
     101:106:void analyzeStaticFields(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder):209:214 -> a
     107:108:void com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder.addMapping(com.android.tools.r8.graph.DexField,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):230:231 -> a
     107:108:void analyzeStaticFields(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder):214 -> a
-com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$1 -> com.android.tools.r8.internal.e50:
+com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$1 -> com.android.tools.r8.internal.i50:
 # {"id":"sourceFile","fileName":"ResourceAccessAnalysis.java"}
     com.android.tools.r8.graph.AppView val$appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -93093,27 +93126,27 @@
     9:9:void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.EnqueuerWorklist):65 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.EnqueuerWorklist):65:65 -> a
-com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore -> com.android.tools.r8.internal.g50:
+com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore -> com.android.tools.r8.internal.k50:
 # {"id":"sourceFile","fileName":"ResourceAccessAnalysis.java"}
     java.util.Map valueMapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:2:void <init>(java.util.Map):222:223 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)V"}
-com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder -> com.android.tools.r8.internal.f50:
+com.android.tools.r8.graph.analysis.ResourceAccessAnalysis$RClassFieldToValueStore$Builder -> com.android.tools.r8.internal.j50:
 # {"id":"sourceFile","fileName":"ResourceAccessAnalysis.java"}
     java.util.Map valueMapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():226:226 -> <clinit>
     1:2:void <init>():226:227 -> <init>
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.b8:
 # {"id":"sourceFile","fileName":"BytecodeInstructionMetadata.java"}
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     1:3:void <init>(java.util.Set,boolean):38:40 -> <init>
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder builder():44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y7;"}
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.Y7:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a8;"}
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.a8:
 # {"id":"sourceFile","fileName":"BytecodeInstructionMetadata.java"}
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
@@ -93121,38 +93154,38 @@
     1:1:void <clinit>():63:63 -> <clinit>
     1:3:void <init>():63:65 -> <init>
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder setIsReadForWrite():80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y7;"}
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.b8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a8;"}
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.d8:
 # {"id":"sourceFile","fileName":"BytecodeMetadata.java"}
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d8;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():17:19 -> <clinit>
     1:3:void <init>(java.util.Map):23:25 -> <init>
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.c8:
 # {"id":"sourceFile","fileName":"BytecodeMetadata.java"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider bytecodeMetadataProvider -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e8;"}
     java.util.Map backing -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):47:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e8;)V"}
     2:5:void <init>(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):45:48 -> <init>
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.e8:
 # {"id":"sourceFile","fileName":"BytecodeMetadataProvider.java"}
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e8;"}
     1:2:void <clinit>():21:22 -> <clinit>
     1:2:void <init>(java.util.Map):26:27 -> <init>
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder builder():31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e8$a;"}
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider empty():35:35 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c8;"}
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.c8$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e8;"}
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.e8$a:
 # {"id":"sourceFile","fileName":"BytecodeMetadataProvider.java"}
     java.util.Map builders -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -93160,12 +93193,12 @@
     1:1:void <clinit>():57:57 -> <clinit>
     1:3:void <init>():57:59 -> <init>
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder addMetadata(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):68:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Ljava/util/function/Consumer;)V"}
     5:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider build():76:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e8;"}
     12:12:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder.build():85:85 -> a
     12:12:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Y7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/a8;)V"}
     13:13:boolean com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder.isEmpty():69:69 -> a
     13:13:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder.build():85 -> a
     13:13:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):81 -> a
@@ -93181,7 +93214,7 @@
     18:18:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder.build():86:86 -> a
     18:18:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):81 -> a
     19:19:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):81:81 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.sN:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.wN:
 # {"id":"sourceFile","fileName":"MergedClasses.java"}
     com.android.tools.r8.graph.DexType getMergeTargetOrDefault(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
@@ -93193,7 +93226,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     boolean isMergeSource(com.android.tools.r8.graph.DexType) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.tN:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.xN:
 # {"id":"sourceFile","fileName":"MergedClassesCollection.java"}
     java.util.List collection -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -93208,37 +93241,37 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:boolean isMergeSource(com.android.tools.r8.graph.DexType):44:45 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
-com.android.tools.r8.graph.fixup.ConcurrentMethodFixup -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.graph.fixup.ConcurrentMethodFixup -> com.android.tools.r8.internal.Bf:
 # {"id":"sourceFile","fileName":"ConcurrentMethodFixup.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.utils.NonProgramMethodsCollection nonProgramVirtualMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Af;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cf;"}
     com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer programClassFixer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Af;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():36:36 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer):43:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Af;)V"}
     3:3:com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection.createVirtualMethodsCollection(com.android.tools.r8.graph.AppView):20:20 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer):46 -> <init>
     4:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer):46:47 -> <init>
     1:3:void fixupClassesConcurrentlyByConnectedProgramComponents(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):52:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     4:4:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.create(com.android.tools.r8.graph.AppView):38:38 -> a
     4:4:void fixupClassesConcurrentlyByConnectedProgramComponents(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):55 -> a
     5:14:void fixupClassesConcurrentlyByConnectedProgramComponents(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):56:65 -> a
     15:21:void fixupClassesConcurrentlyByConnectedProgramComponents(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):62:68 -> a
     22:45:void processConnectedProgramComponents(java.util.Set):81:104 -> a
     46:56:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):113:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
     57:60:boolean shouldReserveAsPinned(com.android.tools.r8.graph.ProgramMethod):148:151 -> a
     57:60:void lambda$createMethodNamingUtility$0(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.ProgramMethod):159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/graph/C5;)V"}
     61:61:void lambda$createMethodNamingUtility$0(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
     62:65:boolean shouldReserveAsPinned(com.android.tools.r8.graph.ProgramMethod):148:151 -> a
     62:65:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$2(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
     66:66:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$2(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):177:177 -> a
     67:67:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.put(com.android.tools.r8.graph.DexMethodSignature,java.lang.Object):48:48 -> a
     67:67:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$2(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):177 -> a
@@ -93246,18 +93279,18 @@
     68:68:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.put(com.android.tools.r8.graph.DexMethodSignature,java.lang.Object):48:48 -> a
     68:68:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$2(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):177 -> a
     69:70:com.android.tools.r8.graph.fixup.MethodNamingUtility createMethodNamingUtility(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexProgramClass):156:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol;)Lcom/android/tools/r8/internal/ZN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/internal/dO;"}
     71:71:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):328:328 -> a
     71:71:com.android.tools.r8.graph.fixup.MethodNamingUtility createMethodNamingUtility(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexProgramClass):157 -> a
     72:72:com.android.tools.r8.graph.fixup.MethodNamingUtility createMethodNamingUtility(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexProgramClass):163:163 -> a
     73:84:void reserveComponentPinnedAndInterfaceMethodSignatures(java.util.List,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):169:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ql;)V"}
     85:85:boolean lambda$reserveComponentPinnedAndInterfaceMethodSignatures$1(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     86:87:boolean lambda$reserveComponentPinnedAndInterfaceMethodSignatures$3(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):184:185 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)Z"}
     88:90:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$4(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):187:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     91:91:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$4(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):188:188 -> a
     92:92:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.getOrComputeNonProgramMethods(com.android.tools.r8.graph.ClasspathOrLibraryClass):28:28 -> a
     92:92:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$4(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):188 -> a
@@ -93274,25 +93307,25 @@
     100:100:void com.android.tools.r8.utils.collections.DexMethodSignatureMap.putAllToIdentity(java.util.Collection):249 -> a
     100:100:void lambda$reserveComponentPinnedAndInterfaceMethodSignatures$4(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):187 -> a
     1:15:void processInterface(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):130:144 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ol;)V"}
-com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer -> com.android.tools.r8.internal.yf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
+com.android.tools.r8.graph.fixup.ConcurrentMethodFixup$ProgramClassFixer -> com.android.tools.r8.internal.Af:
 # {"id":"sourceFile","fileName":"ConcurrentMethodFixup.java"}
     void fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.fixup.MethodNamingUtility) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ZN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/dO;)V"}
     boolean shouldReserveAsIfPinned(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.graph.fixup.MethodNamingUtility -> com.android.tools.r8.internal.ZN:
+com.android.tools.r8.graph.fixup.MethodNamingUtility -> com.android.tools.r8.internal.dO:
 # {"id":"sourceFile","fileName":"MethodNamingUtility.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureBiMap inheritedSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ol;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
     com.android.tools.r8.com.google.common.collect.BiMap localSignatures -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.com.google.common.collect.BiMap):26:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Is;)V"}
     1:17:com.android.tools.r8.graph.DexMethod nextUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):35:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/w2;"}
     18:18:com.android.tools.r8.graph.DexMethod nextUniqueInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):57:57 -> a
@@ -93301,7 +93334,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/w2;"}
     19:19:com.android.tools.r8.graph.DexMethod nextUniqueInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):0:0 -> a
     19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.MethodNamingUtility.nextUniqueInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":46,"2":47,"3":48},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":46,"2":47,"3":48},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     20:20:boolean com.android.tools.r8.utils.collections.DexMethodSignatureMap.containsKey(com.android.tools.r8.graph.DexMethodSignature):209:209 -> a
     20:20:com.android.tools.r8.graph.DexMethod nextUniqueInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):57 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93352,7 +93385,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     57:57:boolean anyCollision(com.android.tools.r8.graph.DexMethod):0:0 -> a
     57:57:boolean com.android.tools.r8.internal.MethodNamingUtility.anyCollision(com.android.tools.r8.graph.DexMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     58:58:boolean com.android.tools.r8.utils.collections.DexMethodSignatureMap.containsValue(java.lang.Object):192:192 -> a
     58:58:boolean anyCollision(com.android.tools.r8.graph.DexMethod):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93373,7 +93406,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/graph/w2;"}
     64:64:com.android.tools.r8.graph.DexMethod nextUniqueMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,java.util.function.BiConsumer):0:0 -> a
     64:64:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.MethodNamingUtility.nextUniqueMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,java.util.function.BiConsumer):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":90,"2":91,"3":92},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":90,"2":91,"3":92},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     65:65:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.get(java.lang.Object):197:197 -> a
     65:65:com.android.tools.r8.graph.DexMethod nextUniqueMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,java.util.function.BiConsumer):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93408,7 +93441,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean lambda$nextUniqueMethod$2(com.android.tools.r8.graph.DexMethod):115:115 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
-com.android.tools.r8.graph.fixup.TreeFixerBase -> com.android.tools.r8.internal.Mh0:
+com.android.tools.r8.graph.fixup.TreeFixerBase -> com.android.tools.r8.internal.Qh0:
 # {"id":"sourceFile","fileName":"TreeFixerBase.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -93507,62 +93540,67 @@
     83:83:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):148 -> a
     84:84:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
     84:84:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):150 -> a
-    85:87:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):581:583 -> a
-    85:87:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):151 -> a
-    88:88:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):154:154 -> a
-    89:89:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
-    89:89:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
+    85:86:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):581:582 -> a
+    85:86:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):151 -> a
+    87:87:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    87:87:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):582 -> a
+    87:87:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):151 -> a
+    88:89:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):582:583 -> a
+    88:89:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):151 -> a
+    90:90:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):154:154 -> a
+    91:91:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
+    91:91:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):62:62 -> a
-    90:90:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):155 -> a
-    91:91:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137:137 -> a
+    92:92:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):62:62 -> a
+    92:92:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):155 -> a
+    93:93:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137:137 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/graph/I4;"}
-    92:92:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):71:71 -> a
-    92:92:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:93:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):71:71 -> a
-    93:93:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137 -> a
-    94:94:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.createInternal(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodCollectionBacking):64:64 -> a
-    94:94:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):72 -> a
+    94:94:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):71:71 -> a
     94:94:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137 -> a
-    95:99:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):190:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/List;)[Lcom/android/tools/r8/graph/g1;"}
-    100:104:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):202:206 -> a
-    100:104:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194 -> a
-    105:105:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):67:67 -> a
-    105:105:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):205 -> a
-    105:105:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194 -> a
-    106:106:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194:194 -> a
-    107:109:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):213:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
-    110:116:java.util.List fixupInnerClassAttributes(java.util.List):221:227 -> a
-    117:117:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):359:359 -> a
-    117:117:java.util.List fixupInnerClassAttributes(java.util.List):228 -> a
-    118:118:java.util.List fixupInnerClassAttributes(java.util.List):229:229 -> a
-    119:119:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):359:359 -> a
-    119:119:java.util.List fixupInnerClassAttributes(java.util.List):230 -> a
-    120:131:java.util.List fixupInnerClassAttributes(java.util.List):231:242 -> a
-    132:139:java.util.List fixupInnerClassAttributes(java.util.List):241:248 -> a
-    140:140:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():787:787 -> a
-    140:140:java.util.List fixupInnerClassAttributes(java.util.List):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    141:147:java.util.List fixupInnerClassAttributes(java.util.List):248:254 -> a
-    148:148:java.util.List fixupInnerClassAttributes(java.util.List):252:252 -> a
-    149:152:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):262:265 -> a
+    95:95:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):71:71 -> a
+    95:95:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137 -> a
+    96:96:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.createInternal(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodCollectionBacking):64:64 -> a
+    96:96:com.android.tools.r8.graph.MethodCollection com.android.tools.r8.graph.MethodCollection.fixup(com.android.tools.r8.graph.DexClass,java.util.function.Function):72 -> a
+    96:96:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):137 -> a
+    97:101:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):190:194 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/List;)[Lcom/android/tools/r8/graph/g1;"}
+    102:106:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):202:206 -> a
+    102:106:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):67:67 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):205 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194 -> a
+    108:108:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):194:194 -> a
+    109:111:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):213:215 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+    112:118:java.util.List fixupInnerClassAttributes(java.util.List):221:227 -> a
+    119:119:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):359:359 -> a
+    119:119:java.util.List fixupInnerClassAttributes(java.util.List):228 -> a
+    120:120:java.util.List fixupInnerClassAttributes(java.util.List):229:229 -> a
+    121:121:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):359:359 -> a
+    121:121:java.util.List fixupInnerClassAttributes(java.util.List):230 -> a
+    122:133:java.util.List fixupInnerClassAttributes(java.util.List):231:242 -> a
+    134:141:java.util.List fixupInnerClassAttributes(java.util.List):241:248 -> a
+    142:142:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():786:786 -> a
+    142:142:java.util.List fixupInnerClassAttributes(java.util.List):248 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    143:149:java.util.List fixupInnerClassAttributes(java.util.List):248:254 -> a
+    150:150:java.util.List fixupInnerClassAttributes(java.util.List):252:252 -> a
+    151:154:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):262:265 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
-    153:154:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1144:1145 -> a
-    153:154:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):266 -> a
-    155:155:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
-    155:155:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):265 -> a
-    156:157:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):273:274 -> a
+    155:156:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1144:1145 -> a
+    155:156:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):266 -> a
+    157:157:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
+    157:157:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):265 -> a
+    158:159:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):273:274 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-    158:158:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):273:273 -> a
-    159:162:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):348:351 -> a
+    160:160:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):273:273 -> a
+    161:164:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):348:351 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/graph/E2;"}
-    163:167:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):382:386 -> a
-    163:167:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):351 -> a
-    168:169:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):352:353 -> a
-    170:179:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):365:374 -> a
+    165:169:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):382:386 -> a
+    165:169:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):351 -> a
+    170:171:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):352:353 -> a
+    172:181:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):365:374 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
@@ -93575,17 +93613,17 @@
 com.android.tools.r8.graph.lens.AppliedGraphLens -> com.android.tools.r8.internal.Y2:
 # {"id":"sourceFile","fileName":"AppliedGraphLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap renamedTypeNames -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     java.util.Map extraOriginalMethodSignatures -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):50:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)V"}
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):38:54 -> <init>
     19:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> <init>
     19:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):54 -> <init>
@@ -93608,7 +93646,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     54:62:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):84:92 -> <init>
     1:11:void recordOriginalTypeNames(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.lens.GraphLens):97:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ns;)V"}
     12:12:void com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.setRepresentative(java.lang.Object,java.lang.Object):53:53 -> a
     12:12:void recordOriginalTypeNames(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.lens.GraphLens):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93623,7 +93661,7 @@
     16:16:void lambda$recordOriginalTypeNames$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104 -> a
     17:18:void lambda$recordOriginalTypeNames$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104:105 -> a
     19:19:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     1:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):118:119 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> b
@@ -93637,49 +93675,49 @@
     2:2:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):158:158 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):125:125 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     2:5:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):150:153 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getPreviousClassType(com.android.tools.r8.graph.DexType):130:130 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.graph.lens.ClearCodeRewritingGraphLens -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.graph.lens.ClearCodeRewritingGraphLens -> com.android.tools.r8.internal.yd:
 # {"id":"sourceFile","fileName":"ClearCodeRewritingGraphLens.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.lens.FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/js;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/op;"}
     2:4:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):52:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     5:5:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     6:6:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     1:1:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):42:42 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):31:31 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
-com.android.tools.r8.graph.lens.DefaultNonIdentityGraphLens -> com.android.tools.r8.internal.fi:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+com.android.tools.r8.graph.lens.DefaultNonIdentityGraphLens -> com.android.tools.r8.internal.hi:
 # {"id":"sourceFile","fileName":"DefaultNonIdentityGraphLens.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):16:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):20:20 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):16 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)V"}
     1:1:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     1:1:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     2:2:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):28:28 -> a
     3:3:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     1:1:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> b
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):40 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     2:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):40:40 -> b
     3:3:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):52:52 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     4:4:com.android.tools.r8.graph.DexField getNextFieldSignature(com.android.tools.r8.graph.DexField):62:62 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     1:1:com.android.tools.r8.graph.DexField getPreviousFieldSignature(com.android.tools.r8.graph.DexField):57:57 -> c
@@ -93692,7 +93730,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> e
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):89 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):91:91 -> e
     4:4:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> e
     4:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):92 -> e
@@ -93701,7 +93739,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.graph.DexType getPreviousClassType(com.android.tools.r8.graph.DexType):45:45 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.graph.lens.FieldLookupResult -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.graph.lens.FieldLookupResult -> com.android.tools.r8.internal.op:
 # {"id":"sourceFile","fileName":"FieldLookupResult.java"}
     com.android.tools.r8.graph.DexType readCastType -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -93720,7 +93758,7 @@
     1:1:boolean hasReadCastType():32:32 -> d
 com.android.tools.r8.graph.lens.FieldLookupResult$Builder -> R8$$REMOVED$$CLASS$$88:
 # {"id":"sourceFile","fileName":"FieldLookupResult.java"}
-com.android.tools.r8.graph.lens.FinalInitClassLens -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.graph.lens.FinalInitClassLens -> com.android.tools.r8.internal.Vp:
 # {"id":"sourceFile","fileName":"FinalInitClassLens.java"}
     java.util.Map mapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -93729,11 +93767,11 @@
     1:5:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):23:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/l1;"}
     6:6:com.android.tools.r8.graph.lens.InitClassLens lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Iv;"}
     7:7:com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Iv;"}
     8:8:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Fv;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Hv;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/l1;)V"}
     9:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     9:10:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):44 -> a
     11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.GraphLens.lookupField(com.android.tools.r8.graph.DexField):333:333 -> a
@@ -93750,23 +93788,23 @@
     16:16:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):46 -> a
     1:1:com.android.tools.r8.graph.lens.InitClassLens$Builder com.android.tools.r8.graph.lens.InitClassLens.builder():16:16 -> b
     1:1:com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):41 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Sp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Vp;"}
     2:2:com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):42:42 -> b
     3:3:com.android.tools.r8.graph.lens.FinalInitClassLens com.android.tools.r8.graph.lens.InitClassLens$Builder.build():42:42 -> b
     3:3:com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):48 -> b
-com.android.tools.r8.graph.lens.GraphLens -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.graph.lens.GraphLens -> com.android.tools.r8.internal.ns:
 # {"id":"sourceFile","fileName":"GraphLens.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():69:69 -> <clinit>
     1:1:void <init>():93:93 -> <init>
     com.android.tools.r8.graph.lens.FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/js;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/op;"}
     com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     java.lang.String lookupPackageName(java.lang.String) -> a
     1:1:boolean com.android.tools.r8.utils.collections.ThrowingSet.isThrowingSet(java.util.Set):24:24 -> a
     1:1:java.util.Set rewriteReferences(java.util.Set):570 -> a
@@ -93777,28 +93815,28 @@
     6:7:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):101:102 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     8:8:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     9:9:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     10:11:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):124:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     12:12:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     13:15:com.android.tools.r8.graph.DexReference getOriginalReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction):143:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ls;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ns;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/graph/F2;"}
     16:16:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     16:16:com.android.tools.r8.graph.DexReference getOriginalReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.graph.DexReference getRenamedReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/F2;"}
     18:19:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):161:162 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     20:21:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):161:162 -> a
     20:21:void lambda$rewriteFieldKeys$11(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):621 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/l1;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/l1;Ljava/lang/Object;)V"}
     22:22:void lambda$rewriteFieldKeys$11(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):621:621 -> a
     23:26:com.android.tools.r8.graph.DexReference getRenamedReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction,java.util.function.Predicate):198:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ls;Ljava/util/function/BiFunction;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ns;Ljava/util/function/BiFunction;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/F2;"}
     27:27:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     27:27:com.android.tools.r8.graph.DexReference getRenamedReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction,java.util.function.Predicate):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93811,13 +93849,13 @@
     35:37:void lambda$rewriteTypeKeys$12(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):638:640 -> a
     38:38:void lambda$rewriteTypeKeys$12(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):639:639 -> a
     39:39:com.android.tools.r8.graph.lens.FieldLookupResult lambda$lookupFieldResult$3(com.android.tools.r8.graph.lens.FieldLookupResult):352:352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     40:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens asEnumUnboxerLens():422:422 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yn;"}
     41:53:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Timing):492:504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/lh0;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/v0;Lcom/android/tools/r8/internal/ph0;)Ljava/util/IdentityHashMap;"}
     54:54:void lambda$rewriteCallSites$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):497:497 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/xJ;Ljava/util/Map;Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/BJ;Ljava/util/Map;Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/internal/CY;)V"}
     55:55:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     55:55:void lambda$rewriteCallSites$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):497 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -93825,9 +93863,9 @@
     56:56:void lambda$rewriteCallSites$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):497 -> a
     57:61:void lambda$rewriteCallSites$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):497:501 -> a
     62:62:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$4(com.android.tools.r8.graph.DexCallSite):500:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)Lcom/android/tools/r8/internal/CY;"}
     63:67:java.util.Set rewriteFields(java.util.Set,com.android.tools.r8.utils.Timing):510:514 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/lh0;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/ph0;)Ljava/util/Set;"}
     68:69:boolean verifyIsIdentityLensForFields(java.util.Collection,com.android.tools.r8.graph.lens.GraphLens):549:550 -> a
     68:69:java.util.Set rewriteFields(java.util.Set,com.android.tools.r8.utils.Timing):514 -> a
     70:83:java.util.Set rewriteFields(java.util.Set,com.android.tools.r8.utils.Timing):518:531 -> a
@@ -93854,7 +93892,7 @@
     132:134:void lambda$rewriteReferenceKeys$10(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):602:604 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/Map;Lcom/android/tools/r8/graph/F2;Ljava/util/List;)V"}
     135:136:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):620:621 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/Du;"}
     137:137:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     137:137:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):622 -> a
     138:162:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):647:671 -> a
@@ -93865,67 +93903,67 @@
     java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     boolean isIdentityLensForFields(com.android.tools.r8.graph.lens.GraphLens) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     1:2:com.android.tools.r8.graph.DexMethod getOriginalMethodSignatureForMapping(com.android.tools.r8.graph.DexMethod):134:135 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     3:3:com.android.tools.r8.graph.DexReference lambda$getRenamedReference$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):154:154 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
     4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):166:166 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     5:5:com.android.tools.r8.graph.DexReference getRenamedReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction):189:189 -> b
     5:5:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):166 -> b
     6:6:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):166:166 -> b
     7:7:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):184:184 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     8:8:com.android.tools.r8.graph.DexReference getRenamedReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction):189:189 -> b
     8:8:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):184 -> b
     9:9:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):184:184 -> b
     10:10:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens asHorizontalClassMergerGraphLens():434:434 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Us;"}
     11:12:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.lens.GraphLens):562:563 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/F2;"}
     13:14:java.util.Map rewriteTypeKeys(java.util.Map,java.util.function.BiFunction):634:635 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/BiFunction;)Ljava/util/IdentityHashMap;"}
     1:1:com.android.tools.r8.graph.DexReference lambda$getRenamedReference$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField):155:155 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/F2;"}
     2:2:com.android.tools.r8.graph.DexReference lambda$getRenamedReference$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):156:156 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/F2;"}
     3:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     5:6:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):233:234 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     7:7:com.android.tools.r8.optimize.MemberRebindingIdentityLens asMemberRebindingIdentityLens():454:454 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nN;"}
     8:8:com.android.tools.r8.graph.DexReference lambda$rewriteReference$6(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):564:564 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
     1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):227:227 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.lens.NonIdentityGraphLens asNonIdentityLens():460:460 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DR;"}
     3:3:com.android.tools.r8.graph.DexReference lambda$rewriteReference$7(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField):565:565 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/F2;"}
     4:4:com.android.tools.r8.graph.DexReference lambda$rewriteReference$8(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):566:566 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/F2;"}
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens) -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens) -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):340:340 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> e
     2:2:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):340 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):340:340 -> e
     4:4:com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens asVerticalClassMergerLens():476:476 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fl0;"}
     1:1:com.android.tools.r8.graph.lens.FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens):352:352 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/op;"}
     2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):376:376 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Z"}
     3:3:com.android.tools.r8.ir.optimize.CustomLensCodeRewriter getCustomLensCodeRewriter():393:393 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/A;"}
     1:1:com.android.tools.r8.graph.lens.GraphLens getIdentityLens():381:381 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     1:1:boolean hasCustomLensCodeRewriter():389:389 -> h
     1:1:boolean isAppliedLens():0:0 -> i
     1:1:boolean isClearCodeRewritingLens():0:0 -> j
@@ -93934,34 +93972,34 @@
     1:1:boolean isMemberRebindingIdentityLens():0:0 -> m
     boolean isNonIdentityLens() -> n
     1:1:boolean isRepackagingLens():468:468 -> o
-com.android.tools.r8.graph.lens.GraphLens$Builder -> com.android.tools.r8.internal.is:
+com.android.tools.r8.graph.lens.GraphLens$Builder -> com.android.tools.r8.internal.ks:
 # {"id":"sourceFile","fileName":"GraphLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     1:1:void <init>():76:76 -> <init>
     2:2:void <init>():74:74 -> <init>
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):83:83 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation -> com.android.tools.r8.internal.js:
+com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation -> com.android.tools.r8.internal.ls:
 # {"id":"sourceFile","fileName":"GraphLens.java"}
     com.android.tools.r8.graph.lens.FieldLookupResult lookupField(com.android.tools.r8.graph.lens.FieldLookupResult) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
-com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation -> com.android.tools.r8.internal.ks:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
+com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation -> com.android.tools.r8.internal.ms:
 # {"id":"sourceFile","fileName":"GraphLens.java"}
     com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;)Lcom/android/tools/r8/internal/cO;"}
 com.android.tools.r8.graph.lens.GraphLensUtils -> R8$$REMOVED$$CLASS$$89:
 # {"id":"sourceFile","fileName":"GraphLensUtils.java"}
-com.android.tools.r8.graph.lens.IdentityGraphLens -> com.android.tools.r8.internal.Wt:
+com.android.tools.r8.graph.lens.IdentityGraphLens -> com.android.tools.r8.internal.Yt:
 # {"id":"sourceFile","fileName":"IdentityGraphLens.java"}
     com.android.tools.r8.graph.lens.IdentityGraphLens INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yt;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():14:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:java.lang.String lookupPackageName(java.lang.String):46:46 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> a
     3:3:void com.android.tools.r8.graph.lens.MethodLookupResult$Builder.<init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):66 -> a
     3:3:com.android.tools.r8.graph.lens.MethodLookupResult$Builder com.android.tools.r8.graph.lens.MethodLookupResult.builder(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35 -> a
@@ -93970,40 +94008,40 @@
     4:5:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):58 -> a
     6:6:com.android.tools.r8.graph.lens.FieldLookupResult com.android.tools.r8.graph.lens.FieldLookupResult$Builder.build():85:85 -> a
     6:6:com.android.tools.r8.graph.lens.FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation):73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/js;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/op;"}
     7:7:com.android.tools.r8.graph.lens.FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation):72:72 -> a
     8:8:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     9:9:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     1:1:boolean isIdentityLensForFields(com.android.tools.r8.graph.lens.GraphLens):31:31 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     2:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):41:41 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):51:51 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> e
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):64 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     1:1:boolean isIdentityLens():26:26 -> l
     1:1:boolean isNonIdentityLens():36:36 -> n
-com.android.tools.r8.graph.lens.InitClassLens -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.graph.lens.InitClassLens -> com.android.tools.r8.internal.Iv:
 # {"id":"sourceFile","fileName":"InitClassLens.java"}
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Iv;"}
     1:1:com.android.tools.r8.graph.lens.ThrowingInitClassLens getThrowingInstance():20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vg0;"}
-com.android.tools.r8.graph.lens.InitClassLens$Builder -> com.android.tools.r8.internal.Fv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zg0;"}
+com.android.tools.r8.graph.lens.InitClassLens$Builder -> com.android.tools.r8.internal.Hv:
 # {"id":"sourceFile","fileName":"InitClassLens.java"}
     java.util.Map mapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>():31:33 -> <init>
-com.android.tools.r8.graph.lens.MemberLookupResult -> com.android.tools.r8.internal.ZM:
+com.android.tools.r8.graph.lens.MemberLookupResult -> com.android.tools.r8.internal.dN:
 # {"id":"sourceFile","fileName":"MemberLookupResult.java"}
     com.android.tools.r8.graph.DexMember reference -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/r2;"}
@@ -94014,18 +94052,18 @@
     1:1:com.android.tools.r8.graph.DexMember getReference():27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/r2;"}
     1:1:boolean hasReboundReference():53:53 -> b
-com.android.tools.r8.graph.lens.MethodLookupResult -> com.android.tools.r8.internal.YN:
+com.android.tools.r8.graph.lens.MethodLookupResult -> com.android.tools.r8.internal.cO:
 # {"id":"sourceFile","fileName":"MethodLookupResult.java"}
     com.android.tools.r8.ir.code.InvokeType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription prototypeChanges -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/j;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):29:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/proto/j;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/proto/j;)V"}
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult verify(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult verify(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):47 -> a
     3:4:com.android.tools.r8.graph.lens.MethodLookupResult verify(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):47:48 -> a
@@ -94049,34 +94087,34 @@
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription getPrototypeChanges():43:43 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/j;"}
     1:1:com.android.tools.r8.ir.code.InvokeType getType():39:39 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
 com.android.tools.r8.graph.lens.MethodLookupResult$Builder -> R8$$REMOVED$$CLASS$$90:
 # {"id":"sourceFile","fileName":"MethodLookupResult.java"}
-com.android.tools.r8.graph.lens.NestedGraphLens -> com.android.tools.r8.internal.fQ:
+com.android.tools.r8.graph.lens.NestedGraphLens -> com.android.tools.r8.internal.jQ:
 # {"id":"sourceFile","fileName":"NestedGraphLens.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap fieldMap -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b6;"}
     java.util.function.Function methodMap -> g
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap typeMap -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X5;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap newMethodSignatures -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X5;"}
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_FIELD_MAP -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pm;"}
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_METHOD_MAP -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pm;"}
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_TYPE_MAP -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pm;"}
     boolean $assertionsDisabled -> m
     1:7:void <clinit>():32:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):93:93 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z5;Ljava/util/Map;Lcom/android/tools/r8/internal/V5;Lcom/android/tools/r8/internal/V5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/b6;Ljava/util/Map;Lcom/android/tools/r8/internal/X5;Lcom/android/tools/r8/internal/X5;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.function.Function,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):106:110 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):93 -> <init>
     7:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):94:97 -> <init>
     11:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):94:94 -> <init>
     1:4:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):165:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     5:6:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getRewrittenReboundReference(java.util.function.Function):69:70 -> a
     5:6:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):168 -> a
     7:7:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):168:168 -> a
@@ -94137,14 +94175,14 @@
     42:42:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):227:227 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     43:43:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):258:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):129:129 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     2:2:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> b
     2:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):129 -> b
     3:3:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):129:129 -> b
     4:6:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):135:137 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     7:7:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getRewrittenReboundReference(com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):61:61 -> b
     7:7:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):137 -> b
     8:8:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):137:137 -> b
@@ -94173,7 +94211,7 @@
     2:2:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):247:247 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):215:217 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     4:4:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> e
     4:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):219 -> e
     5:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):219:220 -> e
@@ -94182,7 +94220,7 @@
     1:1:com.android.tools.r8.graph.DexType getPreviousClassType(com.android.tools.r8.graph.DexType):115:115 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):291:291 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Z"}
     3:3:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> f
     3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):292 -> f
     4:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):292:292 -> f
@@ -94191,17 +94229,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/Iterable;"}
     1:1:boolean isLegitimateToHaveEmptyMappings():0:0 -> q
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.graph.lens.NestedGraphLensWithCustomLensCodeRewriter -> com.android.tools.r8.internal.gQ:
+com.android.tools.r8.graph.lens.NestedGraphLensWithCustomLensCodeRewriter -> com.android.tools.r8.internal.kQ:
 # {"id":"sourceFile","fileName":"NestedGraphLensWithCustomLensCodeRewriter.java"}
     com.android.tools.r8.ir.optimize.CustomLensCodeRewriter customLensCodeRewriter -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/A;"}
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):36:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d6;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Z5;Lcom/android/tools/r8/internal/b6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/f6;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/b6;Lcom/android/tools/r8/internal/d6;)V"}
     2:2:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap,com.android.tools.r8.ir.optimize.CustomLensCodeRewriter):26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/internal/rS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/internal/vS;)V"}
     3:3:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():96:96 -> <init>
     3:3:java.util.Map com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():16 -> <init>
     3:3:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84 -> <init>
@@ -94212,30 +94250,30 @@
     1:2:com.android.tools.r8.ir.optimize.CustomLensCodeRewriter getCustomLensCodeRewriter():50:51 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/A;"}
     1:1:boolean hasCustomLensCodeRewriter():41:41 -> h
-com.android.tools.r8.graph.lens.NonIdentityGraphLens -> com.android.tools.r8.internal.zR:
+com.android.tools.r8.graph.lens.NonIdentityGraphLens -> com.android.tools.r8.internal.DR:
 # {"id":"sourceFile","fileName":"NonIdentityGraphLens.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.lens.GraphLens previousLens -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():17:17 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):27:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)V"}
     com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     1:1:com.android.tools.r8.graph.lens.GraphLens getPrevious():38:38 -> a
     1:1:java.lang.String lookupPackageName(java.lang.String):99 -> a
     2:2:java.lang.String lookupPackageName(java.lang.String):99:99 -> a
     3:5:com.android.tools.r8.graph.lens.NonIdentityGraphLens find(java.util.function.Predicate):48:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/DR;"}
     6:6:com.android.tools.r8.graph.lens.GraphLens getPrevious():38:38 -> a
     6:6:com.android.tools.r8.graph.lens.NonIdentityGraphLens find(java.util.function.Predicate):53 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:9:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):84:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     10:10:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
     11:11:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> a
     11:11:void com.android.tools.r8.graph.lens.MethodLookupResult$Builder.<init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):66 -> a
@@ -94246,22 +94284,22 @@
     13:14:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):91 -> a
     15:16:com.android.tools.r8.graph.lens.MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens):93:94 -> a
     17:17:com.android.tools.r8.graph.lens.MethodLookupResult lambda$lookupMethod$1(com.android.tools.r8.graph.lens.MethodLookupResult):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;)Lcom/android/tools/r8/internal/cO;"}
     18:20:com.android.tools.r8.graph.lens.FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation):120:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/js;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/op;"}
     21:21:com.android.tools.r8.graph.lens.FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.lens.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.lens.FieldLookupResult):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/js;Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     22:28:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):136:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     29:29:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):140:140 -> a
     30:30:com.android.tools.r8.graph.lens.MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.MethodLookupResult):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ks;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/YN;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ms;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/cO;)Lcom/android/tools/r8/internal/cO;"}
     com.android.tools.r8.graph.DexField getNextFieldSignature(com.android.tools.r8.graph.DexField) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     1:1:boolean isIdentityLensForFields(com.android.tools.r8.graph.lens.GraphLens):203:203 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     com.android.tools.r8.graph.DexField getPreviousFieldSignature(com.android.tools.r8.graph.DexField) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.graph.DexType getNextClassType(com.android.tools.r8.graph.DexType) -> d
@@ -94269,11 +94307,11 @@
     com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.lens.NonIdentityGraphLens asNonIdentityLens():213:213 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:9:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):104:112 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     10:10:com.android.tools.r8.graph.DexType getNextType(com.android.tools.r8.graph.DexType):159:159 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     11:11:com.android.tools.r8.graph.DexItemFactory dexItemFactory():34:34 -> e
@@ -94288,23 +94326,23 @@
     com.android.tools.r8.graph.DexType getPreviousClassType(com.android.tools.r8.graph.DexType) -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):86:86 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Z"}
     2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignatureForMapping(com.android.tools.r8.graph.DexMethod):185:185 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean isIdentityLens():198:198 -> l
     1:1:boolean isNonIdentityLens():208:208 -> n
     1:1:com.android.tools.r8.graph.lens.GraphLens getPrevious():38:38 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
-com.android.tools.r8.graph.lens.ThrowingInitClassLens -> com.android.tools.r8.internal.Vg0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
+com.android.tools.r8.graph.lens.ThrowingInitClassLens -> com.android.tools.r8.internal.Zg0:
 # {"id":"sourceFile","fileName":"ThrowingInitClassLens.java"}
     com.android.tools.r8.graph.lens.ThrowingInitClassLens INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zg0;"}
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/l1;"}
     2:2:com.android.tools.r8.graph.lens.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Iv;"}
 com.android.tools.r8.graph.proto.ArgumentInfo -> com.android.tools.r8.graph.proto.b:
 # {"id":"sourceFile","fileName":"ArgumentInfo.java"}
     com.android.tools.r8.graph.proto.ArgumentInfo NO_INFO -> a
@@ -94316,7 +94354,7 @@
     com.android.tools.r8.graph.proto.ArgumentInfo combine(com.android.tools.r8.graph.proto.ArgumentInfo) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/b;)Lcom/android/tools/r8/graph/proto/b;"}
     com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/b;"}
     com.android.tools.r8.graph.proto.RewrittenTypeInfo asRewrittenTypeInfo() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/k;"}
     boolean isRemovedArgumentInfo() -> c
@@ -94327,286 +94365,194 @@
     1:1:com.android.tools.r8.graph.proto.ArgumentInfo combine(com.android.tools.r8.graph.proto.ArgumentInfo):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/b;)Lcom/android/tools/r8/graph/proto/b;"}
     2:2:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/b;"}
     1:1:int hashCode():39:39 -> hashCode
 com.android.tools.r8.graph.proto.ArgumentInfoCollection -> com.android.tools.r8.graph.proto.c:
 # {"id":"sourceFile","fileName":"ArgumentInfoCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     int argumentInfosSize -> b
     com.android.tools.r8.graph.proto.ArgumentPermutation argumentPermutation -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/d;"}
     boolean isConvertedToStaticMethod -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap EMPTY_MAP -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     com.android.tools.r8.graph.proto.ArgumentInfoCollection EMPTY -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/c;"}
     boolean $assertionsDisabled -> g
-    1:4:void <clinit>():29:32 -> <clinit>
-    1:5:void <init>():40:44 -> <init>
-    6:10:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):51:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;ILcom/android/tools/r8/graph/proto/d;Z)V"}
+    1:4:void <clinit>():27:30 -> <clinit>
+    1:5:void <init>():38:42 -> <init>
+    6:10:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):49:53 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;ILcom/android/tools/r8/graph/proto/d;Z)V"}
     11:11:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> <init>
-    11:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):55 -> <init>
-    12:18:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):55:61 -> <init>
-    1:1:void forEach(com.android.tools.r8.utils.IntObjConsumer):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gA;)V"}
+    11:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):53 -> <init>
+    12:18:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):53:59 -> <init>
+    1:1:void forEach(com.android.tools.r8.utils.IntObjConsumer):67:67 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iA;)V"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    2:2:void forEach(com.android.tools.r8.utils.IntObjConsumer):69 -> a
+    2:2:void forEach(com.android.tools.r8.utils.IntObjConsumer):67 -> a
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    3:3:void forEach(com.android.tools.r8.utils.IntObjConsumer):69 -> a
+    3:3:void forEach(com.android.tools.r8.utils.IntObjConsumer):67 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    4:4:void forEach(com.android.tools.r8.utils.IntObjConsumer):69 -> a
-    5:5:void forEach(com.android.tools.r8.utils.IntObjConsumer):69:69 -> a
+    4:4:void forEach(com.android.tools.r8.utils.IntObjConsumer):67 -> a
+    5:5:void forEach(com.android.tools.r8.utils.IntObjConsumer):67:67 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():920:920 -> a
     6:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():914 -> a
-    6:6:void forEach(com.android.tools.r8.utils.IntObjConsumer):69 -> a
-    7:7:void forEach(com.android.tools.r8.utils.IntObjConsumer):70:70 -> a
-    8:15:int getNumberOfRemovedArgumentsBefore(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):130:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ry;)I"}
-    16:16:com.android.tools.r8.graph.proto.ArgumentInfo getArgumentInfo(int):158:158 -> a
+    6:6:void forEach(com.android.tools.r8.utils.IntObjConsumer):67 -> a
+    7:7:void forEach(com.android.tools.r8.utils.IntObjConsumer):68:68 -> a
+    8:15:int getNumberOfRemovedArgumentsBefore(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):128:135 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ty;)I"}
+    16:16:com.android.tools.r8.graph.proto.ArgumentInfo getArgumentInfo(int):156:156 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/proto/b;"}
-    17:17:int getNewArgumentIndex(int,int):167:167 -> a
-    18:22:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):182:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/c;"}
-    23:24:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():261:262 -> a
-    23:24:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):194 -> a
+    17:17:int getNewArgumentIndex(int,int):165:165 -> a
+    18:22:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):180:184 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/c;"}
+    23:24:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():259:260 -> a
+    23:24:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):192 -> a
     25:25:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> a
-    25:25:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():262 -> a
-    25:25:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):194 -> a
-    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():262:262 -> a
-    26:26:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):194 -> a
-    27:34:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):195:202 -> a
-    35:35:boolean isConvertedToStaticMethod():171:171 -> a
-    35:35:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):203 -> a
-    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):281:281 -> a
-    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):203 -> a
+    25:25:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():260 -> a
+    25:25:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):192 -> a
+    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.isEmpty():260:260 -> a
+    26:26:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):192 -> a
+    27:34:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):193:200 -> a
+    35:35:boolean isConvertedToStaticMethod():169:169 -> a
+    35:35:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):201 -> a
+    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):279:279 -> a
+    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    37:37:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):204:204 -> a
-    38:40:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):189:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/proto/c$a;ILcom/android/tools/r8/graph/proto/b;)V"}
-    41:41:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder builder():232:232 -> a
+    37:37:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):202:202 -> a
+    38:40:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):187:189 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/proto/c$a;ILcom/android/tools/r8/graph/proto/b;)V"}
+    41:41:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder builder():230:230 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/c$a;"}
-    42:42:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.hasArgumentInfo(int):257:257 -> a
-    42:42:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):197 -> a
+    42:42:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.hasArgumentInfo(int):255:255 -> a
+    42:42:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):195 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c$a;ILcom/android/tools/r8/graph/proto/b;)V"}
-    43:43:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.hasArgumentInfo(int):257:257 -> a
-    43:43:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):197 -> a
-    44:44:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):198:198 -> a
-    45:53:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):297:305 -> a
+    43:43:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.hasArgumentInfo(int):255:255 -> a
+    43:43:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):195 -> a
+    44:44:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):196:196 -> a
+    45:53:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):295:303 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/graph/proto/c;"}
     54:54:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    54:54:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
+    54:54:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):303 -> a
     55:55:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    55:55:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
+    55:55:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):303 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:56:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    56:56:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
-    57:57:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307:307 -> a
+    56:56:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):303 -> a
+    57:57:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305:305 -> a
     58:58:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    58:58:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307 -> a
+    58:58:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
     59:59:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    59:59:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307 -> a
+    59:59:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     60:60:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    60:60:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307 -> a
-    61:61:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307:307 -> a
+    60:60:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
+    61:61:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305:305 -> a
     62:62:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():920:920 -> a
     62:62:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():914 -> a
-    62:62:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307 -> a
-    63:64:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):308:309 -> a
-    65:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):360:362 -> a
-    65:67:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):310 -> a
-    68:68:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):312:312 -> a
+    62:62:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):305 -> a
+    63:64:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):306:307 -> a
+    65:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):358:360 -> a
+    65:67:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):308 -> a
+    68:68:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):310:310 -> a
     69:69:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():920:920 -> a
     69:69:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():914 -> a
-    69:69:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):313 -> a
-    70:71:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):314:315 -> a
-    72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):360:360 -> a
-    72:72:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):318 -> a
+    69:69:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):311 -> a
+    70:71:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):312:313 -> a
+    72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):358:358 -> a
+    72:72:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):316 -> a
     73:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():920:920 -> a
     73:73:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():914 -> a
-    73:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):361 -> a
-    73:73:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):318 -> a
+    73:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):359 -> a
+    73:73:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):316 -> a
     74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.previous():922:922 -> a
     74:74:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.previous():914 -> a
-    74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):362 -> a
-    74:74:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):318 -> a
-    75:84:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):321:330 -> a
+    74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):360 -> a
+    74:74:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):316 -> a
+    75:84:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):319:328 -> a
     85:85:void com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.<init>(int):32:32 -> a
     85:85:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder com.android.tools.r8.graph.proto.ArgumentPermutation.builder(int):14 -> a
-    85:85:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):331 -> a
+    85:85:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):329 -> a
     86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():100:100 -> a
     86:86:void com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.<init>(int):32 -> a
     86:86:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder com.android.tools.r8.graph.proto.ArgumentPermutation.builder(int):14 -> a
-    86:86:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):331 -> a
+    86:86:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):329 -> a
     87:87:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue(int):44:44 -> a
     87:87:void com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.<init>(int):33 -> a
     87:87:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder com.android.tools.r8.graph.proto.ArgumentPermutation.builder(int):14 -> a
-    87:87:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):331 -> a
-    88:88:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):332:332 -> a
-    89:89:boolean isArgumentRemoved(int):98:98 -> a
-    89:89:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):333 -> a
-    90:90:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):336:336 -> a
-    91:91:boolean isArgumentRemoved(int):98:98 -> a
-    91:91:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):337 -> a
-    92:92:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):340:340 -> a
-    93:93:int com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.getNumberOfRemovedArgumentsBefore(int):253:253 -> a
-    93:93:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):342 -> a
+    87:87:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):329 -> a
+    88:88:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):330:330 -> a
+    89:89:boolean isArgumentRemoved(int):96:96 -> a
+    89:89:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):331 -> a
+    90:90:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):334:334 -> a
+    91:91:boolean isArgumentRemoved(int):96:96 -> a
+    91:91:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):335 -> a
+    92:92:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):338:338 -> a
+    93:93:int com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.getNumberOfRemovedArgumentsBefore(int):251:251 -> a
+    93:93:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):340 -> a
     94:96:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.setNewArgumentIndex(int,int):43:45 -> a
-    94:96:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):344 -> a
-    97:97:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):347:347 -> a
-    98:98:boolean isConvertedToStaticMethod():171:171 -> a
-    98:98:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):347 -> a
-    99:99:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):347:347 -> a
-    100:100:boolean isConvertedToStaticMethod():171:171 -> a
-    100:100:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):348 -> a
-    101:101:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):348:348 -> a
-    102:106:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):347:351 -> a
+    94:96:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):342 -> a
+    97:97:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345:345 -> a
+    98:98:boolean isConvertedToStaticMethod():169:169 -> a
+    98:98:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345 -> a
+    99:99:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345:345 -> a
+    100:100:boolean isConvertedToStaticMethod():169:169 -> a
+    100:100:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):346 -> a
+    101:101:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):346:346 -> a
+    102:106:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345:349 -> a
     107:107:boolean com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.isDefault():38:38 -> a
     107:107:com.android.tools.r8.graph.proto.ArgumentPermutation com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.build():51 -> a
-    107:107:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):352 -> a
+    107:107:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):350 -> a
     108:110:com.android.tools.r8.graph.proto.ArgumentPermutation com.android.tools.r8.graph.proto.ArgumentPermutation$Builder.build():52:54 -> a
-    108:110:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):352 -> a
-    111:111:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):272:272 -> a
-    111:111:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):352 -> a
+    108:110:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):350 -> a
+    111:111:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):270:270 -> a
+    111:111:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    112:113:boolean isConvertedToStaticMethod():171:171 -> a
-    112:113:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):354 -> a
-    114:114:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):281:281 -> a
-    114:114:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):353 -> a
-    115:115:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):355:355 -> a
-    116:116:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):380:380 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Ljava/util/function/Consumer;"}
-    117:117:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1583:1583 -> a
-    117:117:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1$a;)V"}
-    118:122:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1583:1587 -> a
-    118:122:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    123:123:boolean hasRemovedArguments():111:111 -> a
-    123:123:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    123:123:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    124:124:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    124:124:boolean hasRemovedArguments():111 -> a
-    124:124:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    124:124:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    125:125:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    125:125:boolean hasRemovedArguments():111 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    125:125:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    125:125:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    126:126:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    126:126:boolean hasRemovedArguments():111 -> a
-    126:126:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    126:126:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    127:127:boolean hasRemovedArguments():111:111 -> a
-    127:127:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    127:127:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    128:128:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator.next():1040:1040 -> a
-    128:128:boolean hasRemovedArguments():111 -> a
-    128:128:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    128:128:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    129:130:boolean hasRemovedArguments():111:112 -> a
-    129:130:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1588 -> a
-    129:130:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    131:131:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1593:1593 -> a
-    131:131:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    132:132:int com.android.tools.r8.graph.ParameterAnnotationsList.countNonMissing():165:165 -> a
-    132:132:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1594 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    132:132:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    133:133:int com.android.tools.r8.graph.ParameterAnnotationsList.countNonMissing():165:165 -> a
-    133:133:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1594 -> a
-    133:133:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    134:138:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1594:1598 -> a
-    134:138:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    139:139:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
-    139:139:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1600 -> a
-    139:139:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    140:140:boolean isArgumentRemoved(int):98:98 -> a
-    140:140:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1601 -> a
-    140:140:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    141:141:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1602:1602 -> a
-    141:141:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    142:143:boolean com.android.tools.r8.graph.ParameterAnnotationsList.isMissing(int):175:176 -> a
-    142:143:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1602 -> a
-    142:143:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    144:149:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1605:1610 -> a
-    144:149:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    150:150:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> a
-    150:150:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1611 -> a
-    150:150:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    151:151:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
-    151:151:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1611 -> a
-    151:151:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    152:152:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1614:1614 -> a
-    152:152:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    153:153:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> a
-    153:153:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1623 -> a
-    153:153:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    154:154:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
-    154:154:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1623 -> a
-    154:154:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    155:157:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1626:1628 -> a
-    155:157:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    158:158:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
-    158:158:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1630 -> a
-    158:158:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    159:159:int getNewArgumentIndex(int,int):167:167 -> a
-    159:159:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1631 -> a
-    159:159:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    160:160:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
-    160:160:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1632 -> a
-    160:160:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    161:161:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1635:1635 -> a
-    161:161:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    162:172:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1633:1643 -> a
-    162:172:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    173:173:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1642:1642 -> a
-    173:173:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1641 -> a
-    174:174:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):380 -> a
-    1:1:int getNumberOfRemovedArgumentsBefore(int):124:124 -> b
-    1:1:int getNewArgumentIndex(int):162 -> b
-    2:2:int getNewArgumentIndex(int,int):167:167 -> b
-    2:2:int getNewArgumentIndex(int):162 -> b
-    3:3:boolean hasArgumentPermutation():154:154 -> b
+    112:113:boolean isConvertedToStaticMethod():169:169 -> a
+    112:113:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):352 -> a
+    114:114:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):279:279 -> a
+    114:114:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):351 -> a
+    115:115:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):353:353 -> a
+    1:1:int getNumberOfRemovedArgumentsBefore(int):122:122 -> b
+    1:1:int getNewArgumentIndex(int):160 -> b
+    2:2:int getNewArgumentIndex(int,int):165:165 -> b
+    2:2:int getNewArgumentIndex(int):160 -> b
+    3:3:boolean hasArgumentPermutation():152:152 -> b
     4:4:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> b
-    4:4:boolean hasArgumentPermutation():154 -> b
-    1:1:boolean isEmpty():103:103 -> c
-    1:2:int size():175:176 -> d
-    1:6:boolean equals(java.lang.Object):215:220 -> equals
-    1:2:int hashCode():227:228 -> hashCode
-    3:3:int hashCode():227:227 -> hashCode
+    4:4:boolean hasArgumentPermutation():152 -> b
+    1:1:boolean isEmpty():101:101 -> c
+    1:2:int size():173:174 -> d
+    1:6:boolean equals(java.lang.Object):213:218 -> equals
+    1:2:int hashCode():225:226 -> hashCode
+    3:3:int hashCode():225:225 -> hashCode
 com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.proto.c$a:
 # {"id":"sourceFile","fileName":"ArgumentInfoCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     int argumentInfosSize -> b
     com.android.tools.r8.graph.proto.ArgumentPermutation argumentPermutation -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/d;"}
     boolean isConvertedToStaticMethod -> d
-    1:5:void <init>():235:239 -> <init>
-    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.proto.ArgumentInfo):243:243 -> a
+    1:5:void <init>():233:237 -> <init>
+    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.proto.ArgumentInfo):241:241 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/proto/b;)Lcom/android/tools/r8/graph/proto/c$a;"}
-    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfos(com.android.tools.r8.graph.proto.ArgumentInfoCollection):248:248 -> a
+    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfos(com.android.tools.r8.graph.proto.ArgumentInfoCollection):246:246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/graph/proto/c$a;"}
-    3:4:boolean isEmpty():261:262 -> a
-    3:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():286 -> a
+    3:4:boolean isEmpty():259:260 -> a
+    3:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():284 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/c;"}
     5:5:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> a
-    5:5:boolean isEmpty():262 -> a
-    5:5:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():286 -> a
-    6:6:boolean isEmpty():262:262 -> a
-    6:6:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():286 -> a
-    7:7:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():65:65 -> a
-    7:7:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():287 -> a
-    8:9:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():290:291 -> a
-    10:10:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentInfosSize(int):267:267 -> a
+    5:5:boolean isEmpty():260 -> a
+    5:5:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():284 -> a
+    6:6:boolean isEmpty():260:260 -> a
+    6:6:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():284 -> a
+    7:7:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():63:63 -> a
+    7:7:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():285 -> a
+    8:9:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():288:289 -> a
+    10:10:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentInfosSize(int):265:265 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/proto/c$a;"}
 com.android.tools.r8.graph.proto.ArgumentPermutation -> com.android.tools.r8.graph.proto.d:
 # {"id":"sourceFile","fileName":"ArgumentPermutation.java"}
@@ -94637,21 +94583,21 @@
 com.android.tools.r8.graph.proto.RemovedArgumentInfo -> com.android.tools.r8.graph.proto.g:
 # {"id":"sourceFile","fileName":"RemovedArgumentInfo.java"}
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType):49:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cc0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc0;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.graph.proto.RemovedArgumentInfo asRemovedArgumentInfo():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/g;"}
     2:2:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/b;"}
     3:4:com.android.tools.r8.graph.proto.ArgumentInfo combine(com.android.tools.r8.graph.proto.ArgumentInfo):83:83 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/b;)Lcom/android/tools/r8/graph/proto/b;"}
     1:7:com.android.tools.r8.graph.proto.RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):91:97 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/g;"}
     boolean isRemovedArgumentInfo() -> c
     1:1:com.android.tools.r8.graph.proto.RemovedArgumentInfo$Builder builder():56:56 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/g$a;"}
@@ -94665,7 +94611,7 @@
     1:1:void <init>():34:34 -> <init>
     1:2:com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase.setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):22:23 -> a
     1:2:com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cc0;)Lcom/android/tools/r8/graph/proto/g$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc0;)Lcom/android/tools/r8/graph/proto/g$b;"}
     3:4:com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase.setType(com.android.tools.r8.graph.DexType):27:28 -> a
     3:4:com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase setType(com.android.tools.r8.graph.DexType):34 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/proto/g$b;"}
@@ -94676,17 +94622,17 @@
 com.android.tools.r8.graph.proto.RemovedArgumentInfo$BuilderBase -> com.android.tools.r8.graph.proto.g$b:
 # {"id":"sourceFile","fileName":"RemovedArgumentInfo.java"}
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     com.android.tools.r8.graph.DexType type -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:1:void <init>():16:16 -> <init>
 com.android.tools.r8.graph.proto.RemovedReceiverInfo -> com.android.tools.r8.graph.proto.i:
 # {"id":"sourceFile","fileName":"RemovedReceiverInfo.java"}
     1:1:void <init>(com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.graph.DexType):17:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cc0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc0;Lcom/android/tools/r8/graph/I2;)V"}
     1:3:com.android.tools.r8.graph.proto.RemovedReceiverInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):29:31 -> a
     1:3:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/b;"}
     4:4:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RemovedArgumentInfo.getSingleValue():64:64 -> a
     4:4:com.android.tools.r8.graph.proto.RemovedReceiverInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):32 -> a
     4:4:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14 -> a
@@ -94699,7 +94645,7 @@
     7:8:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14 -> a
     1:3:com.android.tools.r8.graph.proto.RemovedReceiverInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):29:31 -> b
     1:3:com.android.tools.r8.graph.proto.RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/g;"}
     4:4:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RemovedArgumentInfo.getSingleValue():64:64 -> b
     4:4:com.android.tools.r8.graph.proto.RemovedReceiverInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):32 -> b
     4:4:com.android.tools.r8.graph.proto.RemovedArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):14 -> b
@@ -94737,7 +94683,7 @@
     boolean $assertionsDisabled -> e
     1:3:void <clinit>():32:34 -> <clinit>
     1:3:void <init>():40:42 -> <init>
-    4:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():65:65 -> <init>
+    4:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():63:63 -> <init>
     4:4:void <init>():43 -> <init>
     5:5:void <init>():43:43 -> <init>
     6:11:void <init>(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):49:54 -> <init>
@@ -94747,129 +94693,232 @@
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription none():82:82 -> a
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):62 -> a
     3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):63:63 -> a
-    4:14:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):95:105 -> a
+    4:4:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Ljava/util/function/Consumer;"}
+    5:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):95:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/graph/proto/j;"}
-    15:15:java.util.List getExtraParameters():130:130 -> a
-    15:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106 -> a
-    16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106:106 -> a
-    17:17:java.util.List getExtraParameters():130:130 -> a
-    17:17:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):107 -> a
-    18:21:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):107:110 -> a
-    22:22:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
-    22:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
-    23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111:111 -> a
-    24:24:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35:35 -> a
-    24:24:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
-    25:25:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
-    25:25:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35 -> a
+    16:16:java.util.List getExtraParameters():130:130 -> a
+    16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106 -> a
+    17:17:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106:106 -> a
+    18:18:java.util.List getExtraParameters():130:130 -> a
+    18:18:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):107 -> a
+    19:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):107:110 -> a
+    23:23:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
+    23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
+    24:24:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111:111 -> a
+    25:25:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35:35 -> a
     25:25:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
-    26:26:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35:35 -> a
+    26:26:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
+    26:26:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35 -> a
     26:26:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
-    27:27:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
-    27:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):112 -> a
-    28:28:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():142:142 -> a
-    28:28:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):114 -> a
-    29:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):114:115 -> a
-    31:31:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():142:142 -> a
+    27:27:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35:35 -> a
+    27:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):111 -> a
+    28:28:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> a
+    28:28:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):112 -> a
+    29:29:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():142:142 -> a
+    29:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):114 -> a
+    30:31:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):114:115 -> a
+    32:32:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():142:142 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/c;"}
-    32:33:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):171:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/tJ;)[Lcom/android/tools/r8/internal/Iw;"}
-    34:34:boolean com.android.tools.r8.graph.proto.RewrittenTypeInfo.hasSingleValue():63:63 -> a
-    34:34:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):172 -> a
-    35:36:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):172:173 -> a
-    37:37:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RewrittenTypeInfo.getSingleValue():51:51 -> a
-    37:37:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):174 -> a
+    33:34:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):171:172 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/xJ;)[Lcom/android/tools/r8/internal/Kw;"}
+    35:35:boolean com.android.tools.r8.graph.proto.RewrittenTypeInfo.hasSingleValue():63:63 -> a
+    35:35:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):172 -> a
+    36:37:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):172:173 -> a
+    38:38:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RewrittenTypeInfo.getSingleValue():51:51 -> a
+    38:38:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:38:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):175:175 -> a
-    39:39:com.android.tools.r8.ir.code.Instruction[] com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):44:44 -> a
-    39:39:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):175 -> a
-    40:40:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/zR;)V"}
-    41:41:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RewrittenTypeInfo.getSingleValue():51:51 -> a
-    41:41:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):182 -> a
+    39:39:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):175:175 -> a
+    40:40:com.android.tools.r8.ir.code.Instruction[] com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):44:44 -> a
+    40:40:com.android.tools.r8.ir.code.Instruction[] getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):175 -> a
+    41:41:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):180:180 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DR;)V"}
+    42:42:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RewrittenTypeInfo.getSingleValue():51:51 -> a
+    42:42:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):182 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:43:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):183:184 -> a
-    44:45:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):189:190 -> a
+    43:44:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):183:184 -> a
+    45:46:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):189:190 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/w2;"}
-    46:46:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197:197 -> a
-    46:46:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    47:47:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexClassAndMethod.getProto():97:97 -> a
-    47:47:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    47:47:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197:197 -> a
     47:47:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
     48:48:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexClassAndMethod.getProto():97:97 -> a
     48:48:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:48:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    49:49:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):201:201 -> a
+    49:49:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexClassAndMethod.getProto():97:97 -> a
+    49:49:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
     49:49:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    50:54:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):208:212 -> a
-    50:54:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    50:54:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    55:55:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
-    55:55:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):145 -> a
-    55:55:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    55:55:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    55:55:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
-    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):145 -> a
+    50:50:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):201:201 -> a
+    50:50:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    51:55:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):208:212 -> a
+    51:55:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    51:55:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
+    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):143 -> a
     56:56:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     56:56:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     56:56:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    57:57:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):146:146 -> a
+    57:57:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
+    57:57:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):143 -> a
     57:57:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
     57:57:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     57:57:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():542:542 -> a
-    58:58:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):146 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    58:58:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):144:144 -> a
     58:58:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
     58:58:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     58:58:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    59:59:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
-    59:59:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):146 -> a
+    59:59:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():542:542 -> a
+    59:59:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):144 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:59:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
     59:59:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     59:59:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    60:60:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):146:146 -> a
+    60:60:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
+    60:60:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):144 -> a
     60:60:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
     60:60:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     60:60:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    61:63:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215:217 -> a
-    61:63:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    61:63:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    64:64:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
-    64:64:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):217 -> a
+    61:61:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):144:144 -> a
+    61:61:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
+    61:61:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    61:61:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    62:64:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215:217 -> a
+    62:64:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    62:64:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    65:65:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
+    65:65:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    64:64:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    64:64:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    65:67:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):219:221 -> a
-    65:67:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    65:67:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    68:68:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isNone():0:0 -> a
-    68:68:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):221 -> a
-    68:68:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    68:68:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    69:69:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):222:222 -> a
+    65:65:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    65:65:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    66:68:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):219:221 -> a
+    66:68:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    66:68:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    69:69:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isNone():0:0 -> a
+    69:69:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):221 -> a
     69:69:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     69:69:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    70:70:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    70:70:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):223 -> a
+    70:70:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):222:222 -> a
     70:70:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
     70:70:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    71:77:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):224:230 -> a
-    71:77:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
-    71:77:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    78:78:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
-    78:78:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
-    79:79:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193:193 -> a
-    80:80:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):361:361 -> a
-    80:80:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    71:71:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    71:71:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):223 -> a
+    71:71:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    71:71:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    72:78:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):224:230 -> a
+    72:78:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202 -> a
+    72:78:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    79:79:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):203:203 -> a
+    79:79:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    80:80:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193:193 -> a
     81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):361:361 -> a
     81:81:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193 -> a
-    82:89:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withExtraParameters(java.util.List):267:274 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    82:82:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):361:361 -> a
+    82:82:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193 -> a
+    83:90:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withExtraParameters(java.util.List):267:274 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/graph/proto/j;"}
+    91:91:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1583:1583 -> a
+    91:91:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1$a;)V"}
+    92:92:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1583:1583 -> a
+    92:92:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    93:93:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():142:142 -> a
+    93:93:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1588 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    93:93:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    94:94:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1589:1589 -> a
+    94:94:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    95:95:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:109 -> a
+    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    95:95:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    96:96:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
+    96:96:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    96:96:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    97:97:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
+    97:97:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    97:97:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    97:97:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    98:98:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
+    98:98:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    98:98:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    99:99:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:109 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    99:99:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    100:100:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator.next():1040:1040 -> a
+    100:100:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
+    100:100:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    100:100:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    101:102:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:110 -> a
+    101:102:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1590 -> a
+    101:102:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    103:108:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1591:1596 -> a
+    103:108:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    109:109:int com.android.tools.r8.graph.ParameterAnnotationsList.countNonMissing():165:165 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1597 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    109:109:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    110:110:int com.android.tools.r8.graph.ParameterAnnotationsList.countNonMissing():165:165 -> a
+    110:110:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1597 -> a
+    110:110:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    111:115:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1597:1601 -> a
+    111:115:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    116:116:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
+    116:116:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1603 -> a
+    116:116:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    117:117:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
+    117:117:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1604 -> a
+    117:117:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    118:118:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1605:1605 -> a
+    118:118:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    119:120:boolean com.android.tools.r8.graph.ParameterAnnotationsList.isMissing(int):175:176 -> a
+    119:120:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1605 -> a
+    119:120:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    121:126:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1608:1613 -> a
+    121:126:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    127:127:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> a
+    127:127:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1614 -> a
+    127:127:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1614 -> a
+    128:128:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    129:129:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1617:1617 -> a
+    129:129:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    130:130:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.empty():55:55 -> a
+    130:130:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1626 -> a
+    130:130:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    131:131:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
+    131:131:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1626 -> a
+    131:131:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    132:134:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1629:1631 -> a
+    132:134:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    135:135:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
+    135:135:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1633 -> a
+    135:135:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    136:136:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
+    136:136:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1634 -> a
+    136:136:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    137:137:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
+    137:137:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1635 -> a
+    137:137:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1638:1638 -> a
+    138:138:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    139:147:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1636:1644 -> a
+    139:147:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    148:148:java.util.List getExtraParameters():130:130 -> a
+    148:148:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1646 -> a
+    148:148:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    149:157:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1646:1654 -> a
+    149:157:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    158:158:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1653:1653 -> a
+    158:158:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
+    159:159:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
+    159:159:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1652 -> a
+    159:159:void lambda$createParameterAnnotationsRemover$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):87 -> a
     1:1:java.util.List getExtraParameters():130:130 -> b
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():157:157 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/k;"}
@@ -94890,10 +94939,10 @@
     2:2:int numberOfExtraParameters():134:134 -> i
     2:2:boolean requiresRewritingAtCallSite():151 -> i
     3:4:boolean requiresRewritingAtCallSite():151:152 -> i
-    5:5:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> i
+    5:5:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> i
     5:5:boolean requiresRewritingAtCallSite():153 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> i
+    6:6:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> i
     6:6:boolean requiresRewritingAtCallSite():153 -> i
 com.android.tools.r8.graph.proto.RewrittenTypeInfo -> com.android.tools.r8.graph.proto.k:
 # {"id":"sourceFile","fileName":"RewrittenTypeInfo.java"}
@@ -94904,13 +94953,13 @@
     com.android.tools.r8.graph.DexType newType -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.SingleValue):27:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/gc0;)V"}
     1:1:com.android.tools.r8.graph.proto.ArgumentInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/b;"}
     2:5:com.android.tools.r8.graph.proto.ArgumentInfo combine(com.android.tools.r8.graph.proto.ArgumentInfo):78:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/b;)Lcom/android/tools/r8/graph/proto/b;"}
     6:6:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
@@ -94926,7 +94975,7 @@
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo asRewrittenTypeInfo():0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/k;"}
     2:3:com.android.tools.r8.graph.proto.RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):97:98 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/proto/k;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/proto/k;"}
     4:4:boolean hasSingleValue():63:63 -> b
     4:4:com.android.tools.r8.graph.proto.RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):100 -> b
     5:11:com.android.tools.r8.graph.proto.RewrittenTypeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):101:107 -> b
@@ -94947,7 +94996,7 @@
     com.android.tools.r8.graph.DexType newType -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     1:1:void <init>():130:130 -> <init>
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder applyIf(boolean,java.util.function.Consumer):139:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/graph/proto/k$a;"}
@@ -94957,7 +95006,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/proto/k;"}
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder setOldType(com.android.tools.r8.graph.DexType):150:150 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/proto/k$a;"}
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.xc:
 # {"id":"sourceFile","fileName":"ClassInstanceFieldsMerger.java"}
     com.android.tools.r8.graph.DexEncodedField[] merge() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/graph/g1;"}
@@ -94978,11 +95027,11 @@
     44:44:java.util.Map getAvailableFieldsByExactInfo(com.android.tools.r8.graph.DexProgramClass):116 -> a
     45:46:java.util.Map getAvailableFieldsByExactInfo(com.android.tools.r8.graph.DexProgramClass):116:117 -> a
     47:47:java.util.LinkedList lambda$getAvailableFieldsByExactInfo$0(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka0;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oa0;)Ljava/util/LinkedList;"}
     48:50:java.util.Map getAvailableFieldsByRelaxedInfo(com.android.tools.r8.graph.AppView,java.util.Map):127:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/LinkedHashMap;)Ljava/util/LinkedHashMap;"}
     51:51:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ka0;Ljava/util/LinkedList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/oa0;Ljava/util/LinkedList;)V"}
     52:52:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo.toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):71:71 -> a
     52:52:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):133 -> a
     53:53:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo.toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):71:71 -> a
@@ -94993,33 +95042,33 @@
     55:55:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):133:133 -> a
     56:59:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):132:135 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$1(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):134:134 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ka0;)Ljava/util/LinkedList;"}
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$1 -> com.android.tools.r8.internal.sc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oa0;)Ljava/util/LinkedList;"}
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$1 -> com.android.tools.r8.internal.uc:
 # {"id":"sourceFile","fileName":"ClassInstanceFieldsMerger.java"}
     1:1:void <init>():44:44 -> <init>
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     2:2:com.android.tools.r8.graph.DexEncodedField[] merge():52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/graph/g1;"}
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$2 -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$2 -> com.android.tools.r8.internal.vc:
 # {"id":"sourceFile","fileName":"ClassInstanceFieldsMerger.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$ClassInstanceFieldsMergerImpl -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$ClassInstanceFieldsMergerImpl -> com.android.tools.r8.internal.wc:
 # {"id":"sourceFile","fileName":"ClassInstanceFieldsMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ts;"}
     com.android.tools.r8.graph.DexEncodedField classIdField -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/g1;"}
     java.util.Set committedFields -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():139:139 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):154:154 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/Xs;)V"}
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):149:157 -> <init>
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):162:162 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
@@ -95106,28 +95155,28 @@
     2:2:boolean lambda$fixAccessFlags$2(com.android.tools.r8.graph.DexEncodedField):231 -> c
     3:3:boolean needsRelaxedType(com.android.tools.r8.graph.DexEncodedField,java.lang.Iterable):239:239 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Ljava/util/Set;)Z"}
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.Fc:
 # {"id":"sourceFile","fileName":"ClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ts;"}
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger classInstanceFieldsMerger -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xc;"}
     com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger classStaticFieldsMerger -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/md;"}
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger classInitializerMerger -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ic;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kc;"}
     com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection instanceInitializerMergers -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ww;"}
     java.util.Collection virtualMethodMergers -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/List;"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> l
@@ -95135,7 +95184,7 @@
     boolean $assertionsDisabled -> m
     1:5:void <clinit>():55:59 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Collection):82:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/Vs;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/Xs;Ljava/util/List;)V"}
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Collection):66:89 -> <init>
     26:26:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> <init>
     26:26:com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):39 -> <init>
@@ -95166,7 +95215,7 @@
     8:8:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110:110 -> a
     8:8:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/internal/ng0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/internal/rg0;)V"}
     9:9:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):118:118 -> a
     9:9:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     9:9:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
@@ -95289,7 +95338,7 @@
     44:47:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):134:137 -> a
     44:47:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     44:47:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2075:2075 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2081:2081 -> a
     48:48:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):137 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:48:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
@@ -95299,7 +95348,7 @@
     49:52:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
     53:53:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):0:0 -> a
     53:53:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81,"2":82,"3":83},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":81,"2":82,"3":83},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     54:54:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():87:87 -> a
     54:54:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):143 -> a
     54:54:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
@@ -95314,13 +95363,13 @@
     58:59:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):144:145 -> a
     58:59:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     58:59:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     60:60:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger.getCfVersion(com.android.tools.r8.utils.InternalOptions):73 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     60:60:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):145 -> a
     60:60:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     60:60:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     61:61:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger.getCfVersion(com.android.tools.r8.utils.InternalOptions):73 -> a
     61:61:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):145 -> a
     61:61:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
@@ -95334,16 +95383,16 @@
     63:65:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):145 -> a
     63:65:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     63:65:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     66:66:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     66:66:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    67:67:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     67:67:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):146 -> a
     67:67:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     67:67:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     68:68:void mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):147 -> a
     68:68:void mergeDirectMethods(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111 -> a
     68:68:void com.android.tools.r8.internal.ClassMerger.mergeDirectMethods(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.SyntheticInitializerConverter$Builder):0 -> a
@@ -95399,13 +95448,13 @@
     111:111:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:void mergeInstanceInitializers(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/YX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/cY;)V"}
     113:113:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/internal/tw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/internal/vw;)V"}
     114:122:void mergeVirtualMethods(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.Consumer):221:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YX;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cY;Ljava/util/function/Consumer;)V"}
     123:123:void lambda$mergeVirtualMethods$3(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.Consumer,com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):223:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YX;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Sl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cY;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Wl0;)V"}
     124:124:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):278:278 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/k5;)Z"}
     125:125:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
@@ -95433,7 +95482,7 @@
     144:144:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.addRemovedField(com.android.tools.r8.graph.DexField):223:223 -> a
     144:144:void lambda$mergeInstanceFields$10(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedField):330 -> a
     145:148:void mergeGroup(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):348:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/graph/H5;Lcom/android/tools/r8/internal/ng0;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/graph/H5;Lcom/android/tools/r8/internal/rg0;Ljava/util/function/Consumer;)V"}
     149:149:void mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):319:319 -> a
     149:149:void mergeGroup(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):352 -> a
     150:150:void appendClassIdField():233:233 -> a
@@ -95710,24 +95759,24 @@
     12:13:void com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger.merge():70 -> f
     12:13:void mergeStaticFields():338 -> f
     14:14:void mergeStaticFields():339:339 -> f
-com.android.tools.r8.horizontalclassmerging.ClassMerger$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Cc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.internal.ClassMerger$$ExternalSyntheticOutline0.m(com.android.tools.r8.graph.DexMethod,boolean):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.Dc:
 # {"id":"sourceFile","fileName":"ClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.List virtualMethodMergers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():363:363 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):370:372 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;)V"}
     1:1:com.android.tools.r8.graph.FieldCollection com.android.tools.r8.graph.DexClass.getFieldCollection():240:240 -> a
     1:1:boolean lambda$createClassIdField$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):457 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -95747,7 +95796,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     7:7:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     7:7:void com.android.tools.r8.internal.ClassMerger$Builder.lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":441,"2":442,"3":443},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":441,"2":442,"3":443},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     437:437:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):430:430 -> a
     437:437:void com.android.tools.r8.internal.ClassMerger$Builder.lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):0 -> a
     438:438:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):429:429 -> a
@@ -95767,9 +95816,9 @@
     443:443:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     443:443:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):430 -> a
     444:444:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$getVirtualMethodMergerBuilders$0(com.android.tools.r8.graph.DexMethodSignature):431:431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;)Lcom/android/tools/r8/internal/Ql0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;)Lcom/android/tools/r8/internal/Ul0;"}
     445:445:boolean lambda$initializeClassIdField$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):439:439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wl0;)Z"}
     446:448:void createClassIdField():447:449 -> a
     449:449:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     449:449:void createClassIdField():451 -> a
@@ -95792,7 +95841,7 @@
     1:3:java.util.Map getVirtualMethodMergerBuilders():422:424 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/LinkedHashMap;"}
     1:6:void initializeClassIdField():437:442 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.Lc:
 # {"id":"sourceFile","fileName":"ClassMethodsBuilder.java"}
     java.util.Set reservedMethods -> a
     java.util.List virtualMethods -> b
@@ -95822,20 +95871,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     4:4:boolean lambda$setClassMethods$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):40:40 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.md:
 # {"id":"sourceFile","fileName":"ClassStaticFieldsMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ts;"}
     java.util.Map targetFields -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/Xs;)V"}
     2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):25:34 -> <init>
     1:1:boolean isFresh(com.android.tools.r8.graph.DexField):38:38 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Z"}
@@ -95865,7 +95914,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     23:23:void com.android.tools.r8.graph.DexClass.forEachStaticField(java.util.function.Consumer):380:380 -> a
     23:23:void addFields(com.android.tools.r8.graph.DexProgramClass):66 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Og:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Qg:
 # {"id":"sourceFile","fileName":"ConstructorEntryPoint.java"}
     com.android.tools.r8.graph.DexField classIdField -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -95873,11 +95922,11 @@
     com.android.tools.r8.graph.ProgramMethod method -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():39:39 -> <clinit>
     1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexField,int,com.android.tools.r8.ir.code.Position):52:56 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/l1;ILcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/l1;ILcom/android/tools/r8/internal/TW;)V"}
     1:1:void addConstructorInvoke(com.android.tools.r8.graph.DexMethod):64:64 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     2:2:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer):54:54 -> a
@@ -95886,9 +95935,9 @@
     3:4:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer):54 -> a
     3:4:void addConstructorInvoke(com.android.tools.r8.graph.DexMethod):64 -> a
     5:5:void lambda$prepareMultiConstructorInstructions$2(int,int[],com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[ILcom/android/tools/r8/internal/Qz;[ILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[ILcom/android/tools/r8/internal/Sz;[ILcom/android/tools/r8/internal/yt;)V"}
     6:6:boolean lambda$prepareMultiConstructorInstructions$3(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Qz;[ILcom/android/tools/r8/internal/wt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Sz;[ILcom/android/tools/r8/internal/yt;)Z"}
     7:7:boolean com.android.tools.r8.ir.synthetic.SyntheticSourceCode.endsSwitch(com.android.tools.r8.ir.conversion.IRBuilder,int,int,int[]):213:213 -> a
     7:7:boolean lambda$prepareMultiConstructorInstructions$3(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):120 -> a
     8:8:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2523:2523 -> a
@@ -95901,7 +95950,7 @@
     9:9:boolean lambda$prepareMultiConstructorInstructions$3(int,com.android.tools.r8.utils.IntBox,int[],com.android.tools.r8.ir.conversion.IRBuilder):120 -> a
     10:10:boolean com.android.tools.r8.ir.conversion.IRBuilder.hasArgumentValues():513:513 -> a
     10:10:void lambda$addConstructorInvoke$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/yt;)V"}
     11:11:boolean com.android.tools.r8.ir.conversion.IRBuilder.hasArgumentValues():513:513 -> a
     11:11:void lambda$addConstructorInvoke$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):67 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -95938,10 +95987,10 @@
     49:49:void lambda$addConstructorInvoke$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):95:95 -> a
     1:2:int com.android.tools.r8.ir.synthetic.SyntheticSourceCode.getReceiverRegister():69:70 -> b
     1:2:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):103 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)V"}
     3:3:void lambda$addRegisterClassIdAssignment$1(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> b
     4:4:void lambda$prepareSingleConstructorInstructions$4(int,int,com.android.tools.r8.ir.conversion.IRBuilder):148:148 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     5:7:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.conversion.IRBuilder.addIntConst(int,long):1215:1217 -> b
     5:7:void lambda$prepareSingleConstructorInstructions$4(int,int,com.android.tools.r8.ir.conversion.IRBuilder):148 -> b
     1:1:void prepareMultiConstructorInstructions():107:107 -> g
@@ -96011,12 +96060,12 @@
     20:23:void prepareSingleConstructorInstructions():149:152 -> h
     24:25:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer,java.util.function.Predicate):58:59 -> h
     24:25:void prepareSingleConstructorInstructions():152 -> h
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Ss:
 # {"id":"sourceFile","fileName":"HorizontalClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$h;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):48:50 -> <init>
@@ -96024,12 +96073,12 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo.getKeepInfo():29:29 -> a
     1:1:void lambda$amendKeepInfo$1(com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wl0;Lcom/android/tools/r8/shaking/u1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/am0;Lcom/android/tools/r8/shaking/u1;)V"}
     2:2:void lambda$amendKeepInfo$1(com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):254:254 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger createForFinalClassMerging(com.android.tools.r8.graph.AppView):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Qs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Ss;"}
     4:6:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/shaking/r4;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/shaking/r4;Ljava/util/concurrent/ExecutorService;)V"}
     7:7:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.createWithDeterministicOrder(com.android.tools.r8.graph.AppView):43:43 -> a
     7:7:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):100 -> a
     8:8:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):103:103 -> a
@@ -96467,14 +96516,14 @@
     332:332:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     332:332:void lambda$transformIncompleteCode$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ss;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Us;Lcom/android/tools/r8/internal/Xs;)V"}
     333:333:void lambda$transformIncompleteCode$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):294:294 -> a
     334:334:void lambda$run$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):186:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/shaking/o1;)V"}
     335:341:void amendKeepInfo(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.List):236:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ss;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Us;Ljava/util/ArrayList;)V"}
     342:342:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):245:245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Ss;Lcom/android/tools/r8/shaking/o1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Us;Lcom/android/tools/r8/shaking/o1;)V"}
     343:343:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo.getRepresentative():25:25 -> a
     343:343:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96489,7 +96538,7 @@
     364:364:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     365:365:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/H0;Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/H0;Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/graph/C5;)V"}
     366:366:void com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder.recordFieldWrittenInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
     366:366:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96519,7 +96568,7 @@
     377:377:void com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder.recordFieldWrittenInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):100 -> a
     377:377:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):271 -> a
     378:378:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Ss;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Us;Ljava/util/concurrent/ExecutorService;)V"}
     379:379:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     379:379:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):286 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96528,22 +96577,22 @@
     381:408:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):287:314 -> a
     409:409:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):290:290 -> a
     410:413:void lambda$transformIncompleteCode$8(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.graph.ProgramMethod):305:308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ss;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Us;Lcom/android/tools/r8/graph/C5;)V"}
     414:417:void lambda$transformIncompleteCode$8(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.graph.ProgramMethod):307:310 -> a
     418:431:boolean verifyNoIncompleteCode(java.util.Collection,java.util.concurrent.ExecutorService):321:334 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)V"}
     432:432:boolean verifyNoIncompleteCode(java.util.Collection,java.util.concurrent.ExecutorService):321:321 -> a
     433:433:void lambda$verifyNoIncompleteCode$11(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):324:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)V"}
     434:434:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     434:434:void lambda$verifyNoIncompleteCode$11(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):325 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     435:441:void lambda$verifyNoIncompleteCode$11(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):325:331 -> a
     442:442:void lambda$verifyNoIncompleteCode$11(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):324:324 -> a
     443:447:com.android.tools.r8.graph.DexApplication getNewApplication(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):342:346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Lcom/android/tools/r8/graph/x0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zs;)Lcom/android/tools/r8/graph/x0;"}
     448:448:boolean lambda$getNewApplication$12(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):345:345 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/graph/D2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zs;Lcom/android/tools/r8/graph/D2;)Z"}
     449:452:java.util.List getInitialGroups():352:355 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/LinkedList;"}
     453:453:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
@@ -96567,9 +96616,9 @@
     465:465:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):445 -> a
     466:468:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):447:449 -> a
     469:471:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$13(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):452:454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):71:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/shaking/r4;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/shaking/r4;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:boolean shouldRun():88:88 -> b
     2:2:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):72 -> b
     3:3:com.android.tools.r8.graph.AppView$WholeProgramOptimizations com.android.tools.r8.graph.AppView.getWholeProgramOptimizations():549:549 -> b
@@ -96585,7 +96634,7 @@
     20:20:boolean lambda$createFieldAccessInfoCollectionModifier$5(com.android.tools.r8.graph.DexEncodedMethod):274:274 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     21:21:void lambda$createFieldAccessInfoCollectionModifier$6(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):275:275 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/H0;Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/H0;Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/graph/C5;)V"}
     22:22:void com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder.recordFieldReadInContext(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):91:91 -> b
     22:22:void lambda$createFieldAccessInfoCollectionModifier$6(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):275 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96618,17 +96667,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     1:2:boolean lambda$verifyNoIncompleteCode$10(com.android.tools.r8.graph.DexEncodedMethod):328:329 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Us:
 # {"id":"sourceFile","fileName":"HorizontalClassMergerGraphLens.java"}
     java.util.Map methodExtraParameters -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zs;"}
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:java.util.Map com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.getForwardMap():82:82 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/W5;Lcom/android/tools/r8/internal/Y5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Zs;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/a6;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/a6;)V"}
     2:2:com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.getBidirectionalMap():73:73 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):54 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96637,12 +96686,12 @@
     1:1:void com.android.tools.r8.graph.lens.MethodLookupResult$Builder.<init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):66 -> a
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult$Builder com.android.tools.r8.graph.lens.MethodLookupResult.builder(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35 -> a
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     2:3:com.android.tools.r8.graph.lens.MethodLookupResult com.android.tools.r8.graph.lens.MethodLookupResult$Builder.build():85:86 -> a
     2:3:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):105 -> a
     4:6:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):106:108 -> a
     7:11:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):118:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     12:13:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):147:148 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     14:14:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.lens.NonIdentityGraphLens.dexItemFactory():34:34 -> a
@@ -96652,7 +96701,7 @@
     16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):148 -> a
     17:20:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):148:151 -> a
     21:21:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150:150 -> a
-    22:22:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():65:65 -> a
+    22:22:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():63:63 -> a
     22:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73 -> a
     22:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150 -> a
     23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73:73 -> a
@@ -96663,9 +96712,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):156:160 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens asHorizontalClassMergerGraphLens():77:77 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Us;"}
     2:2:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):127:127 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     3:3:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> b
     3:3:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):128 -> b
     4:4:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):128:128 -> b
@@ -96691,7 +96740,7 @@
     19:19:com.android.tools.r8.graph.lens.FieldLookupResult com.android.tools.r8.graph.lens.FieldLookupResult$Builder.build():85:85 -> b
     19:19:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):139 -> b
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):168:168 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):242:242 -> e
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):170 -> e
     3:3:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> e
@@ -96704,7 +96753,7 @@
     9:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):174 -> e
     10:13:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):174:177 -> e
     14:14:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):176:176 -> e
-    15:15:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():65:65 -> e
+    15:15:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():63:63 -> e
     15:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73 -> e
     15:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):176 -> e
     16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73:73 -> e
@@ -96722,22 +96771,22 @@
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> g
     4:4:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):151 -> g
     4:4:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):82 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Ts:
 # {"id":"sourceFile","fileName":"HorizontalClassMergerGraphLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newFieldSignatures -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap methodMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W5;"}
-    com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+    com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     java.util.Map methodExtraParameters -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap pendingMethodMapUpdates -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap pendingNewFieldSignatureUpdates -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap pendingNewMethodSignatureUpdates -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():183:183 -> <clinit>
     1:1:void <init>():204:204 -> <init>
@@ -96749,9 +96798,9 @@
     8:8:void <init>():196 -> <init>
     9:15:void <init>():196:202 -> <init>
     1:1:com.android.tools.r8.classmerging.ClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.MergedClasses):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/Fc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wN;)Lcom/android/tools/r8/internal/Hc;"}
     2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;)Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Zs;)Lcom/android/tools/r8/internal/Us;"}
     3:3:boolean com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.isEmpty():103:103 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):209 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -96786,7 +96835,7 @@
     29:29:boolean lambda$build$0(com.android.tools.r8.graph.DexMethod):216 -> a
     30:30:boolean lambda$build$0(com.android.tools.r8.graph.DexMethod):215:215 -> a
     31:32:void recordNewFieldSignature(java.lang.Iterable,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):246:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     33:35:void recordNewFieldSignature(java.lang.Iterable,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):246:248 -> a
     36:37:boolean com.android.tools.r8.com.google.common.collect.Iterables.contains(java.lang.Iterable,java.lang.Object):142:143 -> a
     36:37:void recordNewFieldSignature(java.lang.Iterable,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):249 -> a
@@ -96896,16 +96945,16 @@
     7:7:void recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):298 -> b
     1:1:void recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):291:291 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerPolicyExecutor -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerPolicyExecutor -> com.android.tools.r8.internal.Vs:
 # {"id":"sourceFile","fileName":"HorizontalClassMergerPolicyExecutor.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:10:java.util.LinkedList apply(com.android.tools.r8.classmerging.Policy,java.util.LinkedList,java.util.concurrent.ExecutorService):21:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
     11:11:java.util.LinkedList apply(com.android.tools.r8.classmerging.Policy,java.util.LinkedList,java.util.concurrent.ExecutorService):29:29 -> a
     12:15:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):37:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mb0;Ljava/util/LinkedList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qb0;Ljava/util/LinkedList;)V"}
     16:16:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
     16:16:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):41 -> a
     17:19:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):42:44 -> a
@@ -96913,38 +96962,38 @@
     20:20:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):44 -> a
     21:24:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):43:46 -> a
     25:25:boolean lambda$applySingleClassPolicy$0(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,com.android.tools.r8.graph.DexProgramClass):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mb0;Lcom/android/tools/r8/graph/D2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qb0;Lcom/android/tools/r8/graph/D2;)Z"}
     26:27:java.util.LinkedList applyMultiClassPolicy(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;Ljava/util/LinkedList;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vP;Ljava/util/LinkedList;)Ljava/util/LinkedList;"}
     28:28:void lambda$applyMultiClassPolicy$2(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vP;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Xs;)V"}
     29:29:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
     29:29:void lambda$applyMultiClassPolicy$2(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):60 -> a
     30:34:void lambda$applyMultiClassPolicy$2(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):61:65 -> a
     35:35:void lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/Xs;)V"}
     36:36:void com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.applyMetadataFrom(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):62:62 -> a
     36:36:void lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):62 -> a
     37:39:java.util.LinkedList applyMultiClassPolicyWithPreprocessing(com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing,java.util.LinkedList,java.util.concurrent.ExecutorService):78:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sP;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wP;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
     40:40:void lambda$applyMultiClassPolicyWithPreprocessing$4(com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing,java.lang.Object,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sP;Ljava/lang/Object;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wP;Ljava/lang/Object;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/Xs;)V"}
     41:41:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
     41:41:void lambda$applyMultiClassPolicyWithPreprocessing$4(com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing,java.lang.Object,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):83 -> a
     42:46:void lambda$applyMultiClassPolicyWithPreprocessing$4(com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing,java.lang.Object,java.util.LinkedList,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):84:88 -> a
     1:1:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/Xs;)V"}
     2:2:void com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.applyMetadataFrom(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):62:62 -> b
     2:2:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):85 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerTreeFixer -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerTreeFixer -> com.android.tools.r8.internal.Ws:
 # {"id":"sourceFile","fileName":"HorizontalClassMergerTreeFixer.java"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):37:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/Rs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Zs;Lcom/android/tools/r8/internal/Ts;)V"}
     1:13:void traverseProgramClassesDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):104:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ol;)V"}
-com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup -> com.android.tools.r8.internal.Vs:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
+com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup -> com.android.tools.r8.internal.Xs:
 # {"id":"sourceFile","fileName":"HorizontalMergeGroup.java"}
     java.util.LinkedList classes -> b
     com.android.tools.r8.graph.DexField classIdField -> c
@@ -96952,7 +97001,7 @@
     com.android.tools.r8.graph.DexProgramClass target -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap instanceFieldMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():46:46 -> <init>
@@ -96972,7 +97021,7 @@
     10:11:void setInstanceFieldMap(com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):142:143 -> a
     10:11:void selectInstanceFieldMap(com.android.tools.r8.graph.AppView):137 -> a
     12:12:void lambda$selectInstanceFieldMap$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap,com.android.tools.r8.graph.DexProgramClass):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/OP;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/SP;Lcom/android/tools/r8/graph/D2;)V"}
     13:13:boolean lambda$getSources$1(com.android.tools.r8.graph.DexProgramClass):148:148 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:boolean add(java.lang.Object):30:30 -> add
@@ -97007,7 +97056,7 @@
     22:23:void setTarget(com.android.tools.r8.graph.DexProgramClass):197:198 -> b
     22:23:void selectTarget(com.android.tools.r8.graph.AppView):193 -> b
     24:25:java.lang.Iterable getSources():147:148 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iC;"}
     1:1:com.android.tools.r8.graph.DexType getSuperType():152:152 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     2:2:java.util.LinkedList getClasses():105:105 -> c
@@ -97041,14 +97090,14 @@
     1:1:int size():231:231 -> size
     1:1:java.lang.Object[] toArray():264:264 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):269:269 -> toArray
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Xs:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Zs:
 # {"id":"sourceFile","fileName":"HorizontallyMergedClasses.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap mergedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b6;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):23:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b6;)V"}
     1:1:void forEachMergeGroup(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexType getMergeTargetOrDefault(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
@@ -97062,17 +97111,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:java.util.Set getSourcesFor(com.android.tools.r8.graph.DexType):51:51 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Ys:
 # {"id":"sourceFile","fileName":"HorizontallyMergedClasses.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap mergedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():87:87 -> <clinit>
     1:4:void <init>():87:90 -> <init>
     1:1:void addMergeGroup(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)V"}
     2:2:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.DexProgramClass):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/graph/D2;)V"}
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     3:3:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.DexProgramClass):98 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -97089,8 +97138,8 @@
     8:9:void add(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):93:94 -> a
     8:9:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.DexProgramClass):98 -> a
     10:10:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder addMergeGroups(java.lang.Iterable):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Lcom/android/tools/r8/internal/Ws;"}
-com.android.tools.r8.horizontalclassmerging.IncompleteHorizontalClassMergerCode -> com.android.tools.r8.internal.rv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Lcom/android/tools/r8/internal/Ys;"}
+com.android.tools.r8.horizontalclassmerging.IncompleteHorizontalClassMergerCode -> com.android.tools.r8.internal.tv:
 # {"id":"sourceFile","fileName":"IncompleteHorizontalClassMergerCode.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():22:22 -> <clinit>
@@ -97101,20 +97150,20 @@
     1:1:boolean isHorizontalClassMergerCode():28:28 -> U0
     1:1:boolean isIncompleteHorizontalClassMergerCode():33:33 -> V0
     com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ss;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Us;)Lcom/android/tools/r8/internal/CK;"}
     1:1:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/i0;"}
     2:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):85:85 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     5:5:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):65:65 -> c
     void addExtraUnusedArguments(int) -> m
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode -> com.android.tools.r8.internal.vv:
 # {"id":"sourceFile","fileName":"IncompleteMergedInstanceInitializerCode.java"}
     com.android.tools.r8.graph.DexField classIdField -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -97133,7 +97182,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;ILjava/util/LinkedHashMap;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;)V"}
     1:1:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
     1:1:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ss;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Us;)Lcom/android/tools/r8/internal/CK;"}
     2:5:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):81:84 -> a
     6:17:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):80:91 -> a
     18:18:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
@@ -97195,7 +97244,7 @@
     85:85:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):165:165 -> a
     86:105:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):164:183 -> a
     106:121:int addLirInstructionsForInstanceFieldAssignments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,java.util.List,int,java.util.Map,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):207:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rK;Lcom/android/tools/r8/internal/wW;Ljava/util/ArrayList;ILjava/util/LinkedHashMap;Lcom/android/tools/r8/internal/Ss;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/vK;Lcom/android/tools/r8/internal/AW;Ljava/util/ArrayList;ILjava/util/LinkedHashMap;Lcom/android/tools/r8/internal/Us;)I"}
     122:131:int addLirInstructionsForInstanceFieldAssignments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,java.util.List,int,java.util.Map,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):214:223 -> a
     132:132:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.NestedGraphLens.getNextFieldSignature(com.android.tools.r8.graph.DexField):237:237 -> a
     132:132:int addLirInstructionsForInstanceFieldAssignments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,java.util.List,int,java.util.Map,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):232 -> a
@@ -97226,7 +97275,7 @@
     152:152:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstancePut(com.android.tools.r8.graph.DexField,java.lang.Object,java.lang.Object):721:721 -> a
     152:152:int addLirInstructionsForInstanceFieldAssignments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,java.util.List,int,java.util.Map,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):251 -> a
     153:154:int addLirInstructionsForInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,java.util.List,int,com.android.tools.r8.graph.DexType,java.util.function.Consumer):267:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rK;Lcom/android/tools/r8/internal/wW;Lcom/android/tools/r8/internal/dw;Ljava/util/ArrayList;ILcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/vK;Lcom/android/tools/r8/internal/AW;Lcom/android/tools/r8/internal/fw;Ljava/util/ArrayList;ILcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)I"}
     155:155:int com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo.getArgumentIndex():29:29 -> a
     155:155:int addLirInstructionsForInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,java.util.List,int,com.android.tools.r8.graph.DexType,java.util.function.Consumer):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -97288,28 +97337,28 @@
     214:214:int addLirInstructionsForInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirBuilder,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,java.util.List,int,com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:304 -> a
     1:1:void addExtraUnusedArguments(int):69:69 -> m
     1:1:java.lang.String toString():310:310 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode$1 -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode$1 -> com.android.tools.r8.internal.uv:
 # {"id":"sourceFile","fileName":"IncompleteMergedInstanceInitializerCode.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Us;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):183:183 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/Ss;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/Us;)V"}
     1:1:boolean hasExplicitCodeLens():187:187 -> N0
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.wv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
+com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.yv:
 # {"id":"sourceFile","fileName":"IncompleteVirtuallyMergedMethodCode.java"}
     com.android.tools.r8.graph.DexField classIdField -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference superMethod -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vl0;"}
     1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference):44:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Ly;Lcom/android/tools/r8/internal/Rl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Ny;Lcom/android/tools/r8/internal/Vl0;)V"}
     1:1:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
     1:1:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ss;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Us;)Lcom/android/tools/r8/internal/CK;"}
     2:5:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):72:75 -> a
     6:19:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):71:84 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
@@ -97443,19 +97492,19 @@
     111:111:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):161:161 -> a
     1:1:void addExtraUnusedArguments(int):52:52 -> m
     1:1:java.lang.String toString():177:177 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.vv:
+com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.xv:
 # {"id":"sourceFile","fileName":"IncompleteVirtuallyMergedMethodCode.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Us;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):161:161 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/Ss;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/Us;)V"}
     1:1:boolean hasExplicitCodeLens():165:165 -> N0
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.nw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.pw:
 # {"id":"sourceFile","fileName":"InstanceInitializerAnalysis.java"}
     1:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):189:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/fw;"}
     8:8:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory com.android.tools.r8.graph.AppView.instanceFieldInitializationInfoFactory():373:373 -> a
     8:8:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):197 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -97476,7 +97525,7 @@
     27:27:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:28:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):212:212 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.rw:
 # {"id":"sourceFile","fileName":"InstanceInitializerDescription.java"}
     java.util.Map instanceFieldAssignmentsPre -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
@@ -97492,7 +97541,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/K2;)V"}
     1:8:boolean equals(java.lang.Object):83:90 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.qw:
 # {"id":"sourceFile","fileName":"InstanceInitializerDescription.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -97522,7 +97571,7 @@
     20:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):120:120 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):121:121 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.vw:
 # {"id":"sourceFile","fileName":"InstanceInitializerMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -97531,16 +97580,16 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.List instanceInitializers -> e
     com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription instanceInitializerDescription -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rw;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ts;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():38:38 -> <clinit>
     1:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):63:75 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Vs;Ljava/util/List;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/pw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Xs;Ljava/util/List;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/rw;)V"}
     1:1:int getArity():80:80 -> a
     2:2:java.util.Set getParameterTypes(java.util.List,int):121:121 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/List;)Ljava/util/Set;"}
@@ -97548,10 +97597,10 @@
     4:4:void lambda$getParameterTypes$0(java.util.function.Consumer,int,com.android.tools.r8.graph.ProgramMethod):125:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;ILcom/android/tools/r8/graph/C5;)V"}
     5:9:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexMethod):137:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     10:10:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexMethod):137:137 -> a
     11:13:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):268:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     14:14:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     14:14:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):270 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -97577,14 +97626,14 @@
     30:30:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):282 -> a
     31:31:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):283:283 -> a
     32:32:boolean lambda$moveInstanceInitializer$2(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):273:273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Z"}
     33:33:boolean com.android.tools.r8.graph.DexMethod.isNotIdenticalTo(com.android.tools.r8.graph.DexMethod):35:35 -> a
     33:33:boolean lambda$moveInstanceInitializer$2(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):274 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:39:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):314:319 -> a
     34:39:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/internal/Jc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/internal/Lc;)V"}
     40:48:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):100:108 -> a
     40:48:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):321 -> a
     40:48:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
@@ -97675,7 +97724,7 @@
     126:126:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
     127:127:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):0:0 -> a
     127:127:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":166,"2":167,"3":168},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":166,"2":167,"3":168},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     128:128:com.android.tools.r8.graph.MethodAccessFlags getNewAccessFlags():288:288 -> a
     128:128:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):386 -> a
     128:128:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
@@ -97710,7 +97759,7 @@
     151:151:com.android.tools.r8.cf.CfVersion getNewClassFileVersion():92:92 -> a
     151:151:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):388 -> a
     151:151:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
-    152:152:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    152:152:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     152:152:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     152:152:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
@@ -97718,13 +97767,13 @@
     153:153:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):389 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     153:153:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
-    154:154:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    154:154:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     154:154:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):389 -> a
     154:154:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
     155:155:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     155:155:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):390 -> a
     155:155:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
-    156:156:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    156:156:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     156:156:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):390 -> a
     156:156:void com.android.tools.r8.internal.InstanceInitializerMerger.merge(com.android.tools.r8.internal.ClassMergerSharedData,com.android.tools.r8.internal.ProfileCollectionAdditions,com.android.tools.r8.internal.ClassMethodsBuilder):0 -> a
     157:161:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):391:395 -> a
@@ -97742,7 +97791,7 @@
     167:167:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):384 -> a
     168:168:void merge(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder):385:385 -> a
     169:169:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):353:353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     170:170:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     170:170:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     170:170:void lambda$merge$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):353 -> a
@@ -97759,7 +97808,7 @@
     1:1:boolean isSingleton():305:305 -> d
     1:1:boolean useSyntheticMethod():408 -> d
     2:2:boolean useSyntheticMethod():408:408 -> d
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.uw:
 # {"id":"sourceFile","fileName":"InstanceInitializerMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -97769,25 +97818,25 @@
     java.util.List instanceInitializerGroups -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ts;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():159:159 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):170:170 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;)V"}
     2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):164:173 -> <init>
     12:14:java.util.List createNewGroup():178:180 -> <init>
     12:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):174 -> <init>
     1:2:java.util.List build(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):235:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/List;"}
     3:3:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.List):239:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/util/List;)Lcom/android/tools/r8/internal/tw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/util/List;)Lcom/android/tools/r8/internal/vw;"}
     4:4:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):54:54 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.List):239 -> a
     5:6:java.util.List buildEquivalent(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):245:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/pw;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/rw;)Ljava/util/List;"}
     7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$buildEquivalent$1(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription,java.util.List):249:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/pw;Ljava/util/List;)Lcom/android/tools/r8/internal/tw;"}
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.uw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/rw;Ljava/util/List;)Lcom/android/tools/r8/internal/vw;"}
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.ww:
 # {"id":"sourceFile","fileName":"InstanceInitializerMergerCollection.java"}
     java.util.List instanceInitializerMergers -> a
     java.util.Map equivalentInstanceInitializerMergers -> b
@@ -97795,11 +97844,11 @@
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>(java.util.List,java.util.Map):35:37 -> <init>
     1:1:void lambda$create$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vs;Ljava/util/Map;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;Ljava/util/Map;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/D2;)V"}
     2:2:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis.analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):73 -> a
     2:2:void lambda$create$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vs;Ljava/util/Map;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;Ljava/util/Map;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):125:125 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis.analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.ProgramMethod):73 -> a
@@ -97942,9 +97991,9 @@
     189:189:void lambda$create$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):73 -> a
     190:190:void lambda$create$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):75:75 -> a
     191:191:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder lambda$create$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;)Lcom/android/tools/r8/internal/sw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;)Lcom/android/tools/r8/internal/uw;"}
     192:193:void lambda$create$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Map,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder):84:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/yY;Ljava/util/Map;Lcom/android/tools/r8/internal/pw;Lcom/android/tools/r8/internal/sw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/CY;Ljava/util/Map;Lcom/android/tools/r8/internal/rw;Lcom/android/tools/r8/internal/uw;)V"}
     194:194:int com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.size():156:156 -> a
     194:194:void lambda$create$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Map,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -97954,15 +98003,15 @@
     196:196:void lambda$create$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Map,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder):90 -> a
     197:202:void lambda$create$3(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Map,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder):89:94 -> a
     203:203:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/graph/C5;)V"}
     204:209:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):105:110 -> a
     210:213:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.add(com.android.tools.r8.graph.ProgramMethod):186:189 -> a
     210:213:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):110 -> a
-    214:214:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():448:448 -> a
+    214:214:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():447:447 -> a
     214:214:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.add(com.android.tools.r8.graph.ProgramMethod):189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     214:214:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):110 -> a
-    215:215:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():448:448 -> a
+    215:215:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():447:447 -> a
     215:215:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.add(com.android.tools.r8.graph.ProgramMethod):189 -> a
     215:215:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):110 -> a
     216:216:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.add(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
@@ -97973,9 +98022,9 @@
     220:221:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder.add(com.android.tools.r8.graph.ProgramMethod):194:195 -> a
     220:221:void lambda$create$5(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.ProgramMethod):110 -> a
     222:222:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder lambda$create$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexProto):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/internal/sw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/internal/uw;"}
     223:223:boolean verifyNoInstanceInitializers(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)V"}
     224:224:void lambda$verifyNoInstanceInitializers$6(com.android.tools.r8.graph.DexProgramClass):126:126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     225:225:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
@@ -97991,7 +98040,7 @@
     233:233:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     233:233:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/W20;Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/Rs;)Lcom/android/tools/r8/internal/uw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/a30;Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/Ts;)Lcom/android/tools/r8/internal/ww;"}
     234:234:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     234:234:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):46 -> a
     235:244:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):47:56 -> a
@@ -97999,31 +98048,31 @@
     245:245:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):56 -> a
     246:307:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):57:118 -> a
     308:310:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):117:119 -> a
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.rP:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.vP:
 # {"id":"sourceFile","fileName":"MultiClassPolicy.java"}
     1:1:void <init>():10:10 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     1:1:com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy():29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vP;"}
     1:1:boolean isMultiClassPolicy():24:24 -> h
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.sP:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.wP:
 # {"id":"sourceFile","fileName":"MultiClassPolicyWithPreprocessing.java"}
     1:1:void <init>():12:12 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/lang/Object;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/lang/Object;)Ljava/util/Collection;"}
     java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing():36:36 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wP;"}
     1:1:boolean isMultiClassPolicyWithPreprocessing():31:31 -> i
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.tP:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.xP:
 # {"id":"sourceFile","fileName":"MultiClassSameReferencePolicy.java"}
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/Object;"}
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:2:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     2:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):17 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98037,19 +98086,19 @@
     9:9:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):20 -> a
     10:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):23:24 -> a
     12:12:com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup lambda$apply$0(java.lang.Object):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Vs;"}
-com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.IW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Xs;"}
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.MW:
 # {"id":"sourceFile","fileName":"PolicyScheduler.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():66:66 -> <clinit>
     1:3:boolean verifyMultiClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):280:282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/uu;)V"}
     4:10:boolean verifyPolicyOrderingConstraints(java.util.List):291:297 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
     11:11:boolean lambda$verifyPolicyOrderingConstraints$0(com.android.tools.r8.classmerging.Policy):293:293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GW;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KW;)Z"}
     1:1:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):165:165 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/uu;)V"}
     2:2:void com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks.<init>(com.android.tools.r8.graph.AppView):19:19 -> b
     2:2:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):165 -> b
     3:4:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):165:166 -> b
@@ -98065,7 +98114,7 @@
     7:7:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):166 -> b
     8:8:boolean verifySingleClassPoliciesIrrelevantForMergingSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):178:178 -> b
     1:1:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):185:185 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/uu;)V"}
     2:2:void com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks.<init>(com.android.tools.r8.graph.AppView):19:19 -> c
     2:2:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):185 -> c
     3:4:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):185:186 -> c
@@ -98080,24 +98129,24 @@
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):172 -> c
     7:7:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):186 -> c
     8:8:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):196:196 -> c
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Mb0:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Qb0:
 # {"id":"sourceFile","fileName":"SingleClassPolicy.java"}
     1:1:void <init>():10:10 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy():25:25 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qb0;"}
     1:1:boolean isSingleClassPolicy():20:20 -> j
-com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining -> com.android.tools.r8.internal.Hj0:
+com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining -> com.android.tools.r8.internal.Lj0:
 # {"id":"sourceFile","fileName":"UndoConstructorInlining.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.classmerging.ClassMergerSharedData classMergerSharedData -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ic;"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):79:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/graph/X3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/graph/X3;)V"}
     1:10:void run(java.util.Collection,java.util.concurrent.ExecutorService):109:118 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)V"}
     11:19:java.util.Map computeStronglyConnectedComponents():150:158 -> a
@@ -98108,13 +98157,13 @@
     26:27:void ensureConstructorsOnSubclasses(java.util.Map):136 -> a
     28:38:void ensureConstructorsOnSubclasses(java.util.Map):136:146 -> a
     39:43:void lambda$ensureConstructorsOnSubclasses$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):139:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Bm0;)V"}
     44:44:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.isClassGroup():215:215 -> a
     44:44:boolean lambda$run$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):110 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Z"}
     45:45:boolean lambda$run$0(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):110:110 -> a
-com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$InvokeDirectInfo -> com.android.tools.r8.internal.Ej0:
+com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$InvokeDirectInfo -> com.android.tools.r8.internal.Ij0:
 # {"id":"sourceFile","fileName":"UndoConstructorInlining.java"}
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -98123,13 +98172,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexProgramClass):453:456 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ILcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$LirRewriter -> com.android.tools.r8.internal.Fj0:
+com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$LirRewriter -> com.android.tools.r8.internal.Jj0:
 # {"id":"sourceFile","fileName":"UndoConstructorInlining.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map ensureConstructorsOnClasses -> b
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions profileCollectionAdditions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cY;"}
     java.util.Map stronglyConnectedComponents -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> e
@@ -98151,22 +98200,22 @@
     20:20:void processMethod(com.android.tools.r8.graph.ProgramMethod):206 -> a
     21:21:void processMethod(com.android.tools.r8.graph.ProgramMethod):207:207 -> a
     22:23:boolean mayInstantiateClassOfInterest(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.lightir.LirCode,java.util.Map):217:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/yK;Ljava/util/Map;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/CK;Ljava/util/Map;)Z"}
     24:24:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> a
     24:24:boolean mayInstantiateClassOfInterest(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.lightir.LirCode,java.util.Map):222 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:boolean mayInstantiateClassOfInterest(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.lightir.LirCode,java.util.Map):222:222 -> a
     26:26:boolean mayInstantiateClassOfInterest(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.lightir.LirCode,java.util.Map):221:221 -> a
     27:27:boolean lambda$mayInstantiateClassOfInterest$1(java.util.Map,com.android.tools.r8.lightir.LirConstant):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/AK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/EK;)Z"}
     28:28:java.lang.Integer lambda$rewriteLir$3(java.util.List,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod):261:261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/graph/w2;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/graph/w2;)Ljava/lang/Integer;"}
     29:29:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> a
     29:29:java.lang.Integer lambda$rewriteLir$3(java.util.List,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod):262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:java.lang.Integer lambda$rewriteLir$3(java.util.List,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod):262:262 -> a
     31:31:com.android.tools.r8.lightir.LirCode rewriteIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/CK;"}
     32:32:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.Code.buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):29:29 -> a
     32:32:com.android.tools.r8.lightir.LirCode rewriteIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):283 -> a
     33:44:com.android.tools.r8.lightir.LirCode rewriteIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):284:295 -> a
@@ -98218,7 +98267,7 @@
     105:105:void lambda$rewriteIR$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):314:314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     106:116:com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$InvokeDirectInfo getAllocationOfInterest(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirWriter,com.android.tools.r8.lightir.LirInstructionView,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):373:383 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/YK;Lcom/android/tools/r8/internal/FK;Lcom/android/tools/r8/internal/lz;)Lcom/android/tools/r8/internal/Ej0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/cL;Lcom/android/tools/r8/internal/JK;Lcom/android/tools/r8/internal/nz;)Lcom/android/tools/r8/internal/Ij0;"}
     117:117:com.android.tools.r8.lightir.LirConstant com.android.tools.r8.lightir.LirCode.getConstantItem(int):496:496 -> a
     117:117:com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$InvokeDirectInfo getAllocationOfInterest(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirWriter,com.android.tools.r8.lightir.LirInstructionView,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):385 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98245,7 +98294,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getAllocationsOfInterest(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):343:343 -> b
     2:2:com.android.tools.r8.lightir.LirCode rewriteLir(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):230 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/CK;"}
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> b
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getAllocationsOfInterest(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):343 -> b
     3:3:com.android.tools.r8.lightir.LirCode rewriteLir(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):230 -> b
@@ -98287,14 +98336,14 @@
     81:81:com.android.tools.r8.lightir.LirCode rewriteLir(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):279 -> b
     82:82:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirCode.copyWithNewConstantsAndInstructions(com.android.tools.r8.lightir.LirConstant[],byte[]):853:853 -> b
     82:82:com.android.tools.r8.lightir.LirCode rewriteLir(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):277 -> b
-com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$StronglyConnectedComponent -> com.android.tools.r8.internal.Gj0:
+com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining$StronglyConnectedComponent -> com.android.tools.r8.internal.Kj0:
 # {"id":"sourceFile","fileName":"UndoConstructorInlining.java"}
     java.util.Map constructorCache -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lj0;"}
     1:3:void <init>(com.android.tools.r8.horizontalclassmerging.UndoConstructorInlining):472:474 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hj0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lj0;)V"}
     1:1:com.android.tools.r8.graph.ProgramMethod lambda$getOrCreateConstructor$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod):492:492 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Ljava/util/Map;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/C5;"}
     2:3:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):504:505 -> a
@@ -98331,7 +98380,7 @@
     29:29:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     30:30:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0:0 -> a
     30:30:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     31:31:com.android.tools.r8.graph.MethodAccessFlags$Builder com.android.tools.r8.graph.MethodAccessFlags.builder():65:65 -> a
     31:31:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):532 -> a
     31:31:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
@@ -98428,7 +98477,7 @@
     67:78:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     79:79:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):533:533 -> a
     79:79:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
-    80:80:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    80:80:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     80:80:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):534 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:80:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
@@ -98440,7 +98489,7 @@
     82:82:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):537:537 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
-    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    84:84:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     84:84:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):536 -> a
     84:84:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     85:85:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):536:536 -> a
@@ -98451,7 +98500,7 @@
     86:86:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     87:87:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):539:539 -> a
     87:87:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
-    88:88:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    88:88:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     88:88:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):538 -> a
     88:88:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.internal.UndoConstructorInlining$StronglyConnectedComponent.createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):0 -> a
     89:91:com.android.tools.r8.graph.ProgramMethod createConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):540:542 -> a
@@ -98490,24 +98539,24 @@
     107:107:void lambda$commitPendingConstructors$2(com.android.tools.r8.graph.DexProgramClass,java.util.Map):602 -> a
     1:3:com.android.tools.r8.graph.ProgramMethod getOrCreateConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.function.Consumer):488:490 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Ljava/util/Map;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.Sl0:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.Wl0:
 # {"id":"sourceFile","fileName":"VirtualMethodMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.List methods -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference superMethod -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vl0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():29:29 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.List,com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference):60:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vs;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Rl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xs;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Vl0;)V"}
     1:5:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):118:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/w2;"}
     6:6:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     6:6:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98566,7 +98615,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)Z"}
     49:49:com.android.tools.r8.graph.DexMethod getNewMethodReference():167:167 -> a
     49:49:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/internal/Rs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/internal/Ts;)V"}
     50:50:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.getTarget():161:161 -> a
     50:50:com.android.tools.r8.graph.DexMethod getNewMethodReference():167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98603,21 +98652,21 @@
     91:91:boolean lambda$isNop$6(com.android.tools.r8.graph.ProgramMethod):176:176 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     92:92:void lambda$mergeTrivial$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):217:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;)V"}
     93:93:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):266:266 -> a
     93:93:void lambda$mergeTrivial$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     94:94:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):266:266 -> a
     94:94:void lambda$mergeTrivial$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):217 -> a
     95:95:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):242:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QU;Lcom/android/tools/r8/graph/j1$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/graph/j1$a;)V"}
     96:96:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1551:1551 -> a
     96:96:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):242 -> a
     97:97:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1544:1544 -> a
     97:97:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIfKnown(com.android.tools.r8.utils.OptionalBool):1550 -> a
     97:97:void lambda$mergeTrivial$10(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.DexEncodedMethod$Builder):242 -> a
     98:121:void merge(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.function.Consumer):256:279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/internal/Jc;Lcom/android/tools/r8/internal/Rs;Lcom/android/tools/r8/internal/W20;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/internal/Lc;Lcom/android/tools/r8/internal/Ts;Lcom/android/tools/r8/internal/a30;Ljava/util/function/Consumer;)V"}
     122:139:void merge(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.function.Consumer):278:295 -> a
     140:145:void merge(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.function.Consumer):291:296 -> a
     146:146:com.android.tools.r8.graph.DexMethod getNewMethodReference():167:167 -> a
@@ -98639,7 +98688,7 @@
     151:189:void merge(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.function.Consumer):298:336 -> a
     190:199:void merge(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.function.Consumer):335:344 -> a
     200:200:void lambda$merge$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):337:337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/aY;)V"}
     1:1:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.MethodAccessFlags):145:145 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)Z"}
     2:3:boolean isNop():175:176 -> b
@@ -98657,12 +98706,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)Z"}
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):159:159 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)Z"}
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.Ql0:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.Ul0:
 # {"id":"sourceFile","fileName":"VirtualMethodMerger.java"}
     java.util.List methods -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:2:void <init>():68:69 -> <init>
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference -> com.android.tools.r8.internal.Rl0:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference -> com.android.tools.r8.internal.Vl0:
 # {"id":"sourceFile","fileName":"VirtualMethodMerger.java"}
     com.android.tools.r8.graph.DexMethod reference -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -98670,7 +98719,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):36:38 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.Wl0:
+com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.am0:
 # {"id":"sourceFile","fileName":"VirtuallyMergedMethodsKeepInfo.java"}
     com.android.tools.r8.graph.DexMethod representative -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -98688,20 +98737,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/v1;)V"}
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner getKeepInfo():29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.ic:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.kc:
 # {"id":"sourceFile","fileName":"ClassInitializerMerger.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):49:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:2:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger create(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):54:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Lcom/android/tools/r8/internal/ic;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Lcom/android/tools/r8/internal/kc;"}
     3:3:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder.build():118:118 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger create(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):61 -> a
     4:4:void lambda$create$0(com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder,com.android.tools.r8.graph.DexProgramClass):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ic;Lcom/android/tools/r8/graph/D2;)V"}
     5:5:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     5:5:void lambda$create$0(com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder,com.android.tools.r8.graph.DexProgramClass):58 -> a
     6:6:void lambda$create$0(com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder,com.android.tools.r8.graph.DexProgramClass):58:58 -> a
@@ -98716,26 +98765,26 @@
     14:14:com.android.tools.r8.androidapi.ComputedApiLevel getApiReferenceLevel(com.android.tools.r8.graph.AppView):93:93 -> a
     15:15:com.android.tools.r8.androidapi.ComputedApiLevel lambda$getApiReferenceLevel$1(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod):96:96 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/androidapi/f;"}
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.ic:
 # {"id":"sourceFile","fileName":"ClassInitializerMerger.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():107:107 -> <clinit>
     1:3:void <init>():107:109 -> <init>
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.jc:
 # {"id":"sourceFile","fileName":"ClassInitializerMerger.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():126:126 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):130:131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:int computeHashCode():224:224 -> G0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():234:234 -> M0
     1:1:boolean isEmptyVoidMethod():239:239 -> T0
     1:7:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):139:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     8:8:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> a
     8:8:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98778,22 +98827,22 @@
     96:96:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):244:244 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     97:97:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):249:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     98:98:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):259:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):229:229 -> c
     1:1:java.lang.String toString():254:254 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Qg:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Sg:
 # {"id":"sourceFile","fileName":"ConstructorEntryPointSynthesizedCode.java"}
     com.android.tools.r8.graph.DexField classIdField -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     int numberOfUnusedArguments -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():37:37 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,int):46:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;Lcom/android/tools/r8/graph/l1;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;Lcom/android/tools/r8/graph/l1;I)V"}
     1:1:int computeHashCode():163:163 -> G0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():178:178 -> M0
     1:1:boolean hasExplicitCodeLens():69:69 -> N0
@@ -98824,9 +98873,9 @@
     14:14:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:17:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):75:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
     18:18:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ss;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Us;)Lcom/android/tools/r8/internal/CK;"}
     19:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():998:998 -> a
     19:19:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):85 -> a
     20:20:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():998:998 -> a
@@ -98849,36 +98898,36 @@
     28:28:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):88 -> a
     29:32:com.android.tools.r8.lightir.LirCode toLirCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):89:92 -> a
     33:35:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):117:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     36:36:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> a
     36:36:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:41:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):121:125 -> a
     42:42:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     43:43:com.android.tools.r8.ir.conversion.IRBuilder com.android.tools.r8.ir.conversion.IRBuilder.createForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):456:456 -> a
     43:43:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):140 -> a
     44:44:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):142:142 -> a
     45:45:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):152:152 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     46:46:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     47:47:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):168:168 -> c
     1:1:void addExtraUnusedArguments(int):54:54 -> m
     1:1:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):173:173 -> toString
     1:1:java.lang.String toString():147 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode$1 -> com.android.tools.r8.internal.Pg:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode$1 -> com.android.tools.r8.internal.Rg:
 # {"id":"sourceFile","fileName":"ConstructorEntryPointSynthesizedCode.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Us;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):92:92 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/Ss;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/Us;)V"}
     1:1:boolean hasExplicitCodeLens():96:96 -> N0
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ls;"}
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.og0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ns;"}
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.sg0:
 # {"id":"sourceFile","fileName":"SyntheticInitializerConverter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -98892,7 +98941,7 @@
     8:13:void convertClassInitializers(java.util.concurrent.ExecutorService):43:48 -> a
     14:14:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):53:53 -> a
     14:14:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/graph/C5;)V"}
     15:15:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore.getInstance():32:32 -> a
     15:15:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):55 -> a
     15:15:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):45 -> a
@@ -98900,7 +98949,7 @@
     16:16:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):45 -> a
     17:17:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):54:54 -> a
     17:17:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):45 -> a
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.ng0:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.rg0:
 # {"id":"sourceFile","fileName":"SyntheticInitializerConverter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -98915,7 +98964,7 @@
     boolean atMostOneOf(com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:2:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     2:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):26 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -98941,10 +98990,10 @@
     26:26:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
     26:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):42 -> a
     27:27:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):45:45 -> a
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.Bb:
 # {"id":"sourceFile","fileName":"CheckAbstractClasses.java"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:3:com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification getMergeKey(com.android.tools.r8.graph.DexProgramClass):40:42 -> a
@@ -98952,19 +99001,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/Object;"}
     1:1:java.lang.String getName():28:28 -> f
     1:1:boolean shouldSkipPolicy():35:35 -> l
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.Ab:
 # {"id":"sourceFile","fileName":"CheckAbstractClasses.java"}
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ab;"}
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ab;"}
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.Sb:
 # {"id":"sourceFile","fileName":"CheckSyntheticClasses.java"}
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$h;"}
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/I;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):18:19 -> <init>
@@ -98974,7 +99023,7 @@
     4:4:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isSyntheticMergingEnabled():1892:1892 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isSyntheticMergingEnabled():1898:1898 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
@@ -98985,7 +99034,7 @@
     5:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25 -> a
     6:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
     1:1:java.lang.String getName():37:37 -> f
-com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.Wp:
 # {"id":"sourceFile","fileName":"FinalizeMergeGroup.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -98994,14 +99043,14 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:8:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):32:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     9:10:void com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.setInstanceFieldMap(com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):142:143 -> a
     9:10:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):39 -> a
     11:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):41:41 -> a
     12:13:java.util.LinkedList com.android.tools.r8.utils.ListUtils.newLinkedList(java.lang.Object):259:260 -> a
     12:13:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):41 -> a
     1:1:java.lang.String getName():46:46 -> f
-com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.JJ:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.NJ:
 # {"id":"sourceFile","fileName":"LimitClassGroups.java"}
     int maxGroupSize -> b
     boolean $assertionsDisabled -> c
@@ -99011,7 +99060,7 @@
     1:1:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:2:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
     2:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):31 -> a
     3:7:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):31:35 -> a
@@ -99040,7 +99089,7 @@
     26:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):32:32 -> a
     1:1:java.lang.String getName():62:62 -> f
     1:1:boolean isIdentityForInterfaceGroups():67:67 -> g
-com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.KJ:
+com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.OJ:
 # {"id":"sourceFile","fileName":"LimitInterfaceGroups.java"}
     int maxGroupSize -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
@@ -99048,7 +99097,7 @@
     1:1:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.isClassGroup():215:215 -> a
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:5:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):30:33 -> a
     6:6:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     6:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):34 -> a
@@ -99075,13 +99124,13 @@
     18:24:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):35 -> a
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):37:37 -> a
     1:1:java.lang.String getName():61:61 -> f
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.CO:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.GO:
 # {"id":"sourceFile","fileName":"MinimizeInstanceFieldCasts.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     1:8:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):25:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     9:9:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.isEmpty():211:211 -> a
     9:9:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):41 -> a
     10:21:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):42:53 -> a
@@ -99104,7 +99153,7 @@
     29:29:void lambda$apply$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;)V"}
     30:30:boolean lambda$apply$1(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/internal/Vs;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/internal/Xs;)Z"}
     31:31:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):72:72 -> a
     31:31:boolean lambda$apply$1(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99130,9 +99179,9 @@
     40:40:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
     40:40:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):67 -> a
     41:41:com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup lambda$addExact$2(com.android.tools.r8.com.google.common.collect.Multiset):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GP;)Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KP;)Lcom/android/tools/r8/internal/Xs;"}
     1:1:java.lang.String getName():80:80 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.rQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.vQ:
 # {"id":"sourceFile","fileName":"NoAnnotationClasses.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
@@ -99142,7 +99191,7 @@
     2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():18:18 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline -> com.android.tools.r8.internal.uQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline -> com.android.tools.r8.internal.yQ:
 # {"id":"sourceFile","fileName":"NoApiOutlineWithNonApiOutline.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -99153,7 +99202,7 @@
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getMergeKey$0(com.android.tools.r8.synthesis.SyntheticNaming):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:33 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/tQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/xQ;"}
     2:2:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     2:2:com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging getMergeKey(com.android.tools.r8.graph.DexProgramClass):34 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99161,16 +99210,16 @@
     3:3:com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging getMergeKey(com.android.tools.r8.graph.DexProgramClass):34 -> b
     4:7:com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging getMergeKey(com.android.tools.r8.graph.DexProgramClass):35:38 -> b
     1:1:java.lang.String getName():28:28 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging -> com.android.tools.r8.internal.tQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging -> com.android.tools.r8.internal.xQ:
 # {"id":"sourceFile","fileName":"NoApiOutlineWithNonApiOutline.java"}
     com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging API_MODEL -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xQ;"}
     com.android.tools.r8.horizontalclassmerging.policies.NoApiOutlineWithNonApiOutline$SyntheticKindForMerging NOT_API_MODEL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xQ;"}
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.vQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.zQ:
 # {"id":"sourceFile","fileName":"NoCheckDiscard.java"}
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/p1;"}
@@ -99183,27 +99232,27 @@
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1:1:java.lang.String getName():31:31 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.wQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.AQ:
 # {"id":"sourceFile","fileName":"NoClassAnnotationCollisions.java"}
     1:1:void <init>():9:9 -> <init>
     1:1:boolean atMostOneOf(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():18:18 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.AQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.EQ:
 # {"id":"sourceFile","fileName":"NoClassInitializerCycles.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map allGroups -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation singleCallerInformation -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gb0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():94:94 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):103:103 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView):99:104 -> <init>
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/lang/Object;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/lang/Object;)Ljava/util/Collection;"}
     2:10:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Void):122:130 -> a
     2:10:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):94 -> a
     11:11:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
@@ -99289,7 +99338,7 @@
     54:57:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Void):142 -> a
     54:57:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):94 -> a
     58:60:java.util.List partitionClassesWithPossibleClassInitializerDeadlock(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):211:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Lcom/android/tools/r8/internal/xu;"}
     61:61:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     61:61:java.util.List partitionClassesWithPossibleClassInitializerDeadlock(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):215 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99340,7 +99389,7 @@
     108:108:java.util.List partitionClassesWithPossibleClassInitializerDeadlock(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):247 -> a
     109:112:java.util.List partitionClassesWithPossibleClassInitializerDeadlock(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):251:254 -> a
     113:117:com.android.tools.r8.utils.TraversalContinuation lambda$partitionClassesWithPossibleClassInitializerDeadlock$0(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):217:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Oh0;"}
     118:118:java.lang.Void preprocess(java.util.Collection,java.util.concurrent.ExecutorService):284:284 -> a
     118:118:java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService):94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/lang/Object;"}
@@ -99361,28 +99410,28 @@
     1:1:void clear():273:273 -> e
     1:1:java.lang.String getName():278:278 -> f
     1:1:boolean shouldSkipPolicy():296:296 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isClassInitializerDeadlockDetectionEnabled():1872:1872 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isClassInitializerDeadlockDetectionEnabled():1878:1878 -> l
     2:2:boolean shouldSkipPolicy():297 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.zQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.DQ:
 # {"id":"sourceFile","fileName":"NoClassInitializerCycles.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.Set groupMembers -> b
     java.util.Set seenClassInitializers -> c
     com.android.tools.r8.utils.collections.ProgramMethodSet seenMethods -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     java.util.Deque worklist -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     java.util.Map classInitializerReachableFromClasses -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Collection tracingRoots -> g
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EQ;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():300:300 -> <clinit>
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):320:320 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AQ;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EQ;Lcom/android/tools/r8/internal/Xs;)V"}
     2:17:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):307:322 -> <init>
     1:1:void clearWorklist():331:331 -> a
     2:5:boolean enqueueMethod(com.android.tools.r8.graph.ProgramMethod):335:338 -> a
@@ -99422,14 +99471,14 @@
     7:7:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> c
     7:7:void clearSeen():327 -> c
     7:7:void trace():404 -> c
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.yQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.CQ:
 # {"id":"sourceFile","fileName":"NoClassInitializerCycles.java"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer this$1 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DQ;"}
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer,com.android.tools.r8.graph.ProgramMethod):422:423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zQ;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DQ;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:com.android.tools.r8.graph.AppView com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles.appView():108:108 -> <init>
     3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer,com.android.tools.r8.graph.ProgramMethod):423 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99608,7 +99657,7 @@
     18:18:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):583 -> h
     19:20:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):583:584 -> h
     21:21:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> h
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.BQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.FQ:
 # {"id":"sourceFile","fileName":"NoClassInitializerWithObservableSideEffects.java"}
     1:1:void <init>():16:16 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):20:23 -> a
@@ -99630,15 +99679,15 @@
     10:10:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
     11:11:boolean isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):29:29 -> a
     11:11:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
-    12:12:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():61:61 -> a
+    12:12:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():59:59 -> a
     12:12:boolean isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):29 -> a
     12:12:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():61:61 -> a
+    13:13:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():59:59 -> a
     13:13:boolean isKotlinLambda(com.android.tools.r8.graph.DexProgramClass):29 -> a
     13:13:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):24 -> a
     1:1:java.lang.String getName():34:34 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.CQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.GQ:
 # {"id":"sourceFile","fileName":"NoDeadLocks.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -99661,7 +99710,7 @@
     6:6:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):39 -> a
     7:7:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):40:40 -> a
     8:24:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):33:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     25:25:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):50 -> a
     26:30:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):50:54 -> a
@@ -99672,7 +99721,7 @@
     32:32:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):54 -> a
     33:33:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):57:57 -> a
     1:1:java.lang.String getName():64:64 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.FQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.JQ:
 # {"id":"sourceFile","fileName":"NoDefaultInterfaceMethodCollisions.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -99683,7 +99732,7 @@
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):71:71 -> a
     1:1:java.util.Collection com.android.tools.r8.internal.NoDefaultInterfaceMethodCollisions.apply(com.android.tools.r8.internal.HorizontalMergeGroup,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/lang/Object;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/lang/Object;)Ljava/util/Collection;"}
     2:3:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):87:88 -> a
     2:3:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):71 -> a
     2:3:java.util.Collection com.android.tools.r8.internal.NoDefaultInterfaceMethodCollisions.apply(com.android.tools.r8.internal.HorizontalMergeGroup,java.lang.Object):0 -> a
@@ -99717,7 +99766,7 @@
     12:12:java.util.Collection com.android.tools.r8.internal.NoDefaultInterfaceMethodCollisions.apply(com.android.tools.r8.internal.HorizontalMergeGroup,java.lang.Object):0 -> a
     13:13:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):0:0 -> a
     13:13:java.util.Collection com.android.tools.r8.internal.NoDefaultInterfaceMethodCollisions.apply(com.android.tools.r8.internal.HorizontalMergeGroup,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     14:14:boolean isSafeToAddDefaultMethodsToClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,java.util.Map):137:137 -> a
     14:14:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):103 -> a
     14:14:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):71 -> a
@@ -99751,7 +99800,7 @@
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):103 -> a
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.lang.Object):71 -> a
     26:26:java.util.Set computeNewDefaultMethodsAddedToClassByMerge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Vs;Ljava/util/Map;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Xs;Ljava/util/Map;)Ljava/util/Set;"}
     27:27:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     27:27:java.util.Set computeNewDefaultMethodsAddedToClassByMerge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99808,9 +99857,9 @@
     183:183:java.util.Map computeDefaultMethodsInheritedBySubclassesPerProgramClass(java.util.Collection,java.util.Map,java.util.Collection,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):317 -> a
     184:210:java.util.Map computeDefaultMethodsInheritedBySubclassesPerProgramClass(java.util.Collection,java.util.Map,java.util.Collection,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):317:343 -> a
     211:211:void lambda$computeDefaultMethodsInheritedBySubclassesPerProgramClass$7(java.util.IdentityHashMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,com.android.tools.r8.graph.DexProgramClass):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Vs;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Xs;Lcom/android/tools/r8/graph/D2;)V"}
     212:212:void lambda$computeDefaultMethodsInheritedBySubclassesPerProgramClass$8(java.util.IdentityHashMap,com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Vs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Xs;)V"}
     213:213:java.util.Map lambda$computeDefaultMethodsInheritedBySubclassesPerProgramClass$10(java.util.Map):295:295 -> a
     214:214:java.lang.Iterable lambda$computeDefaultMethodsInheritedBySubclassesPerProgramClass$11(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/X3;Ljava/util/Map;Lcom/android/tools/r8/graph/D2;)Ljava/lang/Iterable;"}
@@ -99851,15 +99900,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:java.lang.String getName():349:349 -> f
     1:1:boolean shouldSkipPolicy():354:354 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1896:1896 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1902:1902 -> l
     2:2:boolean shouldSkipPolicy():354 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.EQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.IQ:
 # {"id":"sourceFile","fileName":"NoDefaultInterfaceMethodCollisions.java"}
     java.util.Map inheritedDefaultMethods -> a
     java.util.Map defaultMethodsInheritedBySubclasses -> b
     1:3:void <init>(java.util.Map,java.util.Map):369:371 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.GQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.KQ:
 # {"id":"sourceFile","fileName":"NoDefaultInterfaceMethodMerging.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -99870,7 +99919,7 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):37:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:2:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     2:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):50 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -99952,21 +100001,21 @@
     44:44:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):59 -> a
     45:45:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):59:59 -> a
     46:46:void addDefaultMethods(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/D2;)V"}
     47:48:void lambda$addDefaultMethods$1(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):105:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     49:49:void lambda$addDefaultMethods$1(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
     50:50:com.android.tools.r8.graph.DexType lambda$addDefaultMethods$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):107:107 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     51:51:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInImplementedInterfaces(com.android.tools.r8.graph.DexProgramClass):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Rl;"}
     52:52:com.android.tools.r8.utils.collections.DexMethodSignatureMap com.android.tools.r8.utils.collections.DexMethodSignatureMap.create():31:31 -> a
     52:52:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInImplementedInterfaces(com.android.tools.r8.graph.DexProgramClass):128 -> a
     53:53:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
     53:53:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInImplementedInterfaces(com.android.tools.r8.graph.DexProgramClass):129 -> a
     54:59:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInImplementedInterfaces(com.android.tools.r8.graph.DexProgramClass):130:135 -> a
     60:61:void addInterfacesToWorklist(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):141:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Bm0;)V"}
     62:62:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):43:43 -> a
     62:62:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):60 -> a
     62:62:void addInterfacesToWorklist(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):142 -> a
@@ -99975,14 +100024,14 @@
     63:63:void addInterfacesToWorklist(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):142 -> a
     64:65:void addInterfacesToWorklist(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):143:144 -> a
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInInterfaces(com.android.tools.r8.graph.DexProgramClass):111:111 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Rl;"}
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureMap com.android.tools.r8.utils.collections.DexMethodSignatureMap.create():31:31 -> b
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInInterfaces(com.android.tools.r8.graph.DexProgramClass):112 -> b
     3:3:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> b
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInInterfaces(com.android.tools.r8.graph.DexProgramClass):113 -> b
     4:9:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInInterfaces(com.android.tools.r8.graph.DexProgramClass):114:119 -> b
     1:1:java.lang.String getName():151:151 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.HQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.LQ:
 # {"id":"sourceFile","fileName":"NoDifferentApiReferenceLevel.java"}
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/a;"}
@@ -100040,7 +100089,7 @@
     26:26:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):16 -> a
     1:1:java.lang.String getName():38:38 -> f
     1:1:boolean shouldSkipPolicy():33:33 -> l
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.IQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.MQ:
 # {"id":"sourceFile","fileName":"NoDirectRuntimeTypeChecks.java"}
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/r4;"}
@@ -100059,12 +100108,12 @@
     1:6:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):29:34 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():39:39 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.LQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.PQ:
 # {"id":"sourceFile","fileName":"NoEnums.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppView):18:21 -> <init>
@@ -100074,7 +100123,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     1:1:void clear():26:26 -> e
     1:1:java.lang.String getName():31:31 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.MQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.QQ:
 # {"id":"sourceFile","fileName":"NoFailedResolutionTargets.java"}
     java.util.Set failedResolutionHolders -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):21:23 -> <init>
@@ -100086,14 +100135,14 @@
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():30:30 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.PQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.TQ:
 # {"id":"sourceFile","fileName":"NoIndirectRuntimeTypeChecks.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/r4;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):27:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/r4;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):23:29 -> <init>
@@ -100127,39 +100176,39 @@
     7:13:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():176:182 -> b
     7:13:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
     1:1:java.lang.String getName():81:81 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.RQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.VQ:
 # {"id":"sourceFile","fileName":"NoInnerClasses.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():20:20 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.SQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.WQ:
 # {"id":"sourceFile","fileName":"NoInstanceFieldAnnotations.java"}
     1:1:void <init>():11:11 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():25:25 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.TQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.XQ:
 # {"id":"sourceFile","fileName":"NoInterfaces.java"}
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$h;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():32:32 -> f
     1:1:boolean shouldSkipPolicy():27:27 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1896:1896 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1902:1902 -> l
     2:2:boolean shouldSkipPolicy():27 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.XQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.bR:
 # {"id":"sourceFile","fileName":"NoKeepRules.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/p1;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set dontMergeTypes -> e
     1:1:void <init>(com.android.tools.r8.graph.AppView):29:29 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -100170,7 +100219,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     3:4:boolean isPinned(com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature):55:56 -> b
     3:4:void processClass(com.android.tools.r8.graph.DexProgramClass):38 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> b
     5:5:boolean isPinned(com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature):57 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void processClass(com.android.tools.r8.graph.DexProgramClass):38 -> b
@@ -100179,7 +100228,7 @@
     7:8:void processClass(com.android.tools.r8.graph.DexProgramClass):39:40 -> b
     9:10:boolean isPinned(com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature):55:56 -> b
     9:10:void processClass(com.android.tools.r8.graph.DexProgramClass):40 -> b
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> b
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> b
     11:11:boolean isPinned(com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature):57 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:void processClass(com.android.tools.r8.graph.DexProgramClass):40 -> b
@@ -100193,7 +100242,7 @@
     18:18:void processClass(com.android.tools.r8.graph.DexProgramClass):44 -> b
     19:27:void processClass(com.android.tools.r8.graph.DexProgramClass):42:50 -> b
     1:1:java.lang.String getName():68:68 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.ZQ:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.dR:
 # {"id":"sourceFile","fileName":"NoKotlinMetadata.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
@@ -100212,25 +100261,25 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     3:3:boolean verifyNoUnexpectedKotlinMemberInfo(com.android.tools.r8.graph.DexProgramClass):28:28 -> b
     1:1:java.lang.String getName():35:35 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.cR:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.gR:
 # {"id":"sourceFile","fileName":"NoNativeMethods.java"}
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():20:20 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoRecords -> com.android.tools.r8.internal.fR:
+com.android.tools.r8.horizontalclassmerging.policies.NoRecords -> com.android.tools.r8.internal.jR:
 # {"id":"sourceFile","fileName":"NoRecords.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():20:20 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoResourceClasses -> com.android.tools.r8.internal.gR:
+com.android.tools.r8.horizontalclassmerging.policies.NoResourceClasses -> com.android.tools.r8.internal.kR:
 # {"id":"sourceFile","fileName":"NoResourceClasses.java"}
     1:1:void <init>():10:10 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():20:20 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.iR:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.mR:
 # {"id":"sourceFile","fileName":"NoServiceLoaders.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100248,10 +100297,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
     1:1:java.lang.String getName():31:31 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.jR:
+com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.nR:
 # {"id":"sourceFile","fileName":"NoWeakerAccessPrivileges.java"}
     com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph graph -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rY;"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     java.util.Map inheritedInterfaceMethodsCache -> d
@@ -100266,7 +100315,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):30:43 -> <init>
     1:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):50:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     3:3:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     3:3:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):53 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -100328,15 +100377,15 @@
     46:46:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):74 -> a
     47:56:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):75:84 -> a
     57:58:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeInheritedInterfaceMethods(com.android.tools.r8.graph.DexClass):114:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Sl;"}
     59:59:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     59:59:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeInheritedInterfaceMethods(com.android.tools.r8.graph.DexClass):117 -> a
     60:67:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeInheritedInterfaceMethods(com.android.tools.r8.graph.DexClass):118:125 -> a
     68:71:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeInheritedInterfaceMethods(com.android.tools.r8.graph.DexClass):124:127 -> a
     72:72:void lambda$getOrComputeInheritedInterfaceMethods$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
     73:74:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualMethodSignaturesInComponent(java.util.Set):151:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Sl;"}
     75:75:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     75:75:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualMethodSignaturesInComponent(java.util.Set):154 -> a
     76:79:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualMethodSignaturesInComponent(java.util.Set):155:158 -> a
@@ -100346,22 +100395,22 @@
     1:1:boolean lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$1(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     2:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualLibraryMethodSignatures(com.android.tools.r8.graph.DexClass):173:174 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Sl;"}
     4:4:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> b
     4:4:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualLibraryMethodSignatures(com.android.tools.r8.graph.DexClass):176 -> b
     5:7:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualLibraryMethodSignatures(com.android.tools.r8.graph.DexClass):177:179 -> b
     8:16:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeNonPublicVirtualLibraryMethodSignatures(com.android.tools.r8.graph.DexClass):177:185 -> b
     17:17:void lambda$getOrComputeNonPublicVirtualLibraryMethodSignatures$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):184:184 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
     18:18:void lambda$getOrComputeNonPublicVirtualLibraryMethodSignatures$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):183:183 -> b
     1:1:boolean lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$2(com.android.tools.r8.graph.DexClass):161:161 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     2:2:void lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):164:164 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
     3:3:void lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):163:163 -> c
     1:3:void clear():192:194 -> e
     1:1:java.lang.String getName():199:199 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.JR:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.OR:
 # {"id":"sourceFile","fileName":"NotMatchedByNoHorizontalClassMerging.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100384,7 +100433,7 @@
     7:7:boolean com.android.tools.r8.shaking.KeepClassInfo.isHorizontalClassMergingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):97 -> a
     7:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22 -> a
     1:1:java.lang.String getName():27:27 -> f
-com.android.tools.r8.horizontalclassmerging.policies.NotTwoInitsWithMonitors -> com.android.tools.r8.internal.MR:
+com.android.tools.r8.horizontalclassmerging.policies.NotTwoInitsWithMonitors -> com.android.tools.r8.internal.QR:
 # {"id":"sourceFile","fileName":"NotTwoInitsWithMonitors.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100407,9 +100456,9 @@
     9:9:boolean atMostOneOf(com.android.tools.r8.graph.DexProgramClass):24:24 -> a
     1:1:java.lang.String getName():33:33 -> f
     1:1:boolean shouldSkipPolicy():38:38 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveIssueWithInlinedMonitors():3229:3229 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveIssueWithInlinedMonitors():3235:3235 -> l
     2:2:boolean shouldSkipPolicy():38 -> l
-com.android.tools.r8.horizontalclassmerging.policies.OnlyClassesWithStaticDefinitionsAndNoClassInitializer -> com.android.tools.r8.internal.JU:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyClassesWithStaticDefinitionsAndNoClassInitializer -> com.android.tools.r8.internal.NU:
 # {"id":"sourceFile","fileName":"OnlyClassesWithStaticDefinitionsAndNoClassInitializer.java"}
     1:1:void <init>():12:12 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):16:19 -> a
@@ -100417,7 +100466,7 @@
     5:5:boolean lambda$canMerge$0(com.android.tools.r8.graph.DexEncodedMember):19:19 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h1;)Z"}
     1:1:java.lang.String getName():24:24 -> f
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.LU:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.PU:
 # {"id":"sourceFile","fileName":"OnlyDirectlyConnectedOrUnrelatedInterfaces.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100431,7 +100480,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):58:64 -> <init>
     1:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):71:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     3:3:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):72 -> a
     4:4:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):75:75 -> a
@@ -100485,7 +100534,7 @@
     77:77:java.util.Set com.android.tools.r8.utils.WorkList.getMutableSeenSet():179:179 -> a
     77:77:java.util.Set computeStrictTransitiveInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.function.Function):138 -> a
     78:82:void lambda$computeStrictTransitiveInterfaces$1(com.android.tools.r8.utils.WorkList,java.util.function.Function,com.android.tools.r8.graph.DexProgramClass):131:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Ljava/util/function/Function;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Ljava/util/function/Function;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:java.util.Set computeSuperInterfaces(com.android.tools.r8.graph.DexProgramClass):115:115 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/util/Set;"}
     1:1:java.lang.Iterable lambda$computeSuperInterfaces$0(com.android.tools.r8.graph.DexProgramClass):116:116 -> c
@@ -100493,13 +100542,13 @@
     1:1:void clear():143:143 -> e
     1:1:java.lang.String getName():148:148 -> f
     1:1:boolean shouldSkipPolicy():153:153 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1896:1896 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isInterfaceMergingEnabled():1902:1902 -> l
     2:2:boolean shouldSkipPolicy():153 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.KU:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.OU:
 # {"id":"sourceFile","fileName":"OnlyDirectlyConnectedOrUnrelatedInterfaces.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.Set members -> b
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -100522,7 +100571,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:boolean lambda$add$1(com.android.tools.r8.graph.DexProgramClass):186:186 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.wX:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.AX:
 # {"id":"sourceFile","fileName":"PreserveMethodCharacteristics.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100531,7 +100580,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView):85:87 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:2:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     2:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -100546,15 +100595,15 @@
     18:18:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):146 -> a
     19:19:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):146:146 -> a
     20:20:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vX;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/zX;)Z"}
     1:1:java.lang.String getName():33:33 -> f
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.uX:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.yX:
 # {"id":"sourceFile","fileName":"PreserveMethodCharacteristics.java"}
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G4;"}
     boolean isAssumeNoSideEffectsMethod -> b
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):42:44 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Z)V"}
     4:4:com.android.tools.r8.graph.MethodAccessFlags$Builder com.android.tools.r8.graph.MethodAccessFlags.builder():65:65 -> <init>
@@ -100603,10 +100652,10 @@
     1:5:boolean equals(java.lang.Object):73:77 -> equals
     1:2:int hashCode():63:64 -> hashCode
     3:3:int hashCode():63:63 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.vX:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.zX:
 # {"id":"sourceFile","fileName":"PreserveMethodCharacteristics.java"}
     com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup group -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xs;"}
     java.util.Map methodMap -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:4:void <init>():90:93 -> <init>
@@ -100639,23 +100688,23 @@
     21:21:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):114 -> a
     22:22:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.EX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.IX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache interfaceDefaultMethodsCache -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DX;"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache parentClassMethodsCache -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FX;"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor reservedInterfaceSignaturesFor -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GX;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):129:129 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
     2:76:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):57:131 -> <init>
     1:2:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):156:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     3:3:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):157 -> a
     4:4:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.createLinked():45:45 -> a
@@ -100700,71 +100749,71 @@
     34:34:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):181 -> a
     35:35:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):183:183 -> a
     36:36:com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yX;)Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CX;)Lcom/android/tools/r8/internal/Xs;"}
     1:1:java.lang.String getName():66:66 -> f
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.xX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.BX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IX;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):85:85 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IX;)V"}
     1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):88:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Sl;"}
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):89 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.yX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.CX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():139:139 -> <clinit>
     1:1:void <init>():139:139 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.zX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.DX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):93:93 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IX;)V"}
     1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):97:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.AX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.EX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory CLASS_HIERARCHY_SAFE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EX;"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory KEEP_ABSENT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EX;"}
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.BX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.FX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IX;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):102:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IX;)V"}
     1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):106:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.CX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.GX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IX;"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):116:116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IX;)V"}
     1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
     2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/D2;)V"}
     3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:123 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.DX:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.HX:
 # {"id":"sourceFile","fileName":"PreventClassMethodAndDefaultMethodCollisions.java"}
     java.util.Map memoizedSignatures -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:2:void <init>():69:70 -> <init>
     void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/E0;)V"}
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.createLinked():45:45 -> a
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$getOrComputeSignatures$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Sl;"}
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$getOrComputeSignatures$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):77:77 -> a
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexClass):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Ql;"}
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.U80:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Sl;"}
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.Y80:
 # {"id":"sourceFile","fileName":"RespectPackageBoundaries.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100782,7 +100831,7 @@
     51:51:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Oh0;"}
     53:53:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):132:132 -> a
     53:53:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):87 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -100792,13 +100841,13 @@
     54:54:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):87 -> a
     55:77:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):87:109 -> a
     78:78:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/util/LinkedHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/util/LinkedHashMap;)V"}
     79:80:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):121:122 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;)Z"}
     81:81:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
     81:81:boolean lambda$tryFindRestrictedPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):124 -> a
     82:83:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):133:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     84:84:java.util.Iterator com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.iterator():226:226 -> a
     84:84:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):137 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -100818,9 +100867,9 @@
     101:101:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):154 -> a
     102:104:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):155:157 -> a
     105:105:com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup lambda$apply$2(java.lang.String):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Vs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Xs;"}
     1:1:java.lang.String getName():163:163 -> f
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries$1 -> com.android.tools.r8.internal.T80:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries$1 -> com.android.tools.r8.internal.X80:
 # {"id":"sourceFile","fileName":"RespectPackageBoundaries.java"}
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):88:88 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
@@ -100833,7 +100882,7 @@
     3:3:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.UseRegistry.dexItemFactory():42:42 -> a
     3:3:boolean checkRewrittenFieldType(com.android.tools.r8.graph.DexClassAndField):96 -> a
     4:8:boolean checkRewrittenFieldType(com.android.tools.r8.graph.DexClassAndField):96:100 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.ha0:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.la0:
 # {"id":"sourceFile","fileName":"SameFeatureSplit.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -100870,10 +100919,10 @@
     7:7:com.android.tools.r8.FeatureSplit getMergeKey(com.android.tools.r8.graph.DexProgramClass):23 -> a
     7:7:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():29:29 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SameFilePolicy -> com.android.tools.r8.internal.ja0:
+com.android.tools.r8.horizontalclassmerging.policies.SameFilePolicy -> com.android.tools.r8.internal.na0:
 # {"id":"sourceFile","fileName":"SameFilePolicy.java"}
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$h;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.lang.String getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
@@ -100881,10 +100930,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/Object;"}
     1:1:java.lang.String getName():27:27 -> f
     1:1:boolean shouldSkipPolicy():32:32 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isSameFilePolicyEnabled():1888:1888 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions.isSameFilePolicyEnabled():1894:1894 -> l
     2:2:boolean shouldSkipPolicy():32 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.la0:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.pa0:
 # {"id":"sourceFile","fileName":"SameInstanceFields.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -100903,7 +100952,7 @@
     7:7:com.android.tools.r8.com.google.common.collect.Multiset getMergeKey(com.android.tools.r8.graph.DexProgramClass):32 -> a
     7:7:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):20 -> a
     1:1:java.lang.String getName():39:39 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.ka0:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.oa0:
 # {"id":"sourceFile","fileName":"SameInstanceFields.java"}
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/g3;"}
@@ -100934,7 +100983,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:boolean equals(java.lang.Object):82:82 -> equals
     1:1:int hashCode():87:87 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.ma0:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.qa0:
 # {"id":"sourceFile","fileName":"SameMainDexGroup.java"}
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y1;"}
@@ -100994,7 +101043,7 @@
     12:12:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup getMergeKey(com.android.tools.r8.graph.DexProgramClass):27 -> a
     12:12:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():33:33 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.oa0:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.sa0:
 # {"id":"sourceFile","fileName":"SameNestHost.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -101004,7 +101053,7 @@
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/Object;"}
     1:1:java.lang.String getName():28:28 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SamePackageForNonGlobalMergeSynthetic -> com.android.tools.r8.internal.qa0:
+com.android.tools.r8.horizontalclassmerging.policies.SamePackageForNonGlobalMergeSynthetic -> com.android.tools.r8.internal.ua0:
 # {"id":"sourceFile","fileName":"SamePackageForNonGlobalMergeSynthetic.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -101013,13 +101062,13 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:void tryFindRestrictedPackage(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup,java.util.Map):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;Ljava/util/LinkedHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;Ljava/util/LinkedHashMap;)V"}
     2:3:boolean lambda$tryFindRestrictedPackage$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):35:36 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;)Z"}
     4:4:boolean com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.add(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
     4:4:boolean lambda$tryFindRestrictedPackage$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):38 -> a
     5:7:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):47:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     8:8:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     8:8:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -101053,19 +101102,19 @@
     39:39:boolean lambda$apply$1(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getName():81:81 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.ra0:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.va0:
 # {"id":"sourceFile","fileName":"SameParentClass.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getMergeKey(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/Object;"}
     1:1:java.lang.String getName():20:20 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition -> com.android.tools.r8.internal.ta0:
+com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition -> com.android.tools.r8.internal.xa0:
 # {"id":"sourceFile","fileName":"SameStartupPartition.java"}
     com.android.tools.r8.profile.startup.StartupOptions startupOptions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bd0;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfile com.android.tools.r8.graph.AppView.getStartupProfile():471:471 -> <init>
@@ -101079,16 +101128,16 @@
     2:2:boolean com.android.tools.r8.profile.startup.StartupOptions.isStartupBoundaryOptimizationsEnabled():81:81 -> l
     2:2:boolean shouldSkipPolicy():38 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition$StartupPartition -> com.android.tools.r8.internal.sa0:
+com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition$StartupPartition -> com.android.tools.r8.internal.wa0:
 # {"id":"sourceFile","fileName":"SameStartupPartition.java"}
     com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition$StartupPartition STARTUP -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa0;"}
     com.android.tools.r8.horizontalclassmerging.policies.SameStartupPartition$StartupPartition POST_STARTUP -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa0;"}
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.qg0:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.ug0:
 # {"id":"sourceFile","fileName":"SyntheticItemsPolicy.java"}
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/I;"}
@@ -101113,25 +101162,25 @@
     4:6:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind getMergeKey(com.android.tools.r8.graph.DexProgramClass):30:32 -> a
     4:6:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():37:37 -> f
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.pg0:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.tg0:
 # {"id":"sourceFile","fileName":"SyntheticItemsPolicy.java"}
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tg0;"}
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tg0;"}
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.VerifyMultiClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.sl0:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyMultiClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.wl0:
 # {"id":"sourceFile","fileName":"VerifyMultiClassPolicyAlwaysSatisfied.java"}
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy policy -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vP;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy):17:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vP;)V"}
     1:1:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vs;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xs;)Ljava/util/Collection;"}
     2:4:boolean verifySameAppliedGroup(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):38:40 -> a
     2:4:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):33 -> a
     5:5:int com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup.size():231:231 -> a
@@ -101156,39 +101205,39 @@
     11:11:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.HorizontalMergeGroup):34:34 -> a
     1:1:java.lang.String getName():23:23 -> f
     1:1:boolean shouldSkipPolicy():28:28 -> l
-com.android.tools.r8.horizontalclassmerging.policies.VerifySingleClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.tl0:
+com.android.tools.r8.horizontalclassmerging.policies.VerifySingleClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.xl0:
 # {"id":"sourceFile","fileName":"VerifySingleClassPolicyAlwaysSatisfied.java"}
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qb0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy):15:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qb0;)V"}
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:1:java.lang.String getName():27:27 -> f
     1:1:boolean shouldSkipPolicy():32:32 -> l
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.Cb0:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.Gb0:
 # {"id":"sourceFile","fileName":"SingleCallerInformation.java"}
     com.android.tools.r8.utils.collections.ProgramMethodMap singleCallers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     java.util.Map singleClinitCallers -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:3:void <init>(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.Map):43:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Ljava/util/IdentityHashMap;)V"}
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.Bb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Ljava/util/IdentityHashMap;)V"}
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.Fb0:
 # {"id":"sourceFile","fileName":"SingleCallerInformation.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     java.util.Map clinitCallers -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView):68:72 -> <init>
     1:12:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder analyze(java.util.concurrent.ExecutorService):76:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/Bb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/Fb0;"}
     13:13:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder analyze(java.util.concurrent.ExecutorService):76:76 -> a
     14:14:void lambda$analyze$1(java.util.function.Consumer):79:79 -> a
     15:15:void com.android.tools.r8.graph.AppInfo.forEachMethod(java.util.function.Consumer):150:150 -> a
@@ -101199,9 +101248,9 @@
     18:19:void lambda$analyze$0(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):82:83 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
     20:26:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation build():93:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gb0;"}
     27:27:void lambda$build$3(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)V"}
     28:28:void lambda$build$4(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):98:98 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     29:29:void lambda$build$5(java.util.Map,com.android.tools.r8.graph.DexProgramClass,java.util.Optional):98:98 -> a
@@ -101211,21 +101260,21 @@
     31:31:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
     31:31:void lambda$build$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     32:32:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
     32:32:void lambda$build$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.Ab0:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.Eb0:
 # {"id":"sourceFile","fileName":"SingleCallerInformation.java"}
     com.android.tools.r8.graph.AppView appViewWithClassHierachy -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fb0;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():106:106 -> <clinit>
     1:4:void <init>(com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):113:116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bb0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fb0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     1:1:java.util.Optional lambda$recordDispatchTarget$0(com.android.tools.r8.graph.ProgramMethod,java.util.Optional):126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)Ljava/util/Optional;"}
@@ -101435,7 +101484,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.inspector.ValueInspector -> com.android.tools.r8.inspector.ValueInspector:
 # {"id":"sourceFile","fileName":"ValueInspector.java"}
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.tc:
 # {"id":"sourceFile","fileName":"ClassInspectorImpl.java"}
     com.android.tools.r8.graph.DexClass clazz -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
@@ -101451,22 +101500,22 @@
     1:1:void forEachMethod(java.util.function.Consumer):45:45 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():26:29 -> getClassReference
     1:2:java.lang.String getSourceFile():34:35 -> getSourceFile
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.mp:
 # {"id":"sourceFile","fileName":"FieldInspectorImpl.java"}
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tc;"}
     com.android.tools.r8.graph.DexEncodedField field -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/g1;"}
     com.android.tools.r8.references.FieldReference reference -> c
     1:1:void <init>(com.android.tools.r8.inspector.internal.ClassInspectorImpl,com.android.tools.r8.graph.DexEncodedField):18:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rc;Lcom/android/tools/r8/graph/g1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tc;Lcom/android/tools/r8/graph/g1;)V"}
     2:6:void <init>(com.android.tools.r8.inspector.internal.ClassInspectorImpl,com.android.tools.r8.graph.DexEncodedField):16:20 -> <init>
     1:6:com.android.tools.r8.references.FieldReference getFieldReference():25:30 -> getFieldReference
     7:12:com.android.tools.r8.references.FieldReference getFieldReference():27:32 -> getFieldReference
     1:4:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.dw:
 # {"id":"sourceFile","fileName":"InspectorImpl.java"}
     java.util.Collection classes -> a
     1:2:void <init>(java.util.Collection):44:45 -> <init>
@@ -101474,22 +101523,22 @@
     7:7:java.util.List wrapInspections(java.util.Collection):22:22 -> a
     8:13:void runInspections(java.util.List,java.util.Collection):33:38 -> a
     1:2:void forEachClass(java.util.function.Consumer):50:51 -> forEachClass
-com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.WN:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.aO:
 # {"id":"sourceFile","fileName":"MethodInspectorImpl.java"}
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tc;"}
     com.android.tools.r8.graph.DexEncodedMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j1;"}
     com.android.tools.r8.references.MethodReference reference -> c
     1:3:void <init>(com.android.tools.r8.inspector.internal.ClassInspectorImpl,com.android.tools.r8.graph.DexEncodedMethod):19:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rc;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tc;Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.references.TypeReference lambda$getMethodReference$0(com.android.tools.r8.graph.DexType):33:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/references/TypeReference;"}
     1:7:com.android.tools.r8.references.MethodReference getMethodReference():26:32 -> getMethodReference
     8:14:com.android.tools.r8.references.MethodReference getMethodReference():31:37 -> getMethodReference
     15:15:com.android.tools.r8.references.MethodReference getMethodReference():36:36 -> getMethodReference
     16:27:com.android.tools.r8.references.MethodReference getMethodReference():28:39 -> getMethodReference
-com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.cl0:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.gl0:
 # {"id":"sourceFile","fileName":"ValueInspectorImpl.java"}
     com.android.tools.r8.graph.DexValue value -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/N2;"}
@@ -101551,26 +101600,26 @@
     1:1:boolean isPrimitive():46:46 -> isPrimitive
     1:1:boolean isShortValue():99:99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.gc:
 # {"id":"sourceFile","fileName":"ClassInitializationAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nm;"}
     int markingColor -> d
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ec;"}
     boolean $assertionsDisabled -> f
     1:13:void <clinit>():54:66 -> <clinit>
     1:1:void <init>():82:82 -> <init>
     2:7:void <init>():79:84 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):87:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     9:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:89 -> <init>
     1:26:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):98:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/WB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/YB;)Z"}
     27:42:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):182:197 -> a
     27:42:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):124 -> a
     43:43:boolean com.android.tools.r8.ir.code.CatchHandlers$1.hasNext():158:158 -> a
@@ -101587,17 +101636,17 @@
     58:58:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):135 -> a
     59:60:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):135:136 -> a
     61:61:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):135:135 -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.ec:
 # {"id":"sourceFile","fileName":"ClassInitializationAnalysis.java"}
     1:1:void <init>():67:67 -> <init>
     1:1:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/WB;)Z"}
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.dc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/YB;)Z"}
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.fc:
 # {"id":"sourceFile","fileName":"ClassInitializationAnalysis.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
     1:1:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):273:273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;II)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;II)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
     2:2:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):273 -> a
     3:3:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):273:273 -> a
@@ -101605,7 +101654,7 @@
     4:4:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):276 -> a
     5:14:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):277:286 -> a
     15:29:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):498:512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/b1;Lcom/android/tools/r8/graph/y;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/b1;Lcom/android/tools/r8/graph/y;I)Z"}
     30:30:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
     30:30:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):513 -> a
     31:36:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):514:519 -> a
@@ -101630,20 +101679,20 @@
     74:75:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):572 -> a
     76:82:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):572:578 -> a
     1:1:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:480 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;II)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y;II)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480 -> b
     3:10:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:487 -> b
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.fl:
 # {"id":"sourceFile","fileName":"DeterminismAnalysis.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:49:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Z"}
     50:50:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Lv:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Nv:
 # {"id":"sourceFile","fileName":"InitializedClassesOnNormalExitAnalysis.java"}
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Kv:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Mv:
 # {"id":"sourceFile","fileName":"InitializedClassesOnNormalExitAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -101661,10 +101710,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     38:44:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):119:125 -> a
     38:44:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;)V"}
     45:54:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):133:142 -> a
     45:54:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FB;)V"}
     55:55:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
     55:55:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -101676,18 +101725,18 @@
     57:57:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):57 -> a
     58:64:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):140:146 -> a
     58:64:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):57 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.Ui0:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.Yi0:
 # {"id":"sourceFile","fileName":"TypeChecker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ul0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yl0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():32:32 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):38:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yl0;)V"}
     1:3:boolean check(com.android.tools.r8.ir.code.IRCode):44:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
     4:4:boolean check(com.android.tools.r8.ir.code.InstancePut):67:67 -> a
     4:4:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
     5:6:boolean check(com.android.tools.r8.ir.code.IRCode):49:50 -> a
@@ -101711,8 +101760,8 @@
     36:38:boolean check(com.android.tools.r8.ir.code.Throw):118:120 -> a
     36:38:boolean check(com.android.tools.r8.ir.code.IRCode):58 -> a
     39:51:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):97:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;)Z"}
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.hl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;)Z"}
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.ll0:
 # {"id":"sourceFile","fileName":"ValueMayDependOnEnvironmentAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -101721,11 +101770,11 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():80:80 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):87:91 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     1:3:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):95:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Z"}
     4:5:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Iterable):55:56 -> a
@@ -101850,11 +101899,11 @@
     94:94:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):122 -> a
     95:117:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):122:144 -> a
     118:119:boolean lambda$anyValueMayDependOnEnvironment$0(java.util.Set,java.util.Set,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):129:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/al0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/el0;)Z"}
     120:128:boolean addInvokeVirtualValueToValueGraph(com.android.tools.r8.ir.code.Value):253:261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     129:134:boolean addLogicalBinopValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,com.android.tools.r8.utils.WorkList):281:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/al0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/xm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/el0;Lcom/android/tools/r8/internal/fl0;Lcom/android/tools/r8/internal/Bm0;)Z"}
     135:135:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     135:135:boolean addLogicalBinopValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,com.android.tools.r8.utils.WorkList):287 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -101863,7 +101912,7 @@
     138:139:boolean addLogicalBinopValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,com.android.tools.r8.utils.WorkList):288 -> a
     140:140:boolean addLogicalBinopValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,com.android.tools.r8.utils.WorkList):289:289 -> a
     141:146:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):302:307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/al0;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/xm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/el0;Lcom/android/tools/r8/internal/fl0;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Bm0;)Z"}
     147:147:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
     147:147:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):307 -> a
     148:148:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):313:313 -> a
@@ -101912,23 +101961,23 @@
     250:250:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):411 -> a
     251:253:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):414:416 -> a
     1:6:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):268:273 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getType():51:51 -> b
     7:7:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):273 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):273:273 -> b
     9:9:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):272:272 -> b
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.gl0:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.kl0:
 # {"id":"sourceFile","fileName":"ValueMayDependOnEnvironmentAnalysis.java"}
     boolean hasTrackedValueEscaped -> a
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
     1:1:void <clinit>():433:433 -> <clinit>
     1:6:void <init>():431:436 -> <init>
     1:1:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):452:452 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.ul0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.yl0:
 # {"id":"sourceFile","fileName":"VerifyTypesHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -101937,11 +101986,11 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):14:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:8:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/Wi0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/aj0;)Z"}
     9:9:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     9:9:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):32 -> a
     10:28:boolean isAssignable(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):32:50 -> a
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.Fc0:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.Jc0:
 # {"id":"sourceFile","fileName":"SparseConditionalConstantPropagation.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueConstantPropagationJoiner joiner -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D1;"}
@@ -101951,22 +102000,22 @@
     2:2:void <init>(com.android.tools.r8.graph.AppView):48 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):48:48 -> <init>
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     1:1:java.lang.String getRewriterId():53:53 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     3:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode.run():125:126 -> b
     3:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):67 -> b
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode -> com.android.tools.r8.internal.Ec0:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode -> com.android.tools.r8.internal.Ic0:
 # {"id":"sourceFile","fileName":"SparseConditionalConstantPropagation.java"}
     com.android.tools.r8.ir.code.IRCode code -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Map mapping -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.WorkList ssaEdges -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bm0;"}
     com.android.tools.r8.utils.WorkList flowEdges -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bm0;"}
     java.util.BitSet[] executableFlowEdges -> e
     java.util.BitSet visitedBlocks -> f
     java.util.Map intSwitchKeyToTargetMapCache -> g
@@ -101974,11 +102023,11 @@
     java.util.Map stringSwitchKeyToTargetMapCache -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jc0;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():70:70 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation,com.android.tools.r8.ir.code.IRCode):87:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fc0;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jc0;Lcom/android/tools/r8/internal/Dt;)V"}
     2:2:void <init>(com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation,com.android.tools.r8.ir.code.IRCode):73:73 -> <init>
     3:3:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation,com.android.tools.r8.ir.code.IRCode):75 -> <init>
@@ -101995,7 +102044,7 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> a
     1:1:void visitPhi(com.android.tools.r8.ir.code.Phi):207 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     2:8:void visitPhi(com.android.tools.r8.ir.code.Phi):208:214 -> a
     9:13:boolean isExecutableEdge(int,int):356:360 -> a
     9:13:void visitPhi(com.android.tools.r8.ir.code.Phi):214 -> a
@@ -102017,7 +102066,7 @@
     27:27:void setAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue):199:199 -> a
     27:27:void visitPhi(com.android.tools.r8.ir.code.Phi):227 -> a
     28:28:com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode analyze():95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ec0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ic0;"}
     29:32:void visitInstructions(com.android.tools.r8.ir.code.BasicBlock):232:235 -> a
     29:32:com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode analyze():96 -> a
     33:35:com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode analyze():98:100 -> a
@@ -102038,7 +102087,7 @@
     51:58:com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation$SparseConditionalConstantPropagationOnCode analyze():109:116 -> a
     59:59:boolean lambda$rewriteConstants$0(java.util.Map$Entry):134:134 -> a
     60:64:void lambda$rewriteConstants$4(java.util.List,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.utils.BooleanBox,java.util.Map$Entry):138:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/D6;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/F6;Ljava/util/Map$Entry;)V"}
     65:65:long com.android.tools.r8.ir.analysis.value.SingleNumberValue.getValue():127:127 -> a
     65:65:void lambda$rewriteConstants$4(java.util.List,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.utils.BooleanBox,java.util.Map$Entry):142 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102073,19 +102122,19 @@
     107:107:void lambda$rewriteConstants$4(java.util.List,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.utils.BooleanBox,java.util.Map$Entry):176 -> a
     108:110:void lambda$rewriteConstants$4(java.util.List,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.utils.BooleanBox,java.util.Map$Entry):176:178 -> a
     111:111:boolean lambda$rewriteConstants$2(com.android.tools.r8.ir.code.Instruction):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     112:112:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     112:112:boolean lambda$rewriteConstants$2(com.android.tools.r8.ir.code.Instruction):152 -> a
     113:113:boolean lambda$rewriteConstants$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     114:114:com.android.tools.r8.ir.analysis.value.AbstractValue getCachedAbstractValue(com.android.tools.r8.ir.code.Value):195:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
     115:115:boolean isConstNumber(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue):203:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/B1;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/B1;)Z"}
     116:116:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     116:116:boolean isConstNumber(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue):203 -> a
     117:120:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):264:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hD;)V"}
     121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     121:121:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102173,7 +102222,7 @@
     64:64:boolean rewriteConstants():189:189 -> b
     65:65:int lambda$rewriteConstants$1(java.util.Map$Entry):135:135 -> b
     66:66:void visitInstruction(com.android.tools.r8.ir.code.Instruction):239:239 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     67:67:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> b
     67:67:void visitInstruction(com.android.tools.r8.ir.code.Instruction):239 -> b
     68:70:void visitInstruction(com.android.tools.r8.ir.code.Instruction):241:243 -> b
@@ -102196,7 +102245,7 @@
     88:88:void setAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue):199:199 -> b
     88:88:void visitInstruction(com.android.tools.r8.ir.code.Instruction):254 -> b
     89:93:void visitInstruction(com.android.tools.r8.ir.code.Instruction):255:259 -> b
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.bl0:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.fl0:
 # {"id":"sourceFile","fileName":"ValueGraph.java"}
     java.util.Map nodes -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -102204,7 +102253,7 @@
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>():27:29 -> <init>
     1:1:com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node createNodeIfAbsent(com.android.tools.r8.ir.code.Value):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/el0;"}
     2:2:void mergeStronglyConnectedComponents():57:57 -> a
     3:4:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Iterable):55:56 -> a
     3:4:void mergeStronglyConnectedComponents():57 -> a
@@ -102233,19 +102282,19 @@
     33:33:void mergeNodes(java.lang.Iterable):52:52 -> a
     33:33:void mergeStronglyConnectedComponents():62 -> a
     34:34:void mergeStronglyConnectedComponents():63:63 -> a
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.al0:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.el0:
 # {"id":"sourceFile","fileName":"ValueGraph.java"}
     com.android.tools.r8.ir.code.Value value -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.Set label -> b
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     1:1:void <init>(com.android.tools.r8.ir.code.Value):76:76 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:8:void <init>(com.android.tools.r8.ir.code.Value):72:78 -> <init>
     1:1:java.util.Set getSuccessors():86:86 -> a
     2:3:boolean hasSuccessorThatMatches(java.util.function.Predicate):90:91 -> a
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.J5:
 # {"id":"sourceFile","fileName":"BasicBlockBehavioralSubsumption.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -102254,12 +102303,12 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():37:37 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     1:2:com.android.tools.r8.ir.code.Instruction skipNonDependentInstructionsUntil(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,java.util.function.Predicate):91:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Kw;"}
     3:3:com.android.tools.r8.ir.code.Instruction skipNonDependentInstructionsUntil(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,java.util.function.Predicate):91:91 -> a
     4:4:boolean lambda$skipNonDependentInstructionsUntil$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
     5:5:boolean lambda$skipNonDependentInstructionsUntil$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):95 -> a
     6:6:boolean lambda$skipNonDependentInstructionsUntil$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):95:95 -> a
@@ -102285,7 +102334,7 @@
     20:27:boolean dependsOnConditionValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):71:78 -> a
     20:27:boolean lambda$skipNonDependentInstructionsUntil$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):96 -> a
     28:29:boolean isSubsumedBy(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):107:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Jw;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Ljava/util/Set;)Z"}
     30:36:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):237:243 -> a
     30:36:boolean isSubsumedBy(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):114 -> a
     37:50:boolean isSubsumedBy(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):119:132 -> a
@@ -102322,9 +102371,9 @@
     150:167:boolean isSubsumedBy(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):203:220 -> a
     168:168:boolean isSubsumedBy(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):219:219 -> a
     169:170:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):252:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     171:179:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):257:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Z"}
     180:185:boolean instructionsDefineIdenticalValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):270:275 -> a
     180:185:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):265 -> a
     186:186:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
@@ -102356,33 +102405,33 @@
     1:7:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):237:243 -> b
     1:7:boolean definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):233 -> b
     1:7:boolean isNonLocalDefinitionOrSideEffecting(com.android.tools.r8.ir.code.Instruction):229 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     8:8:boolean isNonLocalDefinitionOrSideEffecting(com.android.tools.r8.ir.code.Instruction):229:229 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.po:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.so:
 # {"id":"sourceFile","fileName":"EscapeAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration configuration -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/to;"}
     java.util.Set trackedValues -> c
     java.util.Deque valuesToTrack -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/qo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/to;)V"}
     2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):35:46 -> <init>
     1:1:boolean lambda$isEscaping$0(com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:java.util.Set computeEscapeRoutes(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;)Ljava/util/Set;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     3:3:java.util.Set computeEscapeRoutes(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):74 -> a
     4:11:java.util.Set computeEscapeRoutes(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):75:82 -> a
     12:12:boolean lambda$computeEscapeRoutes$1(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.ir.code.Instruction):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wu;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yu;Lcom/android/tools/r8/internal/Kw;)Z"}
     13:20:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):87:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Ljava/util/function/Predicate;)V"}
     21:21:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> a
     21:21:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102408,31 +102457,31 @@
     102:103:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
     104:105:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):115:116 -> a
     106:108:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.qo:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.to:
 # {"id":"sourceFile","fileName":"EscapeAnalysisConfiguration.java"}
     boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/po;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.Vo:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/so;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/C5;)Z"}
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.Yo:
 # {"id":"sourceFile","fileName":"FieldAccessAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dp;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fp;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis fieldReadForInvokeReceiverAnalysis -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vp;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis fieldReadForWriteAnalysis -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wp;"}
     1:9:void <init>(com.android.tools.r8.graph.AppView):33:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     10:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker,com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis,com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis,com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis):50:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ap;Lcom/android/tools/r8/internal/cp;Lcom/android/tools/r8/internal/sp;Lcom/android/tools/r8/internal/tp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/dp;Lcom/android/tools/r8/internal/fp;Lcom/android/tools/r8/internal/vp;Lcom/android/tools/r8/internal/wp;)V"}
     1:1:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8$a;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8$a;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;)V"}
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     2:2:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102475,7 +102524,7 @@
     44:44:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):92 -> a
     45:47:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):95:97 -> a
     48:61:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):96:109 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.dp:
 # {"id":"sourceFile","fileName":"FieldAssignmentTracker.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C1;"}
@@ -102484,9 +102533,9 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bp;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph objectAllocationGraph -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cp;"}
     java.util.Map fieldStates -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map abstractFinalInstanceFieldValues -> g
@@ -102532,7 +102581,7 @@
     51:51:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):133 -> a
     52:52:void lambda$initializeAbstractInstanceFieldValues$1(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):134:134 -> a
     53:56:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.graph.ProgramField):126:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i3;Lcom/android/tools/r8/internal/qY;Lcom/android/tools/r8/graph/A5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/i3;Lcom/android/tools/r8/internal/uY;Lcom/android/tools/r8/graph/A5;)V"}
     57:57:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
     57:57:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.graph.ProgramField):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102548,7 +102597,7 @@
     66:66:void lambda$acceptClassInitializerDefaultsResult$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):155 -> a
     67:68:void lambda$acceptClassInitializerDefaultsResult$4(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):158:159 -> a
     69:71:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):163:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
     72:72:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
     72:72:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):166 -> a
     73:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):165:169 -> a
@@ -102567,7 +102616,7 @@
     90:90:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):181 -> a
     91:91:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$acceptClassInitializerDefaultsResult$3(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):185:185 -> a
     92:93:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value):201:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/bl0;)V"}
     94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     94:94:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102576,7 +102625,7 @@
     96:100:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value):202:206 -> a
     101:101:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value):205:205 -> a
     102:102:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$recordFieldPut$5(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
     103:103:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     103:103:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$recordFieldPut$5(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):225 -> a
     104:104:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$recordFieldPut$5(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):229:229 -> a
@@ -102705,7 +102754,7 @@
     175:175:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState.create(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):43:43 -> a
     175:175:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$recordFieldPut$5(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):222 -> a
     176:183:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):251:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nQ;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rQ;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     184:184:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
     184:184:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102719,7 +102768,7 @@
     201:201:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):275 -> a
     202:240:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):276:314 -> a
     241:241:boolean lambda$recordAllocationSite$6(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Map$Entry):285:285 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fw;Lcom/android/tools/r8/internal/GB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/B1;Ljava/util/Map$Entry;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hw;Lcom/android/tools/r8/internal/IB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/B1;Ljava/util/Map$Entry;)Z"}
     242:242:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.get(com.android.tools.r8.graph.DexClassAndField):42:42 -> a
     242:242:boolean lambda$recordAllocationSite$6(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Map$Entry):285 -> a
     243:245:boolean lambda$recordAllocationSite$6(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Map$Entry):286:288 -> a
@@ -102838,7 +102887,7 @@
     314:315:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):346:347 -> a
     314:315:void lambda$waveDone$9(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):437 -> a
     316:317:com.android.tools.r8.utils.TraversalContinuation lambda$recordAllAllocationsSitesProcessed$8(com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):410:411 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qY;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uY;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/Oh0;"}
     318:318:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
     318:318:com.android.tools.r8.utils.TraversalContinuation lambda$recordAllAllocationsSitesProcessed$8(com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):411 -> a
     319:323:com.android.tools.r8.utils.TraversalContinuation lambda$recordAllAllocationsSitesProcessed$8(com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):412:416 -> a
@@ -102846,7 +102895,7 @@
     324:324:com.android.tools.r8.utils.TraversalContinuation lambda$recordAllAllocationsSitesProcessed$8(com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):416 -> a
     325:325:com.android.tools.r8.utils.TraversalContinuation lambda$recordAllAllocationsSitesProcessed$8(com.android.tools.r8.utils.collections.ProgramFieldMap,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):418:418 -> a
     326:326:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):435:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/ir/optimize/info/z;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/ir/optimize/info/z;)V"}
     327:327:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     327:327:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):436 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -102884,12 +102933,12 @@
     47:47:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):395 -> b
     48:54:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401:407 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.Yo:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.bp:
 # {"id":"sourceFile","fileName":"FieldAssignmentTracker.java"}
     java.util.Map fieldWrites -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>():454:454 -> <init>
     2:5:void <init>():448:451 -> <init>
     1:1:void initialize(com.android.tools.r8.graph.AppView):458:458 -> a
@@ -102916,12 +102965,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/C5;)V"}
     19:26:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):478:485 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.cp:
 # {"id":"sourceFile","fileName":"FieldAssignmentTracker.java"}
     java.util.Map objectAllocations -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>():502:502 -> <init>
     2:6:void <init>():495:499 -> <init>
     1:1:void initialize(com.android.tools.r8.graph.AppView):506:506 -> a
@@ -102936,12 +102985,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Ljava/util/List;"}
     9:16:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):518:525 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.fp:
 # {"id":"sourceFile","fileName":"FieldBitAccessAnalysis.java"}
     1:1:void <init>():16:16 -> <init>
     1:17:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):67:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/g1;)Z"}
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.sp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/g1;)Z"}
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.vp:
 # {"id":"sourceFile","fileName":"FieldReadForInvokeReceiverAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -102951,7 +103000,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     1:1:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/c8$a;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/internal/e8$a;Lcom/android/tools/r8/graph/C5;)V"}
     2:3:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):39:40 -> a
     4:4:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
     4:4:java.util.Set getMethods(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):50 -> a
@@ -102984,17 +103033,17 @@
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     32:36:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):41:45 -> a
     37:37:void lambda$recordFieldAccess$0(java.util.Set,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Y7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/a8;)V"}
     38:40:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder.setIsReadForInvokeReceiver(java.util.Set):73:75 -> a
     38:40:void lambda$recordFieldAccess$0(java.util.Set,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):46 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.wp:
 # {"id":"sourceFile","fileName":"FieldReadForWriteAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:6:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):33:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/c8$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/e8$a;)V"}
     7:7:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):44:44 -> a
     7:7:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):38 -> a
     8:9:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Iterable):55:56 -> a
@@ -103023,12 +103072,12 @@
     32:35:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):52 -> a
     32:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):38 -> a
     36:36:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):39:39 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.Sh0:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.Wh0:
 # {"id":"sourceFile","fileName":"TrivialFieldAccessReprocessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gX;"}
     java.util.Map dependencies -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map readFields -> d
@@ -103038,17 +103087,17 @@
     java.util.Set constantFields -> f
     java.util.Set nonConstantFields -> g
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):81:81 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gX;)V"}
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):61:77 -> <init>
     19:19:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> <init>
     19:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):77 -> <init>
     20:26:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):77:83 -> <init>
     1:6:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):93:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/ph0;)V"}
     7:20:void computeFieldsWithNonTrivialValue():137:150 -> a
     7:20:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):99 -> a
     21:21:void computeFieldsWithNonTrivialValue():147:147 -> a
@@ -103251,14 +103300,14 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;)V"}
     11:18:void processFieldsNeverWritten(com.android.tools.r8.shaking.AppInfoWithLiveness):263:270 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.Rh0:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.Vh0:
 # {"id":"sourceFile","fileName":"TrivialFieldAccessReprocessor.java"}
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wh0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():331:331 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):333:333 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wh0;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.appView():87:87 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):334 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -103276,7 +103325,7 @@
     8:8:void registerStaticFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):486:486 -> a
     8:8:void registerStaticFieldReadInstruction(com.android.tools.r8.dex.code.CfOrDexStaticFieldRead):498 -> a
     9:9:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):342:342 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;ZZLcom/android/tools/r8/internal/Z7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;ZZLcom/android/tools/r8/internal/b8;)V"}
     10:10:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.appView():87:87 -> a
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):342 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -103362,11 +103411,11 @@
     107:107:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):468 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     108:108:void registerInstanceFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):463:463 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Z7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/b8;)V"}
     1:1:com.android.tools.r8.graph.AbstractAccessContexts lambda$recordFieldAccessContext$0(com.android.tools.r8.graph.DexEncodedField):438:438 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/graph/d;"}
     2:2:void registerStaticFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):486:486 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Z7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/b8;)V"}
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):480:480 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:void registerStaticFieldReadWithMetadata(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata):486:486 -> e
@@ -103382,14 +103431,14 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/q;"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet():38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet():46:46 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xI;"}
     boolean isEmpty() -> c
     1:1:boolean isKnownFieldSet():0:0 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.nf:
 # {"id":"sourceFile","fileName":"ConcreteMutableFieldSet.java"}
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
@@ -103401,7 +103450,7 @@
     4:5:void <init>(com.android.tools.r8.graph.DexEncodedField):31 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexEncodedField):31:31 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet():57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
     2:2:boolean contains(com.android.tools.r8.graph.DexEncodedField):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
     3:3:boolean contains(com.android.tools.r8.graph.DexClassAndField):77:77 -> a
@@ -103419,7 +103468,7 @@
     19:19:com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet addAll(com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet):39:39 -> a
     19:19:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):93 -> a
     20:20:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
     21:21:boolean isEmpty():119:119 -> a
     21:21:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):99 -> a
     22:28:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):99:105 -> a
@@ -103433,15 +103482,15 @@
     35:35:void add(com.android.tools.r8.graph.DexEncodedField) -> a
     35:35:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):112 -> a
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet():22:22 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xI;"}
     1:1:boolean isEmpty():119:119 -> c
     1:5:boolean equals(java.lang.Object):138:142 -> equals
     1:1:int hashCode():129:129 -> hashCode
     1:1:int size():124:124 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Um:
 # {"id":"sourceFile","fileName":"EmptyFieldSet.java"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Um;"}
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():16:18 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -103454,7 +103503,7 @@
     10:10:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet.isEmpty():119:119 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):77 -> a
     11:13:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.proto.ArgumentInfo):62:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lf;ILcom/android/tools/r8/graph/proto/b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nf;ILcom/android/tools/r8/graph/proto/b;)V"}
     14:14:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RemovedArgumentInfo.getSingleValue():64:64 -> a
     14:14:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.proto.ArgumentInfo):65 -> a
     15:15:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.proto.ArgumentInfo):65:65 -> a
@@ -103473,41 +103522,41 @@
     22:22:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.proto.ArgumentInfo):69 -> a
     23:23:void lambda$fixupReadSetAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet,int,com.android.tools.r8.graph.proto.ArgumentInfo):71:71 -> a
     24:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet():16:16 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xI;"}
     1:1:boolean isEmpty():88:88 -> c
     1:1:boolean isKnownFieldSet():28:28 -> d
     1:1:int size():93:93 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Ip:
 # {"id":"sourceFile","fileName":"FieldValueAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.ProgramMethod context -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/y;"}
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nm;"}
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.DexClassAndFieldMap putsPerField -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zl;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):64:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;)V"}
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):61:68 -> <init>
     boolean isSubjectToOptimization(com.android.tools.r8.graph.DexClassAndField) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Z"}
     void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis asInstanceFieldValueAnalysis():90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mw;"}
     2:2:void recordFieldPut(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/fw;)V"}
     3:3:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
     3:3:void recordFieldPut(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -103567,7 +103616,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:64:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):146:148 -> a
     65:65:boolean lambda$computeFieldOptimizationInfo$1(com.android.tools.r8.ir.code.BasicBlock):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     66:77:void lambda$computeFieldOptimizationInfo$2(boolean,java.util.List,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.graph.DexClassAndField,java.util.List):150:161 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/List;Lcom/android/tools/r8/ir/optimize/u;Lcom/android/tools/r8/graph/F0;Ljava/util/List;)V"}
     78:81:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():72:75 -> a
@@ -103671,29 +103720,29 @@
     62:62:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():285 -> b
     63:77:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():293:307 -> b
     78:78:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$3(com.android.tools.r8.ir.code.BasicBlock):236:236 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/q;"}
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Ep:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/q;"}
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Hp:
 # {"id":"sourceFile","fileName":"FieldValueAnalysis.java"}
     com.android.tools.r8.ir.code.Instruction instruction -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo instanceFieldInitializationInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fw;"}
     1:3:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):46:48 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/dw;)V"}
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.kw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/fw;)V"}
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.mw:
 # {"id":"sourceFile","fileName":"InstanceFieldValueAnalysis.java"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ew;"}
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory factory -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gw;"}
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory factory -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iw;"}
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H0;"}
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IB;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeDirect):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/IB;)V"}
     2:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.builder():28:28 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeDirect):45 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeDirect):45:45 -> <init>
@@ -103702,11 +103751,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeDirect):59:61 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis asInstanceFieldValueAnalysis():121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mw;"}
     2:2:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexClassAndField):127:127 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Z"}
     3:3:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/internal/bl0;)V"}
     4:23:boolean fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.InstancePut):247:266 -> a
     4:23:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):137 -> a
     24:27:com.android.tools.r8.ir.code.DominatorTree com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis.getOrCreateDominatorTree():72:75 -> a
@@ -103724,7 +103773,7 @@
     53:53:void recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Value):240:240 -> a
     53:53:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):138 -> a
     54:57:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Value):203:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/fw;"}
     58:58:int com.android.tools.r8.ir.code.Argument.getIndex():53:53 -> a
     58:58:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Value):206 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -103746,7 +103795,7 @@
     75:75:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Value):221:221 -> a
     76:79:boolean fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexClassAndField):306:309 -> a
     76:79:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/fw;)V"}
     80:81:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189:190 -> a
     82:82:int com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo.getArgumentIndex():29:29 -> a
     82:82:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):190 -> a
@@ -103760,7 +103809,7 @@
     89:89:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):59:59 -> a
     89:89:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):195 -> a
     1:4:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):226:229 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/fw;)V"}
     5:5:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> b
     5:5:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):229 -> b
     6:12:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):230:236 -> b
@@ -103773,23 +103822,23 @@
     9:9:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> c
     9:9:void analyzeParentConstructorCall():182 -> c
     10:13:void analyzeParentConstructorCall():182:185 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.yI:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.xI:
 # {"id":"sourceFile","fileName":"KnownFieldSet.java"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
     int size() -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.Md0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.Qd0:
 # {"id":"sourceFile","fileName":"StaticFieldValueAnalysis.java"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rd0;"}
     java.util.Map computedValues -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):55:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):51:56 -> <init>
     8:8:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.builder(com.android.tools.r8.graph.DexProgramClass):29:29 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):56 -> <init>
@@ -103823,12 +103872,12 @@
     20:22:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexClassAndField):121:123 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Z"}
     23:23:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/internal/bl0;)V"}
     24:24:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
     24:24:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):138 -> a
     25:27:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):138:140 -> a
     28:36:void updateFieldOptimizationInfo(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):145:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/B1;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/B1;Z)V"}
     37:37:void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.recordFieldHasAbstractValue(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):33:33 -> a
     37:37:void updateFieldOptimizationInfo(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):153 -> a
     38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
@@ -103853,7 +103902,7 @@
     53:53:void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicType(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.type.DynamicType):24:24 -> a
     53:53:void updateFieldOptimizationInfo(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):164 -> a
     54:55:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClassAndField):183:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
     56:56:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
     56:56:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClassAndField):184 -> a
     57:57:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
@@ -103891,7 +103940,7 @@
     77:77:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleFieldValue(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Value):199:199 -> a
     77:77:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClassAndField):186 -> a
     78:83:boolean updateEnumValueState(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.ir.code.Value):342:347 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/uU;[Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/yU;[Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/bl0;)Z"}
     84:84:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     84:84:boolean updateEnumValueState(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.ir.code.Value):347 -> a
     85:85:boolean updateEnumValueState(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.ir.code.Value):356:356 -> a
@@ -103919,7 +103968,7 @@
     97:97:boolean updateEnumValueState(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.ir.code.Value):361 -> a
     98:103:boolean updateEnumValueState(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.ir.code.Value):364:369 -> a
     104:141:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):392:429 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Sb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Wb0;"}
     142:142:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexClass.lookupStaticField(com.android.tools.r8.graph.DexField):466:466 -> a
     142:142:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):429 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -103947,7 +103996,7 @@
     157:157:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):449 -> a
     158:158:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):449:449 -> a
     1:9:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):229:237 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Sb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Wb0;"}
     10:10:boolean com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.isEnumValuesObjectState():0:0 -> b
     10:10:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):237 -> b
     11:15:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):251:255 -> b
@@ -103999,54 +104048,54 @@
     117:117:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):243 -> b
     118:119:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):244:245 -> b
     120:120:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):244:244 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.Sd0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.Wd0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     1:1:void <init>():18:18 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues():25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rd0;"}
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.Nd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vd0;"}
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.Rd0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     1:1:void <init>():32:32 -> <init>
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wd0;"}
     void recordStaticField(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/graph/B1;)V"}
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.Pd0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.Td0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Td0;"}
     1:1:void <clinit>():118:118 -> <clinit>
     1:1:void <init>():120:120 -> <init>
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.Od0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.Sd0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     1:1:void <init>():130:130 -> <init>
     1:1:void recordStaticField(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):136:136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/graph/B1;)V"}
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sd0;"}
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.Rd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wd0;"}
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.Vd0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap enumAbstractValues -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):45:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)V"}
     1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):55:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Rd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Vd0;"}
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):60 -> a
     8:8:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):60:60 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues asEnumStaticFieldValues():109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vd0;"}
     10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.GraphLens.lookupField(com.android.tools.r8.graph.DexField):333:333 -> a
     10:10:void lambda$rewrittenWithLens$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/uU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yU;)V"}
     11:11:void lambda$rewrittenWithLens$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):59:59 -> a
     12:12:void lambda$rewrittenWithLens$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):58:58 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.Qd0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.Ud0:
 # {"id":"sourceFile","fileName":"StaticFieldValues.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumObjectStateBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.ir.analysis.value.AbstractValue valuesCandidateAbstractValue -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     boolean $assertionsDisabled -> c
@@ -104065,15 +104114,15 @@
     19:22:void recordStaticField(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):83:86 -> a
     23:23:void recordStaticField(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
     24:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wd0;"}
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     25:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():93 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:30:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():94:98 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.Yj0:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.ck0:
 # {"id":"sourceFile","fileName":"UnknownFieldSet.java"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck0;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:boolean contains(com.android.tools.r8.graph.DexClassAndField):26:26 -> a
@@ -104081,7 +104130,7 @@
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet fixupReadSetAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/q;"}
     3:3:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/q;"}
     1:1:boolean isEmpty():31:31 -> c
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractInstruction -> com.android.tools.r8.internal.H:
 # {"id":"sourceFile","fileName":"AbstractInstruction.java"}
@@ -104101,7 +104150,7 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.A1:
 # {"id":"sourceFile","fileName":"AbstractTransferFunction.java"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeInitialState(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/z1;"}
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):35:35 -> a
@@ -104109,73 +104158,73 @@
     3:3:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeExceptionalBlockEntryState(java.lang.Object,com.android.tools.r8.graph.DexType,java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):59:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/z1;"}
     4:4:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult createFailedAnalysisResult(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/zh0;)Lcom/android/tools/r8/internal/Dh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/Dh0;)Lcom/android/tools/r8/internal/Fh;"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):21:21 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph -> com.android.tools.r8.internal.Zg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
+com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph -> com.android.tools.r8.internal.bh:
 # {"id":"sourceFile","fileName":"ControlFlowGraph.java"}
     java.lang.Object getEntryBlock() -> a
     com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,com.android.tools.r8.utils.TriFunction,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Oh0;"}
     1:2:java.lang.Object getUniqueSuccessor(java.lang.Object):29:30 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation lambda$getUniqueSuccessor$1(java.lang.Object,java.util.function.Function):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:com.android.tools.r8.utils.TraversalContinuation lambda$hasExceptionalSuccessors$3(java.util.function.Function,java.lang.Object,com.android.tools.r8.graph.DexType):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Oh0;"}
     5:5:com.android.tools.r8.utils.TraversalContinuation lambda$traversePredecessors$7(java.util.function.Function,java.lang.Object,java.lang.Object):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     6:6:com.android.tools.r8.utils.TraversalContinuation lambda$traverseExceptionalSuccessors$12(java.util.function.BiFunction,java.lang.Object,com.android.tools.r8.graph.DexType,java.lang.Object):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     7:7:com.android.tools.r8.utils.TraversalContinuation lambda$traversePredecessors$13(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.utils.TraversalContinuation$Continue):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Jh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/Oh0;"}
     8:9:com.android.tools.r8.utils.TraversalContinuation traverseSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):120:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     10:10:void lambda$forEachSuccessor$18(java.util.function.Consumer,java.lang.Object,com.android.tools.r8.graph.DexType):167:167 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)V"}
     11:12:com.android.tools.r8.utils.TraversalContinuation lambda$forEachNormalSuccessor$19(java.util.function.Consumer,java.lang.Object):174:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     13:13:void forEachExceptionalSuccessor(java.lang.Object,java.util.function.BiConsumer):180:180 -> a
     14:15:com.android.tools.r8.utils.TraversalContinuation lambda$forEachExceptionalSuccessor$20(java.util.function.BiConsumer,java.lang.Object,com.android.tools.r8.graph.DexType):183:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Oh0;"}
     com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:boolean hasUniqueSuccessor(java.lang.Object):53:53 -> b
     2:2:boolean com.android.tools.r8.utils.TraversalUtils.isSingleton(java.util.function.Consumer):35:35 -> b
     2:2:boolean hasUniqueSuccessor(java.lang.Object):53 -> b
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseSuccessors(java.lang.Object,java.util.function.Function):80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalSuccessors$11(java.util.function.Function,java.lang.Object,java.lang.Object):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,java.util.function.BiFunction):90:90 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)V"}
     6:9:com.android.tools.r8.utils.TraversalContinuation lambda$traverseSuccessors$15(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.utils.TraversalContinuation$Continue):123:126 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Jh0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/Oh0;"}
     10:10:com.android.tools.r8.utils.TraversalContinuation lambda$traverseSuccessors$15(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.utils.TraversalContinuation$Continue):123:123 -> b
     11:11:com.android.tools.r8.utils.TraversalContinuation lambda$traverseSuccessors$14(java.util.function.BiFunction,java.lang.Object,com.android.tools.r8.graph.DexType,java.lang.Object):125:125 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/lang/Object;Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     12:12:void forEachNormalSuccessor(java.lang.Object,java.util.function.Consumer):171:171 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;)V"}
     com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:void lambda$hasExceptionalSuccessors$4(java.lang.Object,java.util.function.Function):40:40 -> c
     2:2:boolean hasUniquePredecessor(java.lang.Object):45:45 -> c
     3:3:boolean com.android.tools.r8.utils.TraversalUtils.isSingleton(java.util.function.Consumer):35:35 -> c
     3:3:boolean hasUniquePredecessor(java.lang.Object):45 -> c
     4:4:com.android.tools.r8.utils.TraversalContinuation lambda$traverseSuccessors$10(java.util.function.Function,java.lang.Object,java.lang.Object):80:80 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     5:6:void forEachSuccessor(java.lang.Object,java.util.function.Consumer):165:166 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;)V"}
     1:2:java.lang.Object getUniquePredecessor(java.lang.Object):24:25 -> d
     3:3:com.android.tools.r8.utils.TraversalContinuation traversePredecessors(java.lang.Object,java.util.function.Function):64:64 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:com.android.tools.r8.utils.TraversalContinuation lambda$traverseExceptionalPredecessors$9(java.util.function.Function,java.lang.Object,java.lang.Object):75:75 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     5:6:com.android.tools.r8.utils.TraversalContinuation traversePredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):100:101 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:boolean hasExceptionalPredecessors(java.lang.Object):34:34 -> e
     2:2:boolean com.android.tools.r8.utils.TraversalUtils.isEmpty(java.util.function.Consumer):30:30 -> e
     2:2:boolean com.android.tools.r8.utils.TraversalUtils.hasNext(java.util.function.Consumer):25 -> e
@@ -104192,36 +104241,36 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)V"}
     1:1:void lambda$hasUniqueSuccessor$6(java.lang.Object,java.util.function.Function):53:53 -> i
     1:1:com.android.tools.r8.utils.TraversalContinuation lambda$getUniquePredecessor$0(java.lang.Object,java.util.function.Function):25:25 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph$1 -> com.android.tools.r8.internal.Yg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
+com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph$1 -> com.android.tools.r8.internal.ah:
 # {"id":"sourceFile","fileName":"ControlFlowGraph.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.Hh:
 # {"id":"sourceFile","fileName":"DataflowAnalysisResult.java"}
     1:1:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult():30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gh;"}
     1:1:boolean isFailedAnalysisResult():34:34 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.Dh:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.Fh:
 # {"id":"sourceFile","fileName":"DataflowAnalysisResult.java"}
     1:1:void <init>():67:67 -> <init>
     1:1:boolean isFailedAnalysisResult():71:71 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Eh:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Gh:
 # {"id":"sourceFile","fileName":"DataflowAnalysisResult.java"}
     java.util.Map blockExitStates -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:2:void <init>(java.util.Map):43:44 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult():63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eh;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.Po:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gh;"}
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.So:
 # {"id":"sourceFile","fileName":"FailedTransferFunctionResult.java"}
     1:1:void <init>():16:16 -> <init>
     1:1:boolean isFailedTransferResult():25:25 -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z1;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IRControlFlowGraph -> com.android.tools.r8.internal.Ft:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IRControlFlowGraph -> com.android.tools.r8.internal.Ht:
 # {"id":"sourceFile","fileName":"IRControlFlowGraph.java"}
     1:1:java.lang.Object getUniqueSuccessor(java.lang.Object):10:10 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor(com.android.tools.r8.ir.code.BasicBlock):29:29 -> a
@@ -104232,14 +104281,14 @@
     1:1:boolean hasUniquePredecessor(java.lang.Object):10:10 -> c
     2:2:boolean hasUniquePredecessor(com.android.tools.r8.ir.code.BasicBlock):14:14 -> c
     2:2:boolean hasUniquePredecessor(java.lang.Object):10 -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisBase -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisBase -> com.android.tools.r8.internal.vB:
 # {"id":"sourceFile","fileName":"IntraProceduralDataflowAnalysisBase.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState bottom -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z1;"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph cfg -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bh;"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction transfer -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A1;"}
     java.util.Map blockEntryStates -> e
@@ -104249,14 +104298,14 @@
     java.util.Map exceptionalBlockEntryStates -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions options -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wB;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction,com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/z1;Lcom/android/tools/r8/internal/Zg;Lcom/android/tools/r8/internal/A1;Lcom/android/tools/r8/internal/uB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/z1;Lcom/android/tools/r8/internal/bh;Lcom/android/tools/r8/internal/A1;Lcom/android/tools/r8/internal/wB;)V"}
     2:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction,com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions):43:63 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Fh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Hh;"}
     2:3:java.lang.Object com.android.tools.r8.utils.WorkList.removeSeen():165:166 -> a
     2:3:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):76 -> a
     4:42:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):81:119 -> a
@@ -104272,7 +104321,7 @@
     53:56:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):131 -> a
     57:64:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.Timing):132:139 -> a
     65:76:com.android.tools.r8.utils.TraversalContinuation lambda$run$1(boolean,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractInstruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):98:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/lang/Object;Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/lang/Object;Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Oh0;"}
     77:77:com.android.tools.r8.utils.TraversalContinuation$Break com.android.tools.r8.utils.TraversalContinuation.doBreak(java.lang.Object):152:152 -> a
     77:77:com.android.tools.r8.utils.TraversalContinuation lambda$run$1(boolean,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractInstruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):108 -> a
     78:79:com.android.tools.r8.utils.TraversalContinuation lambda$run$1(boolean,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractInstruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):111:112 -> a
@@ -104286,7 +104335,7 @@
     92:95:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryStateForNormalBlock(java.lang.Object):155:158 -> a
     92:95:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(java.lang.Object):151 -> a
     96:100:com.android.tools.r8.utils.TraversalContinuation lambda$computeBlockEntryStateFromPredecessorExitStates$2(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):166:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Oh0;"}
     101:105:com.android.tools.r8.utils.TraversalContinuation lambda$computeBlockEntryStateFromPredecessorExitStates$2(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):167:171 -> a
     106:106:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     106:106:com.android.tools.r8.utils.TraversalContinuation lambda$computeBlockEntryStateFromPredecessorExitStates$2(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):171 -> a
@@ -104319,33 +104368,33 @@
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(java.lang.Object):82:82 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/z1;"}
     1:1:boolean shouldCacheBlockEntryStateForNormalBlock(java.lang.Object):226:226 -> e
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions -> com.android.tools.r8.internal.wB:
 # {"id":"sourceFile","fileName":"IntraProceduralDataflowAnalysisOptions.java"}
     boolean isCollapsingOfTrivialEdgesEnabled -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions COLLAPSE_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wB;"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions NO_COLLAPSE_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wB;"}
     1:3:void <clinit>():9:11 -> <clinit>
     1:2:void <init>(boolean):16:17 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.vB:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.xB:
 # {"id":"sourceFile","fileName":"IntraproceduralDataflowAnalysis.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):25:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/yh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Ch0;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction,com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions):34:34 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):20 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction,com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisOptions):34:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ve0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/we0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ze0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Ae0;)V"}
     1:1:boolean shouldCacheBlockEntryStateForNormalBlock(java.lang.Object):12:12 -> e
     2:2:boolean shouldCacheBlockEntryStateForNormalBlock(com.android.tools.r8.ir.code.BasicBlock):39:39 -> e
     2:2:boolean shouldCacheBlockEntryStateForNormalBlock(java.lang.Object):12 -> e
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.zh0:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.Dh0:
 # {"id":"sourceFile","fileName":"TransferFunctionResult.java"}
     1:1:boolean isFailedTransferResult():25:25 -> a
     1:1:boolean isAbstractState():19:19 -> b
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z1;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock -> com.android.tools.r8.internal.J8:
 # {"id":"sourceFile","fileName":"CfBlock.java"}
     int firstInstructionIndex -> a
     int firstThrowingInstructionIndex -> b
@@ -104357,17 +104406,17 @@
     java.util.LinkedHashMap exceptionalSuccessors -> f
     1:20:void <init>():21:40 -> <init>
     1:1:void lambda$toString$0(java.util.List,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/H8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/J8;)V"}
     2:2:java.lang.String getRangeString():94:94 -> a
     1:1:void lambda$toString$1(java.util.List,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/H8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/J8;)V"}
     1:7:java.lang.String toString():83:89 -> toString
-com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock -> com.android.tools.r8.internal.I8:
 # {"id":"sourceFile","fileName":"CfBlock.java"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>():98:98 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph -> com.android.tools.r8.internal.g9:
 # {"id":"sourceFile","fileName":"CfControlFlowGraph.java"}
     java.util.Map blocks -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -104378,7 +104427,7 @@
     1:3:void <init>(java.util.Map,com.android.tools.r8.graph.CfCode):46:48 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/graph/G;)V"}
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:java.util.List com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock.getExceptionalPredecessors():74:74 -> a
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):87 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -104386,9 +104435,9 @@
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):87:87 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40 -> a
     4:4:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,com.android.tools.r8.utils.TriFunction,java.lang.Object):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     5:5:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Oh0;"}
     6:6:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     6:6:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):118 -> a
     6:6:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40 -> a
@@ -104416,7 +104465,7 @@
     13:13:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40 -> a
     14:15:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock getBlock(com.android.tools.r8.cf.code.CfInstruction):60:61 -> a
     14:15:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalSuccessors$0(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z9;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/B9;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     16:16:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalSuccessors$0(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):98:98 -> a
     17:17:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock getEntryBlock():71:71 -> a
     17:17:java.lang.Object getEntryBlock():40 -> a
@@ -104433,7 +104482,7 @@
     22:22:java.util.LinkedHashMap com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock.getExceptionalSuccessors():78:78 -> a
     22:22:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.utils.TriFunction,java.lang.Object):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H8;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     23:23:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.utils.TriFunction,java.lang.Object):107:107 -> a
     24:24:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     24:24:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalUtils.traverseMap(java.util.Map,com.android.tools.r8.utils.TriFunction,java.lang.Object):75 -> a
@@ -104443,7 +104492,7 @@
     31:35:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalUtils.traverseMap(java.util.Map,com.android.tools.r8.utils.TriFunction,java.lang.Object):78:82 -> a
     31:35:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.utils.TriFunction,java.lang.Object):106 -> a
     36:36:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     37:37:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock.getLastInstruction(com.android.tools.r8.graph.CfCode):62:62 -> a
     37:37:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):95 -> a
     38:38:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):96:96 -> a
@@ -104454,9 +104503,9 @@
     40:41:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):96 -> a
     42:42:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):97:97 -> a
     43:43:com.android.tools.r8.utils.TraversalContinuation lambda$traverseExceptionalSuccessors$1(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.lang.Object):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/H8;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/J8;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40:40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:java.util.Collection com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock.getPredecessors():70:70 -> b
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):79 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -104464,8 +104513,8 @@
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,java.util.function.BiFunction,java.lang.Object):79:79 -> b
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40 -> b
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):40:40 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
-com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph$Builder -> com.android.tools.r8.internal.d9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
+com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph$Builder -> com.android.tools.r8.internal.f9:
 # {"id":"sourceFile","fileName":"CfControlFlowGraph.java"}
     java.util.Map blocks -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -104479,11 +104528,11 @@
     1:1:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfTryCatch.getEnd():52:52 -> a
     1:1:boolean lambda$updateCatchHandlers$3(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfTryCatch):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/Ya;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/ab;)Z"}
     2:2:void com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.setFirstInstructionIndex(int):114:114 -> a
     2:2:int processBlock(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,java.util.Deque,java.util.Map):237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;ILcom/android/tools/r8/internal/G8;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;ILcom/android/tools/r8/internal/I8;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)I"}
     3:3:int processBlock(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,java.util.Deque,java.util.Map):239:239 -> a
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     4:4:int processBlock(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,java.util.Deque,java.util.Map):239 -> a
@@ -104531,7 +104580,7 @@
     47:47:int processBlock(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,java.util.Deque,java.util.Map):261 -> a
     48:48:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.validate(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions):126:126 -> a
     48:48:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e9;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/G8;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g9;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/I8;)Z"}
     49:49:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.validate(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions):126:126 -> a
     49:49:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -104577,14 +104626,14 @@
     65:66:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
     67:70:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.validate(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions):133:136 -> a
     67:70:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnreachableCfBlocksAllowed():1714:1714 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnreachableCfBlocksAllowed():1720:1720 -> a
     71:71:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.validate(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions):136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:71:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
     72:72:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.validate(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions):133:133 -> a
     72:72:boolean lambda$build$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock):155 -> a
     73:78:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph build(com.android.tools.r8.utils.InternalOptions):145:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/e9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/g9;"}
     79:79:void removeBlockForTrailingLabel():284:284 -> a
     79:79:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph build(com.android.tools.r8.utils.InternalOptions):152 -> a
     80:80:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.graph.CfCode.getInstruction(int):292:292 -> a
@@ -104614,7 +104663,7 @@
     114:114:void createBlocks():187 -> a
     115:118:void createBlocks():187:190 -> a
     119:127:void updateCatchHandlers(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):308:316 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)V"}
     128:128:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfTryCatch.getEnd():52:52 -> a
     128:128:void updateCatchHandlers(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):316 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -104622,10 +104671,10 @@
     129:129:void updateCatchHandlers(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):316 -> a
     130:131:void updateCatchHandlers(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):316:317 -> a
     132:132:void createBlockIfAbsent(com.android.tools.r8.cf.code.CfInstruction):333:333 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)V"}
     133:134:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock getBlock(com.android.tools.r8.cf.code.CfInstruction):337:338 -> a
     133:134:void lambda$processBlock$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,com.android.tools.r8.cf.code.CfInstruction):270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G8;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I8;Lcom/android/tools/r8/internal/B9;)V"}
     135:135:void com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.addPredecessor(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock):101:101 -> a
     135:135:void lambda$processBlock$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,com.android.tools.r8.cf.code.CfInstruction):270 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -104633,7 +104682,7 @@
     136:136:void lambda$processBlock$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,com.android.tools.r8.cf.code.CfInstruction):270 -> a
     137:138:com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock getBlock(com.android.tools.r8.cf.code.CfInstruction):337:338 -> a
     137:138:void lambda$processBlock$2(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfLabel):275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G8;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I8;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/M9;)V"}
     139:139:void com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.addExceptionalSuccessor(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.graph.DexType):109:109 -> a
     139:139:void lambda$processBlock$2(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfLabel):276 -> a
     140:140:void com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock$MutableCfBlock.addExceptionalSuccessor(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.graph.DexType):109:109 -> a
@@ -104654,7 +104703,7 @@
     1:1:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfTryCatch.getEnd():52:52 -> b
     1:1:boolean lambda$verifyCatchHandlersUnchanged$4(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfTryCatch):327 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Lcom/android/tools/r8/internal/Ya;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Lcom/android/tools/r8/internal/ab;)Z"}
     2:9:void processBlocks():197:204 -> b
     10:10:com.android.tools.r8.cf.code.CfLabel com.android.tools.r8.cf.code.CfTryCatch.getStart():48:48 -> b
     10:10:void processBlocks():206 -> b
@@ -104664,12 +104713,12 @@
     19:19:void processBlocks():214 -> b
     20:30:void processBlocks():217:227 -> b
     31:32:boolean verifyCatchHandlersUnchanged(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):326:327 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;Ljava/util/ArrayDeque;Ljava/util/IdentityHashMap;)V"}
     33:35:boolean verifyCatchHandlersUnchanged(com.android.tools.r8.cf.code.CfLabel,java.util.Deque,java.util.Map):326:328 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfIntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfIntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.H9:
 # {"id":"sourceFile","fileName":"CfIntraproceduralDataflowAnalysis.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/e9;Lcom/android/tools/r8/internal/fa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/g9;Lcom/android/tools/r8/internal/ha;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfControlFlowGraph,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):22:22 -> <init>
 com.android.tools.r8.ir.analysis.inlining.AlwaysSimpleInliningConstraint -> com.android.tools.r8.internal.h2:
 # {"id":"sourceFile","fileName":"AlwaysSimpleInliningConstraint.java"}
@@ -104678,23 +104727,23 @@
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
-com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint -> com.android.tools.r8.internal.lg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
+com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint -> com.android.tools.r8.internal.ng:
 # {"id":"sourceFile","fileName":"ConstSimpleInliningConstraint.java"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(int):18:18 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     1:1:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
-    2:2:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
+    2:2:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    3:3:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     3:3:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):38 -> a
     4:4:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):40 -> a
@@ -104705,7 +104754,7 @@
     12:16:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47:51 -> a
     17:17:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     17:17:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51 -> a
-    18:18:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):150:150 -> a
+    18:18:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):148:148 -> a
     18:18:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51 -> a
     19:19:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51:51 -> a
     20:20:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
@@ -104715,19 +104764,19 @@
     22:22:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):53 -> a
     23:23:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex() -> a
     23:23:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     24:25:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):29:30 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.mo:
 # {"id":"sourceFile","fileName":"EqualToBooleanSimpleInliningConstraint.java"}
     boolean value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(int,boolean):22:23 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> a
     1:1:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):58:60 -> a
     5:5:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():82:82 -> a
     5:5:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60 -> a
@@ -104735,11 +104784,11 @@
     6:6:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:60 -> a
     7:7:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     7:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
-    8:8:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
+    8:8:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     8:8:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    9:9:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     9:9:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37 -> a
     10:10:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     10:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):39 -> a
@@ -104753,7 +104802,7 @@
     20:24:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47:51 -> a
     25:25:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     25:25:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51 -> a
-    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):150:150 -> a
+    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):148:148 -> a
     26:26:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51 -> a
     27:27:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):51:51 -> a
     28:28:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
@@ -104761,57 +104810,57 @@
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):53:53 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):66:66 -> a
     30:30:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):53 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.no:
 # {"id":"sourceFile","fileName":"EqualToNumberSimpleInliningConstraint.java"}
     1:1:void <init>(int,long):10:10 -> <init>
     1:1:long com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint.getRawValue():26:26 -> a
     1:1:boolean test(long):21 -> a
     2:2:long com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint.getRawValue():26:26 -> a
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     3:3:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint create(int,long,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):16:16 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToNumberConstraint(int,long):100 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.hQ:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.lQ:
 # {"id":"sourceFile","fileName":"NeverSimpleInliningConstraint.java"}
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lQ;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
-com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.IR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.NR:
 # {"id":"sourceFile","fileName":"NotEqualToNumberSimpleInliningConstraint.java"}
     1:1:void <init>(int,long):10:10 -> <init>
     1:1:long com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint.getRawValue():26:26 -> a
     1:1:boolean test(long):21 -> a
     2:2:long com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint.getRawValue():26:26 -> a
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     3:3:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint create(int,long,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):16:16 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):95 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.SR:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.WR:
 # {"id":"sourceFile","fileName":"NullSimpleInliningConstraint.java"}
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.ir.analysis.type.Nullability):25:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/XR;)V"}
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> a
     1:1:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     2:14:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):69:81 -> a
     15:15:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     15:15:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
     16:17:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):41:42 -> a
     18:18:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     18:18:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):44 -> a
@@ -104843,7 +104892,7 @@
     43:43:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63:63 -> a
     44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):87:87 -> a
     44:44:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.eS:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.iS:
 # {"id":"sourceFile","fileName":"NumberSimpleInliningConstraint.java"}
     long rawValue -> c
     boolean $assertionsDisabled -> d
@@ -104852,15 +104901,15 @@
     boolean test(long) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> a
     1:1:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     2:4:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):54:56 -> a
     5:5:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
-    6:6:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
+    6:6:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     6:6:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    7:7:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     7:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34 -> a
     8:8:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     8:8:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):36 -> a
@@ -104878,31 +104927,31 @@
     20:24:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):43:47 -> a
     25:25:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     25:25:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47 -> a
-    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):150:150 -> a
+    26:26:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasArgumentInfo(int):148:148 -> a
     26:26:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47 -> a
     27:27:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):47:47 -> a
     28:28:int com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint.getArgumentIndex():23:23 -> a
     28:28:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):49 -> a
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):49:49 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.jb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.nb0:
 # {"id":"sourceFile","fileName":"SimpleInliningArgumentConstraint.java"}
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/nb0;"}
     1:1:boolean isArgumentConstraint():28:28 -> d
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.kb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.ob0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraint.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     1:1:boolean isNever():0:0 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lazyMeet(java.util.function.Supplier):69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ub0;"}
     2:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lazyMeet(java.util.function.Supplier):70:72 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth.meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):46:46 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lazyMeet(java.util.function.Supplier):72 -> a
@@ -104913,7 +104962,7 @@
     7:7:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lazyMeet(java.util.function.Supplier):72 -> a
     8:8:boolean isAlways():0:0 -> a
     8:8:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ob0;)Lcom/android/tools/r8/internal/ob0;"}
     9:9:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):50:50 -> a
     10:10:boolean isAlways():0:0 -> a
     10:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):50 -> a
@@ -104933,24 +104982,24 @@
     22:23:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):63:64 -> a
     24:24:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint meet(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):54:54 -> a
     25:25:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction asConjunction():29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb0;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction():37:37 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sb0;"}
     1:1:boolean isAlways():0:0 -> c
     1:1:boolean isArgumentConstraint():21:21 -> d
     1:1:boolean isConjunction():0:0 -> e
     1:1:boolean isDisjunction():0:0 -> f
     1:1:boolean isNever():0:0 -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.mb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.qb0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintAnalysis.java"}
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory constraintFactory -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tb0;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.ProgramMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     int simpleInliningConstraintThreshold -> e
     java.util.Set seen -> f
     boolean $assertionsDisabled -> g
@@ -104964,7 +105013,7 @@
     4:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):59:63 -> <init>
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintForInstructionNotToMaterialize(com.android.tools.r8.ir.code.Instruction):128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/ob0;"}
     2:13:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintForInstructionNotToMaterialize(com.android.tools.r8.ir.code.Instruction):129:140 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     14:14:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintForInstructionNotToMaterialize(com.android.tools.r8.ir.code.Instruction):141 -> a
@@ -104977,7 +105026,7 @@
     25:25:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintForInstructionNotToMaterialize(com.android.tools.r8.ir.code.Instruction):149 -> a
     26:26:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintForInstructionNotToMaterialize(com.android.tools.r8.ir.code.Instruction):153:153 -> a
     27:40:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):92:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;ILcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;ILcom/android/tools/r8/internal/K5;)Lcom/android/tools/r8/internal/ub0;"}
     41:41:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
     41:41:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):105 -> a
     42:42:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
@@ -104990,7 +105039,7 @@
     58:58:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):123 -> a
     59:59:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.InstructionIterator):93:93 -> a
     60:135:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth computeConstraintForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction,int):158:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;I)Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hD;I)Lcom/android/tools/r8/internal/ub0;"}
     136:136:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth.getAlways(int):21:21 -> a
     136:136:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth computeConstraintForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction,int):234 -> a
     137:137:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.withDepth(int):102:102 -> a
@@ -105119,11 +105168,11 @@
     222:222:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):86:86 -> a
     222:222:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth computeConstraintForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction,int):203 -> a
     223:223:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lambda$computeConstraintForJumpInstruction$0(com.android.tools.r8.ir.code.If,int):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;I)Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;I)Lcom/android/tools/r8/internal/ub0;"}
     224:224:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):86:86 -> a
     224:224:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lambda$computeConstraintForJumpInstruction$0(com.android.tools.r8.ir.code.If,int):185 -> a
     225:261:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IfType):247:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/bu;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/du;)Lcom/android/tools/r8/internal/ob0;"}
     262:263:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IfType):267:268 -> a
     264:264:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNullConstraint(int):81:81 -> a
     264:264:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IfType):268 -> a
@@ -105151,33 +105200,33 @@
     288:288:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IfType):259 -> a
     289:289:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint computeConstraintFromIfTest(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IfType):263:263 -> a
     290:294:java.util.OptionalLong getRawNumberValue(com.android.tools.r8.ir.code.Value):288:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Ljava/util/OptionalLong;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Ljava/util/OptionalLong;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lambda$computeConstraintForJumpInstruction$1(com.android.tools.r8.ir.code.If,int):196:196 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;I)Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;I)Lcom/android/tools/r8/internal/ub0;"}
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth analyzeInstructionsInBlock(com.android.tools.r8.ir.code.BasicBlock,int):86:86 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth lambda$computeConstraintForJumpInstruction$1(com.android.tools.r8.ir.code.If,int):196 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.lb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.pb0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintAnalysis.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():247:247 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.nb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.rb0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintConjunction.java"}
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
     1:6:void <init>(java.util.List):20:25 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction asConjunction():58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rb0;"}
     2:3:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     4:34:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):76:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
     35:36:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;Lcom/android/tools/r8/internal/kb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;Lcom/android/tools/r8/internal/ob0;)Lcom/android/tools/r8/internal/ob0;"}
     37:37:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
     37:37:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ob0;)Lcom/android/tools/r8/internal/ob0;"}
     2:2:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29 -> b
     3:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29:30 -> b
@@ -105193,22 +105242,22 @@
     16:16:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isDisjunction():0:0 -> b
     16:16:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):34 -> b
     17:22:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):34:39 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.ob0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.sb0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintDisjunction.java"}
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
     1:6:void <init>(java.util.List):20:25 -> <init>
     1:2:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     3:33:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):76:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;)Lcom/android/tools/r8/internal/ob0;"}
     34:35:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/pb0;Lcom/android/tools/r8/internal/kb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/tb0;Lcom/android/tools/r8/internal/ob0;)Lcom/android/tools/r8/internal/ob0;"}
     36:36:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
     36:36:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kb0;)Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ob0;)Lcom/android/tools/r8/internal/ob0;"}
     2:2:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29 -> b
     3:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):29:30 -> b
@@ -105225,19 +105274,19 @@
     16:16:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):34 -> b
     17:22:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint add(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):34:39 -> b
     23:23:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction():58:58 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.pb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sb0;"}
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.tb0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintFactory.java"}
     com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint[] lowConstConstraints -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ng;"}
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToFalseConstraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mo;"}
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToTrueConstraints -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mo;"}
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowNotEqualToNullConstraints -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/WR;"}
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowEqualToNullConstraints -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/WR;"}
     java.util.Map highConstConstraints -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map highEqualToFalseConstraints -> g
@@ -105250,59 +105299,59 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     1:33:void <init>():16:48 -> <init>
     1:1:com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint createConstConstraint(int):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/lg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ng;"}
     2:3:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint createEqualToBooleanConstraint(int,boolean):71:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/mo;"}
     4:4:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint createEqualToBooleanConstraint(int,boolean):69:69 -> a
     5:6:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint createNullConstraint(int,com.android.tools.r8.ir.analysis.type.Nullability):88:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/WR;"}
     7:7:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint createNullConstraint(int,com.android.tools.r8.ir.analysis.type.Nullability):86:86 -> a
     8:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint createArgumentConstraint(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint[],java.util.Map,java.util.function.Supplier):105:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/jb0;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/nb0;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/nb0;"}
     11:11:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint lambda$createArgumentConstraint$8(java.util.function.Supplier,java.lang.Integer):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/jb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/nb0;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint.create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):24:24 -> b
     1:1:com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint lambda$createConstConstraint$5(int):56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/lg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ng;"}
     2:2:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint.create(int,boolean,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):29:29 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$createEqualToBooleanConstraint$6(int,boolean):73 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/mo;"}
     3:3:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint.create(int,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):33:33 -> b
     3:3:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$7(int,com.android.tools.r8.ir.analysis.type.Nullability):90 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/WR;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint.create(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):24:24 -> c
     1:1:com.android.tools.r8.ir.analysis.inlining.ConstSimpleInliningConstraint lambda$new$0(int):21 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/lg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ng;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint.create(int,boolean,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):29:29 -> d
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$new$1(int):25 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/mo;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint.create(int,boolean,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):29:29 -> e
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$new$2(int):29 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/jo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/mo;"}
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$new$3(int):33:33 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/WR;"}
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint.create(int,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):33:33 -> f
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$new$3(int):33 -> f
     1:1:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$new$4(int):37:37 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/WR;"}
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint.create(int,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):33:33 -> g
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$new$4(int):37 -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth -> com.android.tools.r8.internal.qb0:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth -> com.android.tools.r8.internal.ub0:
 # {"id":"sourceFile","fileName":"SimpleInliningConstraintWithDepth.java"}
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint constraint -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ob0;"}
     int instructionDepth -> b
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintWithDepth NEVER -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ub0;"}
     1:2:void <clinit>():8:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint,int):15:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kb0;I)V"}
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.FJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ob0;I)V"}
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.JJ:
 # {"id":"sourceFile","fileName":"LibraryMethodReadSetModeling.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/q;"}
     2:2:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection com.android.tools.r8.graph.AppView.getLibraryMethodSideEffectModelCollection():583:583 -> a
     2:2:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):27 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -105322,21 +105371,21 @@
     21:21:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):41 -> a
     22:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):41:43 -> a
     25:25:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):37:37 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.Gn:
 # {"id":"sourceFile","fileName":"EnumLiteProtoShrinker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     java.util.Set deadEnumLiteMaps -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d10;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):42:46 -> <init>
     1:1:void clearDeadEnumLiteMaps(com.android.tools.r8.graph.PrunedItems$Builder):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H5;)V"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():2144:2144 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():2150:2150 -> a
     2:2:void clearDeadEnumLiteMaps(com.android.tools.r8.graph.PrunedItems$Builder):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:14:void clearDeadEnumLiteMaps(com.android.tools.r8.graph.PrunedItems$Builder):60:71 -> a
@@ -105395,24 +105444,24 @@
     35:39:boolean isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):96:100 -> b
     35:39:void internalClearDeadEnumLiteMaps(com.android.tools.r8.graph.PrunedItems$Builder):76 -> b
     40:45:void internalClearDeadEnumLiteMaps(com.android.tools.r8.graph.PrunedItems$Builder):77:82 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.yr:
 # {"id":"sourceFile","fileName":"GeneratedExtensionRegistryShrinker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     java.util.Map removedExtensionFields -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):87:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d10;)V"}
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):84:91 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore.getInstance():32:32 -> a
     1:1:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     2:5:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):182:185 -> a
     6:6:void lambda$postOptimizeGeneratedExtensionRegistry$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180:180 -> a
     7:7:void lambda$run$0(com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.graph.DexField):105:105 -> a
@@ -105430,7 +105479,7 @@
     25:25:java.util.Map lambda$recordDeadProtoExtensionField$2(com.android.tools.r8.graph.DexType):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Map;"}
     26:33:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):146:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     34:34:void com.android.tools.r8.ir.code.IRCodeUtils.removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):115:115 -> a
     34:34:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):157 -> a
     35:35:void com.android.tools.r8.ir.code.IRCodeUtils.removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> a
@@ -105439,7 +105488,7 @@
     38:40:boolean wasRemoved(com.android.tools.r8.graph.DexField):164:166 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Z"}
     41:46:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):172:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     47:47:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63:63 -> a
     47:47:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):177 -> a
     48:48:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):70:70 -> a
@@ -105464,7 +105513,7 @@
     90:90:boolean lambda$forEachFindLiteExtensionByNumberMethod$7(com.android.tools.r8.graph.DexEncodedMethod):227:227 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     91:91:void lambda$forEachFindLiteExtensionByNumberMethod$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)V"}
     92:92:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):262:262 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/i3;Lcom/android/tools/r8/shaking/p1;)Z"}
     93:93:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):153:153 -> a
@@ -105507,27 +105556,27 @@
     4:4:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> c
     4:4:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):222 -> c
     1:2:void forEachMethodThatRequiresPostOptimization(java.util.function.Consumer):192:193 -> d
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.xr:
 # {"id":"sourceFile","fileName":"GeneratedExtensionRegistryShrinker.java"}
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yr;"}
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):119:119 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yr;)V"}
     1:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):124:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/graph/g1;)Z"}
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Gr:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Ir:
 # {"id":"sourceFile","fileName":"GeneratedMessageLiteBuilderShrinker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     boolean enableAggressiveBuilderOptimization -> c
     java.util.Map builders -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():67:67 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):76:76 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d10;)V"}
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):73:81 -> <init>
     1:27:boolean computeEnableAggressiveBuilderOptimization():85:111 -> a
     28:45:boolean computeEnableAggressiveBuilderOptimization():109:126 -> a
@@ -105550,10 +105599,10 @@
     57:57:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):205 -> a
     58:60:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):206:208 -> a
     61:75:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):225:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     76:87:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):231:242 -> a
     88:95:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):252:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/QN$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/UN$a;)V"}
     96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
     96:96:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):259 -> a
     97:106:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):263:272 -> a
@@ -105610,16 +105659,16 @@
     174:174:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):337:337 -> a
     175:175:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):336:336 -> a
     176:176:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Instruction):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Kw;)Z"}
     177:177:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$4(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.ir.code.Instruction):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nQ;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rQ;Lcom/android/tools/r8/internal/Kw;)Z"}
     178:188:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$5(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):286:296 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/Kw;)Z"}
     189:189:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     189:189:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$5(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):300 -> a
     190:197:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$5(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):301:308 -> a
     198:201:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):430:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> a
     202:202:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):434 -> a
     203:216:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):434:447 -> a
@@ -105648,7 +105697,7 @@
     242:242:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):562:562 -> a
     242:242:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     243:243:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):562:562 -> a
     243:243:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):234 -> a
     244:244:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):235:235 -> a
@@ -105661,17 +105710,17 @@
     3:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(java.util.function.Predicate):203:204 -> b
     3:4:boolean com.android.tools.r8.graph.MethodCollection.hasMethods(java.util.function.Predicate):89 -> b
     3:4:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):118 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Er:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Gr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLiteBuilderShrinker.java"}
     java.util.Set val$seen -> a
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ir;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():135:135 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker,java.util.Set):135:135 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gr;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;Ljava/util/Set;)V"}
     1:1:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/ph0;)V"}
     2:19:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):141:158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     20:37:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):151:168 -> a
@@ -105689,17 +105738,17 @@
     63:63:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.ProtoReferences.getDefaultInstanceField(com.android.tools.r8.graph.DexProgramClass):159:159 -> a
     63:63:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):190 -> a
     64:64:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):189:189 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Hr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLiteBuilderShrinker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nX;"}
     java.util.Set bypassClinitforInlining -> d
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):482:483 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/jX;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/shaking/A;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nX;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/shaking/A;)V"}
     3:3:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):484 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -105726,255 +105775,171 @@
     13:13:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):524:524 -> a
     14:14:boolean lambda$bypassClinitforInliningNewBuilderMethods$1(com.android.tools.r8.graph.DexEncodedMethod):522:522 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Jr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLiteShrinker.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w10;"}
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x10;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     com.android.tools.r8.ir.analysis.type.TypeElement objectArrayType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.type.TypeElement stringType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rd;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():60:60 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder,com.android.tools.r8.ir.analysis.proto.ProtoReferences):71:80 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s10;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/w10;Lcom/android/tools/r8/internal/d10;)V"}
     11:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder,com.android.tools.r8.ir.analysis.proto.ProtoReferences):79:81 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore.getInstance():32:32 -> a
     1:1:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     2:5:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):259:262 -> a
     6:6:void lambda$postOptimizeDynamicMethods$2(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):257:257 -> a
     7:11:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):87:91 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A;)V"}
     12:23:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):88:99 -> a
-    24:46:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):96:118 -> a
-    47:50:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):117:120 -> a
-    51:52:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):370:371 -> a
-    51:52:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):143 -> a
-    51:52:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):120 -> a
-    53:54:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):146:147 -> a
+    24:31:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129:136 -> a
+    24:31:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):96 -> a
+    32:48:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):102:118 -> a
+    49:52:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):117:120 -> a
+    53:54:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):370:371 -> a
+    53:54:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):143 -> a
     53:54:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):120 -> a
-    55:55:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):122:122 -> a
-    56:57:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):370:371 -> a
-    56:57:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):143 -> a
-    56:57:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):122 -> a
-    58:59:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):146:147 -> a
+    55:56:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):146:147 -> a
+    55:56:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):120 -> a
+    57:57:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):122:122 -> a
+    58:59:com.android.tools.r8.graph.ProgramMember com.android.tools.r8.graph.DexProgramClass.lookupProgramMember(com.android.tools.r8.graph.DexMember):370:371 -> a
+    58:59:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):143 -> a
     58:59:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):122 -> a
-    60:67:void lambda$extendRootSet$0(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.graph.DexMethod):104:111 -> a
+    60:61:void disallowOptimization(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMember,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):146:147 -> a
+    60:61:void extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):122 -> a
+    62:69:void lambda$extendRootSet$0(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.graph.DexMethod):104:111 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/graph/w2;)V"}
-    68:68:void lambda$extendRootSet$0(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.graph.DexMethod):108:108 -> a
-    69:70:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
-    71:71:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    71:71:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
+    70:77:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129:136 -> a
+    70:77:void lambda$extendRootSet$0(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.graph.DexMethod):108 -> a
+    78:79:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161:162 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
+    80:80:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    80:80:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    72:72:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
-    73:73:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
-    73:73:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164 -> a
-    74:76:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):165:167 -> a
-    77:88:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):223:234 -> a
-    77:88:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    89:89:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233:233 -> a
-    89:89:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    90:92:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):432:434 -> a
-    90:92:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
-    90:92:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    93:93:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    93:93:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):434 -> a
-    93:93:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
-    93:93:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    94:95:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):434:435 -> a
-    94:95:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
-    94:95:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    96:96:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):428:428 -> a
-    96:96:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):435 -> a
-    96:96:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
-    96:96:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    97:102:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):237:242 -> a
-    97:102:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
-    103:103:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:174 -> a
-    104:104:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2905:2905 -> a
-    104:104:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174 -> a
+    81:81:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    81:81:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
+    82:82:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
+    82:82:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164 -> a
+    83:85:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):165:167 -> a
+    86:97:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):223:234 -> a
+    86:97:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    98:98:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233:233 -> a
+    98:98:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    99:101:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):432:434 -> a
+    99:101:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
+    99:101:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    102:102:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    102:102:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):434 -> a
+    102:102:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
+    102:102:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    103:104:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):434:435 -> a
+    103:104:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
+    103:104:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    105:105:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):428:428 -> a
+    105:105:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):435 -> a
+    105:105:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):233 -> a
+    105:105:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    106:111:com.android.tools.r8.graph.DexType getNewMutableInstanceType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):237:242 -> a
+    106:111:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):168 -> a
+    112:112:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174:174 -> a
+    113:113:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2905:2905 -> a
+    113:113:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:105:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2905:2905 -> a
-    105:105:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174 -> a
-    106:109:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:179 -> a
-    110:110:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):57:57 -> a
-    110:110:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
-    111:111:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):56:56 -> a
-    111:111:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
-    112:117:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:185 -> a
-    118:118:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance.builder():47:47 -> a
-    118:118:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):185 -> a
-    119:119:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance$Builder.setType(com.android.tools.r8.graph.DexType):262:262 -> a
-    119:119:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186 -> a
-    120:120:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188:188 -> a
-    121:121:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
-    121:121:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188 -> a
-    122:122:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738:1738 -> a
-    122:122:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
-    122:122:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187 -> a
-    123:124:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1729:1730 -> a
-    123:124:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738 -> a
-    123:124:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
-    123:124:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187 -> a
-    125:125:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> a
-    126:126:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756:1756 -> a
-    126:126:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189 -> a
-    127:127:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1742:1742 -> a
-    127:127:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756 -> a
-    127:127:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189 -> a
-    128:132:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):190:194 -> a
-    133:133:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
-    133:133:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):194 -> a
-    134:134:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):375:375 -> a
-    134:134:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> a
-    135:135:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):196:196 -> a
-    136:136:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756:1756 -> a
-    136:136:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):197 -> a
-    137:137:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1742:1742 -> a
-    137:137:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756 -> a
-    137:137:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):197 -> a
-    138:144:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):198:204 -> a
-    145:145:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions):287:287 -> a
-    145:145:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):204 -> a
-    146:148:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):205:207 -> a
-    149:149:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):81:81 -> a
-    149:149:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):208 -> a
-    150:150:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):209:209 -> a
-    151:151:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
-    151:151:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):210 -> a
-    152:152:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:212 -> a
-    153:153:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
-    153:153:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216 -> a
-    154:154:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217:217 -> a
-    155:155:boolean lambda$optimizeNewMutableInstance$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
-    156:160:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):250:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
-    161:161:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63:63 -> a
-    161:161:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):254 -> a
-    162:162:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):70:70 -> a
-    162:162:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63 -> a
-    162:162:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):254 -> a
-    163:171:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):255:263 -> a
-    172:182:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):255:265 -> a
-    183:184:void forEachDynamicMethod(java.util.function.Consumer):269:270 -> a
-    185:185:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
-    185:185:com.android.tools.r8.shaking.AppInfoWithLiveness com.android.tools.r8.graph.AppView.appInfoWithLiveness():394 -> a
-    185:185:void forEachDynamicMethod(java.util.function.Consumer):271 -> a
-    186:186:com.android.tools.r8.shaking.AppInfoWithLiveness com.android.tools.r8.graph.AppView.appInfoWithLiveness():394:394 -> a
-    186:186:void forEachDynamicMethod(java.util.function.Consumer):271 -> a
-    187:187:void forEachDynamicMethod(java.util.function.Consumer):271:271 -> a
-    188:188:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
-    188:188:void forEachDynamicMethod(java.util.function.Consumer):272 -> a
+    114:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2905:2905 -> a
+    114:114:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174 -> a
+    115:118:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:179 -> a
+    119:119:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):57:57 -> a
+    119:119:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
+    120:120:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):56:56 -> a
+    120:120:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> a
+    121:126:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:185 -> a
+    127:127:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance.builder():47:47 -> a
+    127:127:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):185 -> a
+    128:128:com.android.tools.r8.ir.code.NewInstance$Builder com.android.tools.r8.ir.code.NewInstance$Builder.setType(com.android.tools.r8.graph.DexType):262:262 -> a
+    128:128:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186 -> a
+    129:129:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188:188 -> a
+    130:130:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
+    130:130:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):188 -> a
+    131:131:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738:1738 -> a
+    131:131:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
+    131:131:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187 -> a
+    132:133:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1729:1730 -> a
+    132:133:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738 -> a
+    132:133:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
+    132:133:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187 -> a
+    134:134:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> a
+    135:135:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756:1756 -> a
+    135:135:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189 -> a
+    136:136:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1742:1742 -> a
+    136:136:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756 -> a
+    136:136:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189 -> a
+    137:141:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):190:194 -> a
+    142:142:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
+    142:142:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):194 -> a
+    143:143:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):375:375 -> a
+    143:143:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> a
+    144:144:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):196:196 -> a
+    145:145:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756:1756 -> a
+    145:145:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):197 -> a
+    146:146:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1742:1742 -> a
+    146:146:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Instruction):1756 -> a
+    146:146:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):197 -> a
+    147:153:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):198:204 -> a
+    154:154:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions):287:287 -> a
+    154:154:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):204 -> a
+    155:157:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):205:207 -> a
+    158:158:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):81:81 -> a
+    158:158:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):208 -> a
+    159:159:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):209:209 -> a
+    160:160:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
+    160:160:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):210 -> a
+    161:161:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):212:212 -> a
+    162:162:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
+    162:162:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216 -> a
+    163:163:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217:217 -> a
+    164:164:boolean lambda$optimizeNewMutableInstance$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):208:208 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
+    165:169:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):250:254 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
+    170:170:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63:63 -> a
+    170:170:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):254 -> a
+    171:171:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):70:70 -> a
+    171:171:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63 -> a
+    171:171:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):254 -> a
+    172:180:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):255:263 -> a
+    181:191:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):255:265 -> a
+    192:193:void forEachDynamicMethod(java.util.function.Consumer):269:270 -> a
+    194:194:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
+    194:194:com.android.tools.r8.shaking.AppInfoWithLiveness com.android.tools.r8.graph.AppView.appInfoWithLiveness():394 -> a
+    194:194:void forEachDynamicMethod(java.util.function.Consumer):271 -> a
+    195:195:com.android.tools.r8.shaking.AppInfoWithLiveness com.android.tools.r8.graph.AppView.appInfoWithLiveness():394:394 -> a
+    195:195:void forEachDynamicMethod(java.util.function.Consumer):271 -> a
+    196:196:void forEachDynamicMethod(java.util.function.Consumer):271:271 -> a
+    197:197:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
+    197:197:void forEachDynamicMethod(java.util.function.Consumer):272 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    189:189:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
-    189:189:void forEachDynamicMethod(java.util.function.Consumer):272 -> a
-    190:195:void lambda$forEachDynamicMethod$3(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):275:280 -> a
+    198:198:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
+    198:198:void forEachDynamicMethod(java.util.function.Consumer):272 -> a
+    199:204:void lambda$forEachDynamicMethod$3(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):275:280 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)V"}
-    196:196:void lambda$forEachDynamicMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):284:284 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)V"}
-    197:200:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):393:396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Z00;)Lcom/android/tools/r8/internal/LB;"}
-    201:201:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowConstantArgumentOptimization():704:704 -> a
-    201:201:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;)V"}
-    202:202:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowConstantArgumentOptimization():704:704 -> a
-    202:202:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129 -> a
-    203:203:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowConstantArgumentOptimization(boolean):364:364 -> a
-    203:203:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowConstantArgumentOptimization():373 -> a
-    203:203:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowConstantArgumentOptimization():704 -> a
-    203:203:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129 -> a
-    204:204:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowConstantArgumentOptimization():705:705 -> a
-    204:204:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):129 -> a
-    205:205:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowMethodStaticizing():714:714 -> a
-    205:205:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    206:206:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowMethodStaticizing():714:714 -> a
-    206:206:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):130 -> a
-    207:207:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowMethodStaticizing(boolean):402:402 -> a
-    207:207:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowMethodStaticizing():411 -> a
-    207:207:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowMethodStaticizing():714 -> a
-    207:207:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):130 -> a
-    208:208:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowMethodStaticizing():715:715 -> a
-    208:208:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):130 -> a
-    209:209:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterRemoval():719:719 -> a
-    209:209:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):131 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    210:210:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterRemoval():719:719 -> a
-    210:210:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):131 -> a
-    211:211:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterRemoval(boolean):421:421 -> a
-    211:211:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterRemoval():430 -> a
-    211:211:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterRemoval():719 -> a
-    211:211:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):131 -> a
-    212:212:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterRemoval():720:720 -> a
-    212:212:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):131 -> a
-    213:213:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724:724 -> a
-    213:213:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):132 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    214:214:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724:724 -> a
-    214:214:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):132 -> a
-    215:215:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterReordering(boolean):440:440 -> a
-    215:215:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterReordering():449 -> a
-    215:215:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724 -> a
-    215:215:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):132 -> a
-    216:216:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():725:725 -> a
-    216:216:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):132 -> a
-    217:217:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterTypeStrengthening():729:729 -> a
-    217:217:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):133 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    218:218:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterTypeStrengthening():729:729 -> a
-    218:218:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):133 -> a
-    219:219:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterTypeStrengthening(boolean):459:459 -> a
-    219:219:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterTypeStrengthening():468 -> a
-    219:219:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterTypeStrengthening():729 -> a
-    219:219:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):133 -> a
-    220:220:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterTypeStrengthening():730:730 -> a
-    220:220:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):133 -> a
-    221:221:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowReturnTypeStrengthening():739:739 -> a
-    221:221:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):134 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    222:222:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowReturnTypeStrengthening():739:739 -> a
-    222:222:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):134 -> a
-    223:223:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReturnTypeStrengthening(boolean):497:497 -> a
-    223:223:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowReturnTypeStrengthening():506 -> a
-    223:223:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowReturnTypeStrengthening():739 -> a
-    223:223:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):134 -> a
-    224:224:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowReturnTypeStrengthening():740:740 -> a
-    224:224:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):134 -> a
-    225:225:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedArgumentOptimization():749:749 -> a
-    225:225:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):135 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    226:226:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedArgumentOptimization():749:749 -> a
-    226:226:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):135 -> a
-    227:227:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedArgumentOptimization(boolean):535:535 -> a
-    227:227:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedArgumentOptimization():544 -> a
-    227:227:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedArgumentOptimization():749 -> a
-    227:227:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):135 -> a
-    228:228:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedArgumentOptimization():750:750 -> a
-    228:228:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):135 -> a
-    229:229:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedReturnValueOptimization():754:754 -> a
-    229:229:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):136 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    230:230:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedReturnValueOptimization():754:754 -> a
-    230:230:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):136 -> a
-    231:231:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedReturnValueOptimization(boolean):555:555 -> a
-    231:231:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedReturnValueOptimization():564 -> a
-    231:231:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowUnusedReturnValueOptimization():754 -> a
-    231:231:void disallowSignatureOptimizations(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):136 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.z00:
+    205:205:void lambda$forEachDynamicMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):284:284 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)V"}
+    206:209:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):393:396 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/d10;)Lcom/android/tools/r8/internal/NB;"}
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.D00:
 # {"id":"sourceFile","fileName":"ProtoEnqueuerUseRegistry.java"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/d0;"}
     1:1:void <clinit>():25:25 -> <clinit>
@@ -106049,10 +106014,10 @@
     23:23:void com.android.tools.r8.shaking.Enqueuer.addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):662 -> e
     23:23:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):83 -> e
     24:24:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):86:86 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.A00:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.E00:
 # {"id":"sourceFile","fileName":"ProtoEnumSwitchMapRemover.java"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     java.util.Map staticFieldValuesMap -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -106060,24 +106025,24 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;)V"}
     2:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences):23:28 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.F00:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.J00:
 # {"id":"sourceFile","fileName":"ProtoInliningReasonStrategy.java"}
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yv;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Yv;)V"}
     3:3:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):34 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):34:34 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/U;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/U;"}
     2:2:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):168:168 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):46 -> a
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
@@ -106132,7 +106097,7 @@
     36:39:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):54 -> a
     40:40:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):92:92 -> a
     40:40:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):54 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.Z00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.d10:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexString newBuilderMethodName -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -106187,15 +106152,15 @@
     com.android.tools.r8.graph.DexType wireFormatFieldType -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods generatedExtensionMethods -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U00;"}
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X00;"}
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V00;"}
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W00;"}
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y00;"}
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b10;"}
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> s
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods generatedMessageLiteExtendableBuilderMethods -> t
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a10;"}
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> u
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c10;"}
     com.android.tools.r8.graph.DexString defaultInstanceFieldName -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString instanceFieldName -> w
@@ -106242,7 +106207,7 @@
     25:25:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):212:212 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     26:33:boolean isMessageInfoConstruction(com.android.tools.r8.ir.code.InvokeMethod):224:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     1:1:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):187:187 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     1:1:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):200:200 -> c
@@ -106256,34 +106221,34 @@
     6:6:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> c
     6:6:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):202 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.U00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.Y00:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexMethod constructor -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:5:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):246:250 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;Lcom/android/tools/r8/graph/B1;)V"}
     6:18:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):248:260 -> <init>
     19:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):258:258 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.V00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.Z00:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:5:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):353:357 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;Lcom/android/tools/r8/graph/B1;)V"}
     6:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):355:355 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.W00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.a10:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:5:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):371:375 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;Lcom/android/tools/r8/graph/B1;)V"}
     6:13:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):373:380 -> <init>
     14:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):378:378 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.X00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.b10:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexMethod createBuilderMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -106298,14 +106263,14 @@
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:5:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):290:294 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;Lcom/android/tools/r8/graph/B1;)V"}
     6:13:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):292:299 -> <init>
     14:21:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):297:304 -> <init>
     22:30:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):302:310 -> <init>
     31:38:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):308:315 -> <init>
     39:54:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):313:328 -> <init>
     55:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):326:326 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.Y00:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.c10:
 # {"id":"sourceFile","fileName":"ProtoReferences.java"}
     com.android.tools.r8.graph.DexField buildMessageInfoField -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -106322,36 +106287,36 @@
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     1:18:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):401:418 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z00;Lcom/android/tools/r8/graph/B1;)V"}
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.c10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d10;Lcom/android/tools/r8/graph/B1;)V"}
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.g10:
 # {"id":"sourceFile","fileName":"ProtoShrinker.java"}
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w10;"}
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I00;"}
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker generatedExtensionRegistryShrinker -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yr;"}
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jr;"}
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ir;"}
     com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker enumLiteProtoShrinker -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gn;"}
     com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover protoEnumSwitchMapRemover -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E00;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     java.util.Set deadProtoTypes -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d10;)V"}
     2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):28:47 -> <init>
-    22:22:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():2144:2144 -> <init>
+    22:22:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():2150:2150 -> <init>
     22:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):47 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:26:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):48:51 -> <init>
-    27:27:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2132:2132 -> <init>
+    27:27:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2138:2138 -> <init>
     27:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):51 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):52:54 -> <init>
@@ -106369,12 +106334,12 @@
     7:7:boolean com.android.tools.r8.dex.VirtualFile.containsType(com.android.tools.r8.graph.DexType):302:302 -> a
     7:7:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):94 -> a
     8:8:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):94:94 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.f10:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.j10:
 # {"id":"sourceFile","fileName":"ProtoUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:15:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):22:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Z00;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/d10;)Lcom/android/tools/r8/internal/bl0;"}
     16:16:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.analysis.proto.ProtoReferences.dexItemFactory():144:144 -> a
     16:16:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):36 -> a
     17:17:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):36:36 -> a
@@ -106388,7 +106353,7 @@
     21:21:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):39 -> a
     22:27:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):39:44 -> a
     28:38:void setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):78:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/d10;)V"}
     39:39:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.analysis.proto.ProtoReferences.dexItemFactory():144:144 -> a
     39:39:void setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):88 -> a
     40:40:void setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):88:88 -> a
@@ -106406,7 +106371,7 @@
     48:48:void setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):97:97 -> a
     49:49:boolean isProto2(int):101:101 -> a
     1:9:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):50:58 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Z00;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/d10;)Lcom/android/tools/r8/internal/bl0;"}
     10:10:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.analysis.proto.ProtoReferences.dexItemFactory():144:144 -> b
     10:10:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):58 -> b
     11:11:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):58:58 -> b
@@ -106419,18 +106384,18 @@
     15:15:java.lang.Iterable com.android.tools.r8.ir.code.Value.uniqueUsers(java.util.function.Predicate):366:366 -> b
     15:15:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):61 -> b
     16:21:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):61:66 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.s10:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.w10:
 # {"id":"sourceFile","fileName":"RawMessageInfoDecoder.java"}
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I00;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():68:68 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences):73:75 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E00;Lcom/android/tools/r8/internal/Z00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I00;Lcom/android/tools/r8/internal/d10;)V"}
     1:42:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):89:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/nl0;)Lcom/android/tools/r8/internal/I00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/rl0;)Lcom/android/tools/r8/internal/M00;"}
     43:50:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):129:136 -> a
     51:57:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):135:141 -> a
     58:58:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):140:140 -> a
@@ -106442,7 +106407,7 @@
     145:145:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):187:187 -> a
     146:217:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.ValueUtils$ArrayValues):122:193 -> a
     218:221:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):200:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/P00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/T00;"}
     222:222:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     222:222:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):203 -> a
     223:224:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):204:205 -> a
@@ -106481,13 +106446,13 @@
     260:264:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):236:240 -> a
     265:265:int invalidInfoFailure():244:244 -> a
     266:267:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):253:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Wg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/ah0;"}
     268:268:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.graph.DexString):262:262 -> a
     268:268:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):254 -> a
     269:269:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):256:256 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():248:248 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.q10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.u10:
 # {"id":"sourceFile","fileName":"RawMessageInfoDecoder.java"}
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G2;"}
@@ -106506,17 +106471,17 @@
     9:9:int nextInt():294:294 -> b
     10:10:int nextInt():283:283 -> b
     11:11:int nextInt():274:274 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.r10:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.v10:
 # {"id":"sourceFile","fileName":"RawMessageInfoDecoder.java"}
     1:1:void <init>():301:301 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.t10:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.x10:
 # {"id":"sourceFile","fileName":"RawMessageInfoEncoder.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     1:1:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I00;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M00;)Ljava/util/ArrayList;"}
     2:2:int com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.numberOfOneOfObjects():261:261 -> a
     2:2:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):101 -> a
     3:3:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getOneOfObjects():241:241 -> a
@@ -106534,7 +106499,7 @@
     13:13:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):111:111 -> a
-com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.Ih:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.Kh:
 # {"id":"sourceFile","fileName":"DeadProtoFieldObject.java"}
     com.android.tools.r8.graph.DexType holder -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -106543,33 +106508,33 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.mL:
 # {"id":"sourceFile","fileName":"LiveProtoFieldObject.java"}
     com.android.tools.r8.graph.DexField field -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     1:2:void <init>(com.android.tools.r8.graph.DexField):22:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):33 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:37 -> a
     7:7:com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject():47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mL;"}
     1:1:java.lang.String toString():52:52 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.y00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.C00:
 # {"id":"sourceFile","fileName":"ProtoEnqueuerExtension.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w10;"}
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I00;"}
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d10;"}
     java.util.Map liveProtos -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map seenButNotLiveProtos -> f
@@ -106578,7 +106543,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.utils.collections.ProgramMethodSet findLiteExtensionByNumberMethods -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     java.util.Map extensionGraph -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> k
@@ -106599,418 +106564,408 @@
     6:6:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
     7:7:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
     7:7:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
-    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724:724 -> a
-    8:8:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
+    8:8:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146:146 -> a
+    9:9:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    9:9:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):145 -> a
+    10:10:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    10:10:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724:724 -> a
-    9:9:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterReordering(boolean):440:440 -> a
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterReordering():449 -> a
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():724 -> a
-    10:10:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
-    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterReordering():725:725 -> a
-    11:11:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):146 -> a
-    12:12:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    12:12:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):145 -> a
-    13:13:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    13:13:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):145 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:18:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):147:151 -> a
-    19:19:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethod(com.android.tools.r8.graph.ProgramMethod):182:182 -> a
-    19:19:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):151 -> a
-    20:30:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):155:165 -> a
-    31:38:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):170:177 -> a
+    11:15:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):147:151 -> a
+    16:16:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethod(com.android.tools.r8.graph.ProgramMethod):182:182 -> a
+    16:16:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):151 -> a
+    17:27:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):155:165 -> a
+    28:35:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):170:177 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/IdentityHashMap;)V"}
-    39:39:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
+    36:36:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
+    36:36:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    37:37:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
+    37:37:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    38:38:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
+    38:38:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    39:39:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):80:80 -> a
     39:39:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
-    40:40:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
-    40:40:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    41:41:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):79:79 -> a
-    41:41:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
-    42:42:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):80:80 -> a
-    42:42:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    40:41:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):80:81 -> a
+    40:41:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    42:43:com.android.tools.r8.utils.ValueUtils$ArrayValues com.android.tools.r8.ir.analysis.proto.ProtoUtils.getObjectsArrayValuesFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):71:72 -> a
+    42:43:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):82 -> a
+    42:43:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    44:44:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):83:83 -> a
+    44:44:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
+    45:45:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):178:178 -> a
+    46:49:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):183:186 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/ph0;)V"}
+    50:50:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory com.android.tools.r8.shaking.Enqueuer.getUseRegistryFactory():587:587 -> a
+    50:50:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:44:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):80:81 -> a
-    43:44:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
-    45:46:com.android.tools.r8.utils.ValueUtils$ArrayValues com.android.tools.r8.ir.analysis.proto.ProtoUtils.getObjectsArrayValuesFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):71:72 -> a
-    45:46:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):82 -> a
-    45:46:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
-    47:47:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):83:83 -> a
-    47:47:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):177 -> a
-    48:48:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):178:178 -> a
-    49:52:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):183:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/internal/lh0;)V"}
-    53:53:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory com.android.tools.r8.shaking.Enqueuer.getUseRegistryFactory():587:587 -> a
-    53:53:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):191 -> a
+    51:51:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.getFactory():39:39 -> a
+    51:51:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):191 -> a
+    52:52:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194:194 -> a
+    53:53:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
+    53:53:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194 -> a
+    54:54:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194:194 -> a
+    55:55:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    55:55:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):195 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:54:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.getFactory():39:39 -> a
-    54:54:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):191 -> a
-    55:55:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194:194 -> a
-    56:56:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
-    56:56:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194 -> a
-    57:57:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):194:194 -> a
-    58:58:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    58:58:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):195 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    59:59:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):195 -> a
-    60:61:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):492:493 -> a
-    60:61:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    62:62:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getDynamicMethod():225:225 -> a
-    62:62:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):497 -> a
+    56:56:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    56:56:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):195 -> a
+    57:58:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):492:493 -> a
+    57:58:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    59:59:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getDynamicMethod():225:225 -> a
+    59:59:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):497 -> a
+    59:59:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    60:60:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):498:498 -> a
+    60:60:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    61:61:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
+    61:61:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):502 -> a
+    61:61:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    62:62:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):502:502 -> a
     62:62:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    63:63:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):498:498 -> a
+    63:63:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getObjects():61:61 -> a
+    63:63:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):503 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     63:63:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    64:64:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
-    64:64:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):502 -> a
-    64:64:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    65:65:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):502:502 -> a
-    65:65:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    66:66:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getObjects():61:61 -> a
-    66:66:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):503 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    67:75:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):504:512 -> a
-    67:75:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    76:76:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    76:76:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):513 -> a
+    64:72:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):504:512 -> a
+    64:72:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    73:73:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    73:73:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):513 -> a
+    73:73:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    74:75:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):514:515 -> a
+    74:75:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    76:76:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoObjectFromStaticGet():0:0 -> a
+    76:76:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):515 -> a
     76:76:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    77:78:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):514:515 -> a
-    77:78:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    79:79:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoObjectFromStaticGet():0:0 -> a
-    79:79:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):515 -> a
+    77:77:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):517:517 -> a
+    77:77:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    78:78:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet.getField():25:25 -> a
+    78:78:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):517 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    78:78:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
+    79:79:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516:516 -> a
     79:79:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    80:80:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):517:517 -> a
+    80:80:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoTypeObject():0:0 -> a
+    80:80:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):518 -> a
     80:80:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    81:81:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet.getField():25:25 -> a
-    81:81:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):517 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    81:81:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):520:520 -> a
     81:81:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    82:82:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):516:516 -> a
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject.getType():21:21 -> a
+    82:82:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):520 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     82:82:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    83:83:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isProtoTypeObject():0:0 -> a
-    83:83:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):518 -> a
+    83:83:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):519:519 -> a
     83:83:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    84:84:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):520:520 -> a
-    84:84:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject.getType():21:21 -> a
-    85:85:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):520 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    86:86:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):519:519 -> a
-    86:86:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):196 -> a
-    87:87:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):199:199 -> a
-    88:89:java.util.Map collectProgramExtensionFields():260:261 -> a
+    84:84:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):199:199 -> a
+    85:86:java.util.Map collectProgramExtensionFields():260:261 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/IdentityHashMap;"}
-    90:90:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    90:90:java.util.Map collectProgramExtensionFields():261 -> a
+    87:87:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    87:87:java.util.Map collectProgramExtensionFields():261 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    91:91:java.util.Map collectProgramExtensionFields():261 -> a
-    92:98:java.util.Map collectProgramExtensionFields():261:267 -> a
-    99:115:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):277:293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Ljava/util/IdentityHashMap;)V"}
-    116:116:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    116:116:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):293 -> a
-    117:121:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):294:298 -> a
-    122:122:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    122:122:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):301 -> a
-    123:131:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):302:310 -> a
-    132:135:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):315:318 -> a
-    132:135:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    136:136:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):206:206 -> a
+    88:88:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    88:88:java.util.Map collectProgramExtensionFields():261 -> a
+    89:95:java.util.Map collectProgramExtensionFields():261:267 -> a
+    96:112:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):277:293 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Ljava/util/IdentityHashMap;)V"}
+    113:113:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    113:113:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):293 -> a
+    114:118:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):294:298 -> a
+    119:119:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    119:119:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):301 -> a
+    120:128:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):302:310 -> a
+    129:132:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):315:318 -> a
+    129:132:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
+    133:133:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):206:206 -> a
+    133:133:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
+    133:133:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
+    134:134:boolean com.android.tools.r8.graph.DexProto.isIdenticalTo(com.android.tools.r8.graph.DexProto):26:26 -> a
+    134:134:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):206 -> a
+    134:134:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
+    134:134:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
+    135:135:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):207:207 -> a
+    135:135:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
+    135:135:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
+    136:136:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
+    136:136:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):207 -> a
     136:136:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
     136:136:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    137:137:boolean com.android.tools.r8.graph.DexProto.isIdenticalTo(com.android.tools.r8.graph.DexProto):26:26 -> a
-    137:137:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):206 -> a
+    137:137:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):208:208 -> a
     137:137:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
     137:137:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    138:138:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):207:207 -> a
-    138:138:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
+    138:138:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):317:317 -> a
     138:138:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    139:139:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
-    139:139:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):207 -> a
-    139:139:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
-    139:139:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    140:140:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberBridgeMethod(com.android.tools.r8.graph.DexMethod):208:208 -> a
-    140:140:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):318 -> a
-    140:140:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    141:141:boolean verifyIsCallToFindLiteExtensionByNumberMethod(com.android.tools.r8.ir.code.Instruction):317:317 -> a
-    141:141:void collectExtensionFieldsFromValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):310 -> a
-    142:150:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):329:337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vd0;)V"}
-    151:151:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
-    151:151:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337 -> a
+    139:147:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):329:337 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zd0;)V"}
+    148:148:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
+    148:148:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    152:152:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
-    152:152:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337 -> a
-    153:163:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):339:349 -> a
-    164:164:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    164:164:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):350 -> a
-    165:165:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):350:350 -> a
+    149:149:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
+    149:149:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337 -> a
+    150:160:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):339:349 -> a
+    161:161:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    161:161:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):350 -> a
+    162:162:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):350:350 -> a
+    163:163:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    163:163:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):351 -> a
+    164:165:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):351:352 -> a
     166:166:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    166:166:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):351 -> a
-    167:168:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):351:352 -> a
-    169:169:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    169:169:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):354 -> a
-    170:170:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):354:354 -> a
-    171:171:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    171:171:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):355 -> a
-    172:173:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):355:356 -> a
-    174:174:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):277:277 -> a
-    174:174:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):356 -> a
+    166:166:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):354 -> a
+    167:167:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):354:354 -> a
+    168:168:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    168:168:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):355 -> a
+    169:170:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):355:356 -> a
+    171:171:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):277:277 -> a
+    171:171:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):356 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    175:175:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):277:277 -> a
-    175:175:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):356 -> a
-    176:176:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    176:176:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):357 -> a
-    177:177:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):357:357 -> a
-    178:178:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    178:178:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):358 -> a
-    179:184:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):358:363 -> a
-    185:185:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
-    185:185:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):363 -> a
-    186:193:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):367:374 -> a
-    194:196:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):373:375 -> a
-    197:197:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):368:368 -> a
-    198:198:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
-    198:198:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):231 -> a
+    172:172:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):277:277 -> a
+    172:172:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):356 -> a
+    173:173:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    173:173:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):357 -> a
+    174:174:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):357:357 -> a
+    175:175:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    175:175:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):358 -> a
+    176:181:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):358:363 -> a
+    182:182:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
+    182:182:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):363 -> a
+    183:190:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):367:374 -> a
+    191:193:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):373:375 -> a
+    194:194:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):368:368 -> a
+    195:195:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
+    195:195:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/rY;)V"}
-    199:199:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
-    199:199:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):231 -> a
-    200:206:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):233:239 -> a
-    207:207:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
-    207:207:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vY;)V"}
+    196:196:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
+    196:196:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):231 -> a
+    197:203:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):233:239 -> a
+    204:204:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
+    204:204:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    208:208:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
-    208:208:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240 -> a
-    209:209:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240:240 -> a
-    210:210:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
-    210:210:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):241 -> a
-    211:214:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):241:244 -> a
-    215:215:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
-    215:215:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):244 -> a
+    205:205:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
+    205:205:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240 -> a
+    206:206:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):240:240 -> a
+    207:207:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
+    207:207:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):241 -> a
+    208:211:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):241:244 -> a
+    212:212:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
+    212:212:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):244 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    216:219:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):244:247 -> a
-    220:221:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):387:388 -> a
+    213:216:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet):244:247 -> a
+    217:218:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):387:388 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/shaking/G0;)V"}
-    222:222:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getDynamicMethod():225:225 -> a
-    222:222:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):392 -> a
-    223:223:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
-    223:223:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):393 -> a
-    224:231:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):393:400 -> a
-    232:232:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    232:232:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):400 -> a
-    233:233:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447:3447 -> a
+    219:219:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getDynamicMethod():225:225 -> a
+    219:219:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):392 -> a
+    220:220:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
+    220:220:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):393 -> a
+    221:228:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):393:400 -> a
+    229:229:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    229:229:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):400 -> a
+    230:230:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447:3447 -> a
+    230:230:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
+    231:231:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    231:231:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    231:231:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
+    232:232:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    232:232:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447 -> a
+    232:232:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
+    233:233:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadDirectly():244:244 -> a
+    233:233:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isRead():240 -> a
+    233:233:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3448 -> a
     233:233:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
-    234:234:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    234:234:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    234:234:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.hasReflectiveRead():221:221 -> a
+    234:234:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadIndirectly():248 -> a
+    234:234:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isRead():240 -> a
+    234:234:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3448 -> a
     234:234:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
-    235:235:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    235:235:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3447 -> a
-    235:235:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
-    236:236:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadDirectly():244:244 -> a
-    236:236:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isRead():240 -> a
-    236:236:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3448 -> a
-    236:236:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
-    237:237:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.hasReflectiveRead():221:221 -> a
-    237:237:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isReadIndirectly():248 -> a
-    237:237:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isRead():240 -> a
-    237:237:boolean com.android.tools.r8.shaking.Enqueuer.isFieldRead(com.android.tools.r8.graph.ProgramField):3448 -> a
-    237:237:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):401 -> a
-    238:238:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458:3458 -> a
+    235:235:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458:3458 -> a
+    235:235:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
+    236:236:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    236:236:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    236:236:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
+    237:237:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    237:237:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458 -> a
+    237:237:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
+    238:238:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3462:3462 -> a
     238:238:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    239:239:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    239:239:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    239:239:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():762:762 -> a
+    239:239:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3462 -> a
     239:239:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    240:240:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    240:240:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3458 -> a
-    240:240:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    241:241:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3462:3462 -> a
-    241:241:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    242:242:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():762:762 -> a
-    242:242:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3462 -> a
-    242:242:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    243:244:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3464:3465 -> a
-    243:244:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
-    245:256:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):403:414 -> a
-    257:257:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getType():65:65 -> a
-    257:257:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):424 -> a
-    258:258:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    258:258:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):424 -> a
-    259:259:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):425:425 -> a
-    260:260:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    260:260:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    240:241:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3464:3465 -> a
+    240:241:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):402 -> a
+    242:253:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):403:414 -> a
+    254:254:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getType():65:65 -> a
+    254:254:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):424 -> a
+    255:255:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    255:255:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):424 -> a
+    256:256:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):425:425 -> a
+    257:257:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    257:257:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    260:260:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
-    261:261:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    261:261:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
-    261:261:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
-    262:262:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
-    262:262:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
-    263:264:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):427:428 -> a
-    265:265:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getType():65:65 -> a
-    265:265:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):434 -> a
-    266:266:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
-    266:266:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):434 -> a
-    267:268:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):435:436 -> a
-    269:269:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    269:269:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):437 -> a
-    270:270:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    270:270:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    257:257:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
+    258:258:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    258:258:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    258:258:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
+    259:259:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
+    259:259:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):426 -> a
+    260:261:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):427:428 -> a
+    262:262:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getType():65:65 -> a
+    262:262:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):434 -> a
+    263:263:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
+    263:263:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):434 -> a
+    264:265:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):435:436 -> a
+    266:266:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    266:266:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):437 -> a
+    267:267:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    267:267:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    270:270:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
-    271:271:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    271:271:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
-    271:271:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
-    272:272:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
-    272:272:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
-    273:274:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):441:442 -> a
-    275:275:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    275:275:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):443 -> a
-    276:276:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):447:447 -> a
-    277:277:boolean com.android.tools.r8.graph.AppView.isAllCodeProcessed():430:430 -> a
-    277:277:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):447 -> a
+    267:267:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
+    268:268:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    268:268:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    268:268:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
+    269:269:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
+    269:269:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):440 -> a
+    270:271:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):441:442 -> a
+    272:272:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    272:272:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):443 -> a
+    273:273:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):447:447 -> a
+    274:274:boolean com.android.tools.r8.graph.AppView.isAllCodeProcessed():430:430 -> a
+    274:274:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):447 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    278:278:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449:449 -> a
-    279:279:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexEncodedField.getOptimizationInfo():104:104 -> a
-    279:279:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449 -> a
+    275:275:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449:449 -> a
+    276:276:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexEncodedField.getOptimizationInfo():104:104 -> a
+    276:276:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):449 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    280:280:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140:140 -> a
+    277:277:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140:140 -> a
+    277:277:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
+    278:278:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
+    278:278:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
+    278:278:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
+    279:279:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    279:279:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    279:279:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
+    279:279:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
+    280:280:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
+    280:280:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    280:280:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
     280:280:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
     281:281:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
     281:281:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
     281:281:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
-    282:282:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    282:282:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
+    282:283:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140:141 -> a
+    282:283:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
+    284:296:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451:463 -> a
+    297:297:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453:3453 -> a
+    297:297:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
+    298:298:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    298:298:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    282:282:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
-    282:282:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
-    283:283:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
-    283:283:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121 -> a
-    283:283:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
-    283:283:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
-    284:284:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
-    284:284:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140 -> a
-    284:284:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
-    285:286:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):140:141 -> a
-    285:286:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):450 -> a
-    287:299:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451:463 -> a
-    300:300:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453:3453 -> a
+    298:298:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
+    299:299:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    299:299:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453 -> a
+    299:299:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
+    300:300:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isWrittenInMethodSatisfying(java.util.function.Predicate):321:321 -> a
+    300:300:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3454 -> a
     300:300:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
-    301:301:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    301:301:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453 -> a
+    301:306:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):477:482 -> a
+    307:307:int com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.numberOfOneOfObjects():261:261 -> a
+    307:307:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):531 -> a
+    307:307:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    308:308:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getOneOfObjects():241:241 -> a
+    308:308:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):535 -> a
+    308:308:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    309:309:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):535:535 -> a
+    309:309:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    310:310:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.getOneOfCaseObject():25:25 -> a
+    310:310:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):543 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    301:301:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
-    302:302:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    302:302:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3453 -> a
-    302:302:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
-    303:303:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.isWrittenInMethodSatisfying(java.util.function.Predicate):321:321 -> a
-    303:303:boolean com.android.tools.r8.shaking.Enqueuer.isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3454 -> a
-    303:303:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):475 -> a
-    304:309:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):477:482 -> a
-    310:310:int com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.numberOfOneOfObjects():261:261 -> a
-    310:310:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):531 -> a
+    310:310:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
     310:310:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    311:311:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getOneOfObjects():241:241 -> a
-    311:311:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):535 -> a
+    311:311:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):544:544 -> a
+    311:311:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
     311:311:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    312:312:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):535:535 -> a
+    312:312:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    312:312:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):544 -> a
+    312:312:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
     312:312:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    313:313:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.getOneOfCaseObject():25:25 -> a
-    313:313:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):543 -> a
+    313:317:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):545:549 -> a
+    313:317:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    313:317:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    318:318:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject.getField():27:27 -> a
+    318:318:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):549 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    313:313:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    313:313:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    314:314:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):544:544 -> a
-    314:314:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    314:314:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    315:315:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    315:315:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):544 -> a
-    315:315:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    315:315:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    316:320:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):545:549 -> a
-    316:320:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    316:320:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    321:321:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject.getField():27:27 -> a
-    321:321:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):549 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    321:321:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    321:321:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    322:324:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):550:552 -> a
-    322:324:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    322:324:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    325:325:boolean com.android.tools.r8.graph.FieldResolutionResult.isSingleProgramFieldResolutionResult():0:0 -> a
-    325:325:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):552 -> a
-    325:325:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    325:325:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    326:343:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):553:570 -> a
-    326:343:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    326:343:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    344:344:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    344:344:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):570 -> a
+    318:318:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    318:318:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    319:321:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):550:552 -> a
+    319:321:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    319:321:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    322:322:boolean com.android.tools.r8.graph.FieldResolutionResult.isSingleProgramFieldResolutionResult():0:0 -> a
+    322:322:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):552 -> a
+    322:322:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    322:322:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    323:340:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):553:570 -> a
+    323:340:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    323:340:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    341:341:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    341:341:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):570 -> a
+    341:341:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    341:341:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    342:342:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.getOneOfObject():21:21 -> a
+    342:342:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):574 -> a
+    342:342:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    342:342:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    343:343:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575:575 -> a
+    343:343:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    343:343:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    344:344:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
+    344:344:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575 -> a
     344:344:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
     344:344:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    345:345:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.getOneOfObject():21:21 -> a
-    345:345:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):574 -> a
-    345:345:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    345:345:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    346:346:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575:575 -> a
-    346:346:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    346:346:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    347:347:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoObject.isLiveProtoFieldObject():0:0 -> a
-    347:347:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):575 -> a
-    347:347:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    347:347:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    348:352:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):576:580 -> a
-    348:352:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    348:352:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    353:353:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject.getField():27:27 -> a
-    353:353:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):580 -> a
+    345:349:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):576:580 -> a
+    345:349:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    345:349:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    350:350:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject.getField():27:27 -> a
+    350:350:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):580 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    353:353:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    353:353:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    354:356:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):581:583 -> a
-    354:356:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    354:356:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    357:357:boolean com.android.tools.r8.graph.FieldResolutionResult.isSingleProgramFieldResolutionResult():0:0 -> a
-    357:357:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):583 -> a
-    357:357:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    357:357:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    358:368:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):584:594 -> a
-    358:368:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    358:368:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    369:369:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):590:590 -> a
-    369:369:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
-    369:369:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
-    370:372:boolean lambda$markMapOrRequiredFieldsAsReachable$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):465:467 -> a
+    350:350:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    350:350:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    351:353:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):581:583 -> a
+    351:353:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    351:353:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    354:354:boolean com.android.tools.r8.graph.FieldResolutionResult.isSingleProgramFieldResolutionResult():0:0 -> a
+    354:354:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):583 -> a
+    354:354:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    354:354:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    355:365:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):584:594 -> a
+    355:365:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    355:365:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    366:366:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):590:590 -> a
+    366:366:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):536 -> a
+    366:366:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):486 -> a
+    367:369:boolean lambda$markMapOrRequiredFieldsAsReachable$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):465:467 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
-    373:377:boolean lambda$markMapOrRequiredFieldsAsReachable$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):466:470 -> a
-    378:398:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):603:623 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B00;)Z"}
-    399:399:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634:634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I00;)Z"}
-    400:400:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getType():245:245 -> a
-    400:400:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634 -> a
-    401:405:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634:638 -> a
-    406:406:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
-    406:406:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):640 -> a
-    407:418:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):639:650 -> a
-    419:419:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
-    419:419:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):651 -> a
-    420:428:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):651:659 -> a
-    429:429:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getType():245:245 -> a
-    429:429:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660 -> a
-    430:430:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660:660 -> a
-    431:431:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
-    431:431:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660 -> a
-    432:437:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660:665 -> a
-    438:460:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):674:696 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/I00;"}
+    370:374:boolean lambda$markMapOrRequiredFieldsAsReachable$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):466:470 -> a
+    375:395:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):603:623 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F00;)Z"}
+    396:396:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634:634 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M00;)Z"}
+    397:397:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getType():245:245 -> a
+    397:397:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634 -> a
+    398:402:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):634:638 -> a
+    403:403:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
+    403:403:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):640 -> a
+    404:415:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):639:650 -> a
+    416:416:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getFields():229:229 -> a
+    416:416:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):651 -> a
+    417:425:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):651:659 -> a
+    426:426:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getType():245:245 -> a
+    426:426:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660 -> a
+    427:427:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660:660 -> a
+    428:428:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
+    428:428:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660 -> a
+    429:434:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):660:665 -> a
+    435:457:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):674:696 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/M00;"}
     1:11:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):117:127 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/G0;)V"}
     12:19:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):123:130 -> b
@@ -107023,24 +106978,24 @@
     46:46:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):252 -> b
     47:47:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$1(com.android.tools.r8.graph.DexType):374:374 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.B00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.F00:
 # {"id":"sourceFile","fileName":"ProtoFieldInfo.java"}
     int number -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H00;"}
     java.util.OptionalInt auxData -> c
     java.util.List objects -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():16:16 -> <clinit>
     1:5:void <init>(int,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType,java.util.OptionalInt,java.util.List):35:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/D00;Ljava/util/OptionalInt;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/H00;Ljava/util/OptionalInt;Ljava/util/ArrayList;)V"}
     1:1:int getAuxData():47:47 -> a
     2:2:boolean hasAuxData():43:43 -> a
     2:2:int getAuxData():47 -> a
     3:4:int getAuxData():47:48 -> a
     5:5:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E00;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I00;)Lcom/android/tools/r8/graph/I2;"}
     6:6:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
     6:6:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):77 -> a
     7:7:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):78:78 -> a
@@ -107075,7 +107030,7 @@
     32:32:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:com.android.tools.r8.graph.ProgramField getHazzerBitField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I00;)Lcom/android/tools/r8/graph/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/M00;)Lcom/android/tools/r8/graph/A5;"}
     34:34:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):121:121 -> a
     34:34:com.android.tools.r8.graph.ProgramField getHazzerBitField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):126 -> a
     35:35:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.isProto2():221:221 -> a
@@ -107103,9 +107058,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:53:com.android.tools.r8.graph.ProgramField getHazzerBitField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):135:136 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():65:65 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H00;"}
     2:2:com.android.tools.r8.graph.ProgramField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):172:172 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I00;)Lcom/android/tools/r8/graph/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/M00;)Lcom/android/tools/r8/graph/A5;"}
     3:3:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> b
     3:3:com.android.tools.r8.graph.ProgramField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):172 -> b
     4:4:com.android.tools.r8.graph.ProgramField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):172:172 -> b
@@ -107126,7 +107081,7 @@
     15:16:com.android.tools.r8.graph.ProgramField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):177:178 -> b
     1:1:boolean hasAuxData():43:43 -> c
     2:2:com.android.tools.r8.graph.ProgramField getValueStorage(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):190:190 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I00;)Lcom/android/tools/r8/graph/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/M00;)Lcom/android/tools/r8/graph/A5;"}
     3:3:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> c
     3:3:com.android.tools.r8.graph.ProgramField getValueStorage(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):190 -> c
     4:4:java.util.List com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo.getOneOfObjects():241:241 -> c
@@ -107145,13 +107100,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:16:com.android.tools.r8.graph.ProgramField getValueStorage(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):196:197 -> c
     1:15:java.lang.String toString():202:216 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.C00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.G00:
 # {"id":"sourceFile","fileName":"ProtoFieldObject.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject():16:16 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G00;"}
     1:1:boolean isProtoFieldObject():11:11 -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.D00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.H00:
 # {"id":"sourceFile","fileName":"ProtoFieldType.java"}
     int id -> a
     boolean isRequired -> b
@@ -107166,9 +107121,9 @@
     2:2:boolean hasHasBit():82:82 -> a
     2:2:boolean hasAuxData(boolean):76 -> a
     3:3:com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType asOneOf():118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W00;"}
     4:13:int numberOfObjects(boolean,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):143:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/E00;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/I00;)I"}
     14:14:int numberOfObjects(boolean,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):150:150 -> a
     1:1:boolean isMap():98:98 -> b
     1:1:boolean isOneOf():0:0 -> c
@@ -107178,10 +107133,10 @@
     1:1:boolean isValid():134:134 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:14:int serialize():159:172 -> h
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.E00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.I00:
 # {"id":"sourceFile","fileName":"ProtoFieldTypeFactory.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:3:void <init>():10:12 -> <init>
@@ -107189,11 +107144,11 @@
     4:4:void <init>():12 -> <init>
     5:5:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/D00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/H00;"}
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     17:18:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:19 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.I00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.M00:
 # {"id":"sourceFile","fileName":"ProtoMessageInfo.java"}
     com.android.tools.r8.graph.ProgramMethod dynamicMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -107204,10 +107159,10 @@
     1:6:void <init>(com.android.tools.r8.graph.ProgramMethod,int,java.util.LinkedList,java.util.LinkedList,java.util.LinkedList):208:213 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILjava/util/LinkedList;Ljava/util/LinkedList;Ljava/util/LinkedList;)V"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder builder(com.android.tools.r8.graph.ProgramMethod):217:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/G00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/K00;"}
     2:2:boolean hasFields():249:249 -> a
     1:9:java.lang.String toString():266:274 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.G00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.K00:
 # {"id":"sourceFile","fileName":"ProtoMessageInfo.java"}
     com.android.tools.r8.graph.ProgramMethod dynamicMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -107222,23 +107177,23 @@
     1:1:java.util.stream.Stream com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.stream():34:34 -> a
     1:1:boolean lambda$removeUnusedSharedData$1(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T00;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X00;)Z"}
     2:2:java.util.stream.Stream com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair.stream():34:34 -> a
     2:2:boolean lambda$removeUnusedSharedData$1(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair):143 -> a
     3:3:boolean lambda$removeUnusedSharedData$1(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair):143:143 -> a
     4:4:void setFlags(int):44:44 -> a
     5:8:void addField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):50:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F00;)V"}
     9:12:void addHasBitsObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):59:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G00;)V"}
     13:16:void addOneOfObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):68:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C00;Lcom/android/tools/r8/internal/C00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G00;Lcom/android/tools/r8/internal/G00;)V"}
     17:19:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo build():75:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M00;"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getType():65:65 -> b
     1:1:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):85 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B00;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F00;)Z"}
     2:2:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> b
     2:2:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):85 -> b
     3:3:boolean lambda$removeDeadFields$0(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):86:86 -> b
@@ -107301,32 +107256,32 @@
     106:107:void com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.setAuxData(int):52:53 -> c
     106:107:void removeUnusedSharedData():183 -> c
     108:109:void removeUnusedSharedData():96:97 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.H00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.L00:
 # {"id":"sourceFile","fileName":"ProtoMessageInfo.java"}
     1:1:void <init>():193:193 -> <init>
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.P00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.T00:
 # {"id":"sourceFile","fileName":"ProtoObject.java"}
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject():32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mL;"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject():20:20 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G00;"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet():40:40 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V00;"}
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject():48:48 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h10;"}
     1:1:boolean isDeadProtoFieldObject():0:0 -> e
     1:1:boolean isProtoFieldObject():16:16 -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Q00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.U00:
 # {"id":"sourceFile","fileName":"ProtoObjectFromInvokeStatic.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -107334,28 +107289,28 @@
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.R00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.V00:
 # {"id":"sourceFile","fileName":"ProtoObjectFromStaticGet.java"}
     com.android.tools.r8.graph.DexField field -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32:32 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet():42:42 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R00;"}
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.S00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/V00;"}
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.W00:
 # {"id":"sourceFile","fileName":"ProtoOneOfFieldType.java"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getActualFieldType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):25:25 -> a
     1:1:int numberOfObjects(boolean,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/E00;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/I00;)I"}
     2:2:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.id():86:86 -> a
     2:2:int numberOfObjects(boolean,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):62 -> a
     3:3:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isLegacyEnumClosedBit():102:102 -> a
@@ -107363,7 +107318,7 @@
     4:4:int numberOfObjects(boolean,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):67:67 -> a
     5:5:boolean hasAuxData(boolean):30:30 -> a
     6:6:com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType asOneOf():40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W00;"}
     1:1:boolean isRepeated():45:45 -> d
     1:1:boolean isSingular():50:50 -> f
     1:1:boolean isValid():55:55 -> g
@@ -107371,23 +107326,23 @@
     2:2:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.id():86:86 -> g
     2:2:boolean isValid():55 -> g
     3:3:boolean isValid():55:55 -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.T00:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.X00:
 # {"id":"sourceFile","fileName":"ProtoOneOfObjectPair.java"}
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfObject -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G00;"}
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfCaseObject -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G00;"}
     1:3:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):15:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C00;Lcom/android/tools/r8/internal/C00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G00;Lcom/android/tools/r8/internal/G00;)V"}
     1:2:void forEach(java.util.function.Consumer):29:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.d10:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.h10:
 # {"id":"sourceFile","fileName":"ProtoTypeObject.java"}
     com.android.tools.r8.graph.DexType type -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kw;"}
     2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1279:1279 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):428:428 -> a
@@ -107402,11 +107357,11 @@
     6:6:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1280 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject():36:36 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d10;"}
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.kc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h10;"}
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.mc:
 # {"id":"sourceFile","fileName":"ClassInitializerSideEffectAnalysis.java"}
     1:21:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):44:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)I"}
     22:22:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
     22:22:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65 -> a
     23:45:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:88 -> a
@@ -107416,43 +107371,43 @@
     47:47:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     48:48:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):96:96 -> a
     49:92:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:110 -> a
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.lc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.Q3:
 # {"id":"sourceFile","fileName":"ArrayTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YR;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):30:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/UR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/YR;)V"}
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement getBaseType():73:75 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberType():65:65 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getMemberTypeAsValueType():69:69 -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:4:int getNesting():51:54 -> T
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     2:2:com.android.tools.r8.ir.analysis.type.ArrayTypeElement create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Q3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Q3;"}
     3:3:com.android.tools.r8.ir.analysis.type.ArrayTypeElement lambda$create$0(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/Q3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/Q3;"}
     4:5:com.android.tools.r8.ir.analysis.type.ArrayTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):82:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/Q3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/Q3;"}
     6:6:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):95:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     7:7:com.android.tools.r8.ir.analysis.type.ArrayTypeElement asArrayType():105:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q3;"}
     8:12:com.android.tools.r8.ir.analysis.type.ArrayTypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):139:143 -> a
     8:12:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/aj0;"}
     13:14:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):172:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     15:15:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     15:15:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):150 -> a
     15:15:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):173 -> a
@@ -107502,7 +107457,7 @@
     54:54:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):179 -> a
     55:55:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):179:179 -> a
     56:69:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):184:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     70:82:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):193:205 -> a
     83:83:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     83:83:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinMember(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):206 -> a
@@ -107514,7 +107469,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> c
     1:1:com.android.tools.r8.ir.analysis.type.ArrayTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):88 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Q3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Q3;"}
     2:4:com.android.tools.r8.ir.analysis.type.ArrayTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):88:90 -> c
     1:4:boolean equals(java.lang.Object):118:121 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> equals
@@ -107526,10 +107481,10 @@
     1:1:int hashCode():130:130 -> hashCode
     1:1:boolean isArrayType():100:100 -> r
     1:1:java.lang.String toString():110:110 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.Y6:
 # {"id":"sourceFile","fileName":"BooleanTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y6;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
@@ -107537,21 +107492,21 @@
     1:1:boolean equals(java.lang.Object):36:36 -> equals
     1:1:int hashCode():41:41 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.h7:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.j7:
 # {"id":"sourceFile","fileName":"BottomTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j7;"}
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean equals(java.lang.Object):30:30 -> equals
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.W7:
 # {"id":"sourceFile","fileName":"ByteTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.ByteTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
@@ -107559,10 +107514,10 @@
     1:1:boolean equals(java.lang.Object):36:36 -> equals
     1:1:int hashCode():41:41 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.wb:
 # {"id":"sourceFile","fileName":"CharTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ub;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wb;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
@@ -107570,26 +107525,26 @@
     1:1:boolean equals(java.lang.Object):36:36 -> equals
     1:1:int hashCode():41:41 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.rd:
 # {"id":"sourceFile","fileName":"ClassTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.InterfaceCollection lazyInterfaces -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
     com.android.tools.r8.graph.AppView appView -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YR;"}
     com.android.tools.r8.graph.DexType type -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():32:32 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):80:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YR;)V"}
     4:4:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):83 -> <init>
     5:12:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.NullabilityVariants,com.android.tools.r8.graph.AppView):81:88 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():149:149 -> P
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():32 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     2:11:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.Nullability.meet(com.android.tools.r8.ir.analysis.type.Nullability):70:79 -> P
     2:11:com.android.tools.r8.ir.analysis.type.ClassTypeElement asMeetWithNotNull():149 -> P
     2:11:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():32 -> P
@@ -107598,26 +107553,26 @@
     1:1:com.android.tools.r8.graph.DexType getClassType():92:92 -> Q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:7:com.android.tools.r8.ir.analysis.type.InterfaceCollection getInterfaces():96:102 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zA;"}
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     2:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection):47:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xA;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zA;)Lcom/android/tools/r8/internal/rd;"}
     6:6:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/rd;"}
     7:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$create$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.NullabilityVariants):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/rd;"}
     8:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement createForD8(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     9:9:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$createForD8$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/rd;"}
     10:10:com.android.tools.r8.ir.analysis.type.InterfaceCollection com.android.tools.r8.ir.analysis.type.InterfaceCollection.empty():76:76 -> a
     10:10:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$createForD8$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):71 -> a
     11:11:com.android.tools.r8.ir.analysis.type.ClassTypeElement lambda$createForD8$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):71:71 -> a
     12:12:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> a
     12:12:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):491 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/internal/xA;)Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/internal/zA;)Lcom/android/tools/r8/internal/zA;"}
     13:13:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> a
     13:13:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):491 -> a
     14:14:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> a
@@ -107658,16 +107613,16 @@
     107:107:com.android.tools.r8.ir.analysis.type.InterfaceCollection com.android.tools.r8.ir.analysis.type.InterfaceCollection.empty():76:76 -> a
     107:107:com.android.tools.r8.ir.analysis.type.InterfaceCollection computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.InterfaceCollection):492 -> a
     108:109:com.android.tools.r8.ir.analysis.type.ClassTypeElement createVariant(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.NullabilityVariants):109:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/internal/UR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/internal/YR;)Lcom/android/tools/r8/internal/rd;"}
     110:112:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):122:124 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     113:113:boolean lambda$isBasedOnMissingClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.lang.Boolean):124:124 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)Z"}
     114:114:boolean isClassType(java.util.function.Predicate):134:134 -> a
     115:117:java.lang.String lambda$toString$4(com.android.tools.r8.utils.Pair):187:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;)Ljava/lang/String;"}
     118:122:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):207:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/aj0;"}
     123:124:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):35:36 -> a
     123:124:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):212 -> a
     125:125:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):217:217 -> a
@@ -107679,11 +107634,11 @@
     128:169:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):223:264 -> a
     170:170:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):218:218 -> a
     171:187:void lambda$fixupClassTypeReferences$5(java.util.Set,java.util.function.Function,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.Boolean):228:244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Function;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Function;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
     188:190:void lambda$fixupClassTypeReferences$6(java.util.function.Function,com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType,java.lang.Boolean):257:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/xA$a;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/zA$a;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
     191:192:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):293:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     193:201:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ArrayTypeElement,com.android.tools.r8.graph.AppView):276:284 -> a
     193:201:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):294 -> a
     202:202:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
@@ -107726,7 +107681,7 @@
     230:230:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):300 -> a
     231:231:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):300:300 -> a
     232:242:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.Nullability):314:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     243:243:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     243:243:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.Nullability):325 -> a
     244:254:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.InterfaceCollection,com.android.tools.r8.ir.analysis.type.Nullability):325:335 -> a
@@ -107738,21 +107693,21 @@
     286:286:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):510 -> a
     287:287:void lambda$computeLeastUpperBoundOfInterfaces$7(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):510:510 -> a
     288:289:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):535:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/nd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/pd;)V"}
     290:291:boolean com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.knownIfBothAreKnown():409:410 -> a
     290:291:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):536 -> a
     292:292:void lambda$computeLeastUpperBoundOfInterfaces$10(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):536:536 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):32:32 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     2:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):59:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/rd;"}
     5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType():139:139 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     6:12:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):164:170 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.createUnmarked():386:386 -> b
     13:13:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker lambda$computeLeastUpperBoundOfInterfaces$9(com.android.tools.r8.graph.DexType):519 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/pd;"}
     14:14:void lambda$computeLeastUpperBoundOfInterfaces$8(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):513:513 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Queue;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
     15:15:com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker.forRight(boolean):382:382 -> b
@@ -107760,10 +107715,10 @@
     16:16:void lambda$computeLeastUpperBoundOfInterfaces$8(java.util.Queue,com.android.tools.r8.graph.DexType,java.lang.Boolean):513:513 -> b
     1:1:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> c
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):115 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     2:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):115:117 -> c
     5:7:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithoutClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):341:343 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/rd;"}
     8:8:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> c
     8:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithoutClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):343 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -107776,7 +107731,7 @@
     15:15:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinWithoutClassHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):344:344 -> c
     1:1:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> d
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):154 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     2:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):154:154 -> d
     1:4:boolean equals(java.lang.Object):570:573 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> equals
@@ -107789,34 +107744,34 @@
     1:16:java.lang.String toString():175:190 -> toString
     17:26:java.lang.String toString():183:192 -> toString
     1:1:boolean isClassType():129:129 -> w
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.pd:
 # {"id":"sourceFile","fileName":"ClassTypeElement.java"}
     com.android.tools.r8.utils.OptionalBool left -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.utils.OptionalBool right -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_KNOWN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_UNKNOWN -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_KNOWN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_UNKNOWN -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
     boolean $assertionsDisabled -> g
     1:17:void <clinit>():358:374 -> <clinit>
     1:4:void <init>(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.utils.OptionalBool):389:392 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QU;Lcom/android/tools/r8/internal/QU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/internal/UU;)V"}
     1:1:boolean isMarkedOnBothSides():400:400 -> a
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.od:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.qd:
 # {"id":"sourceFile","fileName":"ClassTypeElement.java"}
     com.android.tools.r8.graph.DexType itf -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):435:437 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/nd;)V"}
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.qk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/pd;)V"}
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.sk:
 # {"id":"sourceFile","fileName":"DestructivePhiTypeUpdater.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -107824,13 +107779,13 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):31:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function):35:37 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):31 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:12:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):44:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;)V"}
     13:18:boolean verifyAllChangedPhisAreScheduled(com.android.tools.r8.ir.code.IRCode,java.util.Set):100:105 -> a
     13:18:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):54 -> a
     19:19:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function):77:77 -> a
@@ -107873,31 +107828,31 @@
     53:53:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):76:76 -> a
     54:54:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
     54:54:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):76 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.sm:
 # {"id":"sourceFile","fileName":"DoubleTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sm;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
     1:1:java.lang.String getTypeName():21:21 -> Q
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.Fm:
 # {"id":"sourceFile","fileName":"DynamicType.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     1:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):28:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/Hm;"}
     10:10:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/Hm;"}
     11:11:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
     11:11:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):43 -> a
     12:12:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound bottom():80:80 -> a
@@ -107920,21 +107875,21 @@
     30:33:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):61 -> a
     34:34:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):62:62 -> a
     35:35:com.android.tools.r8.ir.analysis.type.ExactDynamicType createExact(com.android.tools.r8.ir.analysis.type.ClassTypeElement):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/ro;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/uo;"}
     36:36:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound asDynamicTypeWithUpperBound():140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hm;"}
     37:61:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Fm;"}
     62:68:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:196 -> a
     69:69:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):183:183 -> a
     70:70:com.android.tools.r8.ir.analysis.type.DynamicType uncanonicalizeNotNullType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():124:124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     com.android.tools.r8.ir.analysis.type.Nullability getNullability() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean hasDynamicLowerBoundType():120:120 -> e
     boolean equals(java.lang.Object) -> equals
     1:1:boolean hasDynamicUpperBoundType():105:105 -> f
@@ -107945,21 +107900,21 @@
     1:1:boolean isNullType():148:148 -> k
     1:1:boolean isUnknown():156:156 -> l
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound unknown():92:92 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.Em:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hm;"}
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.Gm:
 # {"id":"sourceFile","fileName":"DynamicTypeWithLowerBound.java"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rd;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):17:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/internal/pd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/rd;)V"}
     3:3:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):19 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):19:20 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):27:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/Em;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/Gm;"}
     3:3:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     3:3:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -107969,7 +107924,7 @@
     15:15:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():39:39 -> a
     15:15:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):79 -> a
     15:15:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     16:16:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     16:16:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -107989,7 +107944,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():39:39 -> b
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):79 -> b
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):11 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Hm;"}
     2:2:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):79 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -108007,7 +107962,7 @@
     7:7:com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):84:84 -> b
     7:7:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):11 -> b
     8:8:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     1:4:boolean equals(java.lang.Object):55:58 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():39:39 -> equals
     5:5:boolean equals(java.lang.Object):59 -> equals
@@ -108022,30 +107977,30 @@
     3:3:int hashCode():65:65 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():39:39 -> n
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():11 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():39:39 -> toString
     1:1:java.lang.String toString():71 -> toString
     2:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():49:49 -> toString
     2:2:java.lang.String toString():73 -> toString
     3:3:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.Hm:
 # {"id":"sourceFile","fileName":"DynamicTypeWithUpperBound.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound BOTTOM -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hm;"}
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound NULL_TYPE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hm;"}
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound UNKNOWN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hm;"}
     boolean $assertionsDisabled -> f
     1:8:void <clinit>():24:31 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement):35:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     2:2:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/Hm;"}
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
     3:3:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):53 -> a
     4:4:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicType.bottom():80:80 -> a
@@ -108069,14 +108024,14 @@
     26:26:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):72:72 -> a
     27:30:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):86:89 -> a
     27:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/Hm;"}
     31:33:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):44:46 -> a
     34:34:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     35:35:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound asDynamicTypeWithUpperBound():148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hm;"}
     36:36:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):164:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hm;)Lcom/android/tools/r8/internal/Hm;"}
     37:40:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):86:89 -> a
     37:40:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):166 -> a
     41:41:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167:167 -> a
@@ -108095,21 +108050,21 @@
     65:65:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):168 -> a
     66:70:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):169:173 -> a
     71:86:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):207:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():115:115 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     2:24:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.AppView):231:253 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hm;)Z"}
     25:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):300:305 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Hm;"}
     31:31:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> b
     31:31:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):306 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     32:33:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):309:310 -> b
     1:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():125:127 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():133:133 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean hasDynamicLowerBoundType():0:0 -> e
     1:5:boolean equals(java.lang.Object):259:263 -> equals
     1:1:boolean hasDynamicUpperBoundType():96:96 -> f
@@ -108126,22 +108081,22 @@
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> l
     2:2:boolean isUnknown():158 -> l
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():105:105 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:13:java.lang.String toString():273:285 -> toString
-com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.uo:
 # {"id":"sourceFile","fileName":"ExactDynamicType.java"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> a
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/internal/Fm;"}
     2:6:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):48:52 -> a
     7:7:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.getNullability():133:133 -> a
     7:7:com.android.tools.r8.ir.analysis.type.ExactDynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):57 -> a
     7:7:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     8:8:com.android.tools.r8.ir.analysis.type.ExactDynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):60:60 -> a
     8:8:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> a
     9:9:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> a
@@ -108151,11 +108106,11 @@
     10:10:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> b
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():26 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     2:2:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.getNullability():133:133 -> b
     2:2:com.android.tools.r8.ir.analysis.type.ExactDynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):57 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Hm;"}
     3:3:com.android.tools.r8.ir.analysis.type.ExactDynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):60:60 -> b
     3:3:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> b
     4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> b
@@ -108164,7 +108119,7 @@
     5:5:com.android.tools.r8.ir.analysis.type.ExactDynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):60:60 -> b
     5:5:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):13 -> b
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     1:1:boolean hasDynamicLowerBoundType():36:36 -> e
     1:4:boolean equals(java.lang.Object):66:69 -> equals
     5:5:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> equals
@@ -108177,42 +108132,42 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> n
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicUpperBoundType():21 -> n
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():13 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():31:31 -> toString
     1:1:java.lang.String toString():80 -> toString
     2:2:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.sq:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.uq:
 # {"id":"sourceFile","fileName":"FloatTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uq;"}
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():15:15 -> P
     1:1:java.lang.String getTypeName():20:20 -> Q
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.xA:
 # {"id":"sourceFile","fileName":"IntTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xA;"}
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():15:15 -> P
     1:1:java.lang.String getTypeName():20:20 -> Q
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.zA:
 # {"id":"sourceFile","fileName":"InterfaceCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q1;"}
     com.android.tools.r8.ir.analysis.type.InterfaceCollection EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
     boolean $assertionsDisabled -> c
     1:52:void <clinit>():22:73 -> <clinit>
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap):97:99 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s20;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder builder():84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xA$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zA$a;"}
     2:2:void forEach(java.util.function.BiConsumer):128:128 -> a
     3:3:void forEachKnownInterface(java.util.function.Consumer):132:132 -> a
     4:5:void lambda$forEachKnownInterface$0(java.util.function.Consumer,com.android.tools.r8.graph.DexType,java.lang.Boolean):134:135 -> a
@@ -108221,7 +108176,7 @@
     8:8:void lambda$getInterfaceList$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Boolean):160:160 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)V"}
     9:9:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):178:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/UU;"}
     10:10:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):79:79 -> a
     10:10:com.android.tools.r8.utils.OptionalBool contains(com.android.tools.r8.graph.DexType):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -108235,7 +108190,7 @@
     3:3:boolean containsKnownInterface(com.android.tools.r8.graph.DexType):186:186 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection singleton(com.android.tools.r8.graph.DexType):80:80 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/zA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps.singleton(java.lang.Object,boolean):146:146 -> c
     2:2:com.android.tools.r8.ir.analysis.type.InterfaceCollection singleton(com.android.tools.r8.graph.DexType):80 -> c
     3:3:com.android.tools.r8.ir.analysis.type.InterfaceCollection singleton(com.android.tools.r8.graph.DexType):80:80 -> c
@@ -108244,47 +108199,47 @@
     1:1:int size():107:107 -> d
     1:5:boolean equals(java.lang.Object):115:119 -> equals
     1:1:int hashCode():124:124 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.xA$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.zA$a:
 # {"id":"sourceFile","fileName":"InterfaceCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>():38:38 -> <init>
     2:2:void <init>():36:36 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addInterface(com.android.tools.r8.graph.DexType,boolean):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Z)Lcom/android/tools/r8/internal/xA$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Z)Lcom/android/tools/r8/internal/zA$a;"}
     2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):56:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)Ljava/lang/Boolean;"}
     3:3:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addKnownInterface(com.android.tools.r8.graph.DexType):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xA$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/zA$a;"}
     4:4:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zA;"}
     5:5:com.android.tools.r8.ir.analysis.type.InterfaceCollection com.android.tools.r8.ir.analysis.type.InterfaceCollection.empty():76:76 -> a
     5:5:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():66 -> a
     6:6:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():68:68 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.SL:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.WL:
 # {"id":"sourceFile","fileName":"LongTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WL;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
     1:1:java.lang.String getTypeName():21:21 -> Q
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.KR:
+com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.PR:
 # {"id":"sourceFile","fileName":"NotNullDynamicType.java"}
     com.android.tools.r8.ir.analysis.type.NotNullDynamicType INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PR;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():21:23 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):21:21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/internal/Fm;"}
     2:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):33:34 -> a
     2:3:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     4:4:com.android.tools.r8.ir.analysis.type.DynamicType uncanonicalizeNotNullType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Fm;"}
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toNonNullTypeElement(com.android.tools.r8.graph.AppView):89:89 -> a
     5:5:com.android.tools.r8.ir.analysis.type.DynamicType uncanonicalizeNotNullType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61 -> a
     6:6:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
@@ -108292,65 +108247,65 @@
     6:6:com.android.tools.r8.ir.analysis.type.DynamicType uncanonicalizeNotNullType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61 -> a
     7:7:com.android.tools.r8.ir.analysis.type.DynamicType uncanonicalizeNotNullType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61:61 -> a
     8:8:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     9:9:boolean com.android.tools.r8.ir.analysis.type.Nullability.isBottom():33:33 -> a
     9:9:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):66 -> a
     10:11:com.android.tools.r8.ir.analysis.type.DynamicType withNullability(com.android.tools.r8.ir.analysis.type.Nullability):66:67 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():39:39 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():44:44 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean equals(java.lang.Object):72:72 -> equals
     1:1:int hashCode():77:77 -> hashCode
     1:1:boolean isNotNullType():49:49 -> j
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.TR:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.XR:
 # {"id":"sourceFile","fileName":"Nullability.java"}
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NOT_NULL -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     com.android.tools.r8.ir.analysis.type.Nullability MAYBE_NULL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     1:4:void <clinit>():25:28 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     1:10:com.android.tools.r8.ir.analysis.type.Nullability join(com.android.tools.r8.ir.analysis.type.Nullability):57:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/XR;"}
     11:11:com.android.tools.r8.ir.analysis.type.Nullability bottom():103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNotNull():95:95 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():91:91 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean isDefinitelyNotNull():41:41 -> d
     1:1:boolean isDefinitelyNull():37:37 -> e
     1:1:boolean isMaybeNull():45:45 -> f
     1:1:boolean isNullable():49:49 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.UR:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.YR:
 # {"id":"sourceFile","fileName":"NullabilityVariants.java"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement definitelyNullVariant -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement definitelyNotNullVariant -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement create(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.Function):19:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/K30;"}
     3:11:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     3:11:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement create(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.Function):21 -> a
     12:20:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     12:20:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/K30;"}
     21:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):57:57 -> a
     22:30:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:30:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):58 -> a
@@ -108358,24 +108313,24 @@
     35:43:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     35:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):64 -> a
     44:45:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):65:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.PX:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.TX:
 # {"id":"sourceFile","fileName":"PrimitiveTypeElement.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:boolean isPrimitiveType():26:26 -> H
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():21:21 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     java.lang.String getDescriptor() -> P
     java.lang.String getTypeName() -> Q
     1:1:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromTypeDescriptorChar(char,boolean):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(CZ)Lcom/android/tools/r8/internal/PX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(CZ)Lcom/android/tools/r8/internal/TX;"}
     2:29:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromTypeDescriptorChar(char,boolean):83:110 -> a
     30:30:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromTypeDescriptorChar(char,boolean):106:106 -> a
     31:35:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromTypeDescriptorChar(char,boolean):104:108 -> a
     36:50:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromTypeDescriptorChar(char,boolean):88:102 -> a
     51:64:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):117:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Lcom/android/tools/r8/internal/PX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Lcom/android/tools/r8/internal/TX;"}
     65:65:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):128:128 -> a
     66:66:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):126:126 -> a
     67:67:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):124:124 -> a
@@ -108383,21 +108338,21 @@
     1:25:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):40:64 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType():31:31 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PX;"}
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.OX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TX;"}
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.SX:
 # {"id":"sourceFile","fileName":"PrimitiveTypeElement.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():117 -> <clinit>
     2:2:void <clinit>():117:117 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.G30:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.K30:
 # {"id":"sourceFile","fileName":"ReferenceTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement NULL_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J30;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement NULL_BOTTOM_INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J30;"}
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement.create():25:25 -> <clinit>
     1:1:void <clinit>():63 -> <clinit>
     2:2:void <clinit>():63:63 -> <clinit>
@@ -108405,49 +108360,49 @@
     3:3:void <clinit>():64 -> <clinit>
     4:4:void <clinit>():64:64 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):68:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)V"}
     1:1:boolean isReferenceType():111:111 -> I
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():74:74 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():84:84 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     2:11:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.Nullability.meet(com.android.tools.r8.ir.analysis.type.Nullability):70:79 -> P
     2:11:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():84 -> P
     12:12:com.android.tools.r8.ir.analysis.type.TypeElement asMeetWithNotNull():84:84 -> P
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():74:74 -> b
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):102 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):102:102 -> b
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType():116:116 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K30;"}
     1:1:boolean equals(java.lang.Object):123:123 -> equals
     1:1:int hashCode():128:128 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.F30:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.J30:
 # {"id":"sourceFile","fileName":"ReferenceTypeElement.java"}
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):21:21 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/K30;"}
     2:2:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     2:2:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/K30;"}
     3:3:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement join(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.AppView):39:39 -> a
     1:1:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):44:44 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean equals(java.lang.Object):59:59 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.fb0:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.jb0:
 # {"id":"sourceFile","fileName":"ShortTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jb0;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:java.lang.String getDescriptor():16:16 -> P
@@ -108455,10 +108410,10 @@
     1:1:boolean equals(java.lang.Object):36:36 -> equals
     1:1:int hashCode():41:41 -> hashCode
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.Xb0:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.bc0:
 # {"id":"sourceFile","fileName":"SinglePrimitiveTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bc0;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean isSinglePrimitive():33:33 -> K
@@ -108467,18 +108422,18 @@
     1:1:boolean equals(java.lang.Object):43:43 -> equals
     1:1:int hashCode():48:48 -> hashCode
     1:1:java.lang.String toString():38:38 -> toString
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.ph0:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.th0:
 # {"id":"sourceFile","fileName":"TopTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th0;"}
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:boolean equals(java.lang.Object):30:30 -> equals
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.Si0:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.Wi0:
 # {"id":"sourceFile","fileName":"TypeAnalysis.java"}
     boolean mayHaveImpreciseTypes -> a
     boolean keepRedundantBlocksAfterAssumeRemoval -> b
@@ -108489,13 +108444,13 @@
     com.android.tools.r8.ir.optimize.AssumeRemover assumeRemover -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/r;"}
     com.android.tools.r8.ir.code.IRCode code -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.utils.WorkList worklist -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bm0;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,boolean):53:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Z)V"}
     2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,boolean):40:41 -> <init>
     4:4:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,boolean):47 -> <init>
@@ -108589,7 +108544,7 @@
     63:63:void removeRedundantAssumeInstructions(java.util.function.Consumer):126 -> a
     64:67:void removeRedundantAssumeInstructions(java.util.function.Consumer):127:130 -> a
     68:68:void verifyValuesUpToDate(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     69:69:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:50 -> a
     69:69:void verifyValuesUpToDate(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141 -> a
     70:72:void verifyValuesUpToDate(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:144 -> a
@@ -108600,16 +108555,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     76:78:void analyzeValues(java.lang.Iterable,com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode):155:157 -> a
     79:79:void enqueue(com.android.tools.r8.ir.code.Value):161:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     80:90:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):165:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     91:91:void enqueue(com.android.tools.r8.ir.code.Value):161:161 -> a
     91:91:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):177 -> a
     92:92:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):180:180 -> a
     93:93:void enqueue(com.android.tools.r8.ir.code.Value):161:161 -> a
     93:93:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):181 -> a
     94:133:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):195:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/aj0;)V"}
     134:148:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):225:239 -> a
     149:149:void enqueue(com.android.tools.r8.ir.code.Value):161:161 -> a
     149:149:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):241 -> a
@@ -108617,7 +108572,7 @@
     151:151:void enqueue(com.android.tools.r8.ir.code.Value):161:161 -> a
     151:151:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):246 -> a
     152:160:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):261:269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/I2;"}
     1:2:void narrowing():85:86 -> b
     3:3:boolean verifyIsEmpty():135:135 -> b
     3:3:void narrowing():86 -> b
@@ -108656,7 +108611,7 @@
     9:9:boolean verifyIsEmpty():136:136 -> c
     9:9:void widening():75 -> c
     10:11:void widening():76:77 -> c
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.Wi0:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.aj0:
 # {"id":"sourceFile","fileName":"TypeElement.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
@@ -108694,7 +108649,7 @@
     1:1:boolean isTop():0:0 -> L
     1:1:boolean isWidePrimitive():327:327 -> M
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     1:1:int requiredRegisters():407:407 -> O
     2:2:boolean isBottom():0:0 -> O
     2:2:int requiredRegisters():407 -> O
@@ -108703,21 +108658,21 @@
     4:4:int requiredRegisters():407:407 -> O
     1:1:boolean isBottom():0:0 -> a
     1:1:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Z"}
     2:2:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):230:230 -> a
     3:3:boolean isBottom():0:0 -> a
     3:3:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):230 -> a
     4:12:boolean equalUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement):233:241 -> a
     13:13:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(com.android.tools.r8.graph.AppView,java.util.function.Function,java.util.Set):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Ljava/util/Set;)Lcom/android/tools/r8/internal/aj0;"}
     14:14:com.android.tools.r8.ir.analysis.type.TypeElement rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/aj0;"}
     15:15:com.android.tools.r8.ir.analysis.type.TypeElement rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/internal/aj0;"}
     16:16:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     17:17:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     18:18:boolean isBottom():0:0 -> a
     18:18:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):125 -> a
     19:19:boolean isBottom():0:0 -> a
@@ -108733,9 +108688,9 @@
     39:43:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):138:142 -> a
     44:44:com.android.tools.r8.ir.analysis.type.TypeElement join(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):132:132 -> a
     45:47:com.android.tools.r8.ir.analysis.type.TypeElement join(java.lang.Iterable,com.android.tools.r8.graph.AppView):146:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     48:48:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):174:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/y;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/y;)Z"}
     49:50:boolean internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):179:180 -> a
     49:50:boolean lessThanOrEqual(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):174 -> a
     51:51:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):251:251 -> a
@@ -108748,10 +108703,10 @@
     56:56:boolean isStringType(com.android.tools.r8.graph.DexItemFactory):307:307 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Z"}
     57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):432:432 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     58:62:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):442:446 -> a
     58:62:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):436 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     63:64:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement.fromDexType(com.android.tools.r8.graph.DexType,boolean):35:36 -> a
     63:64:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView,boolean):447 -> a
     63:64:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):436 -> a
@@ -108759,7 +108714,7 @@
     65:65:com.android.tools.r8.ir.analysis.type.TypeElement fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):436 -> a
     1:1:boolean isTop():0:0 -> b
     1:1:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):195 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/y;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/y;)Z"}
     2:2:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):196:196 -> b
     3:3:boolean isTop():0:0 -> b
     3:3:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):196 -> b
@@ -108772,44 +108727,44 @@
     7:7:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):204 -> b
     8:17:boolean lessThanOrEqualUpToNullability(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):207:216 -> b
     18:18:com.android.tools.r8.ir.analysis.type.ClassTypeElement asClassType():311:311 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rd;"}
     1:1:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162:162 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/y;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/y;)Z"}
     2:3:boolean internalLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):179:180 -> c
     2:3:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):162 -> c
     4:4:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType():319:319 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TX;"}
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType():277:277 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K30;"}
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getBoolean():32:32 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y6;"}
     boolean equals(java.lang.Object) -> equals
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getBottom():24:24 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getByte():36:36 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/U7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W7;"}
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getChar():44:44 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ub;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wb;"}
     int hashCode() -> hashCode
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getDouble():64:64 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sm;"}
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getFloat():52:52 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uq;"}
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInt():48:48 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xA;"}
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getLong():60:60 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WL;"}
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.getNullType():78:78 -> m
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getNull():72 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K30;"}
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getShort():40:40 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jb0;"}
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getSingle():56:56 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bc0;"}
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getTop():28:28 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ph0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/th0;"}
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getWide():68:68 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/km0;"}
     1:1:boolean isArrayType():281:281 -> r
     1:1:boolean isBoolean():0:0 -> s
     1:1:boolean isBottom():0:0 -> t
@@ -108820,26 +108775,26 @@
     1:1:boolean isDefinitelyNotNull():402:402 -> x
     1:1:boolean isDefinitelyNull():398:398 -> y
     1:1:boolean isDouble():0:0 -> z
-com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.nj0:
+com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.rj0:
 # {"id":"sourceFile","fileName":"TypeUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:5:void enqueueUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):97:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/xm0;)V"}
-com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.mj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Bm0;)V"}
+com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.qj0:
 # {"id":"sourceFile","fileName":"TypeUtils.java"}
     com.android.tools.r8.ir.code.InstructionOrPhi user -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ow;"}
     com.android.tools.r8.ir.code.Value value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:3:void <init>(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Value):43:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ow;Lcom/android/tools/r8/internal/bl0;)V"}
     1:5:boolean equals(java.lang.Object):54:58 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.gm0:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.km0:
 # {"id":"sourceFile","fileName":"WidePrimitiveTypeElement.java"}
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/km0;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean isWidePrimitive():33:33 -> M
@@ -108869,49 +108824,49 @@
     1:1:boolean isSingleStringValue():225:225 -> O
     1:1:boolean isTrue():39:39 -> P
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue():269:269 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rR;"}
     1:1:com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue():277:277 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fS;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue():213:213 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zb0;"}
     boolean equals(java.lang.Object) -> equals
     1:1:boolean isSingleValue():55:55 -> f
     1:1:com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue():285:285 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gS;"}
     int hashCode() -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue():59:59 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean isUnknown():245:245 -> isUnknown
     1:1:com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue():261:261 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vg;"}
     1:1:com.android.tools.r8.ir.analysis.value.DefiniteBitsNumberValue asDefiniteBitsNumberValue():293:293 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ji;"}
     1:1:com.android.tools.r8.ir.analysis.value.NullOrAbstractValue asNullOrAbstractValue():253:253 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VR;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleBoxedPrimitiveValue asSingleBoxedPrimitive():105:105 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue():185:185 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rb0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue():177:177 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ob0;"}
-    1:1:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue asSingleDexItemBasedStringValue():237:237 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qb0;"}
-    1:1:com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue():193:193 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sb0;"}
-    1:1:com.android.tools.r8.ir.analysis.value.SingleNullValue asSingleNullValue():205:205 -> s
+    1:1:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue asSingleDexItemBasedStringValue():237:237 -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ub0;"}
+    1:1:com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue():193:193 -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wb0;"}
+    1:1:com.android.tools.r8.ir.analysis.value.SingleNullValue asSingleNullValue():205:205 -> s
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yb0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue():229:229 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fc0;"}
     java.lang.String toString() -> toString
     1:1:com.android.tools.r8.ir.analysis.value.StatefulObjectValue asStatefulObjectValue():76:76 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Od0;"}
     1:1:int getDefinitelySetIntBits():84:84 -> v
     1:1:int getDefinitelyUnsetIntBits():88:88 -> w
     1:1:int getKnownArrayLength():96:96 -> x
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():67:67 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
     1:1:boolean hasDefinitelySetAndUnsetBitsInformation():0:0 -> z
 com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.internal.C1:
 # {"id":"sourceFile","fileName":"AbstractValueFactory.java"}
@@ -108924,32 +108879,32 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:11:void <init>():19:29 -> <init>
     1:2:com.android.tools.r8.ir.analysis.value.SingleConstValue createDefaultValue(com.android.tools.r8.graph.DexType):69:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Sb0;"}
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue createDefiniteBitsNumberValue(int,int):83:83 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/B1;"}
     4:6:com.android.tools.r8.ir.analysis.value.AbstractValue createDefiniteBitsNumberValue(int,int):79:81 -> a
     7:7:com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState createKnownLengthArrayState(int):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/zI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/yI;"}
     8:8:com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue createNumberFromIntervalValue(long,long):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JJ)Lcom/android/tools/r8/internal/bS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JJ)Lcom/android/tools/r8/internal/fS;"}
     9:11:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):100:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/uU;)Lcom/android/tools/r8/internal/Sb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yU;)Lcom/android/tools/r8/internal/Wb0;"}
     12:13:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long,com.android.tools.r8.ir.analysis.type.TypeElement):106:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/Zb0;"}
     14:14:com.android.tools.r8.ir.analysis.value.SingleNumberValue createUncheckedSingleNumberValue(long):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Zb0;"}
     15:15:com.android.tools.r8.ir.analysis.value.SingleNullValue createUncheckedNullValue():129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     16:16:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/bc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/fc0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleResourceNumberValue createSingleResourceNumberValue(int):111:111 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Yb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/cc0;"}
     2:3:com.android.tools.r8.ir.analysis.value.SingleNullValue createNullValue(com.android.tools.r8.graph.DexType):119:120 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue createZeroValue():133:133 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zb0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue createSingleConstClassValue(com.android.tools.r8.graph.DexType):87:87 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Nb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Rb0;"}
 com.android.tools.r8.ir.analysis.value.AbstractValueJoiner -> com.android.tools.r8.internal.H1:
 # {"id":"sourceFile","fileName":"AbstractValueJoiner.java"}
     com.android.tools.r8.graph.AppView appView -> a
@@ -108959,7 +108914,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue internalJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueJoinerConfig,com.android.tools.r8.ir.analysis.type.TypeElement):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/B1;"}
     2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue internalJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueJoinerConfig,com.android.tools.r8.ir.analysis.type.TypeElement):33 -> a
     3:6:com.android.tools.r8.ir.analysis.value.AbstractValue internalJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueJoinerConfig,com.android.tools.r8.ir.analysis.type.TypeElement):33:36 -> a
@@ -109157,7 +109112,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):149:149 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:3:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.TypeElement):154:156 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/B1;"}
 com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueFieldJoiner -> com.android.tools.r8.internal.E1:
 # {"id":"sourceFile","fileName":"AbstractValueJoiner.java"}
     boolean $assertionsDisabled -> c
@@ -109196,39 +109151,39 @@
     1:1:void <init>():16:16 -> <init>
     1:1:boolean isNonTrivial():29:29 -> F
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35:35 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:boolean equals(java.lang.Object):40:40 -> equals
     1:1:int hashCode():45:45 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.k7:
 # {"id":"sourceFile","fileName":"BottomValue.java"}
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:1:boolean isNonTrivial():35:35 -> F
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):30:30 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:boolean equals(java.lang.Object):40:40 -> equals
     1:1:int hashCode():45:45 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.vg:
 # {"id":"sourceFile","fileName":"ConstantOrNonConstantNumberValue.java"}
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/UU;"}
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tg;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vg;)Z"}
     boolean maybeContainsInt(int) -> a
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rR;"}
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fS;"}
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zb0;"}
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gS;"}
     long getMinInclusive() -> j
-com.android.tools.r8.ir.analysis.value.DefiniteBitsNumberValue -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.ir.analysis.value.DefiniteBitsNumberValue -> com.android.tools.r8.internal.ji:
 # {"id":"sourceFile","fileName":"DefiniteBitsNumberValue.java"}
     int definitelySetBits -> a
     int definitelyUnsetBits -> b
@@ -109239,29 +109194,29 @@
     1:5:boolean maybeContainsInt(int):28:32 -> a
     6:6:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     6:6:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/UU;"}
     7:7:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tg;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vg;)Z"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):119:119 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:5:boolean equals(java.lang.Object):128:132 -> equals
     1:2:int hashCode():138:139 -> hashCode
     1:1:long getMinInclusive():55:55 -> j
     1:1:com.android.tools.r8.ir.analysis.value.DefiniteBitsNumberValue asDefiniteBitsNumberValue():70:70 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ji;"}
     1:4:java.lang.String toString():145:148 -> toString
     1:1:int getDefinitelySetIntBits():45:45 -> v
     1:1:int getDefinitelyUnsetIntBits():50:50 -> w
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.nR:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.rR:
 # {"id":"sourceFile","fileName":"NonConstantNumberValue.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean isConstantOrNonConstantNumberValue():22:22 -> C
     1:1:boolean isNonConstantNumberValue():12:12 -> E
     1:1:com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue():17:17 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rR;"}
     1:1:com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue():27:27 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tg;"}
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.RR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vg;"}
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.VR:
 # {"id":"sourceFile","fileName":"NullOrAbstractValue.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
@@ -109284,16 +109239,16 @@
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):22 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):25:25 -> a
     1:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):50:51 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     3:3:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> b
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):51 -> b
     4:6:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):53:55 -> b
     1:1:boolean equals(java.lang.Object):64:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.NullOrAbstractValue asNullOrAbstractValue():40:40 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VR;"}
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.bS:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.fS:
 # {"id":"sourceFile","fileName":"NumberFromIntervalValue.java"}
     long minInclusive -> a
     long maxInclusive -> b
@@ -109303,7 +109258,7 @@
     1:1:boolean isNonTrivial():56:56 -> F
     1:1:boolean maybeContainsInt(int):27:27 -> a
     2:2:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tg;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vg;)Z"}
     3:3:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isDefiniteBitsNumberValue():0:0 -> a
     3:3:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):67 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
@@ -109326,31 +109281,31 @@
     15:15:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):78 -> a
     16:16:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> a
     16:16:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue():51:51 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fS;"}
     1:5:boolean equals(java.lang.Object):98:102 -> equals
     1:2:int hashCode():108:109 -> hashCode
     1:1:long getMinInclusive():37:37 -> j
     1:1:java.lang.String toString():115:115 -> toString
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.cS:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.gS:
 # {"id":"sourceFile","fileName":"NumberFromSetValue.java"}
-com.android.tools.r8.ir.analysis.value.SingleBoxedBooleanValue -> com.android.tools.r8.internal.rb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedBooleanValue -> com.android.tools.r8.internal.vb0:
 # {"id":"sourceFile","fileName":"SingleBoxedBooleanValue.java"}
     boolean value -> b
     com.android.tools.r8.ir.analysis.value.SingleBoxedBooleanValue FALSE_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vb0;"}
     com.android.tools.r8.ir.analysis.value.SingleBoxedBooleanValue TRUE_INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vb0;"}
     1:2:void <clinit>():18:19 -> <clinit>
     1:2:void <init>(boolean):23:24 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():73:73 -> Q
     1:1:int getIntValue():63:63 -> R
     1:1:long getRawValue():68 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():46:46 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):43 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):54:54 -> a
@@ -109366,19 +109321,19 @@
     12:12:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):48 -> a
     13:13:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):49:49 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):54:54 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:boolean equals(java.lang.Object):88:88 -> equals
     1:1:int getIntValue():63:63 -> hashCode
     1:1:int hashCode():93 -> hashCode
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedByteValue -> com.android.tools.r8.internal.sb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedByteValue -> com.android.tools.r8.internal.wb0:
 # {"id":"sourceFile","fileName":"SingleBoxedByteValue.java"}
     int value -> b
     1:2:void <init>(int):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109408,18 +109363,18 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedCharValue -> com.android.tools.r8.internal.tb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedCharValue -> com.android.tools.r8.internal.xb0:
 # {"id":"sourceFile","fileName":"SingleBoxedCharValue.java"}
     int value -> b
     1:2:void <init>(int):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109449,18 +109404,18 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedDoubleValue -> com.android.tools.r8.internal.ub0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedDoubleValue -> com.android.tools.r8.internal.yb0:
 # {"id":"sourceFile","fileName":"SingleBoxedDoubleValue.java"}
     long value -> b
     1:2:void <init>(long):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109490,18 +109445,18 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedFloatValue -> com.android.tools.r8.internal.vb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedFloatValue -> com.android.tools.r8.internal.zb0:
 # {"id":"sourceFile","fileName":"SingleBoxedFloatValue.java"}
     int value -> b
     1:2:void <init>(int):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109531,18 +109486,18 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedIntegerValue -> com.android.tools.r8.internal.wb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedIntegerValue -> com.android.tools.r8.internal.Ab0:
 # {"id":"sourceFile","fileName":"SingleBoxedIntegerValue.java"}
     int value -> b
     1:2:void <init>(int):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109572,18 +109527,18 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedLongValue -> com.android.tools.r8.internal.xb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedLongValue -> com.android.tools.r8.internal.Bb0:
 # {"id":"sourceFile","fileName":"SingleBoxedLongValue.java"}
     long value -> b
     1:2:void <init>(long):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109613,39 +109568,39 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleBoxedPrimitiveValue -> com.android.tools.r8.internal.yb0:
+com.android.tools.r8.ir.analysis.value.SingleBoxedPrimitiveValue -> com.android.tools.r8.internal.Cb0:
 # {"id":"sourceFile","fileName":"SingleBoxedPrimitiveValue.java"}
     1:1:void <init>():17:17 -> <init>
     1:1:boolean isSingleBoxedPrimitive():44:44 -> I
     long getRawValue() -> R
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     3:3:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):34:34 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     4:4:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):17:17 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):59:59 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleBoxedPrimitiveValue asSingleBoxedPrimitive():49:49 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yb0;"}
-com.android.tools.r8.ir.analysis.value.SingleBoxedShortValue -> com.android.tools.r8.internal.zb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb0;"}
+com.android.tools.r8.ir.analysis.value.SingleBoxedShortValue -> com.android.tools.r8.internal.Db0:
 # {"id":"sourceFile","fileName":"SingleBoxedShortValue.java"}
     int value -> b
     1:2:void <init>(int):20:21 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():64:64 -> Q
     1:1:long getRawValue():59:59 -> R
     1:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):30:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):32 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getPrimitiveType():54:54 -> a
@@ -109675,11 +109630,11 @@
     21:21:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):41 -> a
     22:24:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):42:44 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getBoxedPrimitiveType(com.android.tools.r8.graph.AppView):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():91:91 -> hashCode
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Nb0:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Rb0:
 # {"id":"sourceFile","fileName":"SingleConstClassValue.java"}
     com.android.tools.r8.graph.DexType type -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -109689,9 +109644,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:boolean hasSingleMaterializingInstruction():39:39 -> Q
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):77:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):428:428 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):78 -> a
     5:7:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):79:81 -> a
@@ -109720,49 +109675,49 @@
     28:41:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):106:119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     42:42:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):28:28 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):133:133 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:int hashCode():63:63 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue():49:49 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rb0;"}
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Ob0:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Sb0:
 # {"id":"sourceFile","fileName":"SingleConstValue.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:boolean isSingleConstValue():11:11 -> J
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue():16:16 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ob0;"}
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.Qb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sb0;"}
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.Ub0:
 # {"id":"sourceFile","fileName":"SingleDexItemBasedStringValue.java"}
     com.android.tools.r8.graph.DexReference item -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F2;"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     1:1:boolean hasSingleMaterializingInstruction():41:41 -> Q
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:9:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):88:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     10:10:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:101 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     11:11:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):106:106 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     12:12:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):28:28 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> c
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):119 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     2:4:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):119:121 -> c
     5:5:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):120:120 -> c
     6:6:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):142:142 -> c
@@ -109770,9 +109725,9 @@
     1:5:boolean equals(java.lang.Object):65:69 -> equals
     1:1:int hashCode():74:74 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue asSingleDexItemBasedStringValue():59:59 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ub0;"}
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.Sb0:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.Wb0:
 # {"id":"sourceFile","fileName":"SingleFieldValue.java"}
     com.android.tools.r8.graph.DexField field -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -109785,9 +109740,9 @@
     1:1:com.android.tools.r8.graph.DexField getField():47:47 -> R
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:5:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):95:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     6:10:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):96:100 -> a
     11:11:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():46:46 -> a
     11:11:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):100 -> a
@@ -109809,32 +109764,32 @@
     25:43:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):123:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     44:44:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):33:33 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> c
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):157 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     2:5:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):158:161 -> c
     6:12:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):160:166 -> c
     1:1:com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue():80:80 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wb0;"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState() -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
-com.android.tools.r8.ir.analysis.value.SingleNullValue -> com.android.tools.r8.internal.Ub0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
+com.android.tools.r8.ir.analysis.value.SingleNullValue -> com.android.tools.r8.internal.Yb0:
 # {"id":"sourceFile","fileName":"SingleNullValue.java"}
     com.android.tools.r8.ir.analysis.value.SingleNullValue INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ub0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yb0;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():20:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():33:33 -> Q
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:3:com.android.tools.r8.ir.code.ConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):74:75 -> a
     2:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     4:4:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     4:4:com.android.tools.r8.ir.code.ConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):75 -> a
     4:4:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):68 -> a
@@ -109846,11 +109801,11 @@
     10:10:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):89:89 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     11:11:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):20:20 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):101:101 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> c
     2:2:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):103 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -109858,9 +109813,9 @@
     1:1:boolean equals(java.lang.Object):48:48 -> equals
     1:1:int hashCode():53:53 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.SingleNullValue asSingleNullValue():43:43 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ub0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yb0;"}
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.Vb0:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.Zb0:
 # {"id":"sourceFile","fileName":"SingleNumberValue.java"}
     long value -> b
     boolean $assertionsDisabled -> c
@@ -109873,10 +109828,10 @@
     1:2:boolean getBooleanValue():96:97 -> R
     1:1:long getValue():127:127 -> S
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:2:int getIntValue():119:119 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Lcom/android/tools/r8/internal/UU;"}
     3:3:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):57:57 -> a
     4:4:boolean com.android.tools.r8.utils.ArrayUtils.containsInt(int[],int):36:36 -> a
     4:4:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):57 -> a
@@ -109884,7 +109839,7 @@
     6:6:int getIntValue():119:119 -> a
     6:6:boolean maybeContainsInt(int):42 -> a
     7:7:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tg;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vg;)Z"}
     8:8:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isDefiniteBitsNumberValue():0:0 -> a
     8:8:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):132 -> a
     9:9:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
@@ -109899,9 +109854,9 @@
     17:17:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):139 -> a
     18:18:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):139:139 -> a
     19:20:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):164:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     21:21:com.android.tools.r8.ir.code.ConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)Lcom/android/tools/r8/internal/kg;"}
     22:23:com.android.tools.r8.ir.code.ConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Position):180:181 -> a
     22:23:com.android.tools.r8.ir.code.ConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):170 -> a
     24:24:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
@@ -109920,18 +109875,18 @@
     30:30:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):196:196 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     31:31:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):25:25 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):208:208 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue():82:82 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zb0;"}
     1:1:boolean equals(java.lang.Object):144:144 -> equals
     1:1:int hashCode():149:149 -> hashCode
     1:1:long getMinInclusive():47:47 -> j
     1:1:com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue():92:92 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vg;"}
     1:1:java.lang.String toString():154:154 -> toString
     1:1:int getIntValue():119:119 -> v
     1:1:int getDefinitelySetIntBits():102 -> v
@@ -109939,7 +109894,7 @@
     1:1:int getDefinitelySetIntBits():102 -> w
     1:1:int getDefinitelyUnsetIntBits():107 -> w
     1:1:boolean hasDefinitelySetAndUnsetBitsInformation():52:52 -> z
-com.android.tools.r8.ir.analysis.value.SingleResourceNumberValue -> com.android.tools.r8.internal.Yb0:
+com.android.tools.r8.ir.analysis.value.SingleResourceNumberValue -> com.android.tools.r8.internal.cc0:
 # {"id":"sourceFile","fileName":"SingleResourceNumberValue.java"}
     int value -> b
     boolean $assertionsDisabled -> c
@@ -109947,10 +109902,10 @@
     1:2:void <init>(int):28:29 -> <init>
     1:1:boolean hasSingleMaterializingInstruction():34:34 -> Q
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:2:com.android.tools.r8.ir.code.ResourceConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):80:80 -> a
     2:2:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     3:3:com.android.tools.r8.ir.code.ResourceConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Position):89:89 -> a
     3:3:com.android.tools.r8.ir.code.ResourceConstNumber createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):79 -> a
     3:3:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):73 -> a
@@ -109983,22 +109938,22 @@
     14:14:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):105:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     15:15:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):23:23 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):117:117 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean equals(java.lang.Object):53:53 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.Zb0:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.dc0:
 # {"id":"sourceFile","fileName":"SingleStatefulFieldValue.java"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yU;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/uU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yU;)V"}
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():39:39 -> A
     1:1:boolean hasKnownArrayLength():24 -> A
     2:2:boolean hasKnownArrayLength():24:24 -> A
@@ -110009,8 +109964,8 @@
     1:1:int getKnownArrayLength():29 -> x
     2:2:int getKnownArrayLength():29:29 -> x
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():39:39 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.ac0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.ec0:
 # {"id":"sourceFile","fileName":"SingleStatelessFieldValue.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
@@ -110019,8 +109974,8 @@
     1:1:int hashCode():49:49 -> hashCode
     1:1:java.lang.String toString():34:34 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():19:19 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.bc0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.fc0:
 # {"id":"sourceFile","fileName":"SingleStringValue.java"}
     com.android.tools.r8.graph.DexString string -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -110033,9 +109988,9 @@
     1:1:com.android.tools.r8.graph.DexString getDexString():50:50 -> R
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:5:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):74:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     6:6:com.android.tools.r8.ir.code.ConstString$Builder com.android.tools.r8.ir.code.ConstString.builder():37:37 -> a
     6:6:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):77 -> a
     7:8:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):78:79 -> a
@@ -110051,17 +110006,17 @@
     16:16:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):94:94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     17:17:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):25:25 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):106:106 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean equals(java.lang.Object):55:55 -> equals
     1:1:int hashCode():60:60 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue():46:46 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fc0;"}
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.cc0:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.gc0:
 # {"id":"sourceFile","fileName":"SingleValue.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -110069,35 +110024,35 @@
     1:1:boolean isNonTrivial():25:25 -> F
     boolean hasSingleMaterializingInstruction() -> Q
     com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.code.MaterializingInstructionsInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/VM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/ZM;)[Lcom/android/tools/r8/internal/Kw;"}
     boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     2:2:com.android.tools.r8.ir.code.Instruction[] createMaterializingInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.MaterializingInstructionsInfo):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/UM;)[Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/YM;)[Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):19:19 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     2:3:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):54:55 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     4:4:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> b
     4:4:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):55 -> b
     5:6:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):55:56 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean isSingleValue():30:30 -> f
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue():35:35 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cc0;"}
-com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.Kd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gc0;"}
+com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.Od0:
 # {"id":"sourceFile","fileName":"StatefulObjectValue.java"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yU;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yU;)V"}
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():66:66 -> A
     1:1:boolean hasKnownArrayLength():45 -> A
     2:2:boolean hasKnownArrayLength():45:45 -> A
@@ -110105,7 +110060,7 @@
     1:1:boolean isNonTrivial():30:30 -> F
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():66:66 -> b
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):56:56 -> b
     3:5:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):23:25 -> b
     3:5:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):56 -> b
@@ -110113,21 +110068,21 @@
     1:1:int hashCode():89:89 -> hashCode
     1:1:java.lang.String toString():71:71 -> toString
     1:1:com.android.tools.r8.ir.analysis.value.StatefulObjectValue asStatefulObjectValue():40:40 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Od0;"}
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():66:66 -> x
     1:1:int getKnownArrayLength():50 -> x
     2:2:int getKnownArrayLength():50:50 -> x
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState():66:66 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.gk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.kk0:
 # {"id":"sourceFile","fileName":"UnknownValue.java"}
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk0;"}
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:1:boolean isNonTrivial():24:24 -> F
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35:35 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/B1;"}
     1:1:boolean equals(java.lang.Object):40:40 -> equals
     1:1:int hashCode():45:45 -> hashCode
     1:1:boolean isUnknown():29:29 -> isUnknown
@@ -110236,31 +110191,31 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:39:com.android.tools.r8.ir.analysis.value.AbstractValue shrIntegers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,int):141:142 -> b
     40:44:com.android.tools.r8.ir.analysis.value.AbstractValue shrIntegers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,int):140:144 -> b
-com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.an:
+com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.cn:
 # {"id":"sourceFile","fileName":"EmptyObjectState.java"}
     com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/an;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cn;"}
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:void forEachAbstractFieldValue(java.util.function.BiConsumer):28:28 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexField):32:32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/B1;"}
     3:3:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/yU;"}
     1:1:boolean isEmpty():37:37 -> e
     1:1:boolean equals(java.lang.Object):48:48 -> equals
     1:1:int hashCode():53:53 -> hashCode
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.io:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.lo:
 # {"id":"sourceFile","fileName":"EnumValuesObjectState.java"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[] state -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/yU;"}
     com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal objectClassForOrdinal -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/io;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[]):25:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/uU;[Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/yU;[Lcom/android/tools/r8/graph/I2;)V"}
     6:7:boolean com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal.sameType(com.android.tools.r8.graph.DexType[]):138:139 -> <init>
     6:7:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal.create(com.android.tools.r8.graph.DexType[]):131 -> <init>
     6:7:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[]):30 -> <init>
@@ -110270,14 +110225,14 @@
     9:9:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[]):30 -> <init>
     10:10:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.graph.DexType[]):30:30 -> <init>
     11:13:void <init>(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[],com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal):33:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/uU;Lcom/android/tools/r8/internal/fo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/yU;Lcom/android/tools/r8/internal/io;)V"}
     1:1:void forEachAbstractFieldValue(java.util.function.BiConsumer):39:39 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexField):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/B1;"}
     3:3:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState asEnumValuesObjectState():81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/io;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lo;"}
     4:4:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/yU;"}
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -110286,7 +110241,7 @@
     1:1:boolean isEmpty():87:87 -> e
     1:11:boolean equals(java.lang.Object):110:120 -> equals
     1:1:int hashCode():125:125 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal -> com.android.tools.r8.internal.io:
 # {"id":"sourceFile","fileName":"EnumValuesObjectState.java"}
     1:1:void <init>():128:128 -> <init>
     boolean enumHasBeenUnboxed(com.android.tools.r8.graph.AppView) -> a
@@ -110294,9 +110249,9 @@
     com.android.tools.r8.graph.DexType getObjectClassForOrdinal(int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/io;"}
     boolean equals(java.lang.Object) -> equals
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$UniformObjectClassForOrdinal -> com.android.tools.r8.internal.go:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$UniformObjectClassForOrdinal -> com.android.tools.r8.internal.jo:
 # {"id":"sourceFile","fileName":"EnumValuesObjectState.java"}
     com.android.tools.r8.graph.DexType type -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -110307,12 +110262,12 @@
     1:1:com.android.tools.r8.graph.DexType getObjectClassForOrdinal(int):171:171 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/I2;"}
     2:4:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):177:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/io;"}
     5:5:boolean enumHasBeenUnboxed(com.android.tools.r8.graph.AppView):199:199 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     1:5:boolean equals(java.lang.Object):190:194 -> equals
     1:1:int hashCode():184:184 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$VariableObjectClassForOrdinal -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$VariableObjectClassForOrdinal -> com.android.tools.r8.internal.ko:
 # {"id":"sourceFile","fileName":"EnumValuesObjectState.java"}
     com.android.tools.r8.graph.DexType[] types -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/I2;"}
@@ -110323,7 +110278,7 @@
     1:2:com.android.tools.r8.graph.DexType getObjectClassForOrdinal(int):213:214 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/I2;"}
     3:4:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):220:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/io;"}
     5:6:boolean com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal.sameType(com.android.tools.r8.graph.DexType[]):138:139 -> a
     5:6:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal.create(com.android.tools.r8.graph.DexType[]):131 -> a
     5:6:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):229 -> a
@@ -110332,12 +110287,12 @@
     8:8:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal.create(com.android.tools.r8.graph.DexType[]):132:132 -> a
     8:8:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState$ObjectClassForOrdinal rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):229 -> a
     9:10:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):224:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     11:12:boolean enumHasBeenUnboxed(com.android.tools.r8.graph.AppView):248:249 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     1:5:boolean equals(java.lang.Object):239:243 -> equals
     1:1:int hashCode():234:234 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.zI:
+com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.yI:
 # {"id":"sourceFile","fileName":"KnownLengthArrayState.java"}
     int length -> a
     1:2:void <init>(int):19:20 -> <init>
@@ -110345,14 +110300,14 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexField):30:30 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/B1;"}
     3:3:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/yU;"}
     1:1:int getKnownArrayLength():45:45 -> c
     1:1:boolean hasKnownArrayLength():40:40 -> d
     1:1:boolean isEmpty():35:35 -> e
     1:1:boolean equals(java.lang.Object):56:56 -> equals
     1:1:int hashCode():61:61 -> hashCode
     1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.sR:
+com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.wR:
 # {"id":"sourceFile","fileName":"NonEmptyObjectState.java"}
     java.util.Map state -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -110364,51 +110319,51 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexField):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/B1;"}
     3:11:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):50:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/yU;"}
     12:15:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):53:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Ljava/util/Map;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
     16:16:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):54:54 -> a
     1:1:boolean isEmpty():44:44 -> e
     1:11:boolean equals(java.lang.Object):64:74 -> equals
     1:1:int hashCode():83:83 -> hashCode
     1:7:java.lang.String toString():88:94 -> toString
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.uU:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.yU:
 # {"id":"sourceFile","fileName":"ObjectState.java"}
     1:1:void <init>():22:22 -> <init>
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexField) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/yU;"}
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
     1:1:boolean hasMaterializableFieldValueThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Predicate;)Z"}
     2:9:boolean hasMaterializableFieldValueThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):40:47 -> a
     10:10:com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState asEnumValuesObjectState():81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/io;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lo;"}
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState empty():29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yU;"}
     1:1:int getKnownArrayLength():73:73 -> c
     1:1:boolean hasKnownArrayLength():0:0 -> d
     boolean isEmpty() -> e
     boolean equals(java.lang.Object) -> equals
     int hashCode() -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.tU:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.xU:
 # {"id":"sourceFile","fileName":"ObjectState.java"}
     java.util.Map state -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():84:84 -> <clinit>
     1:3:void <init>():84:86 -> <init>
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.vU:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.zU:
 # {"id":"sourceFile","fileName":"ObjectStateAnalysis.java"}
     1:1:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
     2:2:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25 -> a
     3:3:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25:25 -> a
     4:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):46:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/yU;"}
     7:7:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):55:55 -> a
     7:7:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -110427,7 +110382,7 @@
     28:28:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder.build():96:96 -> a
     28:28:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):92 -> a
     29:30:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):78:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GB;Lcom/android/tools/r8/internal/tU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/IB;Lcom/android/tools/r8/internal/xU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/fw;)V"}
     31:31:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):2113:2113 -> a
     31:31:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -110450,7 +110405,7 @@
     46:48:void com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder.recordFieldHasValue(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.value.AbstractValue):89:91 -> a
     46:48:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):89 -> a
     1:2:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:24 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/yU;"}
     3:3:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewArrayObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):36:36 -> b
     3:3:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):26 -> b
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Instruction.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):194:194 -> b
@@ -110480,30 +110435,30 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I1;"}
     1:1:void <clinit>():13:13 -> <clinit>
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.code.Value) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.code.AbstractValueSupplier getShallow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):24:24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/J1;"}
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$getShallow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
 com.android.tools.r8.ir.code.AbstractValueSupplier$UnknownAbstractValueSupplier -> com.android.tools.r8.internal.I1:
 # {"id":"sourceFile","fileName":"AbstractValueSupplier.java"}
     1:1:void <init>():31:31 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.code.Value):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.internal.a2:
 # {"id":"sourceFile","fileName":"Add.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():38:38 -> H2
     1:1:boolean isCommutative():48:48 -> L2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():138:138 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:1:com.android.tools.r8.ir.code.Add createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:29 -> a
     1:1:com.android.tools.r8.ir.code.Add create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/a2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/a2;"}
     2:2:com.android.tools.r8.ir.code.Add create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> a
     3:3:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     4:4:com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int):68:68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     5:5:int foldIntegers(int,int):108:108 -> a
@@ -110515,7 +110470,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble2Addr(int,int):88:88 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):103:103 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int):53:53 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateFloat2Addr(int,int):83:83 -> c
@@ -110536,24 +110491,24 @@
 com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.internal.b2:
 # {"id":"sourceFile","fileName":"AliasedValueConfiguration.java"}
     com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/bl0;"}
     boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.internal.e2:
 # {"id":"sourceFile","fileName":"AlwaysMaterializingDefinition.java"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():71:71 -> F2
     1:1:int maxOutValueRegister():76:76 -> G2
     1:1:int opcode():26:26 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:4:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):42 -> a
     5:5:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -110564,18 +110519,18 @@
     7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):43:43 -> a
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     10:10:void buildLir(com.android.tools.r8.lightir.LirBuilder):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     11:11:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     12:12:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):60 -> a
     13:14:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):60:61 -> a
     15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.internal.f2:
 # {"id":"sourceFile","fileName":"AlwaysMaterializingNop.java"}
     1:1:void <init>():21:21 -> <init>
@@ -110583,23 +110538,23 @@
     1:1:int maxOutValueRegister():66:66 -> G2
     1:1:int opcode():26:26 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:4:void com.android.tools.r8.ir.conversion.DexBuilder.addNop(com.android.tools.r8.ir.code.Instruction):738:738 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     6:6:void buildLir(com.android.tools.r8.lightir.LirBuilder):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87:87 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():82:82 -> c1
@@ -110608,45 +110563,45 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:2:int maxInValueRegister():61:62 -> F2
     1:1:int maxOutValueRegister():67:67 -> G2
     1:1:int opcode():25:25 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAlwaysMaterializingUser():40:40 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     5:5:void com.android.tools.r8.ir.conversion.DexBuilder.addNothing(com.android.tools.r8.ir.code.Instruction):718:718 -> a
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):41 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     7:7:void buildLir(com.android.tools.r8.lightir.LirBuilder):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):88:88 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():83:83 -> c1
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.internal.p2:
 # {"id":"sourceFile","fileName":"And.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():38:38 -> H2
     1:1:boolean isCommutative():63:63 -> L2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():118:118 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     2:2:com.android.tools.r8.ir.code.And asAnd(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/p2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/p2;"}
     3:3:com.android.tools.r8.ir.code.And asAnd(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):58:58 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     4:4:boolean outTypeKnownToBeBoolean(java.util.Set):123 -> a
@@ -110662,7 +110617,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):93:93 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isAnd():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
@@ -110681,7 +110636,7 @@
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int,boolean):32:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;IZ)V"}
     1:1:int maxInValueRegister():100:100 -> F2
     1:1:int maxOutValueRegister():106:106 -> G2
     1:1:int opcode():82:82 -> H2
@@ -110691,24 +110646,24 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     8:8:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     13:13:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     14:14:boolean outTypeKnownToBeBoolean(java.util.Set):162:162 -> a
     15:15:void buildLir(com.android.tools.r8.lightir.LirBuilder):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     16:16:void com.android.tools.r8.ir.conversion.DexBuilder.addArgument(com.android.tools.r8.ir.code.Argument):770:770 -> a
     16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     17:17:void com.android.tools.r8.ir.conversion.DexBuilder.addArgument(com.android.tools.r8.ir.code.Argument):770:770 -> a
     17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111 -> a
     18:18:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> a
@@ -110725,7 +110680,7 @@
     2:7:int getIndex(boolean):61 -> b
     8:9:int getIndex(boolean):61:62 -> b
     10:10:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):116:116 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):167:167 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():157:157 -> c1
@@ -110737,19 +110692,19 @@
     int index -> d
     1:1:void <init>():170:170 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.C3:
 # {"id":"sourceFile","fileName":"ArithmeticBinop.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     26:26:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
     27:27:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
     28:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
@@ -110804,9 +110759,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     123:125:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):157:159 -> a
     126:126:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):166:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     127:127:void buildLir(com.android.tools.r8.lightir.LirBuilder):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     128:128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     128:128:void buildLir(com.android.tools.r8.lightir.LirBuilder):171 -> a
     129:129:void buildLir(com.android.tools.r8.lightir.LirBuilder):171:171 -> a
@@ -110827,7 +110782,7 @@
     com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):52:52 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> c
     2:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):52 -> c
     3:3:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):52:52 -> c
@@ -110856,9 +110811,9 @@
 com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.D3:
 # {"id":"sourceFile","fileName":"ArrayAccess.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):18:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Value array():22:22 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:4:int arraySizeIfConst():40:43 -> L2
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> L2
     5:5:int arraySizeIfConst():43 -> L2
@@ -110880,13 +110835,13 @@
     19:19:int com.android.tools.r8.ir.code.NewArrayFilled.size():241:241 -> L2
     19:19:int arraySizeIfConst():47 -> L2
     1:1:com.android.tools.r8.ir.code.Value index():26:26 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:int indexOrDefault(int):30:30 -> N2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> O2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D3;"}
     1:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):76:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     1:1:com.android.tools.r8.ir.code.Value index():26:26 -> b
     1:1:int indexIfConstAndInBounds(int):35 -> b
     2:2:int com.android.tools.r8.ir.code.Value.getConstIntValueIfNonNegative():1049:1049 -> b
@@ -110901,11 +110856,11 @@
 com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.H3:
 # {"id":"sourceFile","fileName":"ArrayGet.java"}
     com.android.tools.r8.ir.code.MemberType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():38:38 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):43:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():135:135 -> F2
     1:1:int maxOutValueRegister():140:140 -> G2
     1:1:int opcode():49:49 -> H2
@@ -110916,15 +110871,15 @@
     2:2:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):276 -> O2
     3:3:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):276:276 -> O2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():254:254 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayGet():48:48 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):156 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     3:3:com.android.tools.r8.ir.code.Value dest():58:58 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:42:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:114 -> a
     43:43:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
     44:46:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:89 -> a
@@ -110935,26 +110890,26 @@
     83:107:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:116 -> a
     108:108:com.android.tools.r8.ir.code.MemberType getMemberType():63:63 -> a
     108:108:void buildLir(com.android.tools.r8.lightir.LirBuilder):300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     109:109:void buildLir(com.android.tools.r8.lightir.LirBuilder):300:300 -> a
     110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayAccess.index():26:26 -> a
     110:110:void buildLir(com.android.tools.r8.lightir.LirBuilder):300 -> a
     111:111:void buildLir(com.android.tools.r8.lightir.LirBuilder):300:300 -> a
     112:114:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):68:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     115:115:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     116:122:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):169:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayElementType(com.android.tools.r8.graph.DexItemFactory):524:524 -> a
     123:123:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     124:125:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):180:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     126:126:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     127:127:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     128:128:com.android.tools.r8.ir.code.MemberType getMemberType():63:63 -> a
     128:128:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):193 -> a
     129:165:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):193:229 -> a
@@ -110977,21 +110932,21 @@
     184:185:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):209:210 -> a
     186:188:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):201:203 -> a
     189:193:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):234:238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/aj0;"}
     194:194:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     195:196:boolean outTypeKnownToBeBoolean(java.util.Set):260:261 -> a
     197:197:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zi0;)V"}
     198:198:com.android.tools.r8.ir.code.Value dest():58:58 -> a
     198:198:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):266 -> a
     199:199:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):266:266 -> a
     200:200:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):130:130 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):286:286 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayAccess.index():26:26 -> b
     3:3:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):286 -> b
     4:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):286:289 -> b
@@ -111008,26 +110963,26 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():162:162 -> c1
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():63:63 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sN;"}
     1:1:boolean isArrayGet():145:145 -> o1
     1:1:com.android.tools.r8.ir.code.ArrayGet asArrayGet():150:150 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H3;"}
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.J3:
 # {"id":"sourceFile","fileName":"ArrayLength.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():65:65 -> F2
     1:1:int maxOutValueRegister():70:70 -> G2
     1:1:int opcode():30:30 -> H2
     1:1:boolean throwsOnNullInput():141:141 -> J2
     1:1:com.android.tools.r8.ir.code.Value array():43:43 -> W0
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():146 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value dest():39:39 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -111044,7 +110999,7 @@
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:60 -> a
     10:10:com.android.tools.r8.ir.code.Value array():43:43 -> a
     10:10:void buildLir(com.android.tools.r8.lightir.LirBuilder):156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     11:11:void buildLir(com.android.tools.r8.lightir.LirBuilder):156:156 -> a
     12:12:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):478:478 -> a
     12:12:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addArrayLength(java.lang.Object):685 -> a
@@ -111054,16 +111009,16 @@
     13:13:void buildLir(com.android.tools.r8.lightir.LirBuilder):156 -> a
     14:14:com.android.tools.r8.ir.code.Value array():43:43 -> a
     14:14:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     15:15:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):84:84 -> a
     16:16:com.android.tools.r8.ir.code.Value array():43:43 -> a
     16:16:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():52:52 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     18:18:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     19:19:com.android.tools.r8.ir.code.Value array():43:43 -> a
     19:19:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):97 -> a
     20:20:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):97:97 -> a
@@ -111073,13 +111028,13 @@
     22:22:com.android.tools.r8.ir.code.Value array():43:43 -> a
     22:22:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):97 -> a
     23:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     26:26:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):151:151 -> c
@@ -111091,11 +111046,11 @@
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.N3:
 # {"id":"sourceFile","fileName":"ArrayPut.java"}
     com.android.tools.r8.ir.code.MemberType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():33:33 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):52:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():132:132 -> F2
     1:1:int maxOutValueRegister():137:137 -> G2
     1:1:int opcode():65:65 -> H2
@@ -111106,9 +111061,9 @@
     2:2:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):282 -> O2
     3:3:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):282:282 -> O2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():267:267 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:2:com.android.tools.r8.ir.code.ArrayPut create(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):41:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/N3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/N3;"}
     3:4:boolean verify():57:58 -> a
     3:4:com.android.tools.r8.ir.code.ArrayPut create(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):42 -> a
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayAccess.index():26:26 -> a
@@ -111120,16 +111075,16 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     8:8:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     9:9:com.android.tools.r8.ir.code.MemberType getMemberType():83:83 -> a
     9:9:void buildLir(com.android.tools.r8.lightir.LirBuilder):287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     10:10:void buildLir(com.android.tools.r8.lightir.LirBuilder):287:287 -> a
     11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ArrayAccess.index():26:26 -> a
     11:11:void buildLir(com.android.tools.r8.lightir.LirBuilder):287 -> a
     12:12:void buildLir(com.android.tools.r8.lightir.LirBuilder):287:287 -> a
     13:49:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):89:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     50:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):123:123 -> a
     51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
     52:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):96:119 -> a
@@ -111138,7 +111093,7 @@
     83:85:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):110:112 -> a
     86:110:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):103:127 -> a
     111:119:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     120:120:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
     120:120:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):156 -> a
     121:121:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157:157 -> a
@@ -111157,46 +111112,46 @@
     133:133:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):168 -> a
     134:152:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):168:186 -> a
     153:155:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):201:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     156:156:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.deadIfInValueIsDead(com.android.tools.r8.ir.code.Value):325:325 -> a
     156:156:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):204 -> a
     157:157:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):207:207 -> a
     158:158:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):216:216 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     159:159:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):242:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     160:160:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):252:252 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     161:161:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):257:257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     162:162:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zi0;)V"}
     163:163:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):196:196 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):221:221 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):277:277 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():247:247 -> c1
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():83:83 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sN;"}
     1:1:boolean isArrayPut():226:226 -> q1
     1:1:com.android.tools.r8.ir.code.Value value():74:74 -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.ArrayPut asArrayPut():231:231 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/N3;"}
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.y4:
 # {"id":"sourceFile","fileName":"Assume.java"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.code.Instruction origin -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():24:24 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):33:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:int maxInValueRegister():169:169 -> F2
     1:1:int maxOutValueRegister():174:174 -> G2
     1:1:int opcode():59:59 -> H2
@@ -111204,39 +111159,39 @@
     1:1:boolean throwsOnNullInput():233 -> J2
     1:5:boolean hasDynamicTypeIgnoringNullability():104:108 -> K2
     1:1:com.android.tools.r8.ir.code.Value src():76:76 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.String getInstructionName():90:90 -> V0
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():228:228 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:2:com.android.tools.r8.ir.code.Assume create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/y4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/y4;"}
     3:3:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     4:4:boolean outTypeKnownToBeBoolean(java.util.Set):85:85 -> a
     5:5:boolean hasNonNullAssumption():113:113 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     6:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):200:203 -> a
     10:27:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):118:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     28:34:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):133:139 -> a
     35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     36:36:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     37:37:void buildLir(com.android.tools.r8.lightir.LirBuilder):164:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     38:38:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):218:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     40:40:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):239:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():241:241 -> a
     41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):194 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):184:184 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):184 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):187:188 -> b
@@ -111269,7 +111224,7 @@
     1:3:void <clinit>():9:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     2:2:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27 -> a
     3:3:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:27 -> a
@@ -111278,21 +111233,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28:28 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.G5:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.I5:
 # {"id":"sourceFile","fileName":"BasicBlock.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.List successors -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List predecessors -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.Set onControlFlowEdgesMayChangeListeners -> d
     com.android.tools.r8.ir.code.CatchHandlers catchHandlers -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     java.util.LinkedList instructions -> f
     int number -> g
     java.util.List phis -> h
@@ -111317,7 +111272,7 @@
     1:11:boolean isSimpleAlwaysThrowingPath():1692:1702 -> F
     1:1:boolean isTrivialGoto():1647:1647 -> G
     1:1:com.android.tools.r8.ir.code.BasicBlockInstructionIterator iterator():1791:1791 -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K5;"}
     1:2:boolean notifyPredecessorsMayChangeListeners():383:384 -> I
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:boolean notifySuccessorsMayChangeListeners():319:320 -> J
@@ -111351,44 +111306,44 @@
     67:91:java.lang.String toDetailedString():1465:1489 -> P
     1:3:void unlinkCatchHandler():975:977 -> Q
     1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():936:940 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:5:void unlinkSinglePredecessorSiblingsAllowed():946:950 -> S
     1:2:boolean verifyFilledPredecessors():862:863 -> T
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:4:boolean consistentInitClassInstruction(com.android.tools.r8.ir.code.InitClass,boolean):102:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ev;Z)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gv;Z)Z"}
     5:6:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):111:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):111:111 -> a
     8:8:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.Instruction):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     9:10:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):125:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hD;Lcom/android/tools/r8/internal/Dt;)V"}
     11:11:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     11:11:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):127 -> a
     12:12:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     12:12:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.util.function.BiFunction,java.lang.Object):242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     13:19:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.util.function.BiFunction,java.lang.Object):243:249 -> a
     20:20:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     20:20:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.util.function.BiFunction,java.lang.Object):227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     21:24:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.util.function.BiFunction,java.lang.Object):228:231 -> a
     25:25:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     25:25:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1803 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/L5;"}
     26:26:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1807:1807 -> a
     26:26:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1803 -> a
     27:31:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):276:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nm;)V"}
     32:32:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):384:384 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F5;)V"}
     33:33:void com.android.tools.r8.ir.code.DominatorTree.onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):333:333 -> a
     33:33:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):384 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:49:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):418:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
     50:52:void swapSuccessorsByIndex(int,int):471:473 -> a
     53:53:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> a
     53:53:void swapSuccessorsByIndex(int,int):473 -> a
@@ -111399,9 +111354,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:71:void swapSuccessorsByIndex(int,int):483:488 -> a
     72:79:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):605:612 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     80:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):616:619 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mz;)V"}
     84:84:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
     84:84:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):293 -> a
     84:84:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):619 -> a
@@ -111436,18 +111391,18 @@
     116:116:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):644 -> a
     117:133:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):644:660 -> a
     134:134:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):746:746 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/lang/Iterable;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/lang/Iterable;"}
     135:136:boolean isMarked(int):842:843 -> a
     137:143:void removePhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):877:883 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;)V"}
     144:145:void removePhis(java.util.Collection):887:888 -> a
     146:146:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):896:896 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/It;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kt;)V"}
     147:147:boolean isFilled():699:699 -> a
     147:147:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):896 -> a
     148:151:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):896:899 -> a
     152:152:void close(com.android.tools.r8.ir.conversion.IRBuilder):903:903 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     153:153:boolean isFilled():699:699 -> a
     153:153:void close(com.android.tools.r8.ir.conversion.IRBuilder):903 -> a
     154:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):903:907 -> a
@@ -111494,9 +111449,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     196:200:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):1007:1011 -> a
     201:201:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):1008:1008 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;)Z"}
     202:211:java.util.Set unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.optimize.AffectedValues):1037:1046 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/lm;Lcom/android/tools/r8/ir/optimize/a;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/nm;Lcom/android/tools/r8/ir/optimize/a;)Ljava/util/Set;"}
     212:222:void cleanForRemoval(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):1054:1064 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
     223:223:void com.android.tools.r8.ir.code.Value.removePhiUser(com.android.tools.r8.ir.code.Phi):551:551 -> a
@@ -111520,7 +111475,7 @@
     241:242:void cleanForRemoval(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):1081 -> a
     243:244:void cleanForRemoval(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):1083:1084 -> a
     245:250:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):1103:1108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/graph/I2;)V"}
     251:251:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
     251:251:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):1108 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -111543,7 +111498,7 @@
     289:289:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):1134 -> a
     290:290:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):1134:1134 -> a
     291:293:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1146:1148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Z"}
     294:294:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
     294:294:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1148 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -111559,16 +111514,16 @@
     308:309:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1250:1251 -> a
     308:309:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1257 -> a
     308:309:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/internal/E5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/internal/G5;)V"}
     310:311:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1373:1374 -> a
     312:313:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1250:1251 -> a
     312:313:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/E5;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/bl0;"}
     314:316:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1265:1267 -> a
     317:318:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1250:1251 -> a
     317:318:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1257 -> a
     317:318:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/E5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/G5;)V"}
     319:321:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1294:1296 -> a
     322:322:void com.android.tools.r8.ir.code.Phi.addDefinitionsUser(java.util.Map):392:392 -> a
     322:322:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1296 -> a
@@ -111585,33 +111540,33 @@
     336:336:void com.android.tools.r8.ir.code.Phi.removeDefinitionsUser(java.util.Map):396:396 -> a
     336:336:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1306 -> a
     337:338:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1314:1315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Xk0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/bl0;I)V"}
     339:340:boolean verifyOnThrowWrite(int):1767:1768 -> a
     339:340:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1315 -> a
     341:342:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1316:1317 -> a
     343:346:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1316:1319 -> a
     347:348:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1548:1549 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Kt;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     349:352:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1562:1565 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/It;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Kt;)Lcom/android/tools/r8/internal/I5;"}
     353:353:com.android.tools.r8.ir.code.Instruction entry():796:796 -> a
     353:353:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1566 -> a
     354:354:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1566:1566 -> a
     355:356:boolean canThrow():1754:1755 -> a
     357:357:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1811:1811 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)Lcom/android/tools/r8/internal/L5;"}
     358:358:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     358:358:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1811 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     359:359:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1811:1811 -> a
     360:360:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1822:1822 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/L5;"}
     361:361:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     361:361:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1822 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     362:362:com.android.tools.r8.ir.code.BasicBlockInstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1822:1822 -> a
     363:374:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1840:1851 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)Lcom/android/tools/r8/internal/I5;"}
     375:378:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1872:1875 -> a
     375:378:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1855 -> a
     379:379:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues):410:410 -> a
@@ -111621,7 +111576,7 @@
     380:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1855 -> a
     381:385:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1859:1863 -> a
     386:386:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1888:1888 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/iB;)V"}
     387:387:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
     387:387:boolean com.android.tools.r8.ir.code.CatchHandlers.hasCatchAll(com.android.tools.r8.graph.DexItemFactory):93 -> a
     387:387:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1888 -> a
@@ -111691,7 +111646,7 @@
     450:489:void splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):1942:1981 -> a
     450:489:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1904 -> a
     490:492:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1997:1999 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/util/ArrayList;"}
     493:493:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> a
     493:493:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1999 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -111709,17 +111664,17 @@
     506:568:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):2008:2070 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> b
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.util.function.BiFunction,java.lang.Object):209 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:8:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.util.function.BiFunction,java.lang.Object):210:216 -> b
     9:9:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):320:320 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F5;)V"}
     10:10:void com.android.tools.r8.ir.code.DominatorTree.onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> b
     10:10:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):320 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:19:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):493:501 -> b
     11:19:void com.android.tools.r8.internal.BasicBlock.replaceSuccessor(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     20:20:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> b
     20:20:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):501 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -111753,7 +111708,7 @@
     56:60:void com.android.tools.r8.internal.BasicBlock.replaceSuccessor(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> b
     61:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> b
     61:61:void com.android.tools.r8.internal.BasicBlock.replaceSuccessor(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":642,"2":643,"3":644},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":642,"2":643,"3":644},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     591:601:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):530:540 -> b
     591:601:void com.android.tools.r8.internal.BasicBlock.replaceSuccessor(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> b
     602:603:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> b
@@ -111786,11 +111741,11 @@
     644:644:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):596:596 -> b
     644:644:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):530 -> b
     645:645:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):750:750 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/lang/Iterable;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/lang/Iterable;"}
     646:647:void clearUserInfo():818:819 -> b
     648:651:void mark(int):829:832 -> b
     652:653:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1339:1340 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/E5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/G5;"}
     1:2:void setNumber(int):721:722 -> c
     3:4:boolean consistentCatchHandlers():1163:1164 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -111812,19 +111767,19 @@
     19:19:boolean consistentCatchHandlers():1177 -> c
     20:29:boolean consistentCatchHandlers():1177:1186 -> c
     30:34:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1344:1348 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     35:35:com.android.tools.r8.ir.code.BasicBlockInstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1799:1799 -> c
     35:35:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):746 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/util/Iterator;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/util/Iterator;"}
     1:1:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):751:751 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/util/Iterator;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/util/Iterator;"}
     2:3:void decrementUnfilledPredecessorCount():857:858 -> d
     4:16:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):2080:2092 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):924:925 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     3:5:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1532:1534 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     6:12:void removeInstructions(java.util.List):1511:1517 -> e
     6:12:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1534 -> e
     13:13:void com.android.tools.r8.ir.code.Instruction.clearBlock():356:356 -> e
@@ -111857,17 +111812,17 @@
     57:58:void deduplicatePhis():2156 -> e
     59:59:void deduplicatePhis():2158:2158 -> e
     1:1:java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock):1431:1431 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/lang/String;"}
     2:2:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1675:1675 -> f
     2:2:com.android.tools.r8.internal.BasicBlock com.android.tools.r8.internal.BasicBlock.endOfGotoChain():0 -> f
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     3:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> f
     3:3:com.android.tools.r8.internal.BasicBlock com.android.tools.r8.internal.BasicBlock.endOfGotoChain():0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1680,"2":1681,"3":1682},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1680,"2":1681,"3":1682},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     4:4:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> f
     4:4:com.android.tools.r8.internal.BasicBlock com.android.tools.r8.internal.BasicBlock.endOfGotoChain():0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1683,"2":1684,"3":1685},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1683,"2":1684,"3":1685},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     1680:1680:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1676:1676 -> f
     1681:1681:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1676:1676 -> f
     1682:1682:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1676:1676 -> f
@@ -111875,7 +111830,7 @@
     1684:1684:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1677:1677 -> f
     1685:1685:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1677:1677 -> f
     1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():806:807 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     3:3:com.android.tools.r8.ir.code.BasicBlockInstructionIterator iterator(int):1795:1795 -> g
     3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():807 -> g
     4:4:boolean com.android.tools.r8.ir.code.BasicBlockInstructionIterator.hasPrevious():28:28 -> g
@@ -111884,11 +111839,11 @@
     5:5:com.android.tools.r8.ir.code.Instruction exceptionalExit():809 -> g
     6:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():810:810 -> g
     7:10:void link(com.android.tools.r8.ir.code.BasicBlock):915:918 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     1:3:com.android.tools.r8.ir.code.JumpInstruction exit():800:802 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hD;"}
     4:5:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1408:1409 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/lang/String;"}
     6:9:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1353:1356 -> h
     6:9:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1409 -> h
     10:10:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> h
@@ -111899,9 +111854,9 @@
     11:16:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1409 -> h
     17:19:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1409:1411 -> h
     1:1:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues):410:410 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     2:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1719:1722 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/t8;"}
     6:6:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> i
     6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1722 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -111911,9 +111866,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1723:1723 -> i
     1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):400:402 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     4:4:com.android.tools.r8.ir.code.BasicBlock getExceptionTrampolineTarget():1192:1192 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     5:5:com.android.tools.r8.ir.code.Instruction entry():796:796 -> j
     5:5:com.android.tools.r8.ir.code.BasicBlock getExceptionTrampolineTarget():1192 -> j
     6:6:com.android.tools.r8.ir.code.BasicBlock getExceptionTrampolineTarget():1192:1192 -> j
@@ -111932,7 +111887,7 @@
     1:1:java.util.List getPhis():691:691 -> q
     1:1:com.android.tools.r8.ir.code.Instruction entry():796:796 -> r
     1:1:com.android.tools.r8.ir.code.Position getPosition():1711 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     2:2:com.android.tools.r8.ir.code.Position getPosition():1711:1711 -> r
     1:1:java.util.List getPredecessors():374:374 -> s
     2:2:java.util.List com.android.tools.r8.utils.ListUtils.unmodifiableForTesting(java.util.List):406:406 -> s
@@ -111942,31 +111897,31 @@
     2:2:java.util.List getSuccessors():310 -> t
     1:1:java.lang.String toString():1400:1400 -> toString
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():305:306 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():369:370 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueSuccessor():300:301 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:2:boolean hasCatchHandlers():711:712 -> x
     1:1:boolean hasPhis():687:687 -> y
     1:1:boolean hasUniqueNormalSuccessor():292:292 -> z
-com.android.tools.r8.ir.code.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.B5:
+com.android.tools.r8.ir.code.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.D5:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.internal.BasicBlock com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0.m(com.android.tools.r8.internal.BasicBlock):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.C5:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.E5:
 # {"id":"sourceFile","fileName":"BasicBlock.java"}
     com.android.tools.r8.ir.code.InstructionIterator iterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
     com.android.tools.r8.ir.code.Instruction next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.code.Instruction val$instruction -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     1:3:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):751:753 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)V"}
     4:5:com.android.tools.r8.ir.code.Instruction advance():757:758 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):754 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):754:754 -> <init>
@@ -111980,20 +111935,20 @@
     5:5:java.lang.Object next():751 -> next
     6:6:com.android.tools.r8.ir.code.Instruction next():775:775 -> next
     6:6:java.lang.Object next():751 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.F5:
 # {"id":"sourceFile","fileName":"BasicBlock.java"}
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.E5:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.G5:
 # {"id":"sourceFile","fileName":"BasicBlock.java"}
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
     1:3:void <clinit>():136:138 -> <clinit>
     1:1:void <init>(java.lang.String,int):135:135 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.H5:
 # {"id":"sourceFile","fileName":"BasicBlock.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():2100:2100 -> <clinit>
@@ -112024,49 +111979,49 @@
     11:11:int doHash(com.android.tools.r8.ir.code.Phi):2116 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:int doHash(java.lang.Object):2100 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.I5:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.K5:
 # {"id":"sourceFile","fileName":"BasicBlockInstructionIterator.java"}
     java.util.ListIterator instructionIterator -> b
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)V"}
     5:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):23:23 -> <init>
     6:7:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
     1:1:com.android.tools.r8.ir.code.Instruction next():43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):23:23 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean hasNext():38:38 -> hasNext
     1:1:boolean hasPrevious():28:28 -> hasPrevious
     1:1:java.lang.Object next():9:9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.J5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.L5:
 # {"id":"sourceFile","fileName":"BasicBlockInstructionListIterator.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.code.Position position -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.IRMetadata metadata -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kt;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):49:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;Lcom/android/tools/r8/internal/I5;)V"}
     2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):45:52 -> <init>
     10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):55:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;Lcom/android/tools/r8/internal/I5;I)V"}
     11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):45:58 -> <init>
     25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Nw;"}
     2:7:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlockImpl(com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):201:206 -> a
     2:7:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):188 -> a
     8:13:boolean hasPriorThrowingInstruction():166:171 -> a
@@ -112088,12 +112043,12 @@
     36:37:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):188 -> a
     38:38:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):190:190 -> a
     39:52:com.android.tools.r8.ir.code.BasicBlock addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):238:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/I5;"}
     53:54:void set(java.util.Collection):274:275 -> a
     55:55:com.android.tools.r8.ir.code.Instruction next():78:78 -> a
     55:55:void set(java.util.Collection):276 -> a
     56:56:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):337:337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Ljava/util/Set;)V"}
     57:57:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     57:57:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):340 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112120,7 +112075,7 @@
     82:83:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):358:359 -> a
     84:84:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):338:338 -> a
     85:85:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):376:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     86:87:com.android.tools.r8.ir.code.Position getPreviousPosition():364:365 -> a
     86:87:void addWithPreviousPosition(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):369 -> a
     86:87:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):377 -> a
@@ -112132,7 +112087,7 @@
     89:90:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):377 -> a
     91:91:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):378:378 -> a
     92:95:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):395:398 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/NB;"}
     96:96:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():36:36 -> a
     96:96:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):398 -> a
     97:97:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -112152,7 +112107,7 @@
     119:119:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):426 -> a
     120:127:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):431:438 -> a
     128:139:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):445:456 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
     140:140:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):637:637 -> a
     140:140:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):456 -> a
     141:141:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):636:636 -> a
@@ -112165,7 +112120,7 @@
     154:154:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):471 -> a
     155:155:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):472:472 -> a
     156:160:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):484:488 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
     161:161:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):428:428 -> a
     161:161:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):488 -> a
     162:163:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):489:490 -> a
@@ -112174,7 +112129,7 @@
     165:165:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):491:491 -> a
     166:166:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):485:485 -> a
     167:171:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):496:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     172:172:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     172:172:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):500 -> a
     173:176:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):500:503 -> a
@@ -112182,13 +112137,13 @@
     177:177:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):504 -> a
     178:178:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):497:497 -> a
     179:184:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):510:515 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
     185:186:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1262:1263 -> a
     185:186:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):515 -> a
     187:187:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):516:516 -> a
     188:188:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):511:511 -> a
     189:193:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):521:525 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)V"}
     194:194:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     194:194:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):525 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112202,7 +112157,7 @@
     204:204:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):529 -> a
     205:205:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):522:522 -> a
     206:206:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):536:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
     207:207:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):98:98 -> a
     207:207:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):541 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112211,7 +112166,7 @@
     209:211:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):542:544 -> a
     212:212:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):537:537 -> a
     213:222:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):555:564 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     223:223:com.android.tools.r8.ir.code.Instruction previous():104:104 -> a
     223:223:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):567 -> a
     224:224:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):570:570 -> a
@@ -112251,7 +112206,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     250:250:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):556:556 -> a
     251:259:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):616:624 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     260:260:com.android.tools.r8.ir.code.Instruction previous():104:104 -> a
     260:260:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):627 -> a
     261:267:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):630:636 -> a
@@ -112295,9 +112250,9 @@
     304:327:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):678:701 -> a
     328:328:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):617:617 -> a
     329:338:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):685:694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/I5;)V"}
     339:340:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):709:710 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/I5;"}
     341:341:boolean hasNext():73:73 -> a
     341:341:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):713 -> a
     342:342:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):713:713 -> a
@@ -112311,15 +112266,15 @@
     351:352:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):723 -> a
     353:371:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):724:742 -> a
     372:379:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):751:758 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/I5;"}
     380:386:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions,java.util.function.UnaryOperator):769:775 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/gB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/iB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/I5;"}
     387:419:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):801:833 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Ljava/util/ListIterator;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Ljava/util/ListIterator;)V"}
     420:425:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):871:876 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/bl0;)V"}
     426:430:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):887:891 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/I5;"}
     431:431:boolean com.android.tools.r8.graph.DexEncodedMethod.isOnlyInlinedIntoNestMembers():641:641 -> a
     431:431:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):891 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112450,9 +112405,9 @@
     676:677:void com.android.tools.r8.ir.code.IRMetadata.merge(com.android.tools.r8.ir.code.IRMetadata):78:79 -> a
     676:677:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):1072 -> a
     678:678:boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1070:1070 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     679:685:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1078:1084 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/List;)Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/List;)Lcom/android/tools/r8/internal/L5;"}
     686:686:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1271:1271 -> a
     686:686:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1085 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112473,7 +112428,7 @@
     734:734:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1257:1257 -> a
     734:734:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):383 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/bl0;"}
     735:736:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1262:1263 -> a
     735:736:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1257 -> a
     735:736:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):383 -> a
@@ -112491,18 +112446,18 @@
     743:743:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):385:385 -> a
     1:1:void add(java.lang.Object):40:40 -> add
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):64:64 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:2:void add(com.android.tools.r8.ir.code.Instruction):156:157 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     3:3:boolean com.android.tools.r8.ir.code.Instruction.hasPosition():82:82 -> f
     3:3:void add(com.android.tools.r8.ir.code.Instruction):158 -> f
     4:4:boolean hasInsertionPosition():125:125 -> f
     4:4:void add(com.android.tools.r8.ir.code.Instruction):158 -> f
     5:8:void add(com.android.tools.r8.ir.code.Instruction):159:162 -> f
     1:4:void set(com.android.tools.r8.ir.code.Instruction):266:269 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:2:com.android.tools.r8.ir.code.Instruction peekNext():93:94 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:boolean hasNext():73:73 -> hasNext
     1:1:boolean hasPrevious():99:99 -> hasPrevious
     1:7:void removeOrReplaceByDebugLocalRead():325:331 -> i
@@ -112513,9 +112468,9 @@
     1:1:java.lang.Object next():40 -> next
     1:1:int nextIndex():84:84 -> nextIndex
     1:2:com.android.tools.r8.ir.code.Instruction peekPrevious():119:120 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.code.Instruction previous():104:104 -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     2:2:com.android.tools.r8.ir.code.Instruction previous():104:104 -> previous
     2:2:java.lang.Object previous():40 -> previous
     1:1:int previousIndex():110:110 -> previousIndex
@@ -112549,23 +112504,23 @@
     1:1:void set(java.lang.Object):40:40 -> set
     1:5:void removeInstructionIgnoreOutValue():316:320 -> u
     6:6:void removeInstructionIgnoreOutValue():317:317 -> u
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.M5:
 # {"id":"sourceFile","fileName":"BasicBlockIterator.java"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.BasicBlock current -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     4:6:void <init>(com.android.tools.r8.ir.code.IRCode,int):22:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     1:1:com.android.tools.r8.ir.code.BasicBlock next():42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     2:2:boolean lambda$positionAfterPreviousBlock$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     3:3:com.android.tools.r8.ir.code.BasicBlock positionAfterPreviousBlock(com.android.tools.r8.ir.code.BasicBlock):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     4:4:com.android.tools.r8.ir.code.BasicBlock previousUntil(java.util.function.Predicate):81:81 -> a
     4:4:com.android.tools.r8.ir.code.BasicBlock positionAfterPreviousBlock(java.util.function.Predicate):72 -> a
     4:4:com.android.tools.r8.ir.code.BasicBlock positionAfterPreviousBlock(com.android.tools.r8.ir.code.BasicBlock):68 -> a
@@ -112576,9 +112531,9 @@
     2:2:void add(com.android.tools.r8.ir.code.BasicBlock):86:86 -> add
     2:2:void add(java.lang.Object):11 -> add
     1:1:boolean lambda$previousUntil$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):77:77 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     2:2:com.android.tools.r8.ir.code.BasicBlock previousUntil(com.android.tools.r8.ir.code.BasicBlock):77:77 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     3:3:com.android.tools.r8.ir.code.BasicBlock previousUntil(java.util.function.Predicate):81:81 -> b
     3:3:com.android.tools.r8.ir.code.BasicBlock previousUntil(com.android.tools.r8.ir.code.BasicBlock):77 -> b
     1:1:boolean hasNext():37:37 -> hasNext
@@ -112594,30 +112549,30 @@
     1:1:void set(java.lang.Object):11:11 -> set
     2:2:void set(com.android.tools.r8.ir.code.BasicBlock):91:91 -> set
     2:2:void set(java.lang.Object):11 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.h6:
 # {"id":"sourceFile","fileName":"Binop.java"}
     com.android.tools.r8.ir.code.NumericType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Binop asBinop():130:130 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h6;"}
     1:1:int maxInValueRegister():95:95 -> F2
     1:1:int maxOutValueRegister():100:100 -> G2
     1:1:com.android.tools.r8.ir.code.NumericType getNumericType():41:41 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BS;"}
     boolean isCommutative() -> L2
     1:1:com.android.tools.r8.ir.code.Value leftValue():45:45 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:2:int maxInOutValueRegisterSize():87:88 -> N2
     1:2:void normalizeArgumentsForCommutativeBinop():32:33 -> O2
     3:3:com.android.tools.r8.ir.code.Value leftValue():45:45 -> O2
     3:3:void normalizeArgumentsForCommutativeBinop():33 -> O2
     4:7:void normalizeArgumentsForCommutativeBinop():33:36 -> O2
     1:1:com.android.tools.r8.ir.code.Value rightValue():49:49 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
@@ -112640,7 +112595,7 @@
     11:11:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     11:11:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59 -> a
     12:16:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):59:63 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():2931:2931 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():2937:2937 -> a
     17:17:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):63 -> a
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
     18:18:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):63 -> a
@@ -112648,15 +112603,15 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     20:21:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):141:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     22:22:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):157:157 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():152:152 -> c1
     1:3:boolean fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):73:75 -> e
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):69 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.ConstNumber.is16Bit():288:288 -> e
     4:4:boolean fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):75 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112665,30 +112620,30 @@
     5:5:boolean fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):75 -> e
     5:5:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):69 -> e
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):79:81 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     1:1:boolean isBinop():125:125 -> u1
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.n8:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.p8:
 # {"id":"sourceFile","fileName":"CanonicalPositions.java"}
     com.android.tools.r8.ir.code.Position callerPosition -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     java.util.Map canonicalPositions -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.ir.code.Position preamblePosition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean isCompilerSynthesizedInlinee -> d
     com.android.tools.r8.ir.code.Position syntheticPosition -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
     1:8:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):33:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/TW;)V"}
     9:9:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> <init>
     9:9:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):41 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:17:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):42:49 -> <init>
     18:23:void <init>(com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.code.Position):48:53 -> <init>
     1:16:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):88:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
     17:17:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> a
     17:17:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -112703,7 +112658,7 @@
     23:23:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):107:107 -> a
     24:24:com.android.tools.r8.ir.code.Position canonicalizeCallerPosition(com.android.tools.r8.ir.code.Position):100:100 -> a
     25:34:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):118:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Supplier;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Supplier;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/TW;"}
     35:35:com.android.tools.r8.ir.code.Position getPreamblePosition():58:58 -> a
     35:35:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):131 -> a
     36:38:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):132:134 -> a
@@ -112717,7 +112672,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> b
     1:1:com.android.tools.r8.ir.code.Position canonicalizePositionWithCaller(com.android.tools.r8.ir.code.Position):71 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
     2:8:com.android.tools.r8.ir.code.Position canonicalizePositionWithCaller(com.android.tools.r8.ir.code.Position):71:77 -> b
     9:9:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():89:89 -> b
     9:9:com.android.tools.r8.ir.code.Position canonicalizePositionWithCaller(com.android.tools.r8.ir.code.Position):78 -> b
@@ -112730,19 +112685,19 @@
     13:13:com.android.tools.r8.ir.code.Position canonicalizePositionWithCaller(com.android.tools.r8.ir.code.Position):79:79 -> b
     14:14:com.android.tools.r8.ir.code.Position canonicalizePositionWithCaller(com.android.tools.r8.ir.code.Position):75:75 -> b
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):66:66 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.r8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.t8:
 # {"id":"sourceFile","fileName":"CatchHandlers.java"}
     java.util.List guards -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List targets -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Set uniqueTargets -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.ir.code.CatchHandlers EMPTY_INDICES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     com.android.tools.r8.ir.code.CatchHandlers EMPTY_BASIC_BLOCK -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     boolean $assertionsDisabled -> g
     1:27:void <clinit>():22:48 -> <clinit>
     1:2:void <init>():50:51 -> <init>
@@ -112752,40 +112707,40 @@
     6:11:void <init>(java.util.List,java.util.List):55:60 -> <init>
     1:4:java.util.Set getUniqueTargets():85:88 -> a
     5:14:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):106:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/t8;"}
     15:16:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):111:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)V"}
     17:17:com.android.tools.r8.ir.code.CatchHandlers rewriteWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/t8;"}
     18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> a
     18:18:com.android.tools.r8.ir.code.CatchHandlers rewriteWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):119 -> a
     19:40:com.android.tools.r8.ir.code.CatchHandlers rewriteWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):120:141 -> a
     41:45:com.android.tools.r8.graph.DexType lambda$rewriteWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.DexType):125:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;Lcom/android/tools/r8/internal/aA;ILcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;Lcom/android/tools/r8/internal/cA;ILcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     46:47:void forEach(java.util.function.BiConsumer):145:146 -> a
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:boolean isEmpty():64:64 -> isEmpty
     1:1:java.util.Iterator iterator():152:152 -> iterator
     1:2:int size():68:69 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.r8:
 # {"id":"sourceFile","fileName":"CatchHandlers.java"}
     int nextIndex -> b
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):152:154 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t8;)V"}
     1:1:boolean hasNext():158:158 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():163:166 -> next
     1:4:java.lang.Object next():152 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.s8:
 # {"id":"sourceFile","fileName":"CatchHandlers.java"}
     com.android.tools.r8.graph.DexType guard -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     java.lang.Object target -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):29:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)V"}
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.Eb:
 # {"id":"sourceFile","fileName":"CheckCast.java"}
     com.android.tools.r8.graph.DexType type -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -112794,20 +112749,20 @@
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,boolean):48:50 -> <init>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;)V"}
     4:6:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,boolean):48:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;Z)V"}
     1:1:com.android.tools.r8.ir.code.CheckCast asCheckCast():199:199 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eb;"}
     1:1:int maxInValueRegister():137:137 -> F2
     1:1:int maxOutValueRegister():142:142 -> G2
     1:1:int opcode():86:86 -> H2
     1:1:com.android.tools.r8.graph.DexType getType():95:95 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):107 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -112822,7 +112777,7 @@
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111 -> a
     10:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:119 -> a
     17:28:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):151:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     29:29:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):166 -> a
     30:30:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):167:167 -> a
@@ -112837,24 +112792,24 @@
     41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):68:68 -> a
     41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):210 -> a
     42:42:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):215:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     43:49:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):221:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     50:50:com.android.tools.r8.graph.DexType getType():95:95 -> a
     50:50:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):228 -> a
     51:68:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):228:245 -> a
     69:70:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):253:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     71:71:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):265:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     72:72:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     73:73:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):280:280 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     74:74:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerCheckCast(com.android.tools.r8.graph.DexType,boolean):125:125 -> a
     74:74:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):280 -> a
     75:75:void buildLir(com.android.tools.r8.lightir.LirBuilder):285:285 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     76:76:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addCheckCast(com.android.tools.r8.graph.DexType,java.lang.Object,boolean):691:691 -> a
     76:76:void buildLir(com.android.tools.r8.lightir.LirBuilder):285 -> a
     77:77:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addCheckCast(com.android.tools.r8.graph.DexType,java.lang.Object,boolean):690:690 -> a
@@ -112867,54 +112822,54 @@
     3:3:com.android.tools.r8.dex.code.DexCheckCast createCheckCast(int):126 -> b
     4:4:com.android.tools.r8.dex.code.DexCheckCast createCheckCast(int):126:126 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):132:132 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):275:275 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():260:260 -> c1
     1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> m
     1:1:com.android.tools.r8.ir.code.Value object():99 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.ir.code.Value object():99:99 -> m
     1:1:boolean instructionTypeCanThrow():189:189 -> o
     1:1:java.lang.String toString():204:204 -> toString
     1:1:boolean isCheckCast():194:194 -> v1
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.Db:
 # {"id":"sourceFile","fileName":"CheckCast.java"}
     com.android.tools.r8.graph.DexType castType -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.code.Value object -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:1:void <init>():288:288 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():288:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     2:2:com.android.tools.r8.ir.code.CheckCast$Builder setCastType(com.android.tools.r8.graph.DexType):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Db;"}
     1:1:com.android.tools.r8.ir.code.CheckCast$Builder setObject(com.android.tools.r8.ir.code.Value):299:299 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Db;"}
     1:1:com.android.tools.r8.ir.code.CheckCast build():305:305 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb;"}
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.Fd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eb;"}
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.Hd:
 # {"id":"sourceFile","fileName":"Cmp.java"}
     com.android.tools.r8.ir.code.Cmp$Bias bias -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gd;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Ed;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/Gd;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Cmp asCmp():225:225 -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hd;"}
     1:1:int maxInValueRegister():142:142 -> F2
     1:1:int maxOutValueRegister():147:147 -> G2
     1:1:int opcode():42:42 -> H2
     1:1:boolean isCommutative():52:52 -> L2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     30:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:77 -> a
     36:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:87 -> a
     61:69:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):91:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ed;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gd;)Ljava/lang/String;"}
     70:70:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):95:95 -> a
     71:71:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):93:93 -> a
     72:73:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):165:166 -> a
@@ -112970,9 +112925,9 @@
     126:126:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):197 -> a
     127:127:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):202:202 -> a
     128:128:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     129:129:void buildLir(com.android.tools.r8.lightir.LirBuilder):235:235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     130:130:void buildLir(com.android.tools.r8.lightir.LirBuilder):235 -> a
     131:131:void buildLir(com.android.tools.r8.lightir.LirBuilder):235:235 -> a
@@ -112985,16 +112940,16 @@
     134:134:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,java.lang.Object,java.lang.Object):968 -> a
     134:134:void buildLir(com.android.tools.r8.lightir.LirBuilder):235 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):137:137 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):137 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):137:137 -> b
     1:17:java.lang.String toString():105:121 -> toString
     18:19:java.lang.String toString():114:115 -> toString
     20:42:java.lang.String toString():110:132 -> toString
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.Fd:
 # {"id":"sourceFile","fileName":"Cmp.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$Cmp$Bias -> b
@@ -113002,23 +112957,23 @@
     2:2:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     2:2:void <clinit>():61 -> <clinit>
     3:3:void <clinit>():61:61 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.Gd:
 # {"id":"sourceFile","fileName":"Cmp.java"}
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gd;"}
     com.android.tools.r8.ir.code.Cmp$Bias GT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gd;"}
     com.android.tools.r8.ir.code.Cmp$Bias LT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gd;"}
     com.android.tools.r8.ir.code.Cmp$Bias[] $VALUES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Gd;"}
     1:1:void <clinit>():30:30 -> <clinit>
     2:2:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/Ed;"}
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.cg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/Gd;"}
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.eg:
 # {"id":"sourceFile","fileName":"ConstClass.java"}
     com.android.tools.r8.graph.DexType clazz -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -113026,11 +112981,11 @@
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):36:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/graph/I2;)V"}
     2:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,boolean):40:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;Z)V"}
     1:1:com.android.tools.r8.ir.code.ConstClass asConstClass():175:175 -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg;"}
     1:1:int maxInValueRegister():95:95 -> F2
     1:1:int maxOutValueRegister():101:101 -> G2
     1:1:int opcode():56:56 -> H2
@@ -113040,15 +112995,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.graph.DexType getType():51:51 -> a
     1:1:void buildLir(com.android.tools.r8.lightir.LirBuilder):220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):220:220 -> a
     3:3:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     3:3:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstClass(com.android.tools.r8.graph.DexType,boolean):598 -> a
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):220 -> a
     4:4:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     5:6:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):70:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/cg;)Lcom/android/tools/r8/internal/cg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/eg;)Lcom/android/tools/r8/internal/eg;"}
     7:7:com.android.tools.r8.graph.DexType getValue():79:79 -> a
     7:7:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -113056,7 +113011,7 @@
     8:8:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):71 -> a
     9:9:com.android.tools.r8.ir.code.Value dest():75:75 -> a
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     10:10:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84 -> a
     11:11:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -113070,7 +113025,7 @@
     15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
     16:16:com.android.tools.r8.graph.DexType getValue():79:79 -> a
     16:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     17:37:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):126:146 -> a
     38:38:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     38:38:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):150 -> a
@@ -113083,15 +113038,15 @@
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):181 -> a
     43:43:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     44:44:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):428:428 -> a
     44:44:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):186 -> a
     45:45:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     46:46:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):196:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     47:47:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     48:48:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     48:48:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):201 -> a
     49:49:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):201:201 -> a
@@ -113107,29 +113062,29 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     54:56:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):208:210 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):165:165 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):165 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):165:165 -> b
     1:1:boolean instructionTypeCanThrow():116:116 -> o
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.dg:
 # {"id":"sourceFile","fileName":"ConstClass.java"}
     com.android.tools.r8.graph.DexType type -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:1:void <init>():223:223 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():223:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.dg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.fg:
 # {"id":"sourceFile","fileName":"ConstInstruction.java"}
     int $r8$clinit -> i
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction():48:48 -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:1:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():38:38 -> Y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():76:76 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
@@ -113137,26 +113092,26 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():59:59 -> c1
     1:1:boolean isConstInstruction():43:43 -> x1
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.gg:
 # {"id":"sourceFile","fileName":"ConstMethodHandle.java"}
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/y2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/y2;)V"}
     1:1:com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle():124:124 -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gg;"}
     1:1:int maxInValueRegister():87:87 -> F2
     1:1:int maxOutValueRegister():99:99 -> G2
     1:1:int opcode():38:38 -> H2
     1:1:com.android.tools.r8.graph.DexMethodHandle getValue():60:60 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y2;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value dest():56:56 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -113166,52 +113121,52 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65 -> a
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstMethodHandle(com.android.tools.r8.graph.DexMethodHandle):602 -> a
     9:9:void buildLir(com.android.tools.r8.lightir.LirBuilder):76 -> a
     10:10:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     11:11:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):129:129 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     14:14:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):145:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():285:285 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
     1:1:boolean instructionTypeCanThrow():109:109 -> o
     1:1:boolean isOutConstant():114:114 -> r2
     1:1:java.lang.String toString():104:104 -> toString
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.hg:
 # {"id":"sourceFile","fileName":"ConstMethodType.java"}
     com.android.tools.r8.graph.DexProto methodType -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):30:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/E2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/E2;)V"}
     1:1:int maxInValueRegister():85:85 -> F2
     1:1:com.android.tools.r8.ir.code.ConstMethodType asConstMethodType():116:116 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hg;"}
     1:1:int maxOutValueRegister():91:91 -> G2
     1:1:int opcode():36:36 -> H2
     1:1:com.android.tools.r8.graph.DexProto getValue():58:58 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/E2;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value dest():54:54 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -113221,39 +113176,39 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstMethodType(com.android.tools.r8.graph.DexProto):606 -> a
     9:9:void buildLir(com.android.tools.r8.lightir.LirBuilder):74 -> a
     10:10:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     11:11:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):121:121 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     14:14:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):143:143 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():289:289 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
     1:1:boolean instructionTypeCanThrow():101:101 -> o
     1:1:boolean isOutConstant():106:106 -> r2
     1:1:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.ig:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.kg:
 # {"id":"sourceFile","fileName":"ConstNumber.java"}
     long value -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():33:33 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.Value,long):38:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;J)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;J)V"}
     6:6:boolean com.android.tools.r8.ir.code.Value.isFixedRegisterValue():0:0 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.code.Value,long):42 -> <init>
     7:8:void <init>(com.android.tools.r8.ir.code.Value,long):42:43 -> <init>
@@ -113261,7 +113216,7 @@
     1:1:int maxInValueRegister():249:249 -> F2
     1:1:int maxOutValueRegister():255:255 -> G2
     1:1:com.android.tools.r8.ir.code.ConstNumber asConstNumber():307:307 -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kg;"}
     1:1:int opcode():59:59 -> H2
     1:1:boolean getBooleanValue():82:82 -> K2
     1:2:double getDoubleValue():102:103 -> L2
@@ -113276,12 +113231,12 @@
     1:1:boolean isIntegerZero():115:115 -> T2
     1:1:boolean isZero():111:111 -> U2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):73:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ig;)Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/kg;)Lcom/android/tools/r8/internal/kg;"}
     4:4:com.android.tools.r8.ir.code.Value dest():78:78 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     5:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137:138 -> a
     7:7:void com.android.tools.r8.ir.conversion.DexBuilder.addNothing(com.android.tools.r8.ir.code.Instruction):718:718 -> a
     7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138 -> a
@@ -113300,17 +113255,17 @@
     14:22:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):155:163 -> a
     23:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):144:152 -> a
     32:32:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     33:36:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):175:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     37:37:com.android.tools.r8.ir.code.ConstNumber asConstNumber(long):312:312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/kg;"}
     38:39:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):317:318 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     40:40:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):323:323 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     41:42:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):329:330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     43:43:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     43:43:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):330 -> a
     44:44:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):330:330 -> a
@@ -113325,7 +113280,7 @@
     51:51:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):347 -> a
     52:53:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):347:348 -> a
     54:54:void buildLir(com.android.tools.r8.lightir.LirBuilder):353:353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     55:67:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstNumber(com.android.tools.r8.ir.code.ValueType,long):569:581 -> a
     55:67:void buildLir(com.android.tools.r8.lightir.LirBuilder):353 -> a
     68:68:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstNumber(com.android.tools.r8.ir.code.ValueType,long):579:579 -> a
@@ -113339,51 +113294,51 @@
     72:72:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addConstNumber(com.android.tools.r8.ir.code.ValueType,long):571:571 -> a
     72:72:void buildLir(com.android.tools.r8.lightir.LirBuilder):353 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):272:276 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionTypeCanBeCanonicalized():132:132 -> h1
     1:1:boolean isOutConstant():297:297 -> r2
     1:4:java.lang.String toString():260:263 -> toString
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.ig:
 # {"id":"sourceFile","fileName":"ConstNumber.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():188 -> <clinit>
     2:2:void <clinit>():188:188 -> <clinit>
-com.android.tools.r8.ir.code.ConstNumber$Builder -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.ir.code.ConstNumber$Builder -> com.android.tools.r8.internal.jg:
 # {"id":"sourceFile","fileName":"ConstNumber.java"}
     long value -> d
     1:1:void <init>():356:356 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():356:356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:1:boolean verifyInstructionTypeCannotThrow():377:377 -> b
     1:1:com.android.tools.r8.ir.code.ConstNumber build():367:367 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ig;"}
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.ng:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kg;"}
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.pg:
 # {"id":"sourceFile","fileName":"ConstString.java"}
     com.android.tools.r8.graph.DexString value -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/H2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/H2;)V"}
     1:1:boolean isConstString():113:113 -> B1
     1:1:int maxInValueRegister():87:87 -> F2
     1:1:int maxOutValueRegister():93:93 -> G2
     1:1:int opcode():42:42 -> H2
     1:1:com.android.tools.r8.ir.code.ConstString asConstString():118:118 -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pg;"}
     1:1:com.android.tools.r8.ir.code.ConstString$Builder builder():37:37 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/og;"}
     1:1:com.android.tools.r8.graph.DexString getValue():65:65 -> L2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     1:6:boolean instructionInstanceCanThrow():124:129 -> M2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ng;)Lcom/android/tools/r8/internal/ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/pg;)Lcom/android/tools/r8/internal/pg;"}
     4:4:com.android.tools.r8.ir.code.Value dest():61:61 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     5:5:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
     6:6:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -113401,51 +113356,51 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:13:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):183:185 -> a
     14:14:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     15:15:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     16:16:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     17:17:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):147 -> a
     18:21:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:151 -> a
     22:22:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):149:149 -> a
     23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):156:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):161:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):166:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     26:26:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     27:29:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):191:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     30:30:void buildLir(com.android.tools.r8.lightir.LirBuilder):199:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionTypeCanBeCanonicalized():70:70 -> h1
     1:1:boolean instructionTypeCanThrow():103:103 -> o
     1:1:boolean isOutConstant():108:108 -> r2
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.ir.code.ConstString$Builder -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.code.ConstString$Builder -> com.android.tools.r8.internal.og:
 # {"id":"sourceFile","fileName":"ConstString.java"}
     com.android.tools.r8.graph.DexString value -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     1:1:void <init>():202:202 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     2:2:com.android.tools.r8.ir.code.ConstString$Builder setValue(com.android.tools.r8.graph.DexString):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/mg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/og;"}
     1:1:com.android.tools.r8.ir.code.ConstString build():213:213 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ng;"}
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.ug:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pg;"}
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.wg:
 # {"id":"sourceFile","fileName":"ConstantValueUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValueForTracing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/d1;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/d1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     2:2:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValueForTracing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21 -> a
     3:7:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValueForTracing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):22:26 -> a
@@ -113457,7 +113412,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:15:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValueForTracing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):30:34 -> a
     16:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WB;Lcom/android/tools/r8/graph/d1;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YB;Lcom/android/tools/r8/graph/d1;)Lcom/android/tools/r8/graph/I2;"}
     18:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:43 -> a
     19:19:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
@@ -113484,65 +113439,65 @@
     38:38:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     38:38:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56 -> a
     39:39:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):57:57 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Lh:
 # {"id":"sourceFile","fileName":"DebugLocalRead.java"}
     1:1:void <init>():21:21 -> <init>
     1:1:int maxInValueRegister():66:66 -> F2
     1:1:int maxOutValueRegister():71:71 -> G2
     1:1:int opcode():26:26 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalRead():80:80 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     7:7:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNoOperandInstruction(int):467:467 -> a
     7:7:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugLocalRead():930 -> a
     7:7:void buildLir(com.android.tools.r8.lightir.LirBuilder):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     8:8:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNoOperandInstruction(int):468:468 -> a
     8:8:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugLocalRead():930 -> a
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):56 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):61 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):99:99 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():89:89 -> c1
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Mh:
 # {"id":"sourceFile","fileName":"DebugLocalUninitialized.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     1:1:boolean isAllowedAfterThrowingInstruction():41:41 -> j1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Nh:
 # {"id":"sourceFile","fileName":"DebugLocalWrite.java"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite():48:48 -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nh;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     3:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):68:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     7:8:void com.android.tools.r8.cf.LoadStoreHelper.splitAfterStoredOutValue(com.android.tools.r8.ir.code.InstructionListIterator):225:226 -> a
     7:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):72 -> a
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     10:10:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):754:754 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -113550,9 +113505,9 @@
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78 -> a
     12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78:78 -> a
     13:14:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):89:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     15:15:void buildLir(com.android.tools.r8.lightir.LirBuilder):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     16:16:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):478:478 -> a
     16:16:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugLocalWrite(java.lang.Object):926 -> a
     16:16:void buildLir(com.android.tools.r8.lightir.LirBuilder):96 -> a
@@ -113560,31 +113515,31 @@
     17:17:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugLocalWrite(java.lang.Object):926 -> a
     17:17:void buildLir(com.android.tools.r8.lightir.LirBuilder):96 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:58 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58 -> b
     1:1:boolean isAllowedAfterThrowingInstruction():83:83 -> j1
     1:1:boolean isOutConstant():53:53 -> r2
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Oh:
 # {"id":"sourceFile","fileName":"DebugLocalsChange.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):28:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/nz;)V"}
     1:1:int maxInValueRegister():79:79 -> F2
     1:1:int maxOutValueRegister():84:84 -> G2
     1:1:int opcode():36:36 -> H2
     1:1:com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange():59:59 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oh;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():45:45 -> a
     2:2:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;)Z"}
     3:3:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):111:111 -> a
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> a
     4:4:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):111 -> a
@@ -113606,22 +113561,22 @@
     14:14:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):117 -> a
     15:18:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):117:120 -> a
     19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     20:20:void com.android.tools.r8.ir.conversion.DexBuilder.addNothing(com.android.tools.r8.ir.code.Instruction):718:718 -> a
     20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalsChange():84:84 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     22:22:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     25:25:void buildLir(com.android.tools.r8.lightir.LirBuilder):142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69 -> b
     3:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:74 -> b
@@ -113630,7 +113585,7 @@
     1:1:boolean hasInvariantOutType():132:132 -> c1
     1:1:boolean isAllowedAfterThrowingInstruction():152:152 -> j1
     1:6:java.lang.String toString():94:99 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Qh:
 # {"id":"sourceFile","fileName":"DebugPosition.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():18:18 -> <clinit>
@@ -113639,11 +113594,11 @@
     1:1:int maxOutValueRegister():62:62 -> G2
     1:1:int opcode():26:26 -> H2
     1:1:com.android.tools.r8.ir.code.DebugPosition asDebugPosition():41:41 -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qh;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:boolean com.android.tools.r8.ir.code.Position.isSome():159:159 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -113659,11 +113614,11 @@
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     12:12:boolean com.android.tools.r8.ir.code.Position.isSome():159:159 -> a
     12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):88 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -113675,7 +113630,7 @@
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     19:19:void buildLir(com.android.tools.r8.lightir.LirBuilder):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     20:20:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugPosition(com.android.tools.r8.ir.code.Position):788:788 -> a
     20:20:void buildLir(com.android.tools.r8.lightir.LirBuilder):105 -> a
     21:21:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugPosition(com.android.tools.r8.ir.code.Position):788:788 -> a
@@ -113691,55 +113646,55 @@
     24:24:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDebugPosition(com.android.tools.r8.ir.code.Position):789 -> a
     24:24:void buildLir(com.android.tools.r8.lightir.LirBuilder):105 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):95:95 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():83:83 -> c1
     1:1:boolean isAllowedAfterThrowingInstruction():100:100 -> j1
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Xh:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Zh:
 # {"id":"sourceFile","fileName":"DefaultAliasedValueConfiguration.java"}
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zh;"}
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     2:2:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25 -> a
     3:4:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:26 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.ei:
 # {"id":"sourceFile","fileName":"DefaultInstructionVisitor.java"}
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.Nl:
 # {"id":"sourceFile","fileName":"DexItemBasedConstString.java"}
     com.android.tools.r8.graph.DexReference item -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F2;"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     1:1:int maxInValueRegister():105:105 -> F2
     1:1:int maxOutValueRegister():111:111 -> G2
     1:1:int opcode():41:41 -> H2
     1:1:com.android.tools.r8.graph.DexReference getItem():60:60 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/F2;"}
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():64:64 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XP;"}
     1:1:com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString():79:79 -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ll;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nl;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):55:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ll;)Lcom/android/tools/r8/internal/Ll;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Nl;)Lcom/android/tools/r8/internal/Nl;"}
     4:4:com.android.tools.r8.graph.DexReference getItem():60:60 -> a
     4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -113748,7 +113703,7 @@
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):169 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     8:8:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84 -> a
     9:9:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -113758,23 +113713,23 @@
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84 -> a
     11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
     12:12:void buildLir(com.android.tools.r8.lightir.LirBuilder):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     13:15:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1095:1097 -> a
     13:15:void buildLir(com.android.tools.r8.lightir.LirBuilder):92 -> a
     16:16:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1096:1096 -> a
     16:16:void buildLir(com.android.tools.r8.lightir.LirBuilder):92 -> a
     17:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     18:18:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     22:22:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     23:24:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):187:188 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     25:25:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
@@ -113788,7 +113743,7 @@
     31:31:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):142:142 -> a
     31:31:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):182 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:100 -> b
@@ -113796,18 +113751,18 @@
     1:1:boolean instructionTypeCanThrow():121:121 -> o
     1:1:boolean isOutConstant():126:126 -> r2
     1:1:java.lang.String toString():116:116 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.em:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.gm:
 # {"id":"sourceFile","fileName":"Div.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():31:31 -> H2
     1:1:boolean isCommutative():51:51 -> L2
     1:1:com.android.tools.r8.ir.code.Div asDiv():46:46 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gm;"}
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():171:171 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int):71:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:int foldIntegers(int,int):116:116 -> a
@@ -113815,7 +113770,7 @@
     5:5:float foldFloat(float,float):126:126 -> a
     6:6:double foldDouble(double,double):131:131 -> a
     7:11:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):140:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     12:12:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):144 -> a
     13:13:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():47:47 -> a
@@ -113833,7 +113788,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:21:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):164:166 -> a
     22:22:void buildLir(com.android.tools.r8.lightir.LirBuilder):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     23:23:void buildLir(com.android.tools.r8.lightir.LirBuilder):176 -> a
     24:24:void buildLir(com.android.tools.r8.lightir.LirBuilder):176:176 -> a
@@ -113842,7 +113797,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble2Addr(int,int):91:91 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106:106 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isDiv():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106:106 -> b
@@ -113861,20 +113816,20 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):61:61 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean instructionTypeCanThrow():156:156 -> o
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.nm:
 # {"id":"sourceFile","fileName":"DominatorTree.java"}
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock normalExitBlock -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     int unreachableStartIndex -> d
     boolean obsolete -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     2:49:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:77 -> <init>
     50:51:void numberBlocks():240:241 -> <init>
     50:51:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):79 -> <init>
@@ -113900,7 +113855,7 @@
     84:85:boolean recordChangesToControlFlowEdges(java.util.List):320:321 -> <init>
     84:85:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):84 -> <init>
     1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     2:3:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):134:135 -> a
     2:3:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
     4:5:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> a
@@ -113909,22 +113864,22 @@
     6:6:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):140:140 -> a
     6:6:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
     7:11:java.util.Collection dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock,java.util.Collection):176:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Ljava/util/Collection;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Ljava/util/Collection;)Ljava/util/Collection;"}
     12:13:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):193:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/lang/Iterable;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/lang/Iterable;"}
     14:41:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):195:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/km;)Ljava/util/Iterator;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/mm;)Ljava/util/Iterator;"}
     1:9:java.lang.String toString():308:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.lm:
 # {"id":"sourceFile","fileName":"DominatorTree.java"}
     com.android.tools.r8.ir.code.BasicBlock current -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nm;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():196:196 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):196:197 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lm;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nm;Lcom/android/tools/r8/internal/I5;)V"}
     1:1:boolean hasNext():201:201 -> hasNext
     1:8:com.android.tools.r8.ir.code.BasicBlock next():206:213 -> next
     1:8:java.lang.Object next():196 -> next
@@ -113947,63 +113902,63 @@
     13:13:java.lang.Object next():196 -> next
     14:15:com.android.tools.r8.ir.code.BasicBlock next():213:214 -> next
     14:15:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.km:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.mm:
 # {"id":"sourceFile","fileName":"DominatorTree.java"}
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/km;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mm;"}
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.Bm:
 # {"id":"sourceFile","fileName":"Dup.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;)V"}
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):26:27 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22 -> <init>
     1:1:int maxInValueRegister():91:91 -> F2
     1:1:int maxOutValueRegister():96:96 -> G2
     1:1:int opcode():32:32 -> H2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():50:50 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/sd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/wd0;"}
     2:2:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> K2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():50 -> K2
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.ir.code.Dup asDup():122:122 -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bm;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     4:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDup():92:92 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):102 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:127 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():112:112 -> c1
     1:2:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):42:43 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     3:3:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> d
     3:3:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):43 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:7:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):43:46 -> d
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Am:
 # {"id":"sourceFile","fileName":"Dup2.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;)V"}
     2:4:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29 -> <init>
     5:5:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> <init>
@@ -114016,63 +113971,63 @@
     1:1:int maxOutValueRegister():110:110 -> G2
     1:1:int opcode():46:46 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDup2():96:96 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100:100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup2():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():126:126 -> c1
     1:2:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):56:57 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     3:3:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> d
     3:3:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):57 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:7:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):57:60 -> d
-com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.kp:
 # {"id":"sourceFile","fileName":"FieldGet.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ow;"}
     com.android.tools.r8.ir.code.Value outValue() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.graph.DexField getField() -> getField
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.np:
 # {"id":"sourceFile","fileName":"FieldInstruction.java"}
     com.android.tools.r8.graph.DexField field -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):40:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:boolean isFieldInstruction():62:62 -> J1
     1:1:com.android.tools.r8.ir.code.FieldMemberType getType():53:53 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pp;"}
     2:2:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51:51 -> K2
     2:2:com.android.tools.r8.ir.code.FieldMemberType getType():53 -> K2
     1:1:com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction():67:67 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/np;"}
     1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     2:2:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):281:281 -> a
     2:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):77 -> a
     3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):76:76 -> a
     4:9:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult):85:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Hw;Lcom/android/tools/r8/graph/y3;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Jw;Lcom/android/tools/r8/graph/y3;)Z"}
     10:10:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolutionPair():200:200 -> a
     10:10:boolean internalInstructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.graph.FieldResolutionResult):91 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -114157,72 +114112,72 @@
     1:1:com.android.tools.r8.graph.DexField getField():57:57 -> getField
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.ir.code.Value value() -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.mp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.pp:
 # {"id":"sourceFile","fileName":"FieldMemberType.java"}
     com.android.tools.r8.ir.code.FieldMemberType OBJECT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType BOOLEAN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType BYTE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType CHAR -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType SHORT -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType INT -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType FLOAT -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType LONG -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pp;"}
     1:9:void <clinit>():12:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/mp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/pp;"}
     2:18:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):28:44 -> a
     19:19:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):32:32 -> a
     20:34:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):26:40 -> a
     35:41:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):36:42 -> a
     42:42:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):34:34 -> a
     43:43:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):30:30 -> a
-com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.tp:
 # {"id":"sourceFile","fileName":"FieldPut.java"}
     void setValue(com.android.tools.r8.ir.code.Value) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     boolean isStaticPut() -> e
     int getValueIndex() -> g
     com.android.tools.r8.graph.DexField getField() -> getField
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.ir.code.Position getPosition() -> getPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     boolean isInstancePut() -> h
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Aw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cw;"}
     com.android.tools.r8.ir.code.Value value() -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Wp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Zp:
 # {"id":"sourceFile","fileName":"FixedRegisterValue.java"}
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,int):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;)V"}
     1:1:boolean isConstant():70:70 -> b0
     1:1:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):55:55 -> c
     1:1:com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue():65:65 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zp;"}
     1:23:com.android.tools.r8.ir.code.ValueType outType():24:46 -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     24:25:com.android.tools.r8.ir.code.ValueType outType():43:44 -> r0
     1:1:java.lang.String toString():75:75 -> toString
     1:1:int getRegister():50:50 -> w0
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.hs:
 # {"id":"sourceFile","fileName":"Goto.java"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():15:15 -> <clinit>
@@ -114232,24 +114187,24 @@
     1:1:int opcode():32:32 -> H2
     1:1:boolean isGoto():93:93 -> L1
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():41:44 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.ir.code.Goto asGoto():98:98 -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:4:void com.android.tools.r8.ir.conversion.DexBuilder.addGoto(com.android.tools.r8.ir.code.Goto):668:669 -> a
     3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
     5:5:void com.android.tools.r8.ir.conversion.DexBuilder.addNothing(com.android.tools.r8.ir.code.Instruction):718:718 -> a
     5:5:void com.android.tools.r8.ir.conversion.DexBuilder.addGoto(com.android.tools.r8.ir.code.Goto):671 -> a
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     9:9:int com.android.tools.r8.lightir.LirBuilder.getBlockIndex(com.android.tools.r8.ir.code.BasicBlock):416:416 -> a
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addGoto(com.android.tools.r8.ir.code.BasicBlock):797 -> a
     9:9:void buildLir(com.android.tools.r8.lightir.LirBuilder):130 -> a
@@ -114263,32 +114218,32 @@
     12:14:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addGoto(com.android.tools.r8.ir.code.BasicBlock):799:801 -> a
     12:14:void buildLir(com.android.tools.r8.lightir.LirBuilder):130 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:88 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean isAllowedAfterThrowingInstruction():125:125 -> j1
     1:8:java.lang.String toString():76:83 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.Bt:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.Dt:
 # {"id":"sourceFile","fileName":"IRCode.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions conversionOptions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN$a;"}
     com.android.tools.r8.ir.code.Position entryPosition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     java.util.LinkedList blocks -> d
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     com.android.tools.r8.ir.code.NumberGenerator basicBlockNumberGenerator -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     int usedMarkingColors -> g
     int nextInstructionNumber -> h
     com.android.tools.r8.ir.code.IRMetadata metadata -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kt;"}
     com.android.tools.r8.utils.InternalOptions options -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():72:72 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):147:147 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/QN$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/Kt;Lcom/android/tools/r8/internal/UN$a;)V"}
     2:29:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):132:159 -> <init>
     1:5:void removeRedundantBlocks():1313:1317 -> A
     6:6:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueSuccessorWithUniquePredecessor():288:288 -> A
@@ -114327,7 +114282,7 @@
     1:1:java.util.stream.Stream streamInstructions():1101:1101 -> E
     1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():570:593 -> F
     1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():563 -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():564:564 -> F
     26:27:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):599:600 -> F
     26:27:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():565 -> F
@@ -114374,11 +114329,11 @@
     1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():1052:1063 -> J
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(com.android.tools.r8.ir.code.BasicBlock,java.util.function.BiFunction,java.lang.Object):1482:1482 -> a
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,com.android.tools.r8.utils.TriFunction,java.lang.Object):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.ir.code.BasicBlock.traverseExceptionalSuccessors(com.android.tools.r8.utils.TriFunction,java.lang.Object):259:259 -> a
     4:4:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.TriFunction,java.lang.Object):1490 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -114406,7 +114361,7 @@
     12:16:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.TriFunction,java.lang.Object):1490 -> a
     12:16:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,com.android.tools.r8.utils.TriFunction,java.lang.Object):72 -> a
     17:17:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Oh0;"}
     18:18:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     18:18:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(com.android.tools.r8.ir.code.BasicBlock,java.util.function.BiFunction,java.lang.Object):1499 -> a
     18:18:com.android.tools.r8.utils.TraversalContinuation traverseInstructions(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72 -> a
@@ -114432,7 +114387,7 @@
     39:39:boolean controlFlowMayDependOnEnvironment(java.util.function.Consumer):344 -> a
     40:40:boolean controlFlowMayDependOnEnvironment(java.util.function.Consumer):344:344 -> a
     41:42:void forEachBlockWithPreviousAndNext(com.android.tools.r8.ir.code.IRCode$BasicBlockIteratorCallback):543:544 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/At;)V"}
     43:43:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
     43:43:void forEachBlockWithPreviousAndNext(com.android.tools.r8.ir.code.IRCode$BasicBlockIteratorCallback):546 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -114447,132 +114402,137 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     63:63:boolean hasNoMergedClasses(com.android.tools.r8.graph.AppView):671:671 -> a
     64:64:boolean lambda$hasNoMergedClasses$1(com.android.tools.r8.graph.classmerging.MergedClassesCollection,com.android.tools.r8.graph.DexType,java.lang.Boolean):675:675 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tN;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xN;Lcom/android/tools/r8/graph/I2;Ljava/lang/Boolean;)Z"}
     65:65:boolean lambda$verifyTypes$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.BasicBlock):706:706 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ul0;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yl0;Lcom/android/tools/r8/internal/I5;)Z"}
     66:72:void addValueAndCheckUniqueNumber(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Value):740:746 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/bl0;)V"}
     73:73:void addValueAndCheckUniqueNumber(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Value):743:743 -> a
     74:74:java.util.Collection lambda$consistentPredecessorSuccessors$3(java.util.Collection):834:834 -> a
     75:75:java.util.Collection lambda$consistentPredecessorSuccessors$4(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):838:838 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/G5;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/I5;)Ljava/util/Collection;"}
     76:78:void lambda$consistentBlockNumbering$8(java.lang.Integer,java.lang.Long):878:880 -> a
     79:81:boolean consistentBlockInstructions(boolean):894:896 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)V"}
-    82:82:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):77:77 -> a
-    82:82:boolean consistentBlockInstructions(boolean):895 -> a
+    82:82:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    82:82:boolean consistentBlockInstructions(boolean):896 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    83:87:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):77:81 -> a
-    83:87:boolean consistentBlockInstructions(boolean):895 -> a
-    88:88:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
-    88:88:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):81 -> a
-    88:88:boolean consistentBlockInstructions(boolean):895 -> a
-    89:91:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):81:83 -> a
-    89:91:boolean consistentBlockInstructions(boolean):895 -> a
-    92:94:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):82:84 -> a
-    92:94:boolean consistentBlockInstructions(boolean):895 -> a
-    95:95:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    95:95:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):84 -> a
-    95:95:boolean consistentBlockInstructions(boolean):895 -> a
-    96:96:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    96:96:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):85 -> a
-    96:96:boolean consistentBlockInstructions(boolean):895 -> a
-    97:100:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):85:88 -> a
-    97:100:boolean consistentBlockInstructions(boolean):895 -> a
-    101:105:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):87:91 -> a
-    101:105:boolean consistentBlockInstructions(boolean):895 -> a
-    106:110:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1029:1033 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-    111:111:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    111:111:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1033 -> a
-    112:114:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1033:1035 -> a
-    115:115:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1034:1034 -> a
-    116:117:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1070:1071 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Xk0;)Z"}
-    118:118:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> a
-    118:118:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1071 -> a
+    83:83:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    83:83:boolean consistentBlockInstructions(boolean):896 -> a
+    84:84:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):77:77 -> a
+    84:84:boolean consistentBlockInstructions(boolean):895 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    119:121:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1071:1073 -> a
-    122:122:java.lang.Iterable blocks(java.util.function.Predicate):1093:1093 -> a
-    123:123:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1225:1225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Xk0;"}
-    124:124:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1233:1233 -> a
-    124:124:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/ig;"}
-    125:125:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1249:1249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/ig;"}
+    85:89:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):77:81 -> a
+    85:89:boolean consistentBlockInstructions(boolean):895 -> a
+    90:90:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
+    90:90:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):81 -> a
+    90:90:boolean consistentBlockInstructions(boolean):895 -> a
+    91:93:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):81:83 -> a
+    91:93:boolean consistentBlockInstructions(boolean):895 -> a
+    94:96:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):82:84 -> a
+    94:96:boolean consistentBlockInstructions(boolean):895 -> a
+    97:97:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    97:97:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):84 -> a
+    97:97:boolean consistentBlockInstructions(boolean):895 -> a
+    98:98:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
+    98:98:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):85 -> a
+    98:98:boolean consistentBlockInstructions(boolean):895 -> a
+    99:102:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):85:88 -> a
+    99:102:boolean consistentBlockInstructions(boolean):895 -> a
+    103:107:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean,boolean):87:91 -> a
+    103:107:boolean consistentBlockInstructions(boolean):895 -> a
+    108:112:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1029:1033 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+    113:113:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    113:113:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1033 -> a
+    114:116:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1033:1035 -> a
+    117:117:boolean lambda$verifyNoImpreciseOrBottomTypes$9(com.android.tools.r8.ir.code.Value):1034:1034 -> a
+    118:119:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1070:1071 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/bl0;)Z"}
+    120:120:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> a
+    120:120:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1071 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    121:123:boolean lambda$wrapSSAVerifierWithStackValueHandling$14(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):1071:1073 -> a
+    124:124:java.lang.Iterable blocks(java.util.function.Predicate):1093:1093 -> a
+    125:125:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1225:1225 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/bl0;"}
     126:126:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1233:1233 -> a
-    126:126:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1249 -> a
-    127:127:void lambda$removeRedundantBlocks$17(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi):1327:1327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/tW;)V"}
-    128:128:void com.android.tools.r8.ir.code.Phi.setBlock(com.android.tools.r8.ir.code.BasicBlock):95:95 -> a
-    128:128:void lambda$removeRedundantBlocks$17(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi):1327 -> a
+    126:126:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1229 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/kg;"}
+    127:127:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1249:1249 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/kg;"}
+    128:128:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1233:1233 -> a
+    128:128:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1249 -> a
+    129:129:void lambda$removeRedundantBlocks$17(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi):1327:1327 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/xW;)V"}
+    130:130:void com.android.tools.r8.ir.code.Phi.setBlock(com.android.tools.r8.ir.code.BasicBlock):95:95 -> a
+    130:130:void lambda$removeRedundantBlocks$17(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi):1327 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:129:void lambda$removeRedundantBlocks$18(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1330:1330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
-    130:132:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1354:1356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/ir/optimize/a;)Z"}
-    133:134:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
-    133:134:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1357 -> a
-    135:140:boolean isDeadPhi(com.android.tools.r8.utils.WorkList):1370:1375 -> a
-    135:140:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1358 -> a
-    141:141:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1362:1362 -> a
-    142:142:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):286:286 -> a
-    142:142:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1362 -> a
-    143:143:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1359:1359 -> a
-    144:144:void returnMarkingColor(int):1405:1405 -> a
-    145:145:boolean isMarkingColorInUse(int):1411:1411 -> a
-    145:145:void returnMarkingColor(int):1405 -> a
+    131:131:void lambda$removeRedundantBlocks$18(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1330:1330 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
+    132:134:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1354:1356 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/ir/optimize/a;)Z"}
+    135:136:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
+    135:136:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1357 -> a
+    137:142:boolean isDeadPhi(com.android.tools.r8.utils.WorkList):1370:1375 -> a
+    137:142:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1358 -> a
+    143:143:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1362:1362 -> a
+    144:144:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):286:286 -> a
+    144:144:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1362 -> a
+    145:145:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):1359:1359 -> a
     146:146:void returnMarkingColor(int):1405:1405 -> a
-    147:148:void clearMarks(int):504:505 -> a
-    147:148:void returnMarkingColor(int):1406 -> a
-    149:151:void com.android.tools.r8.ir.code.BasicBlock.clearMark(int):836:838 -> a
-    149:151:void clearMarks(int):505 -> a
-    149:151:void returnMarkingColor(int):1406 -> a
-    152:152:void returnMarkingColor(int):1407:1407 -> a
-    153:153:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1428:1428 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/lang/Iterable;"}
-    154:162:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1514:1522 -> a
-    154:162:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1429 -> a
-    163:168:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1430:1435 -> a
-    169:169:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
-    169:169:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
-    169:169:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1435 -> a
-    170:176:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1436:1442 -> a
-    177:177:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
-    177:177:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
-    177:177:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1442 -> a
-    178:178:java.util.Iterator lambda$getInstructionsReachableFrom$19(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1440:1440 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)Ljava/util/Iterator;"}
-    179:179:com.android.tools.r8.ir.code.BasicBlockInstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1799:1799 -> a
-    179:179:java.util.Iterator lambda$getInstructionsReachableFrom$19(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1440 -> a
-    180:181:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1547:1548 -> a
+    147:147:boolean isMarkingColorInUse(int):1411:1411 -> a
+    147:147:void returnMarkingColor(int):1405 -> a
+    148:148:void returnMarkingColor(int):1405:1405 -> a
+    149:150:void clearMarks(int):504:505 -> a
+    149:150:void returnMarkingColor(int):1406 -> a
+    151:153:void com.android.tools.r8.ir.code.BasicBlock.clearMark(int):836:838 -> a
+    151:153:void clearMarks(int):505 -> a
+    151:153:void returnMarkingColor(int):1406 -> a
+    154:154:void returnMarkingColor(int):1407:1407 -> a
+    155:155:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1428:1428 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/lang/Iterable;"}
+    156:164:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1514:1522 -> a
+    156:164:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1429 -> a
+    165:170:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1430:1435 -> a
+    171:171:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
+    171:171:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
+    171:171:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1435 -> a
+    172:178:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1436:1442 -> a
+    179:179:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
+    179:179:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
+    179:179:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1442 -> a
+    180:180:java.util.Iterator lambda$getInstructionsReachableFrom$19(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1440:1440 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)Ljava/util/Iterator;"}
+    181:181:com.android.tools.r8.ir.code.BasicBlockInstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1799:1799 -> a
+    181:181:java.util.Iterator lambda$getInstructionsReachableFrom$19(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1440 -> a
+    182:183:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1547:1548 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;)V"}
-    182:182:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1563:1563 -> a
-    182:182:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1548 -> a
-    183:192:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1549:1558 -> a
-    193:193:boolean lambda$removeUnreachableBlocks$20(int,com.android.tools.r8.ir.code.BasicBlock):1554:1554 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;)Z"}
-    194:194:void markTransitiveSuccessors(java.util.Deque,int):1567:1567 -> a
+    184:184:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1563:1563 -> a
+    184:184:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1548 -> a
+    185:194:void removeUnreachableBlocks(com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer):1549:1558 -> a
+    195:195:boolean lambda$removeUnreachableBlocks$20(int,com.android.tools.r8.ir.code.BasicBlock):1554:1554 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;)Z"}
+    196:196:void markTransitiveSuccessors(java.util.Deque,int):1567:1567 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayDeque;I)V"}
-    195:195:boolean isMarkingColorInUse(int):1411:1411 -> a
-    195:195:void markTransitiveSuccessors(java.util.Deque,int):1567 -> a
-    196:197:boolean anyBlocksMarkedWithColor(int):1415:1416 -> a
-    196:197:void markTransitiveSuccessors(java.util.Deque,int):1567 -> a
-    198:207:void markTransitiveSuccessors(java.util.Deque,int):1567:1576 -> a
-    208:208:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588:1588 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
-    209:209:boolean isMarkingColorInUse(int):1411:1411 -> a
-    209:209:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588 -> a
-    210:221:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588:1599 -> a
-    222:222:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1745:1745 -> a
-    222:222:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):394 -> a
+    197:197:boolean isMarkingColorInUse(int):1411:1411 -> a
+    197:197:void markTransitiveSuccessors(java.util.Deque,int):1567 -> a
+    198:199:boolean anyBlocksMarkedWithColor(int):1415:1416 -> a
+    198:199:void markTransitiveSuccessors(java.util.Deque,int):1567 -> a
+    200:209:void markTransitiveSuccessors(java.util.Deque,int):1567:1576 -> a
+    210:210:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588:1588 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
+    211:211:boolean isMarkingColorInUse(int):1411:1411 -> a
+    211:211:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588 -> a
+    212:223:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1588:1599 -> a
+    224:224:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1745:1745 -> a
+    224:224:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):394 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
-    223:224:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1745:1746 -> a
-    223:224:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):394 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
+    225:226:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1745:1746 -> a
+    225:226:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):394 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72:72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(com.android.tools.r8.ir.code.BasicBlock,java.util.function.BiFunction,java.lang.Object):1466:1466 -> b
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalPredecessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72 -> b
     3:3:void mutateConversionOptions(java.util.function.Consumer):193:193 -> b
@@ -114884,33 +114844,33 @@
     160:160:boolean isConsistentGraph(com.android.tools.r8.graph.AppView,boolean):694 -> b
     161:161:boolean isConsistentGraph(com.android.tools.r8.graph.AppView,boolean):694:694 -> b
     162:162:java.util.Collection lambda$consistentPredecessorSuccessors$5(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):841:841 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/G5;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/I5;)Ljava/util/Collection;"}
     163:164:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):1044:1045 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     165:165:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> b
     165:165:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):1045 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     166:166:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):1045:1045 -> b
     167:167:boolean lambda$verifyNoNullabilityBottomTypes$10(com.android.tools.r8.ir.code.Value):1044:1044 -> b
     168:168:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):1055:1055 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     169:169:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     169:169:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):1055 -> b
     170:170:java.lang.Iterable instructions(java.util.function.Predicate):1105:1105 -> b
     171:171:java.util.Iterator argumentIterator():1162:1162 -> b
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72:72 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(com.android.tools.r8.ir.code.BasicBlock,java.util.function.BiFunction,java.lang.Object):1474:1474 -> c
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseNormalSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):72 -> c
     3:5:boolean isConsistentSSAAllowingRedundantBlocks(com.android.tools.r8.graph.AppView):621:623 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     6:6:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):852:852 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/G5;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/I5;)Ljava/util/Collection;"}
     7:12:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):1054:1059 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     13:19:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$13(com.android.tools.r8.ir.code.Value):1054:1060 -> c
     20:20:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):1058:1058 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
     21:21:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Instruction):1058 -> c
     22:22:java.util.Iterator lambda$blocks$15(java.util.function.Predicate):1093:1093 -> c
@@ -114945,7 +114905,7 @@
     129:129:boolean verifyInvokeInterface(com.android.tools.r8.graph.AppView):652 -> d
     130:130:boolean verifyInvokeInterface(com.android.tools.r8.graph.AppView):653:653 -> d
     131:131:java.util.Collection lambda$consistentPredecessorSuccessors$7(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):859:859 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/G5;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/I5;)Ljava/util/Collection;"}
     132:132:java.util.Iterator lambda$instructions$16(java.util.function.Predicate):1105:1105 -> d
     133:133:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):53:53 -> d
     133:133:java.util.Iterator lambda$instructions$16(java.util.function.Predicate):1105 -> d
@@ -115006,11 +114966,11 @@
     1:1:com.android.tools.r8.graph.ProgramMethod context():167:167 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():176:176 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions getConversionOptions():189:189 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UN$a;"}
     1:1:com.android.tools.r8.ir.code.Position getEntryPosition():185:185 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.ir.code.Argument getLastArgument():1205:1205 -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c3;"}
     2:2:com.android.tools.r8.ir.code.BasicBlockInstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1795:1795 -> m
@@ -115020,7 +114980,7 @@
     4:6:com.android.tools.r8.ir.code.Argument getLastArgument():1206:1208 -> m
     1:2:int getNumberOfArguments():1157:1158 -> n
     1:6:com.android.tools.r8.ir.code.Value getThis():1213:1218 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     7:7:boolean com.android.tools.r8.ir.code.Value.isThis():1016:1016 -> o
     7:7:com.android.tools.r8.ir.code.Value getThis():1219 -> o
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115030,9 +114990,9 @@
     4:4:java.util.Set getUnreachableBlocks():1529 -> p
     5:10:java.util.Set getUnreachableBlocks():1530:1535 -> p
     1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1109:1109 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jw;"}
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator instructionListIterator():1113:1113 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lw;"}
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator instructionListIterator():1113:1113 -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nw;"}
     1:1:java.lang.Iterable instructions():1097:1097 -> s
     1:1:boolean isConsistentSSABeforeTypesAreCorrect(com.android.tools.r8.graph.AppView):628:628 -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -115074,9 +115034,9 @@
     35:35:boolean isConsistentSSABeforeTypesAreCorrectAllowingRedundantBlocks(com.android.tools.r8.graph.AppView):638 -> u
     36:36:boolean isConsistentSSABeforeTypesAreCorrectAllowingRedundantBlocks(com.android.tools.r8.graph.AppView):639:639 -> u
     1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1127:1127 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/K5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/M5;"}
     1:1:com.android.tools.r8.ir.code.IRMetadata metadata():163:163 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kt;"}
     1:1:com.android.tools.r8.graph.DexEncodedMethod method():172:172 -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1;"}
     1:23:void prepareBlocksForCatchHandlers():363:385 -> y
@@ -115088,30 +115048,30 @@
     29:35:void prepareBlocksForCatchHandlers():388:394 -> y
     1:1:boolean removeAllDeadAndTrivialPhis():1341:1341 -> z
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.xt:
+com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.zt:
 # {"id":"sourceFile","fileName":"IRCode.java"}
     com.android.tools.r8.ir.code.InstructionIterator instructionIterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
     com.android.tools.r8.ir.code.Argument next -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c3;"}
     1:4:void <init>(com.android.tools.r8.ir.code.IRCode):1162:1165 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:boolean hasNext():1169:1169 -> hasNext
     1:5:com.android.tools.r8.ir.code.Argument next():1174:1178 -> next
     1:5:java.lang.Object next():1162 -> next
     6:6:com.android.tools.r8.ir.code.Argument next():1175:1175 -> next
     6:6:java.lang.Object next():1162 -> next
-com.android.tools.r8.ir.code.IRCode$BasicBlockIteratorCallback -> com.android.tools.r8.internal.yt:
+com.android.tools.r8.ir.code.IRCode$BasicBlockIteratorCallback -> com.android.tools.r8.internal.At:
 # {"id":"sourceFile","fileName":"IRCode.java"}
     void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.zt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.Bt:
 # {"id":"sourceFile","fileName":"IRCode.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):116:117 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.At:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.Ct:
 # {"id":"sourceFile","fileName":"IRCode.java"}
     java.util.LinkedHashSet liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -115124,18 +115084,18 @@
     1:1:boolean isEmpty():106:106 -> a
     1:2:boolean equals(java.lang.Object):101:102 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.Ct:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.Et:
 # {"id":"sourceFile","fileName":"IRCodeInstructionIterator.java"}
     java.util.ListIterator blockIterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M5;"}
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L5;"}
     com.android.tools.r8.ir.code.IRCode code -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.IRCode):17:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:boolean hasNext():25:25 -> hasNext
     1:1:boolean hasPrevious():43:43 -> hasPrevious
     1:9:com.android.tools.r8.ir.code.Instruction next():30:38 -> next
@@ -115143,20 +115103,20 @@
     10:10:com.android.tools.r8.ir.code.Instruction next():34:34 -> next
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.Dt:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.Ft:
 # {"id":"sourceFile","fileName":"IRCodeInstructionListIterator.java"}
     com.android.tools.r8.ir.code.BasicBlockIterator blockIterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M5;"}
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L5;"}
     com.android.tools.r8.ir.code.IRCode code -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode):32:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     4:4:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.code.IRCode):35 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115164,49 +115124,49 @@
     5:5:void <init>(com.android.tools.r8.ir.code.IRCode):35 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.code.IRCode):35:35 -> <init>
     1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/bl0;"}
     3:3:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/NB;"}
     4:4:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):63:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
     6:6:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
     7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     8:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
     9:9:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)V"}
     10:10:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
     11:11:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     12:12:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/I5;"}
     14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/I5;"}
     15:15:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions,java.util.function.UnaryOperator):151:151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/gB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/iB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/I5;"}
     16:16:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):162:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/I5;"}
     17:17:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):243:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Nw;"}
     18:18:com.android.tools.r8.ir.code.BasicBlock addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/I5;"}
     19:19:void set(java.util.Collection):269:269 -> a
     20:20:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):274:274 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Ljava/util/Set;)V"}
     1:1:void add(java.lang.Object):25:25 -> add
     2:2:void add(com.android.tools.r8.ir.code.Instruction):234:234 -> add
     2:2:void add(java.lang.Object):25 -> add
     1:2:com.android.tools.r8.ir.code.Instruction peekNext():186:187 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> h
     3:3:com.android.tools.r8.ir.code.Instruction peekNext():187 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115257,7 +115217,7 @@
     13:13:java.lang.Object next():25 -> next
     1:1:int nextIndex():224:224 -> nextIndex
     1:2:com.android.tools.r8.ir.code.Instruction peekPrevious():215:216 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasPrevious():53:53 -> p
     3:3:com.android.tools.r8.ir.code.Instruction peekPrevious():216 -> p
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115269,7 +115229,7 @@
     7:7:com.android.tools.r8.ir.code.Instruction peekPrevious():217:217 -> p
     1:1:java.lang.Object previous():25:25 -> previous
     2:5:com.android.tools.r8.ir.code.Instruction previous():200:203 -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasPrevious():53:53 -> previous
     6:6:com.android.tools.r8.ir.code.Instruction previous():203 -> previous
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115289,15 +115249,15 @@
     2:2:void set(com.android.tools.r8.ir.code.Instruction):264:264 -> set
     2:2:void set(java.lang.Object):25 -> set
     1:1:void removeInstructionIgnoreOutValue():110:110 -> u
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.Et:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.Gt:
 # {"id":"sourceFile","fileName":"IRCodeUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/IB;"}
     8:8:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.create():32:32 -> a
     8:8:com.android.tools.r8.utils.collections.ProgramFieldMap findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.collections.ProgramFieldSet):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/rY;)Lcom/android/tools/r8/internal/qY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/vY;)Lcom/android/tools/r8/internal/uY;"}
     9:11:com.android.tools.r8.utils.collections.ProgramFieldMap findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.collections.ProgramFieldSet):50:52 -> a
     12:12:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.contains(com.android.tools.r8.graph.ProgramField):66:66 -> a
     12:12:com.android.tools.r8.utils.collections.ProgramFieldMap findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.collections.ProgramFieldSet):53 -> a
@@ -115310,7 +115270,7 @@
     17:17:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
     17:17:com.android.tools.r8.utils.collections.ProgramFieldMap findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.collections.ProgramFieldSet):58 -> a
     18:35:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):73:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;)V"}
     36:36:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
     36:36:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):91 -> a
     37:39:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):92:94 -> a
@@ -115319,11 +115279,11 @@
     41:50:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):94:103 -> a
     51:51:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):101:101 -> a
     52:80:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):120:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ArrayDeque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ArrayDeque;)V"}
     81:81:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     81:81:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):149 -> a
     82:85:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):149:152 -> a
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.It:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.Kt:
 # {"id":"sourceFile","fileName":"IRMetadata.java"}
     long first -> b
     long second -> c
@@ -115335,7 +115295,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():11:11 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:long lambda$specify$0(com.android.tools.r8.ir.code.IRMetadata):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;)J"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;)J"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):17:17 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:5:boolean get(int):43:45 -> a
@@ -115343,7 +115303,7 @@
     6:6:boolean get(int):47 -> a
     7:7:boolean isAnySetInFirst(long):52:52 -> a
     8:8:void record(com.android.tools.r8.ir.code.Instruction):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     9:13:void set(int):61:65 -> a
     9:13:void record(int):74 -> a
     9:13:void record(com.android.tools.r8.ir.code.Instruction):70 -> a
@@ -115375,7 +115335,7 @@
     27:27:boolean mayHaveArithmeticOrLogicalBinop():364 -> a
     28:28:boolean mayHaveArithmeticOrLogicalBinop():353:353 -> a
     1:1:long lambda$specify$1(com.android.tools.r8.ir.code.IRMetadata):17:17 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;)J"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;)J"}
     2:3:boolean mayHaveFieldInstruction():148:149 -> b
     4:4:boolean mayHaveInstanceGet():166:166 -> b
     4:4:boolean mayHaveFieldInstruction():150 -> b
@@ -115418,29 +115378,29 @@
     4:4:boolean mayHaveSwitch():313 -> g
     5:5:boolean mayHaveSwitch():313:313 -> g
     1:1:com.android.tools.r8.ir.code.IRMetadata unknown():28:28 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kt;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():38:38 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.bu:
 # {"id":"sourceFile","fileName":"If.java"}
     com.android.tools.r8.ir.code.IfType type -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.Value):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/bl0;)V"}
     3:4:void <init>(com.android.tools.r8.ir.code.IfType,java.util.List):37:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Ljava/util/List;)V"}
     1:1:int maxInValueRegister():153:153 -> F2
     1:1:int maxOutValueRegister():158:158 -> G2
     1:1:int opcode():43:43 -> H2
     1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():104:107 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():89:92 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:boolean isIf():237:237 -> M1
     1:1:com.android.tools.r8.ir.code.IfType getType():78:78 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     1:2:void invert():82:83 -> N2
     3:6:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):96:99 -> N2
     3:6:void invert():83 -> N2
@@ -115451,35 +115411,35 @@
     3:3:boolean isInstanceOfTest():53:53 -> O2
     1:1:boolean isZeroTest():65:65 -> P2
     1:1:com.android.tools.r8.ir.code.Value lhs():69:69 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:2:com.android.tools.r8.ir.code.Value rhs():73:74 -> R2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():205:207 -> S2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.ir.code.If asIf():242:242 -> T
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
     1:1:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.IfType):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/bu;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/du;)Z"}
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     2:2:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.IfType):24 -> a
     3:3:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
     3:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.IfType):25 -> a
     4:5:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.IfType):25:26 -> a
     6:6:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     7:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):193:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ig;Lcom/android/tools/r8/internal/ig;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kg;Lcom/android/tools/r8/internal/kg;)Lcom/android/tools/r8/internal/I5;"}
     11:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(long,long):200:201 -> a
     11:12:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):196 -> a
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):247:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     14:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):252:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     22:29:void buildLir(com.android.tools.r8.lightir.LirBuilder):264:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     30:30:void com.android.tools.r8.ir.conversion.DexBuilder.addIf(com.android.tools.r8.ir.code.If):708:708 -> a
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     31:31:void com.android.tools.r8.ir.conversion.DexBuilder.addIf(com.android.tools.r8.ir.code.If):708:708 -> a
     31:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115489,11 +115449,11 @@
     34:34:void com.android.tools.r8.ir.conversion.DexBuilder.addIf(com.android.tools.r8.ir.code.If):709:709 -> a
     34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):118 -> a
     1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):112:113 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):164:169 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):217:232 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/I5;"}
     25:25:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):230:230 -> b
     26:26:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):228:228 -> b
     27:27:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):226:226 -> b
@@ -115501,52 +115461,52 @@
     29:29:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):222:222 -> b
     30:30:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):220:220 -> b
     1:16:java.lang.String toString():133:148 -> toString
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Yt:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.au:
 # {"id":"sourceFile","fileName":"If.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():218:218 -> <clinit>
-com.android.tools.r8.ir.code.IfType -> com.android.tools.r8.internal.bu:
+com.android.tools.r8.ir.code.IfType -> com.android.tools.r8.internal.du:
 # {"id":"sourceFile","fileName":"IfType.java"}
     com.android.tools.r8.ir.code.IfType EQ -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType GE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType GT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType LE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType LT -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType NE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/du;"}
     com.android.tools.r8.ir.code.IfType[] $VALUES -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/du;"}
     1:6:void <clinit>():9:14 -> <clinit>
     7:7:void <clinit>():8:8 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:15:com.android.tools.r8.ir.code.IfType inverted():40:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/du;"}
     16:16:com.android.tools.r8.ir.code.IfType inverted():50:50 -> a
     17:17:com.android.tools.r8.ir.code.IfType inverted():48:48 -> a
     18:18:com.android.tools.r8.ir.code.IfType inverted():46:46 -> a
     19:27:com.android.tools.r8.ir.code.IfType inverted():44:52 -> a
     28:28:com.android.tools.r8.ir.code.IfType inverted():42:42 -> a
     1:1:com.android.tools.r8.ir.code.IfType[] values():8:8 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/bu;"}
-com.android.tools.r8.ir.code.IfType$1 -> com.android.tools.r8.internal.au:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/du;"}
+com.android.tools.r8.ir.code.IfType$1 -> com.android.tools.r8.internal.cu:
 # {"id":"sourceFile","fileName":"IfType.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.code.IgnoreDebugLocalWriteAliasedValueConfiguration -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.ir.code.IgnoreDebugLocalWriteAliasedValueConfiguration -> com.android.tools.r8.internal.eu:
 # {"id":"sourceFile","fileName":"IgnoreDebugLocalWriteAliasedValueConfiguration.java"}
     com.android.tools.r8.ir.code.IgnoreDebugLocalWriteAliasedValueConfiguration INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eu;"}
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     2:2:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25 -> a
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> a
@@ -115556,39 +115516,39 @@
     7:7:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27 -> a
     8:9:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28:29 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.ov:
 # {"id":"sourceFile","fileName":"ImpreciseMemberTypeInstruction.java"}
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zi0;)V"}
     com.android.tools.r8.ir.code.MemberType getMemberType() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oN;"}
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.qv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sN;"}
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.sv:
 # {"id":"sourceFile","fileName":"Inc.java"}
     int increment -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,int):27:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;I)V"}
     1:1:int maxInValueRegister():65:65 -> F2
     1:1:int maxOutValueRegister():70:70 -> G2
     1:1:int opcode():34:34 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:void buildLir(com.android.tools.r8.lightir.LirBuilder):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     7:7:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):775:775 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100 -> a
     8:8:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):775:775 -> a
@@ -115628,18 +115588,18 @@
     25:25:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction[]):767:767 -> a
     25:25:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):108 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):49:50 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:java.lang.String toString():118:118 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Gv:
 # {"id":"sourceFile","fileName":"InitClass.java"}
     com.android.tools.r8.graph.DexType clazz -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):33:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):35 -> <init>
     5:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):35:37 -> <init>
@@ -115650,7 +115610,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean isInitClass():50:50 -> N1
     1:1:com.android.tools.r8.ir.code.InitClass asInitClass():55:55 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gv;"}
     1:1:com.android.tools.r8.graph.DexType getClassValue():45:45 -> a
     1:1:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):245 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115659,20 +115619,20 @@
     2:3:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):245:246 -> a
     2:3:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):95 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     5:5:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     9:9:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInitClass(com.android.tools.r8.graph.DexType):1110 -> a
     9:9:void buildLir(com.android.tools.r8.lightir.LirBuilder):85 -> a
     10:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):113:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     13:13:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     13:13:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):121 -> a
     14:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):122:125 -> a
@@ -115684,46 +115644,46 @@
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163 -> a
     21:21:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     22:22:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):184:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):134:141 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():173:173 -> c1
     1:1:boolean instructionTypeCanThrow():147:147 -> o
     1:1:java.lang.String toString():178:178 -> toString
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.Dv:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.Fv:
 # {"id":"sourceFile","fileName":"InitClass.java"}
     com.android.tools.r8.graph.DexType type -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:1:void <init>():190:190 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.hw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.jw:
 # {"id":"sourceFile","fileName":"InstanceFieldInstruction.java"}
     com.android.tools.r8.ir.code.Value object() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.mw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.ow:
 # {"id":"sourceFile","fileName":"InstanceGet.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void com.android.tools.r8.ir.code.FieldInstruction.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:36 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():143:143 -> F2
     1:1:int maxOutValueRegister():148:148 -> G2
     1:1:int opcode():65:65 -> H2
     1:1:boolean throwsOnNullInput():230:230 -> J2
     1:1:com.android.tools.r8.ir.code.FieldGet asFieldGet():174:174 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kp;"}
     1:1:com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction():184:184 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jw;"}
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():235:235 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.InstanceGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/mw;)Lcom/android/tools/r8/internal/mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ow;)Lcom/android/tools/r8/internal/ow;"}
     2:2:com.android.tools.r8.ir.code.InstanceGet copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InstanceGet):55:55 -> a
     2:2:com.android.tools.r8.ir.code.InstanceGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet):51 -> a
     3:3:com.android.tools.r8.ir.code.InstanceGet$Builder builder():46:46 -> a
@@ -115745,7 +115705,7 @@
     9:9:boolean outTypeKnownToBeBoolean(java.util.Set):70:70 -> a
     10:10:com.android.tools.r8.ir.code.Value dest():79:79 -> a
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     11:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):102:131 -> a
     41:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
     42:61:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):109:128 -> a
@@ -115754,7 +115714,7 @@
     64:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:119 -> a
     65:82:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:133 -> a
     83:85:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):95:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     86:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):164:164 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
@@ -115762,15 +115722,15 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:88:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstanceGet):174:174 -> a
     88:88:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     89:89:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     90:90:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     91:92:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):214:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     93:93:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):220:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     94:94:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):271:271 -> a
     94:94:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115778,7 +115738,7 @@
     95:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):220 -> a
     97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):220:220 -> a
     98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     99:99:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):255:255 -> a
     99:99:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):245 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
@@ -115787,52 +115747,52 @@
     101:101:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInstanceFieldRead(com.android.tools.r8.graph.DexField):72:72 -> a
     101:101:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):261 -> a
     102:102:void buildLir(com.android.tools.r8.lightir.LirBuilder):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     103:103:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstanceGet(com.android.tools.r8.graph.DexField,java.lang.Object):717:717 -> a
     103:103:void buildLir(com.android.tools.r8.lightir.LirBuilder):266 -> a
     104:104:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstanceGet(com.android.tools.r8.graph.DexField,java.lang.Object):716:716 -> a
     104:104:void buildLir(com.android.tools.r8.lightir.LirBuilder):266 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):157:158 -> b
     1:1:com.android.tools.r8.ir.code.InstanceGet asInstanceGet():194:194 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ow;"}
     2:2:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):251:251 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean instructionTypeCanBeCanonicalized():256:256 -> h1
     1:2:com.android.tools.r8.ir.code.Value object():84:85 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean instructionTypeCanThrow():138:138 -> o
     1:1:java.lang.String toString():199:199 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():90:90 -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.InstanceGet$Builder -> com.android.tools.r8.internal.lw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.InstanceGet$Builder -> com.android.tools.r8.internal.nw:
 # {"id":"sourceFile","fileName":"InstanceGet.java"}
     com.android.tools.r8.graph.DexField field -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     1:1:void <init>():269:269 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():269:269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.xw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.zw:
 # {"id":"sourceFile","fileName":"InstanceOf.java"}
     com.android.tools.r8.graph.DexType type -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:int maxInValueRegister():64:64 -> F2
     1:1:int maxOutValueRegister():69:69 -> G2
     1:1:int opcode():35:35 -> H2
     1:1:com.android.tools.r8.graph.DexType type():44:44 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.code.InstanceOf asInstanceOf():90:90 -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zw;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value dest():48:48 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -115850,7 +115810,7 @@
     10:10:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.dex.code.DexInstanceOf):676:676 -> a
     10:10:void com.android.tools.r8.ir.conversion.DexBuilder.addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):700 -> a
     10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtInstanceOfVerifierBug():3032:3032 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtInstanceOfVerifierBug():3038:3038 -> a
     11:11:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.dex.code.DexInstanceOf):676 -> a
     11:11:void com.android.tools.r8.ir.conversion.DexBuilder.addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):700 -> a
     11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
@@ -115867,17 +115827,17 @@
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):108:108 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):96 -> a
     30:30:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     31:32:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):111:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     33:33:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     34:34:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):138:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     35:35:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInstanceOf(com.android.tools.r8.graph.DexType):140:140 -> a
     35:35:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):138 -> a
     36:36:void buildLir(com.android.tools.r8.lightir.LirBuilder):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     37:37:com.android.tools.r8.ir.code.Value value():52:52 -> a
     37:37:void buildLir(com.android.tools.r8.lightir.LirBuilder):143 -> a
     38:38:void buildLir(com.android.tools.r8.lightir.LirBuilder):143:143 -> a
@@ -115886,7 +115846,7 @@
     40:40:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstanceOf(com.android.tools.r8.graph.DexType,java.lang.Object):702:702 -> a
     40:40:void buildLir(com.android.tools.r8.lightir.LirBuilder):143 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
@@ -115895,29 +115855,29 @@
     1:1:boolean hasInvariantOutType():106:106 -> c1
     1:1:boolean instructionTypeCanThrow():74:74 -> o
     1:2:java.lang.String toString():132:133 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Cw:
 # {"id":"sourceFile","fileName":"InstancePut.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():40:40 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,boolean):55:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Z)V"}
     1:1:int maxInValueRegister():202:202 -> F2
     1:1:int maxOutValueRegister():207:207 -> G2
     1:1:int opcode():64:64 -> H2
     1:1:boolean throwsOnNullInput():269:269 -> J2
     1:1:boolean isInstanceFieldInstruction():229:229 -> O1
     1:1:com.android.tools.r8.ir.code.FieldPut asFieldPut():224:224 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tp;"}
     1:1:com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction():234:234 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jw;"}
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():274:274 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.InstancePut createPotentiallyInvalid(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Aw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Cw;"}
     2:2:void setValue(com.android.tools.r8.ir.code.Value):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     3:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:105 -> a
     33:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:120 -> a
     53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):117:117 -> a
@@ -115925,19 +115885,19 @@
     55:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
     56:73:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):108:125 -> a
     74:84:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):172:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     85:85:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InstancePut):184:184 -> a
     85:85:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     86:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):112:112 -> a
     87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:88:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):254:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     89:89:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):259:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     90:90:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):271:271 -> a
     90:90:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115948,19 +115908,19 @@
     94:94:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):284 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     95:95:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):264:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     96:96:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):295:295 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     97:97:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):82:82 -> a
     97:97:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):295 -> a
     98:98:void buildLir(com.android.tools.r8.lightir.LirBuilder):300:300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     99:99:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstancePut(com.android.tools.r8.graph.DexField,java.lang.Object,java.lang.Object):722:722 -> a
     99:99:void buildLir(com.android.tools.r8.lightir.LirBuilder):300 -> a
     100:100:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInstancePut(com.android.tools.r8.graph.DexField,java.lang.Object,java.lang.Object):721:721 -> a
     100:100:void buildLir(com.android.tools.r8.lightir.LirBuilder):300 -> a
     1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):139:149 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> b
     12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):151 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -115971,58 +115931,58 @@
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):156 -> b
     16:21:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157:162 -> b
     22:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):193:197 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):290:290 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:int getValueIndex():74:74 -> g
     1:1:boolean isInstancePut():239:239 -> h
     1:1:com.android.tools.r8.ir.code.InstancePut asInstancePut():244:244 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Aw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cw;"}
     1:1:com.android.tools.r8.ir.code.Value object():79:79 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean instructionTypeCanThrow():130:130 -> o
     1:1:java.lang.String toString():249:249 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():84:84 -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.Iw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.Kw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     com.android.tools.r8.ir.code.Value outValue -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.List inValues -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.code.BasicBlock block -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     int number -> e
     java.util.Set debugValues -> f
     com.android.tools.r8.ir.code.Position position -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():49:49 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):59:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:10:void <init>(com.android.tools.r8.ir.code.Value):52:60 -> <init>
     11:11:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):63:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     12:25:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):52:65 -> <init>
     26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):68:68 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/bl0;)V"}
     27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):52:74 -> <init>
     1:1:com.android.tools.r8.ir.code.Binop asBinop():836:836 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h6;"}
     1:1:com.android.tools.r8.ir.code.Pop asPop():1472:1472 -> A0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NW;"}
     1:1:boolean isConstNumber():864:864 -> A1
     1:1:boolean isSub():0:0 -> A2
     1:1:com.android.tools.r8.ir.code.CheckCast asCheckCast():852:852 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eb;"}
     1:1:com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues():756:756 -> B0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e20;"}
     1:1:boolean isConstString():924:924 -> B1
     1:1:boolean isSwitch():996:996 -> B2
     1:1:com.android.tools.r8.ir.code.Cmp asCmp():944:944 -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hd;"}
     1:1:com.android.tools.r8.ir.code.Rem asRem():1236:1236 -> C0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J40;"}
     1:1:boolean isNewArrayEmpty():0:0 -> C1
     1:1:boolean isCreatingArray():1524 -> C1
     2:3:boolean isCreatingArray():1525:1526 -> C1
@@ -116032,15 +115992,15 @@
     5:5:boolean isCreatingArray():1528 -> C1
     1:1:boolean isThrow():1164:1164 -> C2
     1:1:com.android.tools.r8.ir.code.ConstClass asConstClass():904:904 -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg;"}
     1:1:com.android.tools.r8.ir.code.ResourceConstNumber asResourceConstNumber():880:880 -> D0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n50;"}
     1:1:boolean isCreatingInstanceOrArray():1532:1532 -> D1
     1:1:boolean isUnop():840:840 -> D2
     1:1:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction():896:896 -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:1:com.android.tools.r8.ir.code.Return asReturn():1160:1160 -> E0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/O90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S90;"}
     1:1:boolean isDebugPosition():0:0 -> E1
     1:1:boolean isDebugInstruction():1320 -> E1
     2:2:boolean isDebugLocalsChange():0:0 -> E1
@@ -116053,143 +116013,143 @@
     5:5:boolean isDebugInstruction():1324 -> E1
     1:1:boolean isUnusedArgument():0:0 -> E2
     1:1:com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle():912:912 -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gg;"}
     1:1:com.android.tools.r8.ir.code.SafeCheckCast asSafeCheckCast():860:860 -> F0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ja0;"}
     1:1:boolean isDebugLocalWrite():0:0 -> F1
     int maxInValueRegister() -> F2
     1:1:com.android.tools.r8.ir.code.ConstMethodType asConstMethodType():920:920 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hg;"}
     1:1:com.android.tools.r8.ir.code.Shl asShl():1252:1252 -> G0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gb0;"}
     1:1:boolean isDebugPosition():0:0 -> G1
     int maxOutValueRegister() -> G2
     1:1:com.android.tools.r8.ir.code.ConstNumber asConstNumber():868:868 -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kg;"}
     1:1:com.android.tools.r8.ir.code.Shr asShr():1264:1264 -> H0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
     1:1:boolean isDexItemBasedConstString():0:0 -> H1
     int opcode() -> H2
     1:1:com.android.tools.r8.ir.code.ConstString asConstString():928:928 -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ng;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pg;"}
     1:1:com.android.tools.r8.ir.code.StaticGet asStaticGet():1180:1180 -> I0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ud0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yd0;"}
     1:1:boolean isFieldGet():0:0 -> I1
     1:1:com.android.tools.r8.ir.code.ValueType outType():237:237 -> I2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:1:com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite():1356:1356 -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nh;"}
     1:1:com.android.tools.r8.ir.code.StaticPut asStaticPut():1188:1188 -> J0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zd0;"}
     1:1:boolean isFieldInstruction():972:972 -> J1
     1:1:boolean throwsOnNullInput():1585:1585 -> J2
     1:1:com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange():1340:1340 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oh;"}
     1:1:com.android.tools.r8.ir.code.Store asStore():1480:1480 -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ae0;"}
     1:1:boolean isFieldPut():0:0 -> K1
     1:1:com.android.tools.r8.ir.code.DebugPosition asDebugPosition():1332:1332 -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Oh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qh;"}
     1:1:com.android.tools.r8.ir.code.StringSwitch asStringSwitch():1016:1016 -> L0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uf0;"}
     1:1:boolean isGoto():980:980 -> L1
     1:1:com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString():936:936 -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ll;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nl;"}
     1:1:com.android.tools.r8.ir.code.Sub asSub():1212:1212 -> M0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Uf0;"}
     1:1:boolean isIf():988:988 -> M1
     1:1:com.android.tools.r8.ir.code.Div asDiv():1228:1228 -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/em;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gm;"}
     1:1:com.android.tools.r8.ir.code.Switch asSwitch():1000:1000 -> N0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ag0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg0;"}
     1:1:boolean isInitClass():1192:1192 -> N1
     1:1:com.android.tools.r8.ir.code.Dup asDup():952:952 -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bm;"}
     1:1:com.android.tools.r8.ir.code.Throw asThrow():1168:1168 -> O0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ng0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rg0;"}
     1:1:boolean isInstanceFieldInstruction():0:0 -> O1
     1:1:com.android.tools.r8.ir.code.FieldGet asFieldGet():1048:1048 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kp;"}
     1:1:com.android.tools.r8.ir.code.Ushr asUshr():1276:1276 -> P0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qk0;"}
     1:1:boolean isInstanceGet():0:0 -> P1
     1:1:com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction():976:976 -> Q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/np;"}
     1:1:com.android.tools.r8.ir.code.Xor asXor():1308:1308 -> Q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hm0;"}
     1:1:boolean isInstanceOf():0:0 -> Q1
     1:1:com.android.tools.r8.ir.code.FieldPut asFieldPut():1056:1056 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tp;"}
     1:5:void clearDebugValues():327:331 -> R0
     1:1:boolean isIntSwitch():1004:1004 -> R1
     1:1:com.android.tools.r8.ir.code.Goto asGoto():984:984 -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs;"}
     1:1:com.android.tools.r8.ir.code.Value clearOutValue():170:170 -> S0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean isInvoke():1068:1068 -> S1
     1:1:com.android.tools.r8.ir.code.If asIf():992:992 -> T
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bu;"}
     1:1:java.util.Set getDebugValues():738:738 -> T0
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> T0
     2:2:java.util.Set getDebugValues():738 -> T0
     1:1:boolean isInvokeCustom():0:0 -> T1
     1:1:com.android.tools.r8.ir.code.InitClass asInitClass():1196:1196 -> U
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gv;"}
     1:1:com.android.tools.r8.ir.code.Value getFirstOperand():119:119 -> U0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean isInvokeDirect():1412:1412 -> U1
     1:1:com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction():1024:1024 -> V
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jw;"}
     1:1:java.lang.String getInstructionName():380:380 -> V0
     1:1:boolean isInvokeInterface():0:0 -> V1
     1:1:com.android.tools.r8.ir.code.InstanceOf asInstanceOf():1040:1040 -> W
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zw;"}
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1590:1590 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean isInvokeMethod():1364:1364 -> W1
     1:1:com.android.tools.r8.ir.code.IntSwitch asIntSwitch():1008:1008 -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wA;"}
     1:1:int getNumber():402:402 -> X0
     1:1:boolean isInvokeMethodWithReceiver():1376:1376 -> X1
     1:1:com.android.tools.r8.ir.code.Invoke asInvoke():1072:1072 -> Y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FB;"}
     1:1:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():725:725 -> Y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:1:boolean isInvokeMultiNewArray():0:0 -> Y1
     1:1:com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom():1404:1404 -> Z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GB;"}
     1:1:java.lang.String getPositionAsString():111:111 -> Z0
     1:1:boolean isInvokePolymorphic():0:0 -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     void buildLir(com.android.tools.r8.lightir.LirBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):0:0 -> a
     2:2:int com.android.tools.r8.ir.code.StackValue.getHeight():31:31 -> a
     2:2:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):568 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;)Z"}
     3:3:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():835:835 -> a
     3:3:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):568 -> a
     4:7:void setPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):97:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/iB;)V"}
     8:8:void setPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):98:98 -> a
     9:11:void forceOverwritePosition(com.android.tools.r8.ir.code.Position):105:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     12:12:java.util.List inValues():123:123 -> a
     12:12:com.android.tools.r8.ir.code.Value getOperand(int):115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bl0;"}
     13:13:com.android.tools.r8.ir.code.Value getOperand(int):115:115 -> a
     14:18:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):184:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;)Lcom/android/tools/r8/internal/bl0;"}
     19:21:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):199:201 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     22:22:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
@@ -116200,11 +116160,11 @@
     24:24:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):204 -> a
     25:25:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):206:206 -> a
     26:27:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():211:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     28:34:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):226:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     35:37:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):251:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     38:38:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:517 -> a
     38:38:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -116217,7 +116177,7 @@
     42:43:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):257 -> a
     44:45:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):258:259 -> a
     46:47:void replaceValue(int,com.android.tools.r8.ir.code.Value):264:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/bl0;)V"}
     48:48:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:517 -> a
     48:48:void replaceValue(int,com.android.tools.r8.ir.code.Value):266 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -116229,16 +116189,16 @@
     52:53:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
     52:53:void replaceValue(int,com.android.tools.r8.ir.code.Value):267 -> a
     54:55:void setBlock(com.android.tools.r8.ir.code.BasicBlock):348:349 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     56:57:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):507:508 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;)Z"}
     58:59:boolean identicalPosition(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):517:518 -> a
     58:59:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):511 -> a
     60:60:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
     60:60:boolean identicalPosition(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):518 -> a
     60:60:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):511 -> a
     61:67:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):526:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     68:68:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):109:109 -> a
     68:68:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):532 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -116302,29 +116262,29 @@
     198:198:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):662:662 -> a
     198:198:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):656 -> a
     199:199:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):677:677 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     200:202:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):682:684 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     203:203:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):707:707 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/f;)Z"}
     204:204:com.android.tools.r8.ir.code.ConstNumber asConstNumber(long):872:872 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/kg;"}
     205:205:com.android.tools.r8.ir.code.And asAnd(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1288:1288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/p2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/p2;"}
     206:206:boolean isInvokeMethod(com.android.tools.r8.graph.DexMethod):1368:1368 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     207:207:boolean isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):1408:1408 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Z"}
     208:208:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):1509:1509 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     209:210:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1546:1547 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     211:213:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1554:1556 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     214:214:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):1561:1561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     215:215:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1575:1575 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     216:216:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):1606:1606 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     217:218:boolean verifyValidPositionInfo(boolean):1610:1611 -> a
@@ -116347,32 +116307,32 @@
     229:229:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):1630:1630 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     1:1:com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect():1416:1416 -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IB;"}
     1:1:boolean hasBlock():376:376 -> a1
     1:1:boolean isInvokeStatic():1428:1428 -> a2
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:void setPosition(com.android.tools.r8.ir.code.Position):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     2:2:boolean hasPosition():82:82 -> b
     2:2:void setPosition(com.android.tools.r8.ir.code.Position):92 -> b
     3:4:void setPosition(com.android.tools.r8.ir.code.Position):92:93 -> b
     5:7:void addInValue(com.android.tools.r8.ir.code.Value):128:130 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     8:9:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:518 -> b
     8:9:void addInValue(com.android.tools.r8.ir.code.Value):131 -> b
     10:11:com.android.tools.r8.ir.code.BasicBlock getBlock():340:341 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):625:625 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):630:630 -> b
     13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):624 -> b
     14:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):645:645 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     15:15:com.android.tools.r8.ir.code.Or asOr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1300:1300 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/XU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bV;"}
     1:1:com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface():1424:1424 -> b0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LB;"}
     1:1:boolean hasInValueWithLocalInfo():141:141 -> b1
     2:2:java.util.List inValues():123:123 -> b1
     2:2:boolean hasInValueThatMatches(java.util.function.Predicate):145 -> b1
@@ -116383,7 +116343,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:4:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):289:292 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     5:5:void com.android.tools.r8.ir.code.Value.replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):714:714 -> c
     5:5:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):293 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -116391,104 +116351,104 @@
     6:9:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):293 -> c
     10:10:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):295:295 -> c
     11:11:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):703:703 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     12:12:com.android.tools.r8.ir.code.InstanceGet asInstanceGet():1032:1032 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ow;"}
     13:13:com.android.tools.r8.ir.code.Shl asShl(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1256:1256 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/gb0;"}
     1:1:com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod():1372:1372 -> c0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NB;"}
     boolean hasInvariantOutType() -> c1
     1:1:boolean isInvokeVirtual():1444:1444 -> c2
     1:1:com.android.tools.r8.ir.code.Value outValue():166:166 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:5:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):175:178 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     6:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):692:696 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/q;"}
     11:11:com.android.tools.r8.ir.code.Shr asShr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1268:1268 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/gb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/kb0;"}
     1:1:com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver():1380:1380 -> d0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OB;"}
     1:1:boolean hasOutValue():154:154 -> d1
     1:1:boolean isJumpInstruction():964:964 -> d2
     1:13:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):272:284 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     14:14:boolean isStaticPut():1184:1184 -> e
     1:1:com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray():1396:1396 -> e0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PB;"}
     1:1:boolean hasUnusedOutValue():158:158 -> e1
     1:1:boolean isLoad():0:0 -> e2
     1:1:com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic():1456:1456 -> f0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QB;"}
     1:1:boolean hasUsedOutValue():162:162 -> f1
     1:1:boolean isLogicalBinop():1240:1240 -> f2
     1:1:com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic():1432:1432 -> g0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YB;"}
     1:1:java.util.List inValues():123:123 -> g1
     1:1:boolean isMonitor():0:0 -> g2
     1:2:com.android.tools.r8.ir.code.Position getPosition():87:88 -> getPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:boolean isInstancePut():1060:1060 -> h
     1:1:com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper():1440:1440 -> h0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZB;"}
     1:1:boolean instructionTypeCanBeCanonicalized():0:0 -> h1
     1:1:boolean isMonitorEnter():1080:1080 -> h2
     1:1:com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual():1448:1448 -> i0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eC;"}
     1:1:boolean isAdd():1200:1200 -> i1
     1:1:boolean isMove():1088:1088 -> i2
     1:1:com.android.tools.r8.ir.code.InstancePut asInstancePut():1064:1064 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Aw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cw;"}
     1:1:com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction():968:968 -> j0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hD;"}
     1:1:boolean isAllowedAfterThrowingInstruction():0:0 -> j1
     1:1:boolean isMoveException():0:0 -> j2
     1:1:com.android.tools.r8.ir.code.Instruction asInstruction():748:748 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.code.Load asLoad():1496:1496 -> k0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nL;"}
     1:1:boolean isAnd():0:0 -> k1
     1:1:boolean isNewArrayEmpty():0:0 -> k2
     1:1:com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop():1244:1244 -> l0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zL;"}
     1:1:boolean isArgument():792:792 -> l1
     1:1:boolean isNewArrayEmpty():0:0 -> l2
     1:1:boolean isNewArrayEmptyOrNewArrayFilled():1100 -> l2
     2:2:boolean isNewArrayEmptyOrNewArrayFilled():1100:1100 -> l2
     1:1:com.android.tools.r8.ir.code.Monitor asMonitor():1084:1084 -> m0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XO;"}
     1:1:boolean isArithmeticBinop():808:808 -> m1
     1:1:boolean isNewArrayFilled():1384:1384 -> m2
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():734:734 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
     1:1:com.android.tools.r8.ir.code.Move asMove():1092:1092 -> n0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bP;"}
     1:1:boolean isArrayAccess():760:760 -> n1
     1:1:boolean isNewArrayFilledData():1108:1108 -> n2
     1:1:boolean instructionTypeCanThrow():620:620 -> o
     1:1:com.android.tools.r8.ir.code.MoveException asMoveException():1316:1316 -> o0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cP;"}
     1:1:boolean isArrayGet():768:768 -> o1
     1:1:boolean isNewInstance():1124:1124 -> o2
     1:1:com.android.tools.r8.ir.code.Mul asMul():1220:1220 -> p0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fP;"}
     1:1:boolean isArrayLength():0:0 -> p1
     1:1:boolean isNumberConversion():1148:1148 -> p2
     1:1:com.android.tools.r8.ir.code.Neg asNeg():1120:1120 -> q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dQ;"}
     1:1:boolean isArrayPut():784:784 -> q1
     1:1:boolean isOr():0:0 -> q2
     1:1:com.android.tools.r8.ir.code.Add asAdd():1204:1204 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a2;"}
     1:1:com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty():1104:1104 -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mQ;"}
     1:1:boolean isAssume():0:0 -> r1
     1:1:boolean isOutConstant():0:0 -> r2
     1:1:com.android.tools.r8.ir.code.And asAnd():1284:1284 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/p2;"}
     1:1:com.android.tools.r8.ir.code.NewArrayFilled asNewArrayFilled():1388:1388 -> s0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oQ;"}
     1:1:boolean isAssume():0:0 -> s1
     1:1:boolean isAssumeWithDynamicTypeAssumption():824 -> s1
     2:2:boolean isAssumeWithDynamicTypeAssumption():824:824 -> s1
@@ -116496,7 +116456,7 @@
     1:1:com.android.tools.r8.ir.code.Argument asArgument():796:796 -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c3;"}
     1:1:com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData():1112:1112 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pQ;"}
     1:1:boolean isAssume():0:0 -> t1
     1:1:boolean isAssumeWithNonNullAssumption():828 -> t1
     2:2:boolean isAssumeWithNonNullAssumption():828:828 -> t1
@@ -116510,106 +116470,106 @@
     1:1:com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop():812:812 -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C3;"}
     1:1:com.android.tools.r8.ir.code.NewInstance asNewInstance():1128:1128 -> u0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rQ;"}
     1:1:boolean isBinop():832:832 -> u1
     1:1:boolean isResourceConstNumber():0:0 -> u2
     1:1:com.android.tools.r8.ir.code.ArrayAccess asArrayAccess():764:764 -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/D3;"}
     1:1:com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance():1136:1136 -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sQ;"}
     1:1:boolean isCheckCast():848:848 -> v1
     1:1:boolean isReturn():1156:1156 -> v2
     1:1:com.android.tools.r8.ir.code.ArrayGet asArrayGet():772:772 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H3;"}
     1:1:com.android.tools.r8.ir.code.Not asNot():1144:1144 -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MR;"}
     1:1:boolean isConstClass():0:0 -> w1
     1:1:boolean isStaticFieldInstruction():0:0 -> w2
     1:1:com.android.tools.r8.ir.code.ArrayLength asArrayLength():780:780 -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J3;"}
     1:1:com.android.tools.r8.ir.code.NumberConversion asNumberConversion():1152:1152 -> x0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eS;"}
     1:1:boolean isConstInstruction():892:892 -> x1
     1:1:boolean isStaticGet():0:0 -> x2
     1:1:com.android.tools.r8.ir.code.ArrayPut asArrayPut():788:788 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/N3;"}
     1:1:com.android.tools.r8.ir.code.Or asOr():1296:1296 -> y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bV;"}
     1:1:boolean isConstMethodHandle():0:0 -> y1
     1:1:boolean isStore():0:0 -> y2
     1:1:com.android.tools.r8.ir.code.Assume asAssume():820:820 -> z
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y4;"}
     1:1:com.android.tools.r8.ir.code.OriginalFieldWitnessInstruction asOriginalFieldWitness():888:888 -> z0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fV;"}
     1:1:boolean isConstMethodType():0:0 -> z1
     1:1:boolean isStringSwitch():1012:1012 -> z2
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.Dw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     com.android.tools.r8.ir.code.Value outValue -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Position position -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():1712:1712 -> <clinit>
     1:1:void <init>():1712:1712 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:2:com.android.tools.r8.ir.code.Instruction amend(com.android.tools.r8.ir.code.Instruction):1722:1723 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/Kw;"}
     3:4:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1729:1730 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Dw;"}
     5:5:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738:1738 -> a
     5:5:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/Dw;"}
     6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1729:1730 -> a
     6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738 -> a
     6:7:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1734 -> a
     8:8:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738:1738 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zk0;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dl0;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Dw;"}
     9:10:com.android.tools.r8.ir.code.Instruction$BuilderBase setOutValue(com.android.tools.r8.ir.code.Value):1729:1730 -> a
     9:10:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1738 -> a
     11:12:com.android.tools.r8.ir.code.Instruction$BuilderBase setPositionForNonThrowingInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):1747:1748 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Dw;"}
     13:14:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Position):1742:1743 -> a
     13:14:com.android.tools.r8.ir.code.Instruction$BuilderBase setPositionForNonThrowingInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):1749 -> a
     15:15:com.android.tools.r8.ir.code.Instruction$BuilderBase setPositionForNonThrowingInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):1751:1751 -> a
     16:17:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Position):1742:1743 -> a
     16:17:com.android.tools.r8.ir.code.Instruction$BuilderBase setPositionForNonThrowingInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.InternalOptions):1751 -> a
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1756:1756 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/Dw;"}
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Position):1742:1743 -> b
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1756 -> b
     4:4:boolean verifyInstructionTypeCannotThrow():1763:1763 -> b
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.Hw:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.Jw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jw;"}
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cw;"}
-    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption IGNORE_RECEIVER_FIELD_ASSIGNMENTS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dw;"}
-    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ew;"}
-    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption RECEIVER_NOT_NULL -> e
+    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption IGNORE_RECEIVER_FIELD_ASSIGNMENTS -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fw;"}
+    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gw;"}
+    com.android.tools.r8.ir.code.Instruction$SideEffectAssumption RECEIVER_NOT_NULL -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hw;"}
     1:30:void <clinit>():1634:1663 -> <clinit>
     1:1:void <init>():1632:1632 -> <init>
     1:1:boolean canAssumeClassIsAlreadyInitialized():0:0 -> a
     1:1:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():0:0 -> b
     1:1:boolean canAssumeReceiverIsNotNull():0:0 -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.Cw:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.Ew:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     1:1:void <init>():1637:1637 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.Dw:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.Fw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     1:1:void <init>():1646:1646 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.Gw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     1:1:void <init>():1655:1655 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.Fw:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.Hw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     1:1:void <init>():1664:1664 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.Gw:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.Iw:
 # {"id":"sourceFile","fileName":"Instruction.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1689:1689 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -116625,129 +116585,129 @@
     1:1:boolean canAssumeReceiverIsNotNull():1705:1705 -> c
     2:2:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeInvokedMethodDoesNotHaveSideEffects():0:0 -> c
     2:2:boolean canAssumeReceiverIsNotNull():1705 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.Lw:
 # {"id":"sourceFile","fileName":"InstructionIterator.java"}
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():37:39 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     boolean hasPrevious() -> hasPrevious
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():52:54 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.code.Instruction previous() -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.Lw:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.Nw:
 # {"id":"sourceFile","fileName":"InstructionListIterator.java"}
     1:1:void <clinit>():30:30 -> <clinit>
     com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Nw;"}
     com.android.tools.r8.ir.code.BasicBlock addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/NB;"}
     boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Ljava/util/Set;)V"}
     boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
     void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
     void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)V"}
     void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
     void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     void set(java.util.Collection) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions,java.util.function.UnaryOperator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/gB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/iB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/I5;"}
     1:2:void addAll(com.android.tools.r8.ir.code.Instruction[]):34:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Kw;)V"}
     3:3:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Instruction[],com.android.tools.r8.utils.InternalOptions):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;[Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;[Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Nw;"}
     4:4:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Instruction[],com.android.tools.r8.utils.InternalOptions):68:68 -> a
     5:7:void addBeforeAndPositionAfterNewInstruction(com.android.tools.r8.ir.code.Instruction):92:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;)V"}
     8:8:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/bl0;"}
     9:9:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;I)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;I)Lcom/android/tools/r8/internal/bl0;"}
     10:10:boolean lambda$positionAfterPreviousInstruction$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     11:11:com.android.tools.r8.ir.code.Instruction positionBeforeNextInstruction(com.android.tools.r8.ir.code.Instruction):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     12:12:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):195:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;)Z"}
     13:13:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):194:194 -> a
     14:14:void replaceCurrentInstructionWithConstBoolean(com.android.tools.r8.ir.code.IRCode,boolean):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Z)V"}
     15:15:void replaceCurrentInstructionWithConstTrue(com.android.tools.r8.ir.code.IRCode):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     16:16:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):278:278 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;)Lcom/android/tools/r8/internal/I5;"}
     17:17:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions):287:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/I5;"}
     18:20:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):368:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/I5;"}
     1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     2:3:com.android.tools.r8.ir.code.Instruction positionAfterPreviousInstruction(java.util.function.Predicate):177:178 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Kw;"}
     4:4:boolean lambda$positionBeforeNextInstruction$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):182:182 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):282:282 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/I5;"}
     6:6:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):320:320 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.ir.code.Instruction positionAfterPreviousInstruction(com.android.tools.r8.ir.code.Instruction):172:172 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     2:3:com.android.tools.r8.ir.code.Instruction positionBeforeNextInstructionThatMatches(java.util.function.Predicate):186:187 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Kw;"}
     4:4:void replaceCurrentInstructionWithConstFalse(com.android.tools.r8.ir.code.IRCode):213:213 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     1:4:void addBeforeAndPositionBeforeNewInstruction(com.android.tools.r8.ir.code.Instruction):85:88 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:3:void addAndPositionBeforeNewInstruction(com.android.tools.r8.ir.code.Instruction):79:81 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     void removeOrReplaceByDebugLocalRead() -> i
     void remove() -> remove
     1:1:void removeInstructionIgnoreOutValue():127:127 -> u
-com.android.tools.r8.ir.code.InstructionListIterator$1 -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.ir.code.InstructionListIterator$1 -> com.android.tools.r8.internal.Mw:
 # {"id":"sourceFile","fileName":"InstructionListIterator.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():81:81 -> <clinit>
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.Mw:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.Ow:
 # {"id":"sourceFile","fileName":"InstructionOrPhi.java"}
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:boolean isPhi():18:18 -> i
     1:1:com.android.tools.r8.ir.code.Instruction asInstruction():14:14 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.code.Phi asPhi():26:26 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tW;"}
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.uA:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xW;"}
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.wA:
 # {"id":"sourceFile","fileName":"IntSwitch.java"}
     int[] keys -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):33:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;[I[II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;[I[II)V"}
     4:5:boolean com.android.tools.r8.ir.code.Switch.valid():28:29 -> <init>
     4:5:boolean valid():66 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):35 -> <init>
@@ -116768,17 +116728,17 @@
     1:1:int maxOutValueRegister():270:270 -> G2
     1:1:int opcode():45:45 -> H2
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():225:226 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gz;"}
     3:3:int getKey(int):217:217 -> M2
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():227 -> M2
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():227:227 -> M2
     1:1:int[] getKeys():221:221 -> N2
     1:1:boolean isIntSwitch():193:193 -> R1
     1:1:com.android.tools.r8.ir.code.IntSwitch asIntSwitch():198:198 -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wA;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     2:2:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):208 -> a
     3:3:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -116794,7 +116754,7 @@
     11:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):212 -> a
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     14:14:void buildLir(com.android.tools.r8.lightir.LirBuilder):40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     15:15:void buildLir(com.android.tools.r8.lightir.LirBuilder):40:40 -> a
     16:18:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addIntSwitch(java.lang.Object,int[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.ir.code.BasicBlock):810:812 -> a
     16:18:void buildLir(com.android.tools.r8.lightir.LirBuilder):40 -> a
@@ -116810,13 +116770,13 @@
     26:26:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addIntSwitch(java.lang.Object,int[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.ir.code.BasicBlock):814 -> a
     26:26:void buildLir(com.android.tools.r8.lightir.LirBuilder):40 -> a
     27:27:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     28:28:long numberOfTargetsIfPacked(int[]):79:79 -> a
     29:29:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mB;J)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oB;J)Z"}
     30:30:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):154:154 -> a
     30:30:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mB;[I)J"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oB;[I)J"}
     31:31:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):159:159 -> a
     31:31:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):154 -> a
     31:31:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):95 -> a
@@ -116839,7 +116799,7 @@
     41:41:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):104:104 -> a
     42:42:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
     42:42:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oB;)Z"}
     43:43:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):84:84 -> a
     43:43:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):170 -> a
     43:43:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):184 -> a
@@ -116869,9 +116829,9 @@
     53:53:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):180 -> a
     53:53:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):184 -> a
     54:54:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     55:63:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):294:302 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     64:64:int com.android.tools.r8.ir.code.Switch.getTargetBlockIndex(int):39:39 -> a
     64:64:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):303 -> a
     65:72:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):303:310 -> a
@@ -116879,17 +116839,17 @@
     73:73:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):312 -> a
     74:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):312:315 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):203:203 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:4:java.lang.String toString():275:278 -> toString
     5:5:int getKey(int):217:217 -> toString
     5:5:java.lang.String toString():279 -> toString
     6:11:java.lang.String toString():279:284 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.FB:
 # {"id":"sourceFile","fileName":"Invoke.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:java.util.List arguments():86:86 -> F2
     1:1:int maxInValueRegister():224 -> F2
     2:4:int maxInValueRegister():224:226 -> F2
@@ -116911,15 +116871,15 @@
     10:10:boolean argumentsAreConsecutiveInputArguments():242 -> L2
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.ir.code.Value getFirstArgument():100:100 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.util.List arguments():86:86 -> N2
     1:1:com.android.tools.r8.ir.code.Value getLastArgument():112 -> N2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.ir.code.Value getLastArgument():112:112 -> N2
     com.android.tools.r8.graph.DexType getReturnType() -> O2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.code.InvokeType getType() -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     java.lang.String getTypeString() -> Q2
     1:1:int requiredArgumentRegisters():117:117 -> R2
     2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> R2
@@ -116930,9 +116890,9 @@
     1:1:boolean isInvoke():285:285 -> S1
     1:1:java.lang.String getInstructionName():280:280 -> V0
     1:1:com.android.tools.r8.ir.code.Invoke asInvoke():290:290 -> Y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FB;"}
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):49:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;Z)Lcom/android/tools/r8/internal/DB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;Z)Lcom/android/tools/r8/internal/FB;"}
     22:22:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):67:67 -> a
     23:23:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):65:65 -> a
     24:24:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):63:63 -> a
@@ -116943,7 +116903,7 @@
     29:29:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):53:53 -> a
     30:30:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):51:51 -> a
     31:31:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;[I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;[I)I"}
     32:32:java.util.List arguments():86:86 -> a
     32:32:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):139 -> a
     33:33:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):139:139 -> a
@@ -116971,17 +116931,17 @@
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):153 -> a
     45:46:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):154:155 -> a
     47:60:void addInvokeAndMoveResult(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.ir.conversion.DexBuilder):173:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/z1;Lcom/android/tools/r8/internal/xl;)V"}
     61:65:void addInvokeAndMoveResult(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.ir.conversion.DexBuilder):184:188 -> a
     66:82:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):194:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     83:89:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):208:214 -> a
     90:94:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):295:299 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     95:95:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):297:297 -> a
     96:96:boolean outTypeKnownToBeBoolean(java.util.Set):304:304 -> a
     1:1:com.android.tools.r8.ir.code.Value getArgument(int):90:90 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bl0;"}
     2:2:java.util.List arguments():86:86 -> b
     2:2:com.android.tools.r8.ir.code.Value getArgument(int):90 -> b
     3:3:com.android.tools.r8.ir.code.Value getArgument(int):90:90 -> b
@@ -116989,7 +116949,7 @@
     4:4:com.android.tools.r8.ir.code.Value getArgument(int):91 -> b
     5:5:com.android.tools.r8.ir.code.Value getArgument(int):91:91 -> b
     6:6:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):124:124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     7:7:java.util.List arguments():86:86 -> b
     7:7:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):125 -> b
     8:8:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):125:125 -> b
@@ -117005,7 +116965,7 @@
     13:13:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):131 -> b
     1:1:java.util.List arguments():86:86 -> c
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):162 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     2:2:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):162:162 -> c
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> c
     3:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):163 -> c
@@ -117036,7 +116996,7 @@
     17:17:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> c
     17:17:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):167 -> c
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):251:251 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)Z"}
     2:2:java.util.List arguments():86:86 -> d
     2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):258 -> d
     3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):258:265 -> d
@@ -117052,14 +117012,14 @@
     15:15:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):266 -> d
     16:16:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):267:267 -> d
     1:1:boolean instructionTypeCanThrow():219:219 -> o
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.GB:
 # {"id":"sourceFile","fileName":"InvokeCustom.java"}
     com.android.tools.r8.graph.DexCallSite callSite -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D0;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():32:32 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):37:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():44:44 -> H2
     1:1:com.android.tools.r8.graph.DexType getReturnType():110:110 -> O2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
@@ -117067,9 +117027,9 @@
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> S2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D0;"}
     1:1:com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom():180:180 -> Z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GB;"}
     1:6:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):73:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     7:11:java.util.List com.android.tools.r8.ir.desugar.LambdaDescriptor.getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):446:450 -> a
     7:11:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):78 -> a
     12:22:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):79:89 -> a
@@ -117091,10 +117051,10 @@
     45:45:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):105:105 -> a
     46:46:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):104:104 -> a
     47:47:void lambda$evaluate$0(com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder,com.android.tools.r8.graph.DexType):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xA$a;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zA$a;Lcom/android/tools/r8/graph/I2;)V"}
     48:48:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> a
     48:48:void buildLir(com.android.tools.r8.lightir.LirBuilder):164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     49:49:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     49:49:void buildLir(com.android.tools.r8.lightir.LirBuilder):164 -> a
     50:50:void buildLir(com.android.tools.r8.lightir.LirBuilder):164:164 -> a
@@ -117103,10 +117063,10 @@
     51:51:void buildLir(com.android.tools.r8.lightir.LirBuilder):164 -> a
     52:52:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> a
     52:52:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     53:53:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):207:207 -> a
     54:59:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):135:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     60:60:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> a
     60:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):140 -> a
     61:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):140:144 -> a
@@ -117117,15 +117077,15 @@
     75:75:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     76:76:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     77:77:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> a
     77:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159 -> a
     78:78:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):159:159 -> a
     79:79:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):189:189 -> a
     79:79:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     80:80:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     81:81:com.android.tools.r8.graph.DexCallSite getCallSite():114:114 -> a
     81:81:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):194 -> a
     82:82:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):194:194 -> a
@@ -117135,7 +117095,7 @@
     85:85:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):217:217 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):170:170 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):170 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):170:170 -> b
@@ -117145,26 +117105,26 @@
     1:1:com.android.tools.r8.utils.InternalOptions com.android.tools.r8.ir.conversion.DexBuilder.getOptions():1078:1078 -> d
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):222 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)Z"}
     2:4:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):222:224 -> d
     1:1:java.lang.String toString():129:129 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.GB:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.IB:
 # {"id":"sourceFile","fileName":"InvokeDirect.java"}
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():32:32 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;Z)V"}
     1:1:int opcode():55:55 -> H2
     1:1:com.android.tools.r8.ir.code.InvokeType getType():70:70 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():75:75 -> Q2
     1:1:boolean getInterfaceBit():60:60 -> T2
     1:1:boolean isInvokeDirect():127:127 -> U1
     1:1:com.android.tools.r8.ir.code.InvokeDirect$Builder builder():50:50 -> W2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HB;"}
     1:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     21:21:boolean isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):122:122 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Z"}
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
@@ -117182,10 +117142,10 @@
     36:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):155:155 -> a
     36:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):138 -> a
     37:38:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):143:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     39:39:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):143:143 -> a
     40:41:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     42:42:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):637:637 -> a
     42:42:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):162 -> a
     43:43:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):636:636 -> a
@@ -117195,9 +117155,9 @@
     55:55:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):174 -> a
     56:56:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):194:194 -> a
     56:56:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     57:57:void buildLir(com.android.tools.r8.lightir.LirBuilder):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     58:58:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     58:58:void buildLir(com.android.tools.r8.lightir.LirBuilder):201 -> a
     59:59:void buildLir(com.android.tools.r8.lightir.LirBuilder):201:201 -> a
@@ -117214,9 +117174,9 @@
     70:71:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):303:304 -> a
     70:71:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):155 -> a
     1:1:com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect():132:132 -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IB;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):117:117 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:5:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):179:183 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/q;"}
     6:6:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> d
@@ -117228,29 +117188,29 @@
     9:9:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> d
     9:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):190 -> d
     10:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):191:196 -> d
-com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.FB:
+com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.HB:
 # {"id":"sourceFile","fileName":"InvokeDirect.java"}
     1:1:void <init>():209:209 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:1:com.android.tools.r8.ir.code.InvokeDirect build():213:213 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IB;"}
     2:2:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> c
     2:2:com.android.tools.r8.ir.code.InvokeDirect build():213 -> c
     3:3:com.android.tools.r8.ir.code.InvokeDirect build():213:213 -> c
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.JB:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.LB:
 # {"id":"sourceFile","fileName":"InvokeInterface.java"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():42:42 -> H2
     1:1:com.android.tools.r8.ir.code.InvokeType getType():52:52 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():57:57 -> Q2
     1:1:boolean getInterfaceBit():37:37 -> T2
     1:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     12:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:92 -> a
     36:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:100 -> a
     58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):121:121 -> a
@@ -117286,14 +117246,14 @@
     72:72:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     73:74:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     75:75:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
     76:76:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):143:143 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     77:77:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInvokeInterface(com.android.tools.r8.graph.DexMethod):62:62 -> a
     77:77:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):143 -> a
     78:78:void buildLir(com.android.tools.r8.lightir.LirBuilder):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     79:79:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     79:79:void buildLir(com.android.tools.r8.lightir.LirBuilder):148 -> a
     80:80:void buildLir(com.android.tools.r8.lightir.LirBuilder):148:148 -> a
@@ -117302,41 +117262,41 @@
     81:81:void buildLir(com.android.tools.r8.lightir.LirBuilder):148 -> a
     82:82:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):199:199 -> a
     82:82:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     83:99:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):315:331 -> a
     83:99:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):137 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     100:111:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):330:341 -> a
     100:111:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):137 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:105 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:105 -> b
     1:1:com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface():115:115 -> b0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JB;"}
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.LB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LB;"}
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.NB:
 # {"id":"sourceFile","fileName":"InvokeMethod.java"}
     com.android.tools.r8.graph.DexMethod method -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():48:48 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):53:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:com.android.tools.r8.graph.DexType getReturnType():92:92 -> O2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:int getFirstNonReceiverArgumentIndex():85:85 -> S2
     1:1:com.android.tools.r8.ir.code.Value getFirstNonReceiverArgument():81 -> S2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.ir.code.Value getFirstNonReceiverArgument():81:81 -> S2
     boolean getInterfaceBit() -> T2
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():96:96 -> U2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean isInvokeMethod():112:112 -> W1
     com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/P;"}
     1:18:com.android.tools.r8.ir.code.InvokeMethod create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):59:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;Z)Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;Z)Lcom/android/tools/r8/internal/NB;"}
     19:20:com.android.tools.r8.ir.code.InvokeMethod create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):69:70 -> a
     21:21:com.android.tools.r8.ir.code.InvokeMethod create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):67:67 -> a
     22:22:com.android.tools.r8.ir.code.InvokeMethod create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):65:65 -> a
@@ -117345,14 +117305,14 @@
     25:25:boolean isInvokeMethod(com.android.tools.r8.graph.DexMethod):117:117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     26:27:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):226:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/y4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/y4;)V"}
     28:28:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     28:28:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):227 -> a
     29:29:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):228:228 -> a
     30:30:void lambda$lookupProgramDispatchTargets$1(com.android.tools.r8.graph.LookupLambdaTarget):233:233 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x4;)V"}
     31:36:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):246:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     37:37:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     37:37:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):256 -> a
     38:38:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):256:256 -> a
@@ -117364,9 +117324,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:43:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):258:258 -> a
     44:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):269:273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     49:49:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     50:61:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):299:310 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     62:62:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
@@ -117405,7 +117365,7 @@
     88:88:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     88:88:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):325 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     89:89:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     89:89:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):325 -> a
     90:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):329:337 -> a
@@ -117416,18 +117376,18 @@
     100:100:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):339 -> a
     101:103:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):339:341 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.AppView):127:127 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/U4;"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):288:288 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod():122:122 -> c0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NB;"}
     1:1:boolean hasInvariantOutType():278:278 -> c1
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):293:293 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/q;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):184:184 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/CY;"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> e
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1360 -> e
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):187 -> e
@@ -117472,7 +117432,7 @@
     14:18:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):143:147 -> g
     19:23:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146:150 -> g
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.KB:
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.MB:
 # {"id":"sourceFile","fileName":"InvokeMethod.java"}
     com.android.tools.r8.graph.DexMethod method -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -117481,30 +117441,30 @@
     1:1:void <clinit>():349:349 -> <clinit>
     1:5:void <init>():349:353 -> <init>
     1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder setArguments(com.android.tools.r8.ir.code.Value[]):356:356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/KB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/MB;"}
     2:4:com.android.tools.r8.ir.code.InvokeMethod$Builder setArguments(java.util.List):360:362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/KB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/MB;"}
     5:6:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):375:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/KB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/MB;"}
     1:1:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):371:371 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/KB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/MB;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> b
     2:2:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):371 -> b
     3:3:com.android.tools.r8.ir.code.InvokeMethod$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):371:371 -> b
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.MB:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.OB:
 # {"id":"sourceFile","fileName":"InvokeMethodWithReceiver.java"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):34:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:boolean throwsOnNullInput():119:119 -> J2
     1:2:com.android.tools.r8.ir.code.Value getReceiver():52:53 -> V2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():124:124 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean isInvokeMethodWithReceiver():43:43 -> X1
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/P;"}
     2:3:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.DefaultInliningOracle.computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):550:551 -> a
     2:3:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):62 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():398:398 -> a
@@ -117535,9 +117495,9 @@
     22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.DefaultInliningOracle.computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):567 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):62 -> a
     23:23:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     24:31:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     32:32:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1159:1159 -> a
     32:32:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):139 -> a
     33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):253:253 -> a
@@ -117553,7 +117513,7 @@
     45:73:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):163:191 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     1:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):200:212 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     14:14:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection com.android.tools.r8.graph.AppView.getLibraryMethodSideEffectModelCollection():583:583 -> b
     14:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):217 -> b
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):218:218 -> b
@@ -117613,9 +117573,9 @@
     61:61:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):275 -> b
     62:67:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):276:281 -> b
     1:1:com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver():48:48 -> d0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OB;"}
     1:2:boolean isPrivateMethodInvokedOnSelf(com.android.tools.r8.ir.conversion.DexBuilder):77:78 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)Z"}
     3:3:com.android.tools.r8.ir.regalloc.RegisterAllocator com.android.tools.r8.ir.conversion.DexBuilder.getRegisterAllocator():1082:1082 -> e
     3:3:boolean isPrivateMethodInvokedOnSelf(com.android.tools.r8.ir.conversion.DexBuilder):79 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -117626,19 +117586,19 @@
     1:1:com.android.tools.r8.utils.InternalOptions com.android.tools.r8.ir.conversion.DexBuilder.getOptions():1078:1078 -> f
     1:1:boolean isPrivateNestMethodInvoke(com.android.tools.r8.ir.conversion.DexBuilder):93 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)Z"}
     2:2:boolean isPrivateNestMethodInvoke(com.android.tools.r8.ir.conversion.DexBuilder):93:93 -> f
     3:3:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.conversion.DexBuilder.getProgramMethod():1086:1086 -> f
     3:3:boolean isPrivateNestMethodInvoke(com.android.tools.r8.ir.conversion.DexBuilder):96 -> f
     4:17:boolean isPrivateNestMethodInvoke(com.android.tools.r8.ir.conversion.DexBuilder):96:109 -> f
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.PB:
 # {"id":"sourceFile","fileName":"InvokeMultiNewArray.java"}
     com.android.tools.r8.graph.DexType type -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():39:39 -> H2
     1:1:com.android.tools.r8.graph.DexType getArrayType():63:63 -> O2
     1:1:com.android.tools.r8.graph.DexType getReturnType():68 -> O2
@@ -117657,20 +117617,20 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):163:163 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):85 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     5:5:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     6:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     11:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     12:12:void buildLir(com.android.tools.r8.lightir.LirBuilder):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     13:13:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     13:13:void buildLir(com.android.tools.r8.lightir.LirBuilder):121 -> a
     14:14:void buildLir(com.android.tools.r8.lightir.LirBuilder):121:121 -> a
@@ -117679,46 +117639,46 @@
     16:16:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addInvokeMultiNewArray(com.android.tools.r8.graph.DexType,java.util.List):1002:1002 -> a
     16:16:void buildLir(com.android.tools.r8.lightir.LirBuilder):121 -> a
     17:43:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):131:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     44:44:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     44:44:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):162 -> a
     45:50:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):163:168 -> a
     51:51:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):204:204 -> a
     51:51:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     52:52:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):210:210 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79:79 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79:79 -> b
     4:9:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):194:199 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):204:204 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():95:95 -> c1
     1:1:com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray():54:54 -> e0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NB;"}
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.OB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PB;"}
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.QB:
 # {"id":"sourceFile","fileName":"InvokePolymorphic.java"}
     com.android.tools.r8.graph.DexProto proto -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():30:30 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):35:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():46:46 -> H2
     1:1:com.android.tools.r8.graph.DexType getReturnType():56:56 -> O2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.code.InvokeType getType():61:61 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():66:66 -> Q2
     1:1:boolean getInterfaceBit():41:41 -> T2
     1:1:com.android.tools.r8.graph.DexProto getProto():70:70 -> V2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/E2;"}
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     9:9:com.android.tools.r8.graph.DexProto getProto():70:70 -> a
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83 -> a
     10:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:90 -> a
@@ -117726,12 +117686,12 @@
     18:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91 -> a
     19:26:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:98 -> a
     27:33:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):103:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     34:34:com.android.tools.r8.graph.DexProto getProto():70:70 -> a
     34:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109 -> a
     35:36:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):109:110 -> a
     37:37:void buildLir(com.android.tools.r8.lightir.LirBuilder):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     38:38:com.android.tools.r8.graph.DexProto getProto():70:70 -> a
     38:38:void buildLir(com.android.tools.r8.lightir.LirBuilder):115 -> a
     39:39:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
@@ -117746,37 +117706,37 @@
     44:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):171:171 -> a
     44:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):145 -> a
     45:45:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/P;"}
     46:46:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):214:214 -> a
     46:46:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):120:120 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):120 -> b
     3:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):120:122 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):139:139 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/CY;"}
     1:1:com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic():132:132 -> f0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OB;"}
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.WB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QB;"}
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.YB:
 # {"id":"sourceFile","fileName":"InvokeStatic.java"}
     boolean isInterface -> l
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():32:32 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     3:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> <init>
     4:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;Z)V"}
     1:1:int opcode():57:57 -> H2
     1:1:com.android.tools.r8.ir.code.InvokeType getType():67:67 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():72:72 -> Q2
     1:1:boolean getInterfaceBit():52:52 -> T2
     1:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     22:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):175:184 -> a
@@ -117792,7 +117752,7 @@
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):188:188 -> a
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):118 -> a
     36:36:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/P;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/P;"}
     37:37:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.Inliner$InlineAction.builder():577:577 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.DefaultInliningOracle.computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):576 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):127 -> a
@@ -117810,7 +117770,7 @@
     45:45:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.DefaultInliningOracle.computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):584:584 -> a
     45:45:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):127 -> a
     46:47:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     48:48:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:133 -> a
     49:49:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):216:216 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
@@ -117818,9 +117778,9 @@
     50:50:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):216 -> a
     51:51:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):219:219 -> a
     51:51:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     52:52:void buildLir(com.android.tools.r8.lightir.LirBuilder):221:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     53:53:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     53:53:void buildLir(com.android.tools.r8.lightir.LirBuilder):221 -> a
     54:54:void buildLir(com.android.tools.r8.lightir.LirBuilder):221:221 -> a
@@ -117829,9 +117789,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     1:1:boolean isInvokeStatic():107:107 -> a2
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):102:102 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):155:159 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     7:7:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection com.android.tools.r8.graph.AppView.getLibraryMethodSideEffectModelCollection():583:583 -> b
     7:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):165 -> b
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):166:166 -> b
@@ -117861,32 +117821,32 @@
     29:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):197 -> b
     30:40:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):201:211 -> b
     1:1:com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic():112:112 -> g0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WB;"}
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.VB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YB;"}
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.XB:
 # {"id":"sourceFile","fileName":"InvokeStatic.java"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():224:224 -> <clinit>
     1:1:void <init>():224:224 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():228:232 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WB;"}
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.XB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YB;"}
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.ZB:
 # {"id":"sourceFile","fileName":"InvokeSuper.java"}
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):33:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;Z)V"}
     1:1:int opcode():44:44 -> H2
     1:1:com.android.tools.r8.ir.code.InvokeType getType():54:54 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():59:59 -> Q2
     1:1:boolean getInterfaceBit():39:39 -> T2
     1:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     21:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):89:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):89:89 -> a
     24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
@@ -117897,7 +117857,7 @@
     27:27:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInvokeSuper(com.android.tools.r8.graph.DexMethod):67:67 -> a
     27:27:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):128 -> a
     28:28:void buildLir(com.android.tools.r8.lightir.LirBuilder):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     29:29:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     29:29:void buildLir(com.android.tools.r8.lightir.LirBuilder):133 -> a
     30:30:void buildLir(com.android.tools.r8.lightir.LirBuilder):133:133 -> a
@@ -117906,49 +117866,49 @@
     31:31:void buildLir(com.android.tools.r8.lightir.LirBuilder):133 -> a
     32:32:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):224:224 -> a
     32:32:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     33:49:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):368:384 -> a
     33:49:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):122 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     50:69:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):383:402 -> a
     50:69:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):122 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
     1:1:com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper():106:106 -> h0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XB;"}
-com.android.tools.r8.ir.code.InvokeType -> com.android.tools.r8.internal.aC:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZB;"}
+com.android.tools.r8.ir.code.InvokeType -> com.android.tools.r8.internal.cC:
 # {"id":"sourceFile","fileName":"InvokeType.java"}
     int dexOpcode -> b
     int dexOpcodeRange -> c
     com.android.tools.r8.ir.code.InvokeType DIRECT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType INTERFACE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType STATIC -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType SUPER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType VIRTUAL -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType NEW_ARRAY -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType MULTI_NEW_ARRAY -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     com.android.tools.r8.ir.code.InvokeType POLYMORPHIC -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     boolean $assertionsDisabled -> l
     1:10:void <clinit>():34:43 -> <clinit>
     1:3:void <init>(java.lang.String,int,int,int):48:50 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILjava/lang/String;)V"}
     1:1:com.android.tools.r8.ir.code.InvokeType fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cC;"}
     2:6:com.android.tools.r8.ir.code.InvokeType fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):67:71 -> a
     7:14:com.android.tools.r8.ir.code.InvokeType fromCfOpcode(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):69:76 -> a
     15:34:com.android.tools.r8.ir.code.InvokeType fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):85:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cC;"}
     35:35:com.android.tools.r8.ir.code.InvokeType fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):103:103 -> a
     36:36:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     36:36:com.android.tools.r8.ir.code.InvokeType fromInvokeSpecial(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):105 -> a
@@ -117989,21 +117949,21 @@
     1:1:boolean isStatic():216:216 -> d
     1:1:boolean isSuper():220:220 -> e
     1:1:boolean isVirtual():224:224 -> g
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.eC:
 # {"id":"sourceFile","fileName":"InvokeVirtual.java"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():46:46 -> H2
     1:1:com.android.tools.r8.ir.code.InvokeType getType():56:56 -> P2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
     1:1:java.lang.String getTypeString():61:61 -> Q2
     1:1:boolean getInterfaceBit():41:41 -> T2
     1:1:com.android.tools.r8.ir.code.InvokeVirtual$Builder builder():36:36 -> W2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dC;"}
     1:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     12:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:96 -> a
     36:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:104 -> a
     58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):125:125 -> a
@@ -118039,154 +117999,154 @@
     72:72:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     73:74:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     75:75:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):130:130 -> a
     76:76:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):147:147 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     77:77:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):47:47 -> a
     77:77:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):147 -> a
     78:78:void buildLir(com.android.tools.r8.lightir.LirBuilder):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     79:79:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     79:79:void buildLir(com.android.tools.r8.lightir.LirBuilder):165 -> a
     80:80:void buildLir(com.android.tools.r8.lightir.LirBuilder):165:165 -> a
     81:81:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):229:229 -> a
     81:81:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     82:98:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):413:429 -> a
     82:98:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     99:110:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):428:439 -> a
     99:110:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):141 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):109:109 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean isInvokeVirtual():114:114 -> c2
     1:1:com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual():119:119 -> i0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.bC:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eC;"}
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.dC:
 # {"id":"sourceFile","fileName":"InvokeVirtual.java"}
     1:1:void <init>():150:150 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():154:154 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cC;"}
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.fD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eC;"}
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.hD:
 # {"id":"sourceFile","fileName":"JumpInstruction.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     3:3:void <init>(java.util.List):24:24 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():28:28 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():201:201 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):63:63 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():58:58 -> c1
     1:1:boolean isJumpInstruction():42:42 -> d2
     1:1:com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction():47:47 -> j0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fD;"}
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.aJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hD;"}
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.eJ:
 # {"id":"sourceFile","fileName":"LazyDominatorTree.java"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:java.lang.Object get():9:9 -> a
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nm;"}
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lm;"}
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.NJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nm;"}
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.RJ:
 # {"id":"sourceFile","fileName":"LinearFlowInstructionListIterator.java"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L5;"}
     java.util.Set seenBlocks -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):37:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):40:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;I)V"}
     3:22:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):30:49 -> <init>
     1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Ljava/util/Set;)V"}
     2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;JLcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;JLcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/internal/bl0;"}
     4:4:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/NB;"}
     5:5:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):96:96 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     6:6:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)Z"}
     7:7:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.optimize.AffectedValues):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/ir/optimize/a;)V"}
     8:8:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;I)V"}
     9:9:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.optimize.AffectedValues):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/ir/optimize/a;)V"}
     10:10:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)V"}
     11:11:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/l1;Ljava/util/Set;)V"}
     12:12:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):149:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     13:13:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;)V"}
     14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Z)Lcom/android/tools/r8/internal/I5;"}
     15:15:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ILjava/util/ListIterator;)Lcom/android/tools/r8/internal/I5;"}
     16:16:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.utils.InternalOptions,java.util.function.UnaryOperator):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/gB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/iB;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/I5;"}
     17:17:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/I5;"}
     18:18:com.android.tools.r8.ir.code.InstructionListIterator addPossiblyThrowingInstructionsToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Collection,com.android.tools.r8.utils.InternalOptions):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/Nw;"}
     19:19:com.android.tools.r8.ir.code.BasicBlock addThrowingInstructionToPossiblyThrowingBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.utils.InternalOptions):218:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/I5;"}
     20:23:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     24:32:com.android.tools.r8.ir.code.Instruction next():241:249 -> a
     24:32:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.next():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     33:33:com.android.tools.r8.ir.code.Instruction next():0:0 -> a
     33:33:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.next():0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":294,"2":295,"3":296},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":294,"2":295,"3":296},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     284:293:com.android.tools.r8.ir.code.Instruction next():251:260 -> a
     284:293:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.next():0 -> a
     294:294:com.android.tools.r8.ir.code.Instruction next():250:250 -> a
     295:295:com.android.tools.r8.ir.code.Instruction next():250:250 -> a
     296:296:com.android.tools.r8.ir.code.Instruction next():250:250 -> a
     297:307:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):285:295 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     308:308:void set(java.util.Collection):360:360 -> a
     1:1:void add(java.lang.Object):24:24 -> add
     2:2:void add(com.android.tools.r8.ir.code.Instruction):199:199 -> add
     2:2:void add(java.lang.Object):24 -> add
     1:1:boolean hasVisitedBlock(com.android.tools.r8.ir.code.BasicBlock):54:54 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     1:9:com.android.tools.r8.ir.code.Instruction peekNext():266:274 -> h
     1:9:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.peekNext():0 -> h
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     10:10:com.android.tools.r8.ir.code.Instruction peekNext():0:0 -> h
     10:10:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.peekNext():0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":288,"2":289,"3":290},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":288,"2":289,"3":290},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     286:286:com.android.tools.r8.ir.code.Instruction peekNext():276:276 -> h
     286:286:com.android.tools.r8.internal.Instruction com.android.tools.r8.internal.LinearFlowInstructionListIterator.peekNext():0 -> h
     287:287:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> h
@@ -118201,7 +118161,7 @@
     1:1:java.lang.Object next():24:24 -> next
     1:1:int nextIndex():340:340 -> nextIndex
     1:5:com.android.tools.r8.ir.code.Instruction peekPrevious():327:331 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     6:6:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> p
     6:6:com.android.tools.r8.ir.code.Instruction peekPrevious():332 -> p
     7:7:com.android.tools.r8.ir.code.Instruction peekPrevious():335:335 -> p
@@ -118210,24 +118170,24 @@
     9:9:com.android.tools.r8.ir.code.Instruction peekPrevious():335:335 -> p
     1:1:java.lang.Object previous():24:24 -> previous
     2:15:com.android.tools.r8.ir.code.Instruction previous():308:321 -> previous
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:int previousIndex():345:345 -> previousIndex
     1:1:void remove():350:350 -> remove
     1:1:void set(java.lang.Object):24:24 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):355:355 -> set
     2:2:void set(java.lang.Object):24 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.jL:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.nL:
 # {"id":"sourceFile","fileName":"Load.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():58:58 -> F2
     1:1:int maxOutValueRegister():63:63 -> G2
     1:1:int opcode():29:29 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value src():38:38 -> a
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
     4:4:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):754:754 -> a
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85 -> a
@@ -118237,42 +118197,42 @@
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
     7:7:com.android.tools.r8.ir.code.Value src():38:38 -> a
     7:7:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):90:90 -> a
     9:9:com.android.tools.r8.ir.code.Value src():38:38 -> a
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     10:10:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):100:100 -> a
     11:11:void buildLir(com.android.tools.r8.lightir.LirBuilder):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     12:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     13:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():205:205 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):69 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53:53 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):110:110 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():105:105 -> c1
     1:1:com.android.tools.r8.ir.code.Load asLoad():48:48 -> k0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jL;"}
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.vL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nL;"}
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.zL:
 # {"id":"sourceFile","fileName":"LogicalBinop.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     20:47:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:94 -> a
     48:57:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:97 -> a
     58:59:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):113:114 -> a
@@ -118311,9 +118271,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     83:89:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):135:141 -> a
     90:90:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     91:91:void buildLir(com.android.tools.r8.lightir.LirBuilder):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     92:92:void buildLir(com.android.tools.r8.lightir.LirBuilder):153 -> a
     93:93:void buildLir(com.android.tools.r8.lightir.LirBuilder):153:153 -> a
@@ -118339,76 +118299,76 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> c
     1:1:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:3:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):47:48 -> c
     com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean isLogicalBinop():102:102 -> f2
     1:1:com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop():107:107 -> l0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vL;"}
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.uL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zL;"}
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.yL:
 # {"id":"sourceFile","fileName":"LogicalBinop.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():65 -> <clinit>
     2:2:void <clinit>():65:65 -> <clinit>
-com.android.tools.r8.ir.code.MaterializingInstructionsInfo -> com.android.tools.r8.internal.VM:
+com.android.tools.r8.ir.code.MaterializingInstructionsInfo -> com.android.tools.r8.internal.ZM:
 # {"id":"sourceFile","fileName":"MaterializingInstructionsInfo.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.code.MaterializingInstructionsInfo create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Position):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/UM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/YM;"}
     com.android.tools.r8.ir.code.Position getPosition() -> getPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
-com.android.tools.r8.ir.code.MaterializingInstructionsInfo$1 -> com.android.tools.r8.internal.UM:
+com.android.tools.r8.ir.code.MaterializingInstructionsInfo$1 -> com.android.tools.r8.internal.YM:
 # {"id":"sourceFile","fileName":"MaterializingInstructionsInfo.java"}
     com.android.tools.r8.graph.DebugLocalInfo val$local -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j0;"}
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.code.Position val$position -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.Position):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/TW;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.code.Position getPosition():34:34 -> getPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():24:24 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.oN:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.sN:
 # {"id":"sourceFile","fileName":"MemberType.java"}
     com.android.tools.r8.ir.code.MemberType OBJECT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType CHAR -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType SHORT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType INT -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType FLOAT -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType LONG -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType DOUBLE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType INT_OR_FLOAT -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType LONG_OR_DOUBLE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     com.android.tools.r8.ir.code.MemberType[] $VALUES -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sN;"}
     1:10:void <clinit>():12:21 -> <clinit>
     11:11:void <clinit>() -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:boolean isPrecise():28:28 -> a
     2:44:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):32:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/sN;"}
     45:45:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):69:69 -> a
     46:46:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):64:64 -> a
     47:47:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):59:59 -> a
@@ -118418,21 +118378,21 @@
     51:51:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):39:39 -> a
     52:52:com.android.tools.r8.ir.code.MemberType constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):34:34 -> a
     53:53:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/sN;"}
     54:54:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):101:101 -> a
     55:55:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):89:89 -> a
     56:69:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):84:97 -> a
     70:76:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):93:99 -> a
     77:77:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):91:91 -> a
     78:78:com.android.tools.r8.ir.code.MemberType fromTypeDescriptorChar(char):87:87 -> a
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.TO:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.XO:
 # {"id":"sourceFile","fileName":"Monitor.java"}
     com.android.tools.r8.ir.code.MonitorType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YO;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.MonitorType,com.android.tools.r8.ir.code.Value):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UO;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YO;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():78:78 -> F2
     1:1:int maxOutValueRegister():83:83 -> G2
     1:1:int opcode():33:33 -> H2
@@ -118442,12 +118402,12 @@
     8:8:java.lang.String getInstructionName():117:117 -> V0
     1:1:com.android.tools.r8.ir.code.Value object():42:42 -> W0
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():157 -> W0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value object():42:42 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):664:664 -> a
@@ -118464,13 +118424,13 @@
     9:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:67 -> a
     13:13:com.android.tools.r8.ir.code.Value object():42:42 -> a
     13:13:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     14:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     15:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     16:16:void buildLir(com.android.tools.r8.lightir.LirBuilder):142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     17:17:com.android.tools.r8.ir.code.Value object():42:42 -> a
     17:17:void buildLir(com.android.tools.r8.lightir.LirBuilder):142 -> a
     18:18:void buildLir(com.android.tools.r8.lightir.LirBuilder):142:142 -> a
@@ -118486,7 +118446,7 @@
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):73:73 -> b
@@ -118495,94 +118455,94 @@
     1:1:boolean hasInvariantOutType():127:127 -> c1
     1:1:boolean isMonitorEnter():99:99 -> h2
     1:1:com.android.tools.r8.ir.code.Monitor asMonitor():104:104 -> m0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XO;"}
     1:1:boolean instructionTypeCanThrow():89:89 -> o
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.SO:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.WO:
 # {"id":"sourceFile","fileName":"Monitor.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$MonitorType -> a
     1:1:com.android.tools.r8.ir.code.MonitorType[] com.android.tools.r8.ir.code.MonitorType.values():6:6 -> <clinit>
     1:1:void <clinit>():115 -> <clinit>
     2:2:void <clinit>():115:115 -> <clinit>
-com.android.tools.r8.ir.code.MonitorType -> com.android.tools.r8.internal.UO:
+com.android.tools.r8.ir.code.MonitorType -> com.android.tools.r8.internal.YO:
 # {"id":"sourceFile","fileName":"MonitorType.java"}
     com.android.tools.r8.ir.code.MonitorType ENTER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YO;"}
     com.android.tools.r8.ir.code.MonitorType EXIT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YO;"}
     com.android.tools.r8.ir.code.MonitorType[] $VALUES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/UO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/YO;"}
     1:2:void <clinit>():7:8 -> <clinit>
     3:3:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.XO:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.bP:
 # {"id":"sourceFile","fileName":"Move.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():68:68 -> F2
     1:1:int maxOutValueRegister():73:73 -> G2
     1:1:int opcode():30:30 -> H2
     1:1:com.android.tools.r8.ir.code.Value dest():39:39 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.Value src():43:43 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():93:94 -> Y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> a
     1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     2:2:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):139:139 -> a
     3:3:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     4:4:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     6:6:void com.android.tools.r8.ir.conversion.DexBuilder.addMove(com.android.tools.r8.ir.code.Move):714:714 -> a
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():213:213 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):130:130 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():120:120 -> c1
     1:1:boolean isMove():99:99 -> i2
     1:1:com.android.tools.r8.ir.code.Move asMove():104:104 -> n0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bP;"}
     1:1:boolean isOutConstant():88:88 -> r2
     1:1:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.YO:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.cP:
 # {"id":"sourceFile","fileName":"MoveException.java"}
     com.android.tools.r8.graph.DexType exceptionType -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.utils.InternalOptions options -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():23:23 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):28:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/iB;)V"}
     1:1:int maxInValueRegister():55:55 -> F2
     1:1:int maxOutValueRegister():61:61 -> G2
     1:1:int opcode():35:35 -> H2
     1:1:com.android.tools.r8.graph.DexType getExceptionType():129:129 -> K2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value dest():44:44 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -118592,52 +118552,57 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):49 -> a
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):50:50 -> a
     7:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
-    10:10:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> a
-    10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91 -> a
-    11:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:94 -> a
-    15:15:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92:92 -> a
-    16:16:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
-    17:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
-    18:18:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
-    19:19:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
-    20:20:void buildLir(com.android.tools.r8.lightir.LirBuilder):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
-    21:21:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
-    21:21:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addMoveException(com.android.tools.r8.graph.DexType):918 -> a
-    21:21:void buildLir(com.android.tools.r8.lightir.LirBuilder):139 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():217:217 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):100 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
+    10:10:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    11:11:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    11:11:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90 -> a
+    12:12:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> a
+    12:12:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91 -> a
+    13:16:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:94 -> a
+    17:17:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92:92 -> a
+    18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:105 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
+    19:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
+    20:20:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
+    21:21:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):125:125 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
+    22:22:void buildLir(com.android.tools.r8.lightir.LirBuilder):139:139 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
+    23:23:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
+    23:23:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addMoveException(com.android.tools.r8.graph.DexType):918 -> a
+    23:23:void buildLir(com.android.tools.r8.lightir.LirBuilder):139 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():217:217 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):100 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:70 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():3084:3084 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():3090:3090 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):134:134 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():115:115 -> c1
     1:1:com.android.tools.r8.ir.code.MoveException asMoveException():83:83 -> o0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YO;"}
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.bP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cP;"}
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.fP:
 # {"id":"sourceFile","fileName":"Mul.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():38:38 -> H2
     1:1:boolean isCommutative():48:48 -> L2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():152:152 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:2:com.android.tools.r8.ir.code.Mul create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/bP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/fP;"}
     3:3:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     4:5:com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int):81:82 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     6:6:int foldIntegers(int,int):122:122 -> a
@@ -118649,7 +118614,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble2Addr(int,int):102:102 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):117:117 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):117 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):117:117 -> b
@@ -118668,20 +118633,20 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):64:64 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.ir.code.Mul asMul():147:147 -> p0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bP;"}
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.ZP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fP;"}
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.dQ:
 # {"id":"sourceFile","fileName":"Neg.java"}
     com.android.tools.r8.ir.code.NumericType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():32:32 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     19:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
     20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
     21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
@@ -118719,33 +118684,33 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:61:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):106:108 -> a
     62:62:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     63:63:void buildLir(com.android.tools.r8.lightir.LirBuilder):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.source():25:25 -> a
     64:64:void buildLir(com.android.tools.r8.lightir.LirBuilder):118 -> a
     65:65:void buildLir(com.android.tools.r8.lightir.LirBuilder):118:118 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     1:1:com.android.tools.r8.ir.code.Neg asNeg():83:83 -> q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZP;"}
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.YP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dQ;"}
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.cQ:
 # {"id":"sourceFile","fileName":"Neg.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():57 -> <clinit>
     2:2:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.iQ:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.mQ:
 # {"id":"sourceFile","fileName":"NewArrayEmpty.java"}
     com.android.tools.r8.graph.DexType type -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):34:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:int maxInValueRegister():70:70 -> F2
     1:1:int maxOutValueRegister():75:75 -> G2
     1:1:int opcode():44:44 -> H2
@@ -118753,10 +118718,10 @@
     1:1:int sizeIfConst():191 -> K2
     2:2:int sizeIfConst():192:192 -> K2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value size():58:58 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -118772,20 +118737,20 @@
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
     10:10:com.android.tools.r8.ir.code.Value size():58:58 -> a
     10:10:void buildLir(com.android.tools.r8.lightir.LirBuilder):176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     11:11:void buildLir(com.android.tools.r8.lightir.LirBuilder):176:176 -> a
     12:12:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNewArrayEmpty(java.lang.Object,com.android.tools.r8.graph.DexType):998:998 -> a
     12:12:void buildLir(com.android.tools.r8.lightir.LirBuilder):176 -> a
     13:13:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNewArrayEmpty(java.lang.Object,com.android.tools.r8.graph.DexType):997:997 -> a
     13:13:void buildLir(com.android.tools.r8.lightir.LirBuilder):176 -> a
     14:14:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     15:16:boolean isArrayTypeInaccessible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):95:96 -> a
     15:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):91 -> a
     17:17:boolean isArraySizeMaybeNegative():100:100 -> a
     17:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):91 -> a
     18:21:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):119:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):144:144 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
@@ -118794,13 +118759,13 @@
     24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
     24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):144 -> a
     25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     26:27:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):159:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     28:29:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):165:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     30:30:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     31:31:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):187:187 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     32:32:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):630:630 -> a
@@ -118834,7 +118799,7 @@
     45:47:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):109 -> a
     48:48:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):114:114 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128:128 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):128:128 -> b
@@ -118843,16 +118808,16 @@
     1:1:boolean hasInvariantOutType():149:149 -> c1
     1:1:boolean instructionTypeCanThrow():81:81 -> o
     1:1:com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty():138:138 -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mQ;"}
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.code.NewArrayFilled -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.ir.code.NewArrayFilled -> com.android.tools.r8.internal.oQ:
 # {"id":"sourceFile","fileName":"NewArrayFilled.java"}
     com.android.tools.r8.graph.DexType type -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():32:32 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;Ljava/util/List;)V"}
     1:1:int opcode():47:47 -> H2
     1:1:com.android.tools.r8.graph.DexType getArrayType():61:61 -> O2
     1:1:com.android.tools.r8.graph.DexType getReturnType():57 -> O2
@@ -118862,7 +118827,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.graph.DexType getArrayType():61:61 -> a
     1:1:void buildLir(com.android.tools.r8.lightir.LirBuilder):246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):246 -> a
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):246:246 -> a
@@ -118871,7 +118836,7 @@
     5:5:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNewArrayFilled(com.android.tools.r8.graph.DexType,java.util.List):1007:1007 -> a
     5:5:void buildLir(com.android.tools.r8.lightir.LirBuilder):246 -> a
     6:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):123:123 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilled(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):167:167 -> a
@@ -118880,24 +118845,24 @@
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilled(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):167:167 -> a
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):123 -> a
     29:29:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     30:30:com.android.tools.r8.errors.Unreachable cfUnsupported():152:152 -> a
     30:30:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     31:31:com.android.tools.r8.errors.Unreachable cfUnsupported():152:152 -> a
     31:31:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     32:32:com.android.tools.r8.errors.Unreachable cfUnsupported():152:152 -> a
     32:32:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     33:59:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):173:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     60:60:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     60:60:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):204 -> a
     61:61:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):205:205 -> a
     62:62:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.NewArrayFilled):209:209 -> a
     62:62:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     63:63:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):237:237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     64:64:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):630:630 -> a
@@ -118912,17 +118877,17 @@
     68:70:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):160 -> a
     71:71:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):163:163 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):107:107 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):221:226 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):231:231 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():133:133 -> c1
     1:1:boolean isNewArrayFilled():112:112 -> m2
     1:1:com.android.tools.r8.ir.code.NewArrayFilled asNewArrayFilled():117:117 -> s0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oQ;"}
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.code.NewArrayFilled$Builder -> com.android.tools.r8.internal.jQ:
+com.android.tools.r8.ir.code.NewArrayFilled$Builder -> com.android.tools.r8.internal.nQ:
 # {"id":"sourceFile","fileName":"NewArrayFilled.java"}
     java.util.List elements -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -118930,8 +118895,8 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:1:void <init>():249:249 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():249:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.lQ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.pQ:
 # {"id":"sourceFile","fileName":"NewArrayFilledData.java"}
     int element_width -> i
     long size -> j
@@ -118939,15 +118904,15 @@
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):33:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;IJ[S)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;IJ[S)V"}
     1:1:int maxInValueRegister():86:86 -> F2
     1:1:int maxOutValueRegister():91:91 -> G2
     1:1:int opcode():41:41 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value src():50:50 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
     4:4:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -118959,9 +118924,9 @@
     7:8:void com.android.tools.r8.ir.conversion.DexBuilder.addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.dex.code.DexFillArrayData):765:766 -> a
     7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     10:10:void buildLir(com.android.tools.r8.lightir.LirBuilder):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     11:11:com.android.tools.r8.ir.code.Value src():50:50 -> a
     11:11:void buildLir(com.android.tools.r8.lightir.LirBuilder):70 -> a
     12:12:void buildLir(com.android.tools.r8.lightir.LirBuilder):70:70 -> a
@@ -118970,9 +118935,9 @@
     18:18:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addNewArrayFilledData(int,long,short[],java.lang.Object):1013:1013 -> a
     18:18:void buildLir(com.android.tools.r8.lightir.LirBuilder):70 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     20:20:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     21:21:com.android.tools.r8.ir.code.Value src():50:50 -> a
     21:21:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132 -> a
     22:22:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
@@ -119002,9 +118967,9 @@
     34:36:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):141 -> a
     37:37:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):144:144 -> a
     1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:81 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):154:154 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     9:9:com.android.tools.r8.ir.code.Value src():50:50 -> b
     9:9:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):155 -> b
     10:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):155:159 -> b
@@ -119026,8 +118991,8 @@
     1:1:boolean isNewArrayFilledData():102:102 -> n2
     1:1:boolean instructionTypeCanThrow():97:97 -> o
     1:1:com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData():107:107 -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lQ;"}
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.nQ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pQ;"}
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.rQ:
 # {"id":"sourceFile","fileName":"NewInstance.java"}
     com.android.tools.r8.graph.DexType clazz -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -119035,18 +119000,18 @@
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):41:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)V"}
     2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):38:43 -> <init>
     1:1:int maxInValueRegister():91:91 -> F2
     1:1:int maxOutValueRegister():97:97 -> G2
     1:1:int opcode():60:60 -> H2
     1:1:com.android.tools.r8.ir.code.NewInstance$Builder builder():47:47 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qQ;"}
     1:1:com.android.tools.r8.graph.DexType getType():51:51 -> L2
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.ir.code.Value dest():69:69 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     2:2:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
     3:3:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -119063,32 +119028,32 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):233:233 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):119 -> a
     9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     11:11:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     12:12:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     13:13:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):155:155 -> a
     13:13:java.lang.Object com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):57 -> a
     13:13:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     14:17:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):240:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     18:18:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):249:249 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     19:19:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerNewInstance(com.android.tools.r8.graph.DexType):92:92 -> a
     19:19:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):249 -> a
     20:20:void buildLir(com.android.tools.r8.lightir.LirBuilder):254:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     21:22:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):452:453 -> a
     21:22:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):154 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):86:86 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:18:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):165:181 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     19:19:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView) -> b
     19:19:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):186 -> b
     20:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):187:204 -> b
@@ -119100,19 +119065,19 @@
     1:1:boolean isNewInstance():108:108 -> o2
     1:1:java.lang.String toString():80:80 -> toString
     1:1:com.android.tools.r8.ir.code.NewInstance asNewInstance():113:113 -> u0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nQ;"}
-com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.mQ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rQ;"}
+com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.qQ:
 # {"id":"sourceFile","fileName":"NewInstance.java"}
     com.android.tools.r8.graph.DexType type -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:1:void <init>():257:257 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():257:257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     2:2:com.android.tools.r8.ir.code.NewInstance$Builder setType(com.android.tools.r8.graph.DexType):262:262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/mQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/qQ;"}
     1:1:com.android.tools.r8.ir.code.NewInstance build():268:268 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nQ;"}
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.oQ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rQ;"}
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.sQ:
 # {"id":"sourceFile","fileName":"NewUnboxedEnumInstance.java"}
     com.android.tools.r8.graph.DexType clazz -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -119120,12 +119085,12 @@
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():45:45 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.ir.code.Value):51:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():94:94 -> F2
     1:1:int maxOutValueRegister():100:100 -> G2
     1:1:int opcode():67:67 -> H2
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     2:2:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77 -> a
     3:3:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
@@ -119135,28 +119100,28 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77 -> a
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     10:10:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):161:161 -> a
     10:10:java.lang.Object com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):57 -> a
     10:10:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     11:14:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.VerifyTypesHelper):162:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yl0;)V"}
     15:15:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):171:171 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     16:16:void buildLir(com.android.tools.r8.lightir.LirBuilder):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):124 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewUnboxedEnumInstance():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
@@ -119166,21 +119131,21 @@
     1:1:boolean instructionTypeCanThrow():108:108 -> o
     1:1:java.lang.String toString():83:83 -> toString
     1:1:com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance():118:118 -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oQ;"}
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.pQ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sQ;"}
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.tQ:
 # {"id":"sourceFile","fileName":"NextUntilIterator.java"}
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.HR:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.MR:
 # {"id":"sourceFile","fileName":"Not.java"}
     com.android.tools.r8.ir.code.NumericType type -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():30:30 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:3:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):46:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.source():25:25 -> a
@@ -119201,43 +119166,43 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:17:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):59:61 -> a
     18:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     31:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:80 -> a
     40:40:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     41:41:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     42:42:void buildLir(com.android.tools.r8.lightir.LirBuilder):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     43:43:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.source():25:25 -> a
     43:43:void buildLir(com.android.tools.r8.lightir.LirBuilder):112 -> a
     44:44:void buildLir(com.android.tools.r8.lightir.LirBuilder):112:112 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNot():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
     1:1:com.android.tools.r8.ir.code.Not asNot():95:95 -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HR;"}
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.GR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MR;"}
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.KR:
 # {"id":"sourceFile","fileName":"Not.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():70 -> <clinit>
     2:2:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.aS:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.eS:
 # {"id":"sourceFile","fileName":"NumberConversion.java"}
     com.android.tools.r8.ir.code.NumericType from -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType to -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():45:45 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     76:96:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:84 -> a
     97:97:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
     98:98:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
@@ -119254,11 +119219,11 @@
     194:200:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:96 -> a
     201:243:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:135 -> a
     244:244:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     245:245:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):164:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     246:246:void buildLir(com.android.tools.r8.lightir.LirBuilder):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     247:247:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.source():25:25 -> a
     247:247:void buildLir(com.android.tools.r8.lightir.LirBuilder):169 -> a
     248:248:void buildLir(com.android.tools.r8.lightir.LirBuilder):169:169 -> a
@@ -119275,42 +119240,42 @@
     255:255:boolean outTypeKnownToBeBoolean(java.util.Set):174 -> a
     256:256:boolean outTypeKnownToBeBoolean(java.util.Set):174:174 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):140:144 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean isNumberConversion():149:149 -> p2
     1:1:com.android.tools.r8.ir.code.NumberConversion asNumberConversion():154:154 -> x0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aS;"}
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.ZR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eS;"}
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.dS:
 # {"id":"sourceFile","fileName":"NumberConversion.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():64 -> <clinit>
     2:2:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.dS:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.hS:
 # {"id":"sourceFile","fileName":"NumberGenerator.java"}
     int nextValueNumber -> a
     1:3:void <init>():9:11 -> <init>
     1:1:int next():14:14 -> a
     2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/bl0;"}
     1:1:int peek():18:18 -> b
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.xS:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.BS:
 # {"id":"sourceFile","fileName":"NumericType.java"}
     com.android.tools.r8.ir.code.NumericType BYTE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType CHAR -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType SHORT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType INT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType LONG -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType FLOAT -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType DOUBLE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     com.android.tools.r8.ir.code.NumericType[] $VALUES -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/BS;"}
     1:7:void <clinit>():11:17 -> <clinit>
     8:8:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
@@ -119325,28 +119290,28 @@
     23:23:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):24:24 -> a
     24:24:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):22:22 -> a
     25:39:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):41:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/BS;"}
     40:40:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):47:47 -> a
     41:51:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):43:53 -> a
     52:52:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):49:49 -> a
     53:59:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):45:51 -> a
     60:60:boolean isWide():62:62 -> a
-com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.wS:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.AS:
 # {"id":"sourceFile","fileName":"NumericType.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():20 -> <clinit>
     2:2:void <clinit>():20:20 -> <clinit>
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.XU:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.bV:
 # {"id":"sourceFile","fileName":"Or.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():37:37 -> H2
     1:1:boolean isCommutative():62:62 -> L2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():117:117 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     2:2:boolean outTypeKnownToBeBoolean(java.util.Set):122 -> a
     3:3:boolean outTypeKnownToBeBoolean(java.util.Set):122:122 -> a
@@ -119358,14 +119323,14 @@
     7:7:long foldLongs(long,long):112:112 -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
     1:1:com.android.tools.r8.ir.code.Or asOr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):57 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/XU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bV;"}
     2:2:com.android.tools.r8.ir.code.Or asOr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):57:57 -> b
     3:3:com.android.tools.r8.dex.code.DexInstruction CreateInt2Addr(int,int):77:77 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     4:4:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):92:92 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:97 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isOr():0:0 -> b
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97 -> b
     7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:97 -> b
@@ -119376,50 +119341,50 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):72:72 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.ir.code.Or asOr():52:52 -> y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XU;"}
-com.android.tools.r8.ir.code.OriginalFieldWitnessInstruction -> com.android.tools.r8.internal.bV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bV;"}
+com.android.tools.r8.ir.code.OriginalFieldWitnessInstruction -> com.android.tools.r8.internal.fV:
 # {"id":"sourceFile","fileName":"OriginalFieldWitnessInstruction.java"}
     com.android.tools.r8.graph.OriginalFieldWitness witness -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/t5;"}
     1:2:void <init>(com.android.tools.r8.graph.OriginalFieldWitness,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t5;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t5;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():29:29 -> H2
     1:1:com.android.tools.r8.graph.OriginalFieldWitness getWitness():24:24 -> a
     1:1:void buildLir(com.android.tools.r8.lightir.LirBuilder):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):49:49 -> a
     3:4:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOriginalFieldWitness(com.android.tools.r8.graph.OriginalFieldWitness,java.lang.Object):1122:1123 -> a
     3:4:void buildLir(com.android.tools.r8.lightir.LirBuilder):49 -> a
     5:5:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOriginalFieldWitness(com.android.tools.r8.graph.OriginalFieldWitness,java.lang.Object):1120:1120 -> a
     5:5:void buildLir(com.android.tools.r8.lightir.LirBuilder):49 -> a
     6:6:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:57 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isOriginalFieldWitness():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:61 -> b
     1:1:com.android.tools.r8.ir.code.OriginalFieldWitnessInstruction asOriginalFieldWitness():39:39 -> z0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bV;"}
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.tW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fV;"}
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.xW:
 # {"id":"sourceFile","fileName":"Phi.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.List operands -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW$a;"}
     boolean isStackPhi -> u
     java.util.List definitionUsers -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> w
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):63:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/tW$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/xW$a;)V"}
     2:20:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):47:65 -> <init>
     21:21:void com.android.tools.r8.ir.code.BasicBlock.addPhi(com.android.tools.r8.ir.code.Phi):868:868 -> <init>
     21:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):66 -> <init>
@@ -119443,9 +119408,9 @@
     1:1:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder):282 -> E0
     1:1:void removeTrivialPhi():278 -> E0
     1:4:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Reporter):105:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/d50;)V"}
     5:14:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):130:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)V"}
     15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2153:2153 -> a
     15:15:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):139 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119498,7 +119463,7 @@
     54:54:void throwUndefinedValueError():184:184 -> a
     54:54:void addOperands(java.util.List,boolean):168 -> a
     55:55:com.android.tools.r8.ir.code.Value getOperand(int):196:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bl0;"}
     56:56:void removeOperand(int,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Predicate):209:209 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Predicate;)V"}
     57:57:void com.android.tools.r8.ir.code.Value.removePhiUser(com.android.tools.r8.ir.code.Phi):551:551 -> a
@@ -119510,7 +119475,7 @@
     62:62:boolean com.android.tools.r8.ir.optimize.AffectedValues.add(com.android.tools.r8.ir.code.Value):72:72 -> a
     62:62:void removeOperand(int,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Predicate):212 -> a
     63:64:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value,java.util.Set):236:237 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/ir/optimize/a;)V"}
     65:65:void com.android.tools.r8.ir.code.Value.addPhiUser(com.android.tools.r8.ir.code.Phi):546:546 -> a
     65:65:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value,java.util.Set):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119525,7 +119490,7 @@
     71:71:boolean com.android.tools.r8.ir.optimize.AffectedValues.add(java.lang.Object):22 -> a
     71:71:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value,java.util.Set):241 -> a
     72:74:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):250:252 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     75:75:void com.android.tools.r8.ir.code.Value.addPhiUser(com.android.tools.r8.ir.code.Phi):546:546 -> a
     75:75:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119533,7 +119498,7 @@
     76:77:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):253 -> a
     78:78:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):257:257 -> a
     79:111:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):296:328 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)Z"}
     112:112:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
     112:112:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):328 -> a
     113:113:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):329:329 -> a
@@ -119562,70 +119527,70 @@
     135:135:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):347 -> a
     136:145:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues,java.util.function.Consumer,java.util.function.Predicate):354:363 -> a
     146:149:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):422:425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/bl0;)V"}
     150:150:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):441:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     151:151:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():835:835 -> a
     151:151:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):441 -> a
     152:160:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):441:449 -> a
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):54:55 -> b
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):464 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     3:4:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):14:15 -> b
     3:4:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):465 -> b
     5:25:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):466:486 -> b
     26:26:com.android.tools.r8.ir.code.BasicBlock getBlock():91:91 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     27:29:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):112:114 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;)V"}
     1:1:boolean isConstant():405:405 -> b0
     1:1:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):71:71 -> c
     2:3:boolean verifyIsStackPhi(java.util.Set):419:420 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):454:456 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:boolean isPhi():76:76 -> i
     1:2:boolean isValueOnStack():410:411 -> i0
     1:1:com.android.tools.r8.ir.code.Phi asPhi():81:81 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xW;"}
     1:1:void markNonDebugLocalRead():180:180 -> l0
     1:1:boolean needsRegister():433:433 -> m0
     1:1:java.util.List getOperands():200:200 -> w0
     1:1:boolean isTrivialPhi():263:263 -> x0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.tW$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.xW$a:
 # {"id":"sourceFile","fileName":"Phi.java"}
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW$a;"}
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW$a;"}
     1:2:void <clinit>():42:43 -> <clinit>
     1:1:void <init>(java.lang.String,int):41:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.uW:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.yW:
 # {"id":"sourceFile","fileName":"Phi.java"}
     boolean $assertionsDisabled -> x
     1:1:void <clinit>():494:494 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):502:502 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/tW$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/internal/xW$a;)V"}
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):507:514 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):520:529 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.JW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.NW:
 # {"id":"sourceFile","fileName":"Pop.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):23:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Pop asPop():54:54 -> A0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NW;"}
     1:1:int maxInValueRegister():94:94 -> F2
     1:1:int maxOutValueRegister():99:99 -> G2
     1:1:int opcode():29:29 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;)Z"}
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isPop():0:0 -> a
     3:3:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):59 -> a
     4:6:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):59:61 -> a
@@ -119636,59 +119601,59 @@
     16:16:boolean com.android.tools.r8.ir.code.Instruction.identicalPosition(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):518 -> a
     16:16:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):67 -> a
     17:17:boolean lambda$identicalNonValueParts$0(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.ir.code.InitClass):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/Ev;Lcom/android/tools/r8/internal/Ev;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/Gv;Lcom/android/tools/r8/internal/Gv;)Z"}
     18:26:boolean identicalPop(com.android.tools.r8.ir.code.Pop,java.util.function.BiPredicate):81:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JW;Ljava/util/function/BiPredicate;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NW;Ljava/util/function/BiPredicate;)Z"}
     27:27:void buildLir(com.android.tools.r8.lightir.LirBuilder):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     28:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     29:29:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     30:30:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):78:78 -> a
     30:30:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):120 -> a
     31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):120:120 -> a
     32:32:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     33:33:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():245:245 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):39:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isPop():0:0 -> b
     7:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72 -> b
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141:141 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():130:130 -> c1
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.PW:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.TW:
 # {"id":"sourceFile","fileName":"Position.java"}
     int line -> b
     com.android.tools.r8.graph.DexMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.code.Position callerPosition -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean removeInnerFramesIfThrowingNpe -> e
     boolean isD8R8Synthesized -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():17:17 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,boolean):42:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;ZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;ZZ)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():17:17 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:6:void specifyBasePosition(com.android.tools.r8.utils.structural.StructuralSpecification):124:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     7:7:com.android.tools.r8.ir.code.Position getOutermostCallerMatching(java.util.function.Predicate,boolean):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Z)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Z)Lcom/android/tools/r8/internal/TW;"}
     8:8:com.android.tools.r8.ir.code.Position getCallerPosition():89:89 -> a
     8:8:com.android.tools.r8.ir.code.Position getOutermostCallerMatching(java.util.function.Predicate,boolean):181 -> a
     9:14:com.android.tools.r8.ir.code.Position getOutermostCallerMatching(java.util.function.Predicate,boolean):181:186 -> a
     15:17:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):193:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
     18:18:com.android.tools.r8.ir.code.Position getCallerPosition():89:89 -> a
     18:18:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):196 -> a
     19:19:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):196:196 -> a
@@ -119699,7 +119664,7 @@
     21:21:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):194 -> a
     22:22:com.android.tools.r8.ir.code.Position withOutermostCallerPosition(com.android.tools.r8.ir.code.Position):198:198 -> a
     23:25:com.android.tools.r8.ir.code.Position replacePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):206:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/TW;"}
     26:26:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> a
     26:26:com.android.tools.r8.ir.code.Position replacePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119707,11 +119672,11 @@
     27:27:com.android.tools.r8.ir.code.Position replacePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):208 -> a
     28:28:com.android.tools.r8.ir.code.Position replacePosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):209:209 -> a
     29:29:com.android.tools.r8.ir.code.Position$OutlineCallerPosition asOutlineCaller():258:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QW;"}
     com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     1:1:com.android.tools.r8.ir.code.Position getCallerPosition():89:89 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     int getCompareToId() -> d
     1:1:com.android.tools.r8.graph.DexString getFile():109:109 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
@@ -119723,11 +119688,11 @@
     2:2:int com.android.tools.r8.utils.structural.HashCodeVisitor.run(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> hashCode
     2:2:int hashCode():220 -> hashCode
     1:1:com.android.tools.r8.ir.code.Position getOutermostCaller():166:166 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():77:77 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():81:81 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kz;"}
     1:1:boolean hasCallerPosition():85:85 -> o
     1:1:boolean hasFile():105:105 -> p
     1:1:boolean isD8R8Synthesized():65:65 -> q
@@ -119736,26 +119701,26 @@
     1:1:boolean isOutline():0:0 -> u
     1:1:boolean isRemoveInnerFramesIfThrowingNpe():61:61 -> v
     1:1:com.android.tools.r8.ir.code.Position none():101:101 -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.MW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.QW:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
     com.android.tools.r8.graph.DexMethod outlineCallee -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     int $r8$clinit -> j
       # {"id":"com.android.tools.r8.synthesized"}
     1:3:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,boolean,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.graph.DexMethod,boolean):572:574 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;ZZLcom/android/tools/r8/internal/Iz;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;ZZLcom/android/tools/r8/internal/Kz;Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():550:550 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition asOutlineCaller():615:615 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QW;"}
     1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):557:557 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:2:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():634:634 -> b
     2:2:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():591 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     3:5:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():591:593 -> b
     6:6:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> b
     6:6:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():594 -> b
@@ -119781,15 +119746,15 @@
     1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():620:620 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():625:625 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kz;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():630:630 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:boolean isNone():580:580 -> t
     1:1:boolean isOutline():605:605 -> u
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.LW:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.PW:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder outlinePositionsBuilder -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jz;"}
     com.android.tools.r8.graph.DexMethod outlineCallee -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean $assertionsDisabled -> j
@@ -119800,18 +119765,18 @@
     3:3:void <init>():641 -> <init>
     4:4:void <init>():641:641 -> <init>
     1:1:com.android.tools.r8.ir.code.Position build():637:637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     2:2:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder addOutlinePosition(int,com.android.tools.r8.ir.code.Position):658:658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/LW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/PW;"}
     3:3:com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder.put(int,com.android.tools.r8.utils.structural.StructuralItem):88:88 -> a
     3:3:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder addOutlinePosition(int,com.android.tools.r8.ir.code.Position):658 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder.put(int,com.android.tools.r8.utils.structural.StructuralItem):88:89 -> a
     4:5:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder addOutlinePosition(int,com.android.tools.r8.ir.code.Position):658 -> a
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder self():637:637 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     1:9:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():673:681 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QW;"}
     10:10:com.android.tools.r8.utils.Int2StructuralItemArrayMap com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder.build():98:98 -> d
     10:10:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():681 -> d
     11:16:int[] com.android.tools.r8.com.google.common.primitives.Ints.toArray(java.util.Collection):606:611 -> d
@@ -119827,18 +119792,18 @@
     19:19:com.android.tools.r8.utils.Int2StructuralItemArrayMap com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder.build():98:98 -> d
     19:19:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():681 -> d
     20:20:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():681:681 -> d
-com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.OW:
+com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.SW:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.graph.DexMethod outlineMethodKey -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():473:473 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.graph.DexMethod):485:487 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;ZLcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;ZLcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():473:473 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():506:506 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     2:2:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder(com.android.tools.r8.graph.DexMethod):520:520 -> b
     2:2:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():506 -> b
     3:3:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder.setOutlineMethodKey(com.android.tools.r8.graph.DexMethod):537:537 -> b
@@ -119861,7 +119826,7 @@
     1:1:int getCompareToId():501:501 -> d
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():516:516 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.NW:
+com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.RW:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.graph.DexMethod outlineMethodKey -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -119870,45 +119835,45 @@
     1:1:void <init>():528:528 -> <init>
     1:2:com.android.tools.r8.ir.code.Position$OutlinePosition build():543:544 -> a
     1:2:com.android.tools.r8.ir.code.Position build():523 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder self():523:523 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
-com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.PW$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
+com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.TW$a:
 # {"id":"sourceFile","fileName":"Position.java"}
     int line -> a
     com.android.tools.r8.graph.DexMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.code.Position callerPosition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean removeInnerFramesIfThrowingNpe -> d
     boolean isD8R8Synthesized -> e
     boolean noCheckOfPosition -> f
     boolean noCheckOfMethod -> g
     1:4:void <init>():261:264 -> <init>
     com.android.tools.r8.ir.code.Position build() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setLine(int):276:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW$a;"}
     3:4:com.android.tools.r8.ir.code.Position$PositionBuilder setMethod(com.android.tools.r8.graph.DexMethod):285:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/TW$a;"}
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():310:311 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
-com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.PW$b:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
+com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.TW$b:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.ir.code.Position$SourcePosition NO_POSITION -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW$b;"}
     boolean $assertionsDisabled -> i
     1:5:void <clinit>():317:321 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,boolean,com.android.tools.r8.graph.DexString):337:339 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;ZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;ZZ)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():317:317 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):327:327 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     2:3:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():364:365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     4:4:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder.setFile(com.android.tools.r8.graph.DexString):393:393 -> b
     4:4:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():366 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119936,29 +119901,29 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():375:375 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():379:379 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$b$a;"}
-com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.PW$b$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$b$a;"}
+com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.TW$b$a:
 # {"id":"sourceFile","fileName":"Position.java"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():382:382 -> <clinit>
     1:1:void <init>():382:382 -> <init>
     1:1:com.android.tools.r8.ir.code.Position build():382:382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder self():382:382 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():399:401 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$b;"}
-com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.PW$c:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$b;"}
+com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.TW$c:
 # {"id":"sourceFile","fileName":"Position.java"}
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW$c;"}
     1:1:void <clinit>():412:412 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,boolean):421:421 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;ZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;ZZ)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():407:407 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:3:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():436:438 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     4:4:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> b
     4:4:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():439 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -119976,38 +119941,38 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():446:446 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():450:450 -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$c$a;"}
-com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.PW$c$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$c$a;"}
+com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.TW$c$a:
 # {"id":"sourceFile","fileName":"Position.java"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():453:453 -> <clinit>
     1:1:void <init>():456:456 -> <init>
     1:1:com.android.tools.r8.ir.code.Position build():453:453 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder self():453:453 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$a;"}
     1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():465:467 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW$c;"}
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.FX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW$c;"}
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.JX:
 # {"id":"sourceFile","fileName":"PreviousUntilIterator.java"}
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)V"}
-com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.a20:
+com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.e20:
 # {"id":"sourceFile","fileName":"RecordFieldValues.java"}
     com.android.tools.r8.graph.DexField[] fields -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/l1;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.code.Value,java.util.List):29:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;Ljava/util/ArrayList;)V"}
     1:1:com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues():50:50 -> B0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e20;"}
     1:1:int maxInValueRegister():102:102 -> F2
     1:1:int maxOutValueRegister():107:107 -> G2
     1:1:int opcode():40:40 -> H2
     1:1:com.android.tools.r8.graph.DexField[] getFields():35:35 -> a
     1:1:void buildLir(com.android.tools.r8.lightir.LirBuilder):83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     2:2:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):83 -> a
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):83:83 -> a
@@ -120016,17 +119981,17 @@
     7:7:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],java.util.List):1115:1115 -> a
     7:7:void buildLir(com.android.tools.r8.lightir.LirBuilder):83 -> a
     8:8:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     10:10:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):72:72 -> a
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     12:13:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     14:14:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     14:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
     16:16:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63 -> a
@@ -120054,25 +120019,25 @@
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88:88 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):88 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:92 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97:97 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():124:124 -> c1
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.F40:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.J40:
 # {"id":"sourceFile","fileName":"Rem.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):25:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Rem asRem():45:45 -> C0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J40;"}
     1:1:int opcode():30:30 -> H2
     1:1:boolean isCommutative():50:50 -> L2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():173:173 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int):70:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:int foldIntegers(int,int):115:115 -> a
@@ -120080,7 +120045,7 @@
     5:5:float foldFloat(float,float):125:125 -> a
     6:6:double foldDouble(double,double):130:130 -> a
     7:11:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):139:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     12:12:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):143 -> a
     13:13:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():47:47 -> a
@@ -120102,7 +120067,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble2Addr(int,int):90:90 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:105 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isRem():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):105:105 -> b
@@ -120121,29 +120086,29 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):60:60 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean instructionTypeCanThrow():155:155 -> o
-com.android.tools.r8.ir.code.ResourceConstNumber -> com.android.tools.r8.internal.j50:
+com.android.tools.r8.ir.code.ResourceConstNumber -> com.android.tools.r8.internal.n50:
 # {"id":"sourceFile","fileName":"ResourceConstNumber.java"}
     int value -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():24:24 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int):29:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)V"}
     1:1:com.android.tools.r8.ir.code.ResourceConstNumber asResourceConstNumber():131:131 -> D0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n50;"}
     1:1:int maxInValueRegister():74:74 -> F2
     1:1:int maxOutValueRegister():79:79 -> G2
     1:1:int opcode():40:40 -> H2
     1:1:int getValue():135:135 -> K2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     6:6:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):106 -> a
     7:8:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):106:107 -> a
@@ -120157,10 +120122,10 @@
     13:13:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):116:116 -> a
     14:14:int getValue():135:135 -> a
     14:14:void buildLir(com.android.tools.r8.lightir.LirBuilder):121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     15:15:void buildLir(com.android.tools.r8.lightir.LirBuilder):121:121 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isResourceConstNumber():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
@@ -120171,33 +120136,33 @@
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91 -> b
     1:1:boolean instructionTypeCanBeCanonicalized():50:50 -> h1
     1:1:boolean isOutConstant():96:96 -> r2
-com.android.tools.r8.ir.code.ResourceConstNumber$Builder -> com.android.tools.r8.internal.i50:
+com.android.tools.r8.ir.code.ResourceConstNumber$Builder -> com.android.tools.r8.internal.m50:
 # {"id":"sourceFile","fileName":"ResourceConstNumber.java"}
     int value -> d
     1:1:void <init>():138:138 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
     1:1:boolean verifyInstructionTypeCannotThrow():159:159 -> b
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.O90:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.S90:
 # {"id":"sourceFile","fileName":"Return.java"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):31:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Return asReturn():119:119 -> E0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/O90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S90;"}
     1:1:int maxInValueRegister():103:103 -> F2
     1:1:int maxOutValueRegister():108:108 -> G2
     1:1:int opcode():40:40 -> H2
     1:1:boolean isReturnVoid():49:49 -> L2
     1:2:com.android.tools.r8.ir.code.Value returnValue():62:63 -> M2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:boolean hasReturnValue():58:58 -> a
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):168:168 -> a
     4:4:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneValueInstruction(int,java.lang.Object):478:478 -> a
     4:4:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addReturn(java.lang.Object):779 -> a
@@ -120215,7 +120180,7 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturnVoid():257:257 -> a
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):128 -> a
     14:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     15:15:void com.android.tools.r8.ir.conversion.DexBuilder.addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):775:775 -> a
     15:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -120236,15 +120201,15 @@
     21:21:void com.android.tools.r8.ir.conversion.DexBuilder.addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):780:780 -> a
     21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86 -> a
     22:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):133:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     25:26:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():53:54 -> a
     25:26:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141 -> a
     27:27:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
     28:28:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):140:140 -> a
     1:4:com.android.tools.r8.dex.code.DexInstruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):67:70 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)Lcom/android/tools/r8/dex/code/J;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)Lcom/android/tools/r8/dex/code/J;"}
     5:5:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> b
     5:5:com.android.tools.r8.dex.code.DexInstruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):70 -> b
     6:6:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> b
@@ -120256,7 +120221,7 @@
     8:9:com.android.tools.r8.dex.code.DexInstruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):71 -> b
     10:19:com.android.tools.r8.dex.code.DexInstruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):72:81 -> b
     20:25:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     26:27:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():53:54 -> b
     26:27:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98 -> b
     28:28:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():53:53 -> b
@@ -120275,33 +120240,33 @@
     33:35:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):453:455 -> b
     33:35:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98 -> b
     1:1:boolean isReturn():114:114 -> v2
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.N90:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.R90:
 # {"id":"sourceFile","fileName":"Return.java"}
     com.android.tools.r8.ir.code.Value returnValue -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:3:void <init>():145:147 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():145:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.fa0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.ja0:
 # {"id":"sourceFile","fileName":"SafeCheckCast.java"}
     int $r8$clinit -> l
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):19:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.ir.code.SafeCheckCast asSafeCheckCast():57:57 -> F0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ja0;"}
     1:1:com.android.tools.r8.ir.code.SafeCheckCast$Builder builder():23:23 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ea0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ia0;"}
     1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> a
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):28 -> a
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):28:28 -> a
     4:4:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> a
     5:5:void buildLir(com.android.tools.r8.lightir.LirBuilder):33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     6:6:void buildLir(com.android.tools.r8.lightir.LirBuilder):33:33 -> a
     7:8:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addSafeCheckCast(com.android.tools.r8.graph.DexType,java.lang.Object):697:698 -> a
     7:8:void buildLir(com.android.tools.r8.lightir.LirBuilder):33 -> a
@@ -120312,23 +120277,23 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> b
     2:2:com.android.tools.r8.dex.code.DexCheckCast createCheckCast(int):38 -> b
     3:3:com.android.tools.r8.dex.code.DexCheckCast createCheckCast(int):38:38 -> b
-com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.ea0:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.ia0:
 # {"id":"sourceFile","fileName":"SafeCheckCast.java"}
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.ir.code.CheckCast build():64:64 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cb;"}
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.cb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Eb;"}
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.gb0:
 # {"id":"sourceFile","fileName":"Shl.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Shl asShl():52:52 -> G0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gb0;"}
     1:1:int opcode():26:26 -> H2
     1:1:boolean isCommutative():42:42 -> L2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():112:112 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.arithmetic.AbstractCalculator.shlIntegers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):92:92 -> a
@@ -120352,13 +120317,13 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):87:87 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isShl():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> c
     1:1:com.android.tools.r8.ir.code.Shl asShl(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):57 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/cb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/gb0;"}
     2:2:com.android.tools.r8.ir.code.Shl asShl(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):57:57 -> c
     3:3:com.android.tools.r8.dex.code.DexInstruction CreateLong2Addr(int,int):77:77 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
@@ -120367,19 +120332,19 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):67:67 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):37:37 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.gb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.kb0:
 # {"id":"sourceFile","fileName":"Shr.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Shr asShr():47:47 -> H0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
     1:1:int opcode():26:26 -> H2
     1:1:boolean isCommutative():57:57 -> L2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():112:112 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:int foldIntegers(int,int):97:97 -> a
@@ -120403,7 +120368,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):87:87 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isShr():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
@@ -120413,69 +120378,69 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> d
     1:1:com.android.tools.r8.ir.code.Shr asShr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):52 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/gb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/kb0;"}
     2:2:com.android.tools.r8.ir.code.Shr asShr(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):52:52 -> d
     3:3:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):67:67 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):37:37 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Pb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Tb0:
 # {"id":"sourceFile","fileName":"SingleConstant.java"}
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.sd0:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.wd0:
 # {"id":"sourceFile","fileName":"StackValue.java"}
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wj0;"}
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.ir.analysis.type.TypeElement,int):17:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sj0;Lcom/android/tools/r8/internal/Wi0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wj0;Lcom/android/tools/r8/internal/aj0;I)V"}
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):24:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sj0;ILcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/sd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wj0;ILcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/wd0;"}
     4:4:void setNeedsRegister(boolean):54:54 -> a
     1:1:boolean needsRegister():49:49 -> m0
     1:1:java.lang.String toString():59:59 -> toString
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sj0;"}
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.td0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wj0;"}
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.xd0:
 # {"id":"sourceFile","fileName":"StackValues.java"}
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/wd0;"}
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.StackValue[]):19:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/wd0;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:void setNeedsRegister(boolean):35:35 -> a
     1:1:boolean isValueOnStack():54:54 -> i0
     1:1:boolean needsRegister():30:30 -> m0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/sd0;"}
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.Ud0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/wd0;"}
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.Yd0:
 # {"id":"sourceFile","fileName":"StaticGet.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void com.android.tools.r8.ir.code.FieldInstruction.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:36 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():161:161 -> F2
     1:1:int maxOutValueRegister():166:166 -> G2
     1:1:int opcode():61:61 -> H2
     1:1:com.android.tools.r8.ir.code.StaticGet asStaticGet():212:212 -> I0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ud0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yd0;"}
     1:1:boolean isFieldGet():192:192 -> I1
     1:1:com.android.tools.r8.ir.code.FieldGet asFieldGet():197:197 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kp;"}
     1:1:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Ud0;)Lcom/android/tools/r8/internal/Ud0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Yd0;)Lcom/android/tools/r8/internal/Yd0;"}
     2:3:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):55:56 -> a
     2:3:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):51 -> a
     4:4:com.android.tools.r8.ir.code.Value dest():70:70 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     5:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:131 -> a
     33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
     34:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):109:128 -> a
@@ -120484,7 +120449,7 @@
     56:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:119 -> a
     57:74:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:133 -> a
     75:89:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):80:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     90:96:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):92:98 -> a
     97:97:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
@@ -120492,9 +120457,9 @@
     98:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):182 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     99:99:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):217:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     100:100:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     101:101:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):271:271 -> a
     101:101:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):222 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -120502,29 +120467,29 @@
     102:103:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):222 -> a
     104:104:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):222:222 -> a
     105:105:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     106:106:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     107:107:boolean outTypeKnownToBeBoolean(java.util.Set):249:249 -> a
     108:108:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):269:269 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u;)V"}
     109:109:void com.android.tools.r8.shaking.ComputeApiLevelUseRegistry.registerStaticFieldRead(com.android.tools.r8.graph.DexField):97:97 -> a
     109:109:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):269 -> a
     110:110:void buildLir(com.android.tools.r8.lightir.LirBuilder):298:298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     111:111:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     111:111:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addStaticGet(com.android.tools.r8.graph.DexField):707 -> a
     111:111:void buildLir(com.android.tools.r8.lightir.LirBuilder):298 -> a
     112:112:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):324:324 -> a
     112:112:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     113:113:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forStaticGet(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):462:462 -> a
     113:113:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):242 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     114:114:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
     114:114:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     115:115:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153:153 -> a
     116:116:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):61:61 -> a
     116:116:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153 -> a
@@ -120535,7 +120500,7 @@
     117:117:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153 -> a
     118:118:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):156:156 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172:172 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):172 -> b
     3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):175:176 -> b
@@ -120545,33 +120510,33 @@
     1:1:boolean instructionTypeCanThrow():144:144 -> o
     1:1:java.lang.String toString():187:187 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():75:75 -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.Td0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.Xd0:
 # {"id":"sourceFile","fileName":"StaticGet.java"}
     com.android.tools.r8.graph.DexField field -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     1:1:void <init>():272:272 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.Vd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.Zd0:
 # {"id":"sourceFile","fileName":"StaticPut.java"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void com.android.tools.r8.ir.code.FieldInstruction.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:36 -> <init>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():156:156 -> F2
     1:1:int maxOutValueRegister():161:161 -> G2
     1:1:int opcode():46:46 -> H2
     1:1:com.android.tools.r8.ir.code.StaticPut asStaticPut():229:229 -> J0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zd0;"}
     1:1:boolean isFieldPut():209:209 -> K1
     1:1:com.android.tools.r8.ir.code.FieldPut asFieldPut():214:214 -> R
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tp;"}
     1:1:void setValue(com.android.tools.r8.ir.code.Value):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
     31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:97 -> a
     51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):94:94 -> a
@@ -120579,7 +120544,7 @@
     53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
     54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:102 -> a
     72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/wr;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/yr;)Ljava/lang/Boolean;"}
     73:73:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):242:242 -> a
     73:73:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -120596,16 +120561,16 @@
     79:80:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):131 -> a
     81:81:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):131:131 -> a
     82:92:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):168:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/QN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/UN;)Z"}
     93:93:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):199:199 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     94:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):265:265 -> a
     94:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):199 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     95:95:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):234:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     96:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     97:97:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):271:271 -> a
     97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -120613,7 +120578,7 @@
     98:99:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239 -> a
     100:100:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239:239 -> a
     101:101:void buildLir(com.android.tools.r8.lightir.LirBuilder):244:244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     102:102:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addStaticPut(com.android.tools.r8.graph.DexField,java.lang.Object):712:712 -> a
     102:102:void buildLir(com.android.tools.r8.lightir.LirBuilder):244 -> a
     103:103:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
@@ -120627,12 +120592,12 @@
     106:106:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):276 -> a
     107:107:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticPut):329:329 -> a
     107:107:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     108:108:boolean com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils.forStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):471:471 -> a
     108:108:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;II)Z"}
     1:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):117:131 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Hw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/Jw;)Z"}
     16:16:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):130:130 -> b
     17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> b
     17:17:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):136 -> b
@@ -120644,7 +120609,7 @@
     20:20:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):141 -> b
     21:26:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):142:147 -> b
     27:31:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):189:193 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):262:270 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean isStaticPut():224:224 -> e
@@ -120652,35 +120617,35 @@
     1:1:boolean instructionTypeCanThrow():108:108 -> o
     1:1:java.lang.String toString():204:204 -> toString
     1:2:com.android.tools.r8.ir.code.Value value():61:62 -> value
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean isStaticFieldInstruction():219:219 -> w2
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Wd0:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.ae0:
 # {"id":"sourceFile","fileName":"Store.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):26:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():60:60 -> F2
     1:1:int maxOutValueRegister():65:65 -> G2
     1:1:int opcode():31:31 -> H2
     1:1:com.android.tools.r8.ir.code.Store asStore():50:50 -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ae0;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value src():40:40 -> a
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):91:91 -> a
     4:4:com.android.tools.r8.ir.code.Value src():40:40 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):101:101 -> a
     6:6:void buildLir(com.android.tools.r8.lightir.LirBuilder):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     9:9:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):754:754 -> a
     9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -120688,18 +120653,18 @@
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86 -> a
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
     12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     13:16:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):111:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():269:269 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     1:1:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):119:119 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:2:com.android.tools.r8.ir.code.Value src():40:40 -> c
     2:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):119 -> c
     3:3:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):119:119 -> c
@@ -120709,14 +120674,14 @@
     6:6:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):126:126 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():106:106 -> c1
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.qf0:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.uf0:
 # {"id":"sourceFile","fileName":"StringSwitch.java"}
     com.android.tools.r8.graph.DexString[] keys -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/H2;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):26:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;[Lcom/android/tools/r8/graph/H2;[II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;[Lcom/android/tools/r8/graph/H2;[II)V"}
     4:5:boolean com.android.tools.r8.ir.code.Switch.valid():28:29 -> <init>
     4:5:boolean valid():73 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):28 -> <init>
@@ -120737,15 +120702,15 @@
     1:1:int maxOutValueRegister():144:144 -> G2
     1:1:int opcode():45:45 -> H2
     1:1:com.android.tools.r8.ir.code.StringSwitch asStringSwitch():87:87 -> L0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uf0;"}
     1:2:java.util.Map getKeyToTargetMap():36:37 -> M2
     3:3:com.android.tools.r8.graph.DexString getKey(int):91:91 -> M2
     3:3:java.util.Map getKeyToTargetMap():38 -> M2
     4:4:java.util.Map getKeyToTargetMap():38:38 -> M2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:4:void buildLir(com.android.tools.r8.lightir.LirBuilder):110:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     5:5:void buildLir(com.android.tools.r8.lightir.LirBuilder):114 -> a
     6:6:void buildLir(com.android.tools.r8.lightir.LirBuilder):114:114 -> a
@@ -120772,28 +120737,28 @@
     27:27:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addStringSwitch(java.lang.Object,com.android.tools.r8.graph.DexString[],com.android.tools.r8.ir.code.BasicBlock[],com.android.tools.r8.ir.code.BasicBlock):836:836 -> a
     27:27:void buildLir(com.android.tools.r8.lightir.LirBuilder):114 -> a
     28:28:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     29:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     30:30:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):129:129 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:4:java.lang.String toString():96:99 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):91:91 -> toString
     5:5:java.lang.String toString():100 -> toString
     6:11:java.lang.String toString():100:105 -> toString
     1:1:boolean isStringSwitch():82:82 -> z2
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Qf0:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Uf0:
 # {"id":"sourceFile","fileName":"Sub.java"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():33:33 -> H2
     1:1:boolean isCommutative():43:43 -> L2
     1:1:com.android.tools.r8.ir.code.Sub asSub():213:213 -> M0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Uf0;"}
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> N2
     1:1:int maxInOutValueRegisterSize():132 -> N2
     2:3:int maxInOutValueRegisterSize():132:133 -> N2
@@ -120807,9 +120772,9 @@
     12:12:int maxInOutValueRegisterSize():139 -> N2
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():218:218 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x8$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z8$a;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble(int,int,int):63:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:int foldIntegers(int,int):105:105 -> a
@@ -120819,7 +120784,7 @@
     7:7:com.android.tools.r8.ir.regalloc.RegisterAllocator com.android.tools.r8.ir.conversion.DexBuilder.getRegisterAllocator():1082:1082 -> a
     7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):165:165 -> a
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):171 -> a
@@ -120886,13 +120851,13 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateDouble2Addr(int,int):83:83 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100:100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):100:100 -> b
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> c
     1:1:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):146 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):146:146 -> c
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> c
     3:3:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):150 -> c
@@ -120915,89 +120880,89 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):53:53 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):124:126 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.ConstNumber.negativeIs16Bit():292:292 -> g
     4:4:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):126 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Zf0:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.dg0:
 # {"id":"sourceFile","fileName":"Swap.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;Lcom/android/tools/r8/internal/sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;Lcom/android/tools/r8/internal/wd0;)V"}
     2:5:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:30 -> <init>
     2:5:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23 -> <init>
     1:1:int maxInValueRegister():86:86 -> F2
     1:1:int maxOutValueRegister():91:91 -> G2
     1:1:int opcode():35:35 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():273:273 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isSwap():0:0 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81 -> b
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:122 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():107:107 -> c1
     1:2:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):45:46 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     3:3:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> d
     3:3:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):46 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:7:com.android.tools.r8.ir.code.Value setOutValue(com.android.tools.r8.ir.code.Value):46:49 -> d
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.ag0:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.eg0:
 # {"id":"sourceFile","fileName":"Switch.java"}
     int[] targetBlockIndices -> j
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():10:10 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):16:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;[II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;[II)V"}
     1:1:boolean isSwitch():76:76 -> B2
     1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     1:1:int numberOfKeys():71:71 -> L2
     1:1:com.android.tools.r8.ir.code.Switch asSwitch():81:81 -> N0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ag0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eg0;"}
     1:1:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/I5;"}
     2:2:int[] targetBlockIndices():43:43 -> b
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35 -> b
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> b
     4:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)V"}
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.Ng0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)V"}
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.Rg0:
 # {"id":"sourceFile","fileName":"Throw.java"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):22:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:boolean isThrow():71:71 -> C2
     1:1:int maxInValueRegister():50:50 -> F2
     1:1:int maxOutValueRegister():55:55 -> G2
     1:1:int opcode():31:31 -> H2
     1:1:com.android.tools.r8.ir.code.Throw asThrow():76:76 -> O0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ng0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rg0;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.code.Value exception():40:40 -> a
     2:2:void buildLir(com.android.tools.r8.lightir.LirBuilder):98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     3:3:void buildLir(com.android.tools.r8.lightir.LirBuilder):98:98 -> a
     4:4:com.android.tools.r8.ir.code.Value exception():40:40 -> a
     4:4:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Z"}
     5:5:com.android.tools.r8.ir.code.Value exception():40:40 -> a
     5:5:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):107 -> a
     6:7:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):107:108 -> a
@@ -121009,7 +120974,7 @@
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117 -> a
     11:15:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117:121 -> a
     16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     17:17:com.android.tools.r8.ir.code.Value exception():40:40 -> a
     17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     18:18:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
@@ -121021,120 +120986,120 @@
     20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
     22:22:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():277:277 -> a
     24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):82 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionTypeCanThrow():61:61 -> o
-com.android.tools.r8.ir.code.Throw$Builder -> com.android.tools.r8.internal.Mg0:
+com.android.tools.r8.ir.code.Throw$Builder -> com.android.tools.r8.internal.Qg0:
 # {"id":"sourceFile","fileName":"Throw.java"}
     com.android.tools.r8.ir.code.Value exceptionValue -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:1:void <init>():129:129 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.Qj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.Uj0:
 # {"id":"sourceFile","fileName":"UninitializedThisLocalRead.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():70:70 -> F2
     1:1:int maxOutValueRegister():75:75 -> G2
     1:1:int opcode():35:35 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     4:4:void buildLir(com.android.tools.r8.lightir.LirBuilder):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     7:7:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):65:65 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():96:96 -> c1
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.pk0:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.tk0:
 # {"id":"sourceFile","fileName":"Unop.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:boolean isUnop():40:40 -> D2
     1:1:int maxInValueRegister():30:30 -> F2
     1:1:int maxOutValueRegister():35:35 -> G2
     1:1:com.android.tools.r8.ir.code.Value dest():21:21 -> K2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> L2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     3:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():281:281 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):72:72 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():67:67 -> c1
-com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.Kk0:
+com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.Ok0:
 # {"id":"sourceFile","fileName":"UnusedArgument.java"}
     int $r8$clinit -> i
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int maxInValueRegister():107:107 -> F2
     1:1:int maxOutValueRegister():112:112 -> G2
     1:1:int opcode():117:117 -> H2
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L8;)V"}
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)V"}
     4:4:void buildLir(com.android.tools.r8.lightir.LirBuilder):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vK;)V"}
     5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/E;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/E;"}
     6:6:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tj0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xj0;)Lcom/android/tools/r8/graph/I2;"}
     7:7:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):82:82 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/X;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/O;"}
     9:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rL;)V"}
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87:87 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:boolean hasInvariantOutType():71:71 -> c1
-com.android.tools.r8.ir.code.UnusedArgument$Builder -> com.android.tools.r8.internal.Jk0:
+com.android.tools.r8.ir.code.UnusedArgument$Builder -> com.android.tools.r8.internal.Nk0:
 # {"id":"sourceFile","fileName":"UnusedArgument.java"}
     1:1:void <init>():120:120 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase self():120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bw;"}
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.Mk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dw;"}
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.Qk0:
 # {"id":"sourceFile","fileName":"Ushr.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():26:26 -> H2
     1:1:boolean isCommutative():52:52 -> L2
     1:1:com.android.tools.r8.ir.code.Ushr asUshr():47:47 -> P0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Qk0;"}
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():107:107 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateInt(int,int,int):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:int foldIntegers(int,int):92:92 -> a
@@ -121179,7 +121144,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):82:82 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isUshr():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87:87 -> b
@@ -121190,43 +121155,43 @@
     1:1:com.android.tools.r8.dex.code.DexInstruction CreateLong(int,int,int):62:62 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):37:37 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.Xk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.bl0:
 # {"id":"sourceFile","fileName":"Value.java"}
     int number -> b
     com.android.tools.r8.ir.code.Instruction definition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     java.util.LinkedList users -> d
     java.util.Set uniqueUsers -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.LinkedList phiUsers -> f
     java.util.Set uniquePhiUsers -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.ir.code.Value nextConsecutive -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Value previousConsecutive -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/c;"}
     int needsRegister -> k
     boolean isThis -> l
     com.android.tools.r8.utils.LongInterval valueRange -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NL;"}
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zk0;"}
     com.android.tools.r8.ir.analysis.type.TypeElement type -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.code.Value UNDEFINED -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> q
     1:114:void <clinit>():54:167 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):192:192 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;)V"}
     2:28:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):170:196 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1114:1114 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():1028:1038 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NL;"}
     1:1:boolean hasAnyUsers():425:425 -> C
     1:1:boolean hasBlock():1106:1106 -> D
     1:1:boolean hasDebugUsers():429:429 -> E
@@ -121253,16 +121218,16 @@
     2:2:boolean isConstResourceNumber():864 -> U
     1:1:boolean isConstString():883:883 -> V
     1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Reporter):58:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/d50;)V"}
     15:24:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Reporter):60:69 -> a
     25:25:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Reporter):60:60 -> a
     26:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicType.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):71:75 -> a
     26:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound getDynamicType(com.android.tools.r8.graph.AppView):1118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Hm;"}
     31:33:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicType.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):74:76 -> a
     31:33:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound getDynamicType(com.android.tools.r8.graph.AppView):1118 -> a
     34:93:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):76:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/aj0;"}
     94:95:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):130:131 -> a
     96:97:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):125:126 -> a
     98:99:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):120:121 -> a
@@ -121272,20 +121237,20 @@
     109:125:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:97 -> a
     126:130:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:98 -> a
     131:131:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)V"}
     132:132:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):145:145 -> a
     132:132:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):141 -> a
     133:153:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):241:261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b2;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b2;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/bl0;"}
     154:154:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     154:154:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):261 -> a
     155:155:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):261:261 -> a
     156:157:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):267:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/bl0;"}
     158:160:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):288:290 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;)V"}
     161:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):300:301 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     163:163:void com.android.tools.r8.ir.code.Instruction.addDebugValue(com.android.tools.r8.ir.code.Value):218:218 -> a
     163:163:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):302 -> a
     164:164:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):302:302 -> a
@@ -121297,15 +121262,15 @@
     167:169:void com.android.tools.r8.ir.code.Instruction.addDebugValue(com.android.tools.r8.ir.code.Value):220:222 -> a
     167:169:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):302 -> a
     170:174:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):347:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     175:180:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,java.util.Set):390:395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b2;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b2;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     181:181:boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):527:527 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     182:183:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):556:557 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     184:184:boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):556:556 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/internal/tW;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/internal/xW;)Z"}
     185:186:com.android.tools.r8.ir.optimize.AffectedValues affectedValues():592:593 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/a;"}
     187:192:void forEachAffectedValue(java.util.function.Consumer):602:607 -> a
@@ -121314,12 +121279,12 @@
     194:199:void forEachAffectedValue(java.util.function.Consumer):602:607 -> a
     194:199:void addAffectedValuesTo(java.util.Set):598 -> a
     200:207:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):618:625 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     208:208:void replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):707:707 -> a
     208:208:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):626 -> a
     209:211:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):628:630 -> a
     212:228:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map,java.util.Set):673:689 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/ir/optimize/a;)V"}
     229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Phi.getOperand(int):196:196 -> a
     229:229:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map,java.util.Set):689 -> a
     230:239:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map,java.util.Set):689:698 -> a
@@ -121328,9 +121293,9 @@
     241:241:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map,java.util.Set):700:700 -> a
     242:243:void setNeedsRegister(boolean):740:741 -> a
     244:244:int compareTo(com.android.tools.r8.ir.code.Value):779:779 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)I"}
     245:245:boolean lambda$toString$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):806:806 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     246:246:boolean com.android.tools.r8.ir.code.Instruction.isAnd():0:0 -> a
     246:246:boolean lambda$toString$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):806 -> a
     247:247:boolean com.android.tools.r8.ir.code.Instruction.isOr():0:0 -> a
@@ -121353,19 +121318,19 @@
     260:260:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):917 -> a
     261:269:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):917:925 -> a
     270:271:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1066:1067 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)V"}
     272:272:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)V"}
     273:274:boolean skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1101:1102 -> a
     273:274:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073 -> a
     275:282:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1080 -> a
     283:283:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement):1086:1086 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aj0;)V"}
     284:285:boolean skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1101:1102 -> a
     284:285:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement):1086 -> a
     286:296:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement):1086:1096 -> a
     297:301:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1170:1174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/rd;"}
     302:302:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     302:302:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.meetNullability(com.android.tools.r8.ir.analysis.type.Nullability):159 -> a
     302:302:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1175 -> a
@@ -121406,17 +121371,17 @@
     362:362:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1207:1207 -> a
     1:2:boolean hasUserThatMatches(java.util.function.Predicate):445:446 -> b
     3:4:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):527:528 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):551:552 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     7:7:boolean knownToBeBoolean(java.util.Set):979:979 -> b
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> b
     8:8:boolean knownToBeBoolean(java.util.Set):979 -> b
     9:27:boolean knownToBeBoolean(java.util.Set):983:1001 -> b
     28:28:com.android.tools.r8.ir.code.BasicBlock getBlock():1110:1110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I5;"}
     29:42:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1124:1137 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/aj0;"}
     43:43:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Assume.getDynamicTypeAssumption():72:72 -> b
     43:43:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1138 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -121424,7 +121389,7 @@
     44:44:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1138 -> b
     45:59:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1139:1153 -> b
     60:60:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1197:1197 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     1:1:boolean isConstant():903:903 -> b0
     1:1:java.util.Set aliasedUsers():379:379 -> c
     2:3:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):383:384 -> c
@@ -121438,17 +121403,17 @@
     10:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):494 -> c
     11:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:498 -> c
     13:17:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):569:573 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     18:18:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):929:929 -> c
     19:19:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1127:1127 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     1:1:int compareTo(java.lang.Object):54:54 -> compareTo
     2:2:int compareTo(com.android.tools.r8.ir.code.Value):779:779 -> compareTo
     2:2:int compareTo(java.lang.Object):54 -> compareTo
     1:1:com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue():208:208 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zp;"}
     2:2:boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value):682:682 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     1:1:boolean isDexItemBasedConstString():887:887 -> d0
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> d0
     2:2:boolean isDexItemBasedConstString():887 -> d0
@@ -121457,7 +121422,7 @@
     3:4:void clearUsers():534 -> e
     5:6:void clearUsers():535:536 -> e
     7:7:void replacePhiUsers(com.android.tools.r8.ir.code.Value):637:637 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     8:8:void com.android.tools.r8.ir.code.Phi.replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):246:246 -> e
     8:8:void replacePhiUsers(com.android.tools.r8.ir.code.Value):638 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -121465,7 +121430,7 @@
     9:10:void replacePhiUsers(com.android.tools.r8.ir.code.Value):640 -> e
     1:1:boolean isFixedRegisterValue():0:0 -> e0
     1:1:void replaceUsers(com.android.tools.r8.ir.code.Value):611:611 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:3:boolean isNeverNull():944:946 -> f0
     1:6:void clearUsersInfo():581:586 -> g
     1:1:boolean isUninitializedLocal():561:561 -> g0
@@ -121483,7 +121448,7 @@
     1:1:boolean isValueOnStack():0:0 -> i0
     1:3:boolean isZero():1043:1045 -> k0
     1:1:com.android.tools.r8.ir.code.Phi asPhi():937:937 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xW;"}
     1:1:void markNonDebugLocalRead():150:150 -> l0
     1:4:boolean needsRegister():731:734 -> m0
     5:12:boolean internalComputeNeedsRegister():750:757 -> m0
@@ -121496,11 +121461,11 @@
     1:1:java.util.Set debugUsers():421:421 -> o
     1:5:int numberOfPhiUsers():462:466 -> o0
     1:1:com.android.tools.r8.ir.code.Value getAliasedValue():232:232 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.ir.code.Value getAliasedValue():231:231 -> p
     1:5:int numberOfUsers():454:458 -> p0
     1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():839:840 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fg;"}
     1:15:boolean onlyDependsOnArgument():954:968 -> q0
     16:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstanceOf.value():52:52 -> q0
     16:16:boolean onlyDependsOnArgument():968 -> q0
@@ -121510,9 +121475,9 @@
     18:18:boolean onlyDependsOnArgument():968:968 -> q0
     19:19:boolean onlyDependsOnArgument():966:966 -> q0
     1:1:com.android.tools.r8.ir.code.ValueType outType():835:835 -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():374:375 -> s0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:2:int getConstInt():849:850 -> t
     1:4:java.util.Set uniquePhiUsers():406:409 -> t0
     1:43:java.lang.String toString():789:831 -> toString
@@ -121521,13 +121486,13 @@
     1:4:java.util.Set uniqueUsers():359:362 -> u0
     1:3:java.util.Set getDebugLocalEnds():294:296 -> v
     1:2:com.android.tools.r8.ir.code.Instruction getDefinition():212:213 -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():727:727 -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/regalloc/c;"}
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():280:280 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
     1:1:int getNumber():272:272 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.Vk0:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.Zk0:
 # {"id":"sourceFile","fileName":"Value.java"}
     com.android.tools.r8.graph.DebugLocalInfo local -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j0;"}
@@ -121535,33 +121500,33 @@
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):160:160 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j0;)V"}
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):158:161 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.Zk0:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.dl0:
 # {"id":"sourceFile","fileName":"ValueFactory.java"}
     com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/bl0;"}
     1:1:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.code.ValueIsDeadAnalysis -> com.android.tools.r8.internal.fl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.code.ValueIsDeadAnalysis -> com.android.tools.r8.internal.jl0:
 # {"id":"sourceFile","fileName":"ValueIsDeadAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Map analysisCache -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:46 -> <init>
     1:2:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     1:2:void recordDependentsAreNotDead(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph):205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/dl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/hl0;)V"}
     3:7:void recordDependentsAreNotDead(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph):206:210 -> a
     8:8:boolean hasDeadPhi(com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     9:15:com.android.tools.r8.ir.code.Value findNotDeadWitness(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.BooleanBox):86:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/D6;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/F6;)Lcom/android/tools/r8/internal/bl0;"}
     16:16:boolean com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph.isLeaf(com.android.tools.r8.ir.code.Value):262:262 -> a
     16:16:com.android.tools.r8.ir.code.Value findNotDeadWitness(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.BooleanBox):92 -> a
     17:20:com.android.tools.r8.ir.code.Value findNotDeadWitness(com.android.tools.r8.utils.WorkList,com.android.tools.r8.utils.BooleanBox):92:95 -> a
@@ -121612,7 +121577,7 @@
     82:82:boolean com.android.tools.r8.ir.code.Value.isUnused():486:486 -> a
     82:82:boolean isDead(com.android.tools.r8.ir.code.Value):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     83:84:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     83:84:boolean isDead(com.android.tools.r8.ir.code.Value):64 -> a
     85:90:boolean isDead(com.android.tools.r8.ir.code.Value):65:70 -> a
@@ -121621,10 +121586,10 @@
     93:94:boolean isDead(com.android.tools.r8.ir.code.Value):74:75 -> a
     95:95:boolean isDead(com.android.tools.r8.ir.code.Value):74:74 -> a
     1:1:boolean lambda$isDead$0(com.android.tools.r8.ir.code.Value):75:75 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:4:void recordValueIsNotDead(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph):199:201 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/dl0;)V"}
-com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph -> com.android.tools.r8.internal.dl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/hl0;)V"}
+com.android.tools.r8.ir.code.ValueIsDeadAnalysis$DependenceGraph -> com.android.tools.r8.internal.hl0:
 # {"id":"sourceFile","fileName":"ValueIsDeadAnalysis.java"}
     java.util.Map successors -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -121634,37 +121599,37 @@
     1:1:void <clinit>():215:215 -> <clinit>
     1:4:void <init>():215:218 -> <init>
     1:6:void addDependenceEdge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):226:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     7:7:java.util.Set removeLeaf(com.android.tools.r8.ir.code.Value):235:235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Ljava/util/Set;"}
     8:8:boolean isLeaf(com.android.tools.r8.ir.code.Value):262:262 -> a
     8:8:java.util.Set removeLeaf(com.android.tools.r8.ir.code.Value):235 -> a
     9:16:java.util.Set removeLeaf(com.android.tools.r8.ir.code.Value):235:242 -> a
     1:8:void unlinkSuccessors(com.android.tools.r8.ir.code.Value):249:256 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
-com.android.tools.r8.ir.code.ValueIsDeadAnalysis$ValueIsDeadResult -> com.android.tools.r8.internal.el0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
+com.android.tools.r8.ir.code.ValueIsDeadAnalysis$ValueIsDeadResult -> com.android.tools.r8.internal.il0:
 # {"id":"sourceFile","fileName":"ValueIsDeadAnalysis.java"}
     com.android.tools.r8.ir.code.ValueIsDeadAnalysis$ValueIsDeadResult DEAD -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/el0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/il0;"}
     com.android.tools.r8.ir.code.ValueIsDeadAnalysis$ValueIsDeadResult NOT_DEAD -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/el0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/il0;"}
     1:2:void <clinit>():27:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.kl0:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.ol0:
 # {"id":"sourceFile","fileName":"ValueType.java"}
     com.android.tools.r8.ir.code.ValueType OBJECT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.ir.code.ValueType INT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.ir.code.ValueType FLOAT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.ir.code.ValueType LONG -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.ir.code.ValueType DOUBLE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.ir.code.ValueType[] $VALUES -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ol0;"}
     1:5:void <clinit>():18:22 -> <clinit>
     6:6:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
@@ -121677,28 +121642,28 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:boolean isObject():39:39 -> a
     4:22:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):59:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/ol0;"}
     23:23:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):75:75 -> a
     24:24:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> a
     25:25:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):68:68 -> a
     26:26:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):66:66 -> a
     27:35:com.android.tools.r8.ir.code.ValueType fromMemberType(com.android.tools.r8.ir.code.MemberType):64:72 -> a
     36:36:com.android.tools.r8.ir.code.ValueType fromTypeDescriptorChar(char):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/ol0;"}
     37:37:com.android.tools.r8.ir.code.ValueType fromTypeDescriptorChar(char):99:99 -> a
     38:48:com.android.tools.r8.ir.code.ValueType fromTypeDescriptorChar(char):85:95 -> a
     49:53:com.android.tools.r8.ir.code.ValueType fromTypeDescriptorChar(char):93:97 -> a
     54:54:com.android.tools.r8.ir.code.ValueType fromTypeDescriptorChar(char):91:91 -> a
     55:55:com.android.tools.r8.ir.code.ValueType fromDexType(com.android.tools.r8.graph.DexType):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ol0;"}
     56:69:com.android.tools.r8.ir.code.ValueType fromNumericType(com.android.tools.r8.ir.code.NumericType):110:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Lcom/android/tools/r8/internal/ol0;"}
     70:70:com.android.tools.r8.ir.code.ValueType fromNumericType(com.android.tools.r8.ir.code.NumericType):121:121 -> a
     71:71:com.android.tools.r8.ir.code.ValueType fromNumericType(com.android.tools.r8.ir.code.NumericType):119:119 -> a
     72:72:com.android.tools.r8.ir.code.ValueType fromNumericType(com.android.tools.r8.ir.code.NumericType):117:117 -> a
     73:73:com.android.tools.r8.ir.code.ValueType fromNumericType(com.android.tools.r8.ir.code.NumericType):115:115 -> a
     74:89:com.android.tools.r8.ir.code.ValueType fromType(com.android.tools.r8.ir.analysis.type.TypeElement):128:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/ol0;"}
     90:102:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):147:159 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     103:103:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):157:157 -> a
@@ -121711,14 +121676,14 @@
     1:1:int compareTo(com.android.tools.r8.utils.structural.Ordered):17:17 -> compareTo
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/s;)I"}
     1:11:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():164:174 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TX;"}
     12:12:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():172:172 -> d
     13:13:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():170:170 -> d
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():168:168 -> d
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():166:166 -> d
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():35:35 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.jl0:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.nl0:
 # {"id":"sourceFile","fileName":"ValueType.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
@@ -121732,71 +121697,71 @@
     5:5:com.android.tools.r8.ir.code.MemberType[] com.android.tools.r8.ir.code.MemberType.values():11:11 -> <clinit>
     5:5:void <clinit>():59 -> <clinit>
     6:6:void <clinit>():59:59 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.ml0:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.ql0:
 # {"id":"sourceFile","fileName":"ValueTypeConstraint.java"}
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint INT_OR_FLOAT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint INT_OR_FLOAT_OR_OBJECT -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint LONG -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint DOUBLE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint LONG_OR_DOUBLE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql0;"}
     com.android.tools.r8.ir.code.ValueTypeConstraint[] $VALUES -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ql0;"}
     1:8:void <clinit>():14:21 -> <clinit>
     9:9:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:boolean isObject():24:24 -> a
     2:14:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):46:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)Lcom/android/tools/r8/internal/ql0;"}
     15:15:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):56:56 -> a
     16:16:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):54:54 -> a
     17:17:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):52:52 -> a
     18:18:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):50:50 -> a
     19:19:com.android.tools.r8.ir.code.ValueTypeConstraint fromValueType(com.android.tools.r8.ir.code.ValueType):48:48 -> a
     20:39:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):63:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/ql0;"}
     40:40:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):78:78 -> a
     41:45:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):72:76 -> a
     46:46:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):74:74 -> a
     47:47:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> a
     48:60:com.android.tools.r8.ir.code.ValueTypeConstraint fromMemberType(com.android.tools.r8.ir.code.MemberType):68:80 -> a
     61:61:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeDescriptorChar(char):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/ql0;"}
     62:62:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeDescriptorChar(char):104:104 -> a
     63:73:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeDescriptorChar(char):90:100 -> a
     74:78:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeDescriptorChar(char):98:102 -> a
     79:79:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeDescriptorChar(char):96:96 -> a
     80:80:com.android.tools.r8.ir.code.ValueTypeConstraint fromDexType(com.android.tools.r8.graph.DexType):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ql0;"}
     81:94:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):115:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Lcom/android/tools/r8/internal/ql0;"}
     95:95:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):126:126 -> a
     96:96:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):124:124 -> a
     97:97:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):122:122 -> a
     98:98:com.android.tools.r8.ir.code.ValueTypeConstraint fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     99:123:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):133:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/ql0;"}
     124:124:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:boolean isPrecise():36:36 -> b
     1:1:boolean isWide():32:32 -> c
     1:1:int requiredRegisters():42 -> c
     1:11:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():161:171 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TX;"}
     12:12:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():167:167 -> d
     13:13:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():165:165 -> d
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():163:163 -> d
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.ll0:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.pl0:
 # {"id":"sourceFile","fileName":"ValueTypeConstraint.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
@@ -121814,19 +121779,19 @@
     7:7:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     7:7:void <clinit>():46 -> <clinit>
     8:8:void <clinit>():46:46 -> <clinit>
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.dm0:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.hm0:
 # {"id":"sourceFile","fileName":"WideConstant.java"}
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Dm0:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Hm0:
 # {"id":"sourceFile","fileName":"Xor.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:int opcode():37:37 -> H2
     1:1:boolean isCommutative():57:57 -> L2
     1:1:com.android.tools.r8.ir.code.Xor asXor():52:52 -> Q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hm0;"}
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():112:112 -> Q2
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S9;"}
     1:1:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.arithmetic.AbstractCalculator.xorIntegers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):175 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue foldIntegers(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):102 -> a
@@ -121863,7 +121828,7 @@
     18:24:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.arithmetic.AbstractCalculator.xorIntegers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):184:190 -> a
     18:24:com.android.tools.r8.ir.analysis.value.AbstractValue foldIntegers(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.AppView):102 -> a
     25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mv;)Ljava/lang/Object;"}
     26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     26:26:boolean outTypeKnownToBeBoolean(java.util.Set):117 -> a
     27:27:boolean outTypeKnownToBeBoolean(java.util.Set):117:117 -> a
@@ -121876,7 +121841,7 @@
     2:2:com.android.tools.r8.dex.code.DexInstruction CreateIntLit16(int,int,int):87:87 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/dex/code/z1;"}
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isXor():0:0 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
     5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
@@ -121901,14 +121866,14 @@
     long size -> b
     short[] data -> c
     1:1:void <init>():17:17 -> <init>
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.L8:
 # {"id":"sourceFile","fileName":"CfBuilder.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.ProgramMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.code.IRCode code -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Map labels -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Set emittedLabels -> e
@@ -121916,22 +121881,22 @@
     java.util.List instructions -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.cf.CfRegisterAllocator registerAllocator -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ua;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa;"}
     com.android.tools.r8.ir.code.Position currentPosition -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.Position preamblePosition -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap emittedLocals -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pendingLocals -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean pendingLocalChanges -> l
     com.android.tools.r8.ir.code.BasicBlock pendingFrame -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.List localVariablesTable -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap openLocalVariables -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.Map initializers -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.List thisInitializers -> q
@@ -121939,11 +121904,11 @@
     java.util.Map newInstanceLabels -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder bytecodeMetadataBuilder -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c8;"}
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):142:142 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):93:96 -> <init>
     6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):96 -> <init>
@@ -121955,7 +121920,7 @@
     60:60:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):146 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):146:146 -> <init>
     1:10:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.utils.Timing,java.lang.String):150:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)Lcom/android/tools/r8/graph/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)Lcom/android/tools/r8/graph/G;"}
     11:21:void com.android.tools.r8.cf.LoadStoreHelper.insertLoadsAndStores():99:109 -> a
     11:21:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.utils.Timing,java.lang.String):160 -> a
     22:25:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.utils.Timing,java.lang.String):161:164 -> a
@@ -122420,13 +122385,13 @@
     386:391:void computeInitializers():291:296 -> a
     386:391:void lambda$build$0():151 -> a
     392:394:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):301:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Ljava/util/ArrayList;"}
     395:395:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     395:395:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):304 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     396:399:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):304:307 -> a
     400:401:void updateLocals(com.android.tools.r8.cf.code.CfLabel):618:619 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)V"}
     402:407:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):75:80 -> a
     402:407:void updateLocals(com.android.tools.r8.cf.code.CfLabel):619 -> a
     408:408:void updateLocals(com.android.tools.r8.cf.code.CfLabel):620:620 -> a
@@ -122459,13 +122424,13 @@
     436:440:void updateLocals(com.android.tools.r8.cf.code.CfLabel):633:637 -> a
     441:446:void updateLocals(com.android.tools.r8.cf.code.CfLabel):636:641 -> a
     447:452:com.android.tools.r8.cf.code.frame.UninitializedFrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):699:704 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/sj0;)Lcom/android/tools/r8/internal/Kj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/wj0;)Lcom/android/tools/r8/internal/Oj0;"}
     453:484:com.android.tools.r8.cf.code.frame.UninitializedFrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):703:734 -> a
     485:485:com.android.tools.r8.cf.code.frame.UninitializedFrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):709:709 -> a
     486:486:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):750:750 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/M9;"}
     487:487:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):762:762 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/Kw;)V"}
     488:488:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:52 -> a
     488:488:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):762 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -122498,7 +122463,7 @@
     61:61:void rewriteIincPatterns():512:512 -> b
     62:62:void rewriteIincPatterns():507:507 -> b
     63:63:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$1(com.android.tools.r8.ir.code.BasicBlock):750:750 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/M9;"}
     1:5:void rewriteNots():314:318 -> c
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isNot():0:0 -> c
     6:6:void rewriteNots():318 -> c
@@ -122513,21 +122478,21 @@
     23:24:void rewriteNots():335 -> c
     25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> c
     25:25:void rewriteNots():334 -> c
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.K8:
 # {"id":"sourceFile","fileName":"CfBuilder.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():113:113 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.Ea:
 # {"id":"sourceFile","fileName":"CfSourceCode.java"}
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tt;"}
     boolean hasExitingInstruction -> b
     boolean needsGeneratedMethodSynchronization -> c
     boolean currentlyGeneratingMethodSynchronization -> d
     com.android.tools.r8.ir.code.Monitor monitorEnter -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XO;"}
     com.android.tools.r8.ir.conversion.CfState state -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ra;"}
     java.util.List localVariables -> g
     com.android.tools.r8.graph.CfCode code -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G;"}
@@ -122536,28 +122501,28 @@
     com.android.tools.r8.graph.AppView appView -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelOffsets -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList cachedTryHandlerList -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ba;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Da;"}
     com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList cachedLocalVariableList -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca;"}
     int currentInstructionIndex -> n
     int currentBlockIndex -> o
     boolean inPrelude -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap incomingLocals -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap outgoingLocals -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap incomingState -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.ir.code.CanonicalPositions canonicalPositions -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p8;"}
     com.android.tools.r8.utils.InternalOutputMode internalOutputMode -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
     boolean $assertionsDisabled -> v
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.AppView):211:211 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;Ljava/util/List;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G;Ljava/util/List;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/y;)V"}
     2:141:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.AppView):63:202 -> <init>
     142:142:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     142:142:void <init>(com.android.tools.r8.graph.CfCode,java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.AppView):202 -> <init>
@@ -122578,7 +122543,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.cf.code.CfFrame.getLocals():136:136 -> a
     1:1:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):580 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9;)V"}
     2:2:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):581:581 -> a
     3:3:java.util.Deque com.android.tools.r8.cf.code.CfFrame.getStack():145:145 -> a
     3:3:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):582 -> a
@@ -122612,11 +122577,11 @@
     28:28:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):595 -> a
     29:29:void setStateFromFrame(com.android.tools.r8.cf.code.CfFrame):596:596 -> a
     30:32:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):274:276 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     33:33:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):276 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     34:34:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):276 -> a
     35:36:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):276:277 -> a
     37:40:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):276:279 -> a
@@ -122654,7 +122619,7 @@
     63:63:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):300 -> a
     64:64:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):302:302 -> a
     65:65:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Ba;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Da;"}
     66:66:boolean com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList.validFor(int):85:85 -> a
     66:66:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -122671,7 +122636,7 @@
     106:113:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):311:318 -> a
     114:116:void buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):421:423 -> a
     114:116:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):487 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     117:118:void com.android.tools.r8.ir.conversion.CfState.setPosition(com.android.tools.r8.ir.code.Position):230:231 -> a
     117:118:void buildExceptionalExitMethodSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):423 -> a
     117:118:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):487 -> a
@@ -122763,28 +122728,28 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     205:213:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):546:554 -> a
     214:216:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):431:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     217:217:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     217:217:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):433 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     218:219:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):433:434 -> a
     220:221:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):448:449 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     222:222:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):448:448 -> a
     223:224:void com.android.tools.r8.ir.conversion.CfState.setPosition(com.android.tools.r8.ir.code.Position):230:231 -> a
     223:224:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):448 -> a
     225:249:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):452:476 -> a
     250:251:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):563:564 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Na;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Pa;)V"}
     252:256:com.android.tools.r8.ir.conversion.CfState$Snapshot com.android.tools.r8.ir.conversion.CfState.merge(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.graph.ProgramMethod):122:126 -> a
     252:256:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):564 -> a
     257:257:void recordStateForTarget(int,com.android.tools.r8.ir.conversion.CfState$Snapshot):566:566 -> a
     258:259:int getLabelOffset(com.android.tools.r8.cf.code.CfLabel):575:576 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K9;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M9;)I"}
     260:260:void lambda$setStateFromFrame$0(com.android.tools.r8.graph.DexType[],int,com.android.tools.r8.cf.code.frame.FrameType):584:584 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/Sq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;ILcom/android/tools/r8/internal/Uq;)V"}
     261:263:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.frame.FrameType):612:614 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)Lcom/android/tools/r8/graph/I2;"}
     264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.NullFrameType.getInitializedType():72:72 -> a
     264:264:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.frame.FrameType):614 -> a
     265:266:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.frame.FrameType):616:617 -> a
@@ -122793,21 +122758,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     268:296:com.android.tools.r8.graph.DexType convertUninitialized(com.android.tools.r8.cf.code.frame.FrameType):620:648 -> a
     297:297:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):654:654 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     298:298:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):658:658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     299:299:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):662:662 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/graph/j0;"}
     300:325:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):668:693 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/tW$a;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/xW$a;)Lcom/android/tools/r8/graph/I2;"}
     326:326:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):662:662 -> a
     326:326:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):694 -> a
     327:361:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):696:730 -> a
     362:363:boolean isControlFlow(com.android.tools.r8.cf.code.CfInstruction):812:813 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Z"}
     364:364:boolean hasValidTypesFromStackMap():855:855 -> a
     365:372:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):861:868 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     373:393:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):861:881 -> a
     394:394:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():58:58 -> a
     394:394:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):881 -> a
@@ -122817,7 +122782,7 @@
     396:396:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):883 -> a
     1:1:boolean verifyRegister(int):263:263 -> b
     2:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):359:361 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     5:5:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():58:58 -> b
     5:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):361 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -122889,10 +122854,10 @@
     81:81:boolean verifyCurrentInstructionCanThrow():842 -> b
     82:85:boolean verifyCurrentInstructionCanThrow():842:845 -> b
     86:86:boolean lambda$getCanonicalDebugPositionAtOffset$1(com.android.tools.r8.cf.code.CfInstruction):865:865 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Z"}
     1:1:int instructionIndex(int):253:253 -> c
     2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):820:820 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     3:3:boolean isCurrentlyGeneratingMethodSynchronization():396:396 -> c
     3:3:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):823 -> c
     4:6:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):826:828 -> c
@@ -122913,7 +122878,7 @@
     14:14:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):850:850 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     15:15:com.android.tools.r8.ir.code.Position lambda$getCanonicalDebugPositionAtOffset$2(com.android.tools.r8.cf.code.CfInstruction):866:866 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/TW;"}
     1:1:void clear():270:270 -> clear
     1:1:void setUp():267:267 -> d
     2:2:boolean isCurrentlyGeneratingMethodSynchronization():396:396 -> d
@@ -122921,7 +122886,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     3:8:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):743:748 -> d
     9:9:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):778:778 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     10:10:boolean localsChanged():765:765 -> d
     10:10:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):778 -> d
     11:16:void startLocals(com.android.tools.r8.ir.conversion.IRBuilder):778:783 -> d
@@ -122945,7 +122910,7 @@
     3:3:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):735:735 -> e
     1:1:int getMoveExceptionRegister(int):837:837 -> f
     2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():888:888 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     3:3:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.conversion.CfState.getPosition():226:226 -> f
     3:3:com.android.tools.r8.ir.code.Position getCurrentPosition():888 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -122953,7 +122918,7 @@
     2:2:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$3():867:867 -> g
     3:6:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$3():864:867 -> g
     1:1:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):322:322 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Aa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ca;"}
     2:2:boolean com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList.validFor(int):183:183 -> h
     2:2:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):322 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -122970,87 +122935,87 @@
     24:26:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList getLocalVariables(int):324:326 -> h
     1:25:int[] getTargets(int):330:354 -> i
     26:27:int[] getTargets(int):334:335 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.za:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.Ba:
 # {"id":"sourceFile","fileName":"CfSourceCode.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     1:1:void <clinit>():795 -> <clinit>
     2:2:void <clinit>():795:795 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.Ca:
 # {"id":"sourceFile","fileName":"CfSourceCode.java"}
     int startOffset -> a
     int endOffset -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):148:151 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/az;)V"}
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.Ba:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/cz;)V"}
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.Da:
 # {"id":"sourceFile","fileName":"CfSourceCode.java"}
     int startOffset -> a
     int endOffset -> b
     java.util.List guards -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList offsets -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/ArrayList;Lcom/android/tools/r8/internal/Kz;)V"}
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.Da:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/util/ArrayList;Lcom/android/tools/r8/internal/Mz;)V"}
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.Fa:
 # {"id":"sourceFile","fileName":"CfSourceUtils.java"}
     1:1:com.android.tools.r8.cf.code.CfInstruction getLastInstruction(java.util.List):24:24 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/K9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/M9;"}
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2:2:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):15 -> a
     3:6:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):16:19 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.Ra:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Na;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pa;"}
     com.android.tools.r8.ir.code.Position position -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.ProgramMethod):81:81 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:23:com.android.tools.r8.ir.conversion.CfState$Snapshot merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.graph.ProgramMethod):130:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ga;Lcom/android/tools/r8/internal/Ga;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ga;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ia;Lcom/android/tools/r8/internal/Ia;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ia;"}
     24:29:com.android.tools.r8.ir.conversion.CfState$Snapshot merge(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.ir.conversion.CfState$BaseSnapshot,com.android.tools.r8.graph.ProgramMethod):131:136 -> a
     30:30:com.android.tools.r8.ir.conversion.CfState$Slot push(com.android.tools.r8.graph.DexType):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/La;"}
     31:31:com.android.tools.r8.ir.conversion.CfState$Slot push(com.android.tools.r8.ir.code.ValueType):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)Lcom/android/tools/r8/internal/La;"}
     32:34:com.android.tools.r8.ir.conversion.CfState$Slot push(com.android.tools.r8.ir.conversion.CfState$SlotType):177:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ma;)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oa;)Lcom/android/tools/r8/internal/La;"}
     35:35:void updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Na;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pa;)V"}
     36:37:void com.android.tools.r8.ir.conversion.CfState$BaseSnapshot.<init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):348:349 -> a
     36:37:void updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183 -> a
     38:38:void updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183:183 -> a
     39:40:com.android.tools.r8.ir.conversion.CfState$Slot pop():187:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/La;"}
     41:41:com.android.tools.r8.ir.conversion.CfState$Slot read(int):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     42:42:com.android.tools.r8.ir.conversion.CfState$Slot write(int,com.android.tools.r8.graph.DexType):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/La;"}
     43:44:com.android.tools.r8.ir.conversion.CfState$Slot write(int,com.android.tools.r8.ir.conversion.CfState$SlotType):221:222 -> a
     43:44:com.android.tools.r8.ir.conversion.CfState$Slot write(int,com.android.tools.r8.graph.DexType):213 -> a
     1:1:java.lang.String toString():236:236 -> toString
     2:3:void com.android.tools.r8.ir.conversion.CfState$BaseSnapshot.<init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):348:349 -> toString
     2:3:java.lang.String toString():236 -> toString
     4:4:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.Ia:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ma;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Oa;"}
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ma;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Oa;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():333:333 -> <clinit>
     1:3:void <init>(int,int):342:344 -> <init>
     4:9:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):353:358 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;[Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;[Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TW;)V"}
     10:12:com.android.tools.r8.ir.conversion.CfState$SlotType getSlotType(com.android.tools.r8.graph.DexType):367:369 -> <init>
     10:12:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):358 -> <init>
     13:17:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):358:362 -> <init>
@@ -123058,18 +123023,18 @@
     18:20:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):362 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.DexType[],com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.code.Position):362:362 -> <init>
     1:5:com.android.tools.r8.ir.conversion.CfState$Slot getLocal(int):395:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     6:10:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):404:408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ga;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ia;)V"}
     11:11:com.android.tools.r8.ir.conversion.CfState$BaseSnapshot asBase():414:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ga;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ia;"}
     1:1:int maxLocal():379:379 -> b
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):384:384 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     3:3:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState$Slot.stackSlot(int,com.android.tools.r8.ir.conversion.CfState$SlotType):255:255 -> b
     3:3:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):384 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():389:389 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/La;"}
     2:2:int stackHeight():374:374 -> c
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot peek():389 -> c
     3:3:com.android.tools.r8.ir.conversion.CfState$Slot peek():389:389 -> c
@@ -123078,32 +123043,32 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():390:390 -> c
     1:1:int stackHeight():374:374 -> d
     1:15:java.lang.String toString():419:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.Ja:
 # {"id":"sourceFile","fileName":"CfState.java"}
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):481:483 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Na;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pa;)V"}
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):493:494 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():499:499 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/La;"}
     1:1:int stackHeight():488:488 -> d
     1:1:java.lang.String toString():504:504 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.Ka:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/La;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$SlotType):442:443 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Na;Lcom/android/tools/r8/internal/Ma;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pa;Lcom/android/tools/r8/internal/Oa;)V"}
     3:3:com.android.tools.r8.ir.conversion.CfState$Slot com.android.tools.r8.ir.conversion.CfState$Slot.stackSlot(int,com.android.tools.r8.ir.conversion.CfState$SlotType):255:255 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$SlotType):443 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,com.android.tools.r8.ir.conversion.CfState$SlotType):443:444 -> <init>
     1:2:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):464:465 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ga;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ia;)V"}
     3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> a
     3:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):465 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -123117,7 +123082,7 @@
     8:8:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466 -> a
     9:9:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):466:466 -> a
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454:454 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> b
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -123127,7 +123092,7 @@
     4:4:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454 -> b
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):454:454 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():459:459 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/La;"}
     1:1:int stackHeight():449:449 -> d
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> d
     2:2:int stackHeight():449 -> d
@@ -123135,105 +123100,105 @@
     3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.stackPosition():259:259 -> d
     3:3:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.Ja:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.La:
 # {"id":"sourceFile","fileName":"CfState.java"}
     int register -> a
     com.android.tools.r8.ir.code.ValueType type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.graph.DexType preciseType -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ma;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oa;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():239:239 -> <clinit>
     1:5:void <init>(int,com.android.tools.r8.ir.conversion.CfState$SlotType):247:251 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Ma;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Oa;)V"}
     1:1:boolean isStackSlot(int):280:280 -> a
     2:2:boolean isPrecise():284:284 -> a
     3:3:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
     3:3:boolean isPrecise():284 -> a
     1:2:int stackPosition(int):263:264 -> b
     1:3:java.lang.String toString():270:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.Oa:
 # {"id":"sourceFile","fileName":"CfState.java"}
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     com.android.tools.r8.graph.DexType getPrecise() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.Ma:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.code.ValueType type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ol0;"}
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):56:57 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)V"}
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:1:com.android.tools.r8.graph.DexType getPrecise():62:62 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.La:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.Na:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.graph.DexType type -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
     1:1:com.android.tools.r8.graph.DexType getPrecise():33:33 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.Pa:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Na;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pa;"}
     int updates -> b
     1:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int):292:294 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Na;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Pa;)V"}
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot getLocal(int):314:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     2:2:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):318:318 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ga;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ia;)V"}
     3:3:com.android.tools.r8.ir.conversion.CfState$BaseSnapshot asBase():322:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ga;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ia;"}
     4:5:void com.android.tools.r8.ir.conversion.CfState$BaseSnapshot.<init>(com.android.tools.r8.ir.conversion.CfState$Snapshot):348:349 -> a
     4:5:com.android.tools.r8.ir.conversion.CfState$BaseSnapshot asBase():322 -> a
     1:1:int maxLocal():302:302 -> b
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):306:306 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():310:310 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/La;"}
     1:1:int stackHeight():298:298 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.Qa:
 # {"id":"sourceFile","fileName":"CfState.java"}
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/La;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$SlotType):513:515 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Na;ILcom/android/tools/r8/internal/Ma;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pa;ILcom/android/tools/r8/internal/Oa;)V"}
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot getLocal(int):525:525 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ja;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/La;"}
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):530:531 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ga;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ia;)V"}
     1:1:int maxLocal():520:520 -> b
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.Yb:
 # {"id":"sourceFile","fileName":"ClassConverter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KX;"}
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xh;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MA;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():34:34 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):45:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GX;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/KX;Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;)V"}
     void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/D2;)V"}
     void notifyAllClassesConverted() -> a
     1:1:java.util.List lambda$getDeterministicNestWaves$0(com.android.tools.r8.graph.DexType):76:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/List;"}
@@ -123242,7 +123207,7 @@
     4:5:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):116:117 -> a
     4:5:void com.android.tools.r8.internal.ClassConverter.internalConvertClasses(com.android.tools.r8.internal.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xb;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zb;Ljava/util/concurrent/ExecutorService;)V"}
     6:6:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions com.android.tools.r8.ir.conversion.D8MethodProcessor.getProfileCollectionAdditions():61:61 -> a
     6:6:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -123345,35 +123310,35 @@
     275:275:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):163:163 -> a
     276:276:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):160:160 -> a
     277:278:void lambda$internalConvertClasses$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):180:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)V"}
     279:280:void com.android.tools.r8.graph.DexEncodedMethod.markNotProcessed():722:723 -> a
     279:280:void lambda$internalConvertClasses$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):182 -> a
     281:283:void lambda$internalConvertClasses$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):184:186 -> a
     284:287:void checkWaveDeterminism(java.util.Collection):206:209 -> a
     288:290:void lambda$checkWaveDeterminism$5(java.util.Collection,com.android.tools.r8.utils.DeterminismChecker):213:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/il;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/kl;)V"}
     291:292:void lambda$checkWaveDeterminism$4(java.util.List,com.android.tools.r8.utils.DeterminismChecker$LineCallback):217:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/fl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/hl;)V"}
     1:25:java.util.Deque getDeterministicNestWaves(java.util.Collection):73:97 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Ljava/util/ArrayDeque;"}
     26:26:void lambda$internalConvertClasses$2(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):162:162 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.Ub:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/D2;)V"}
+com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.Wb:
 # {"id":"sourceFile","fileName":"ClassConverter.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):241:241 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GX;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/KX;Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;)V"}
     1:1:void com.android.tools.r8.ir.conversion.ClassConverter.convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):229:229 -> a
     1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/D2;)V"}
     2:2:void notifyAllClassesConverted():253:253 -> a
-com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.Xb:
 # {"id":"sourceFile","fileName":"ClassConverter.java"}
     java.util.Set alreadyLibraryDesugared -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):265:265 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GX;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/KX;Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):258:258 -> <init>
     1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):273:273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/D2;)V"}
     2:2:void com.android.tools.r8.ir.conversion.LibraryDesugaredChecker.<init>(com.android.tools.r8.graph.AppView):28:28 -> a
     2:2:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):273 -> a
     3:3:boolean com.android.tools.r8.ir.conversion.LibraryDesugaredChecker.isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):32:32 -> a
@@ -123400,32 +123365,32 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
 com.android.tools.r8.ir.conversion.ClassConverterResult -> R8$$REMOVED$$CLASS$$92:
 # {"id":"sourceFile","fileName":"ClassConverterResult.java"}
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.Zb:
 # {"id":"sourceFile","fileName":"ClassConverterResult.java"}
     java.util.Map forcefullyMovedLambdaMethods -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:3:void <init>():28:30 -> <init>
     1:1:void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):34:34 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.xh:
 # {"id":"sourceFile","fileName":"D8MethodProcessor.java"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions profileCollectionAdditions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cY;"}
     com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KX;"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer eventConsumer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rO;"}
     java.util.Set scheduled -> d
     com.android.tools.r8.threading.SynchronizedTaskCollection terminalTasks -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pg0;"}
     com.android.tools.r8.threading.SynchronizedTaskCollection nonTerminalTasks -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pg0;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,java.util.concurrent.ExecutorService):42:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/internal/GX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/internal/KX;Ljava/util/concurrent/ExecutorService;)V"}
     2:20:void <init>(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,java.util.concurrent.ExecutorService):26:44 -> <init>
     21:21:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer.createForD8(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions):30:30 -> <init>
     21:21:void <init>(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,java.util.concurrent.ExecutorService):45 -> <init>
@@ -123443,7 +123408,7 @@
     1:1:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):77:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     2:2:void lambda$scheduleMethodForProcessing$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     3:3:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore.getInstance():32:32 -> a
     3:3:void lambda$scheduleMethodForProcessing$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):99 -> a
     4:6:void lambda$scheduleMethodForProcessing$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):99:101 -> a
@@ -123463,15 +123428,15 @@
     10:12:void com.android.tools.r8.threading.TaskCollection.submitUnchecked(com.android.tools.r8.utils.ThrowingAction):125:127 -> b
     10:12:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):116 -> b
     13:17:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142:146 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     18:18:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142:142 -> b
     19:20:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):141:142 -> b
     19:20:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     21:21:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):142 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     22:22:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):142 -> b
     22:22:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
     23:25:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):142:144 -> b
@@ -123481,7 +123446,7 @@
     33:37:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):168:172 -> b
     33:37:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     33:37:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    38:38:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():387:387 -> b
+    38:38:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():386:386 -> b
     38:38:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):172 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:38:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
@@ -123496,7 +123461,7 @@
     42:44:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):174:176 -> b
     42:44:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     42:44:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    45:45:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    45:45:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     45:45:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):176 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
@@ -123515,7 +123480,7 @@
     58:64:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     58:64:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     58:64:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    65:65:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():387:387 -> b
+    65:65:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():386:386 -> b
     65:65:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):200 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123525,7 +123490,7 @@
     66:67:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     66:67:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     66:67:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    68:68:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():387:387 -> b
+    68:68:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():386:386 -> b
     68:68:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):201 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     68:68:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123535,7 +123500,7 @@
     69:71:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     69:71:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     69:71:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    72:72:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():387:387 -> b
+    72:72:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():386:386 -> b
     72:72:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):204 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:72:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123545,7 +123510,7 @@
     73:75:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     73:75:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     73:75:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    76:76:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():387:387 -> b
+    76:76:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getPrefixes():386:386 -> b
     76:76:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):206 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     76:76:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123555,7 +123520,7 @@
     77:79:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     77:79:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     77:79:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    80:80:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    80:80:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     80:80:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):208 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:80:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123565,7 +123530,7 @@
     81:84:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     81:84:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     81:84:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    85:85:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    85:85:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     85:85:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):211 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:85:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123575,7 +123540,7 @@
     86:87:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     86:87:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     86:87:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    88:88:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    88:88:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     88:88:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):212 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:88:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123585,7 +123550,7 @@
     89:91:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     89:91:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     89:91:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    92:92:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    92:92:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     92:92:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):216 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     92:92:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123599,7 +123564,7 @@
     94:97:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     94:97:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     94:97:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    98:98:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    98:98:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     98:98:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):218 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:98:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
@@ -123619,7 +123584,7 @@
     111:111:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):187 -> b
     111:111:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):152 -> b
     111:111:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    112:112:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():391:391 -> b
+    112:112:java.util.List com.android.tools.r8.utils.InternalOptions$NeverMergeGroup.getExceptionPrefixes():390:390 -> b
     112:112:boolean com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.hasExceptionPrefix(com.android.tools.r8.graph.DexProgramClass):250 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:java.lang.String com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.getOrComputeConflictingPrefixesErrorMessage(com.android.tools.r8.graph.DexString):229 -> b
@@ -123650,11 +123615,11 @@
     133:133:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
     134:134:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):153:153 -> b
     134:134:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     135:135:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):153 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     135:135:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     136:136:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):153 -> b
     136:136:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):142 -> b
     137:147:void com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter.convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):153:163 -> b
@@ -123664,7 +123629,7 @@
     1:1:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):82:82 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     2:2:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):89:89 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> c
     3:3:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):90 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -123683,9 +123648,9 @@
     3:6:void lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):120:123 -> d
     7:7:void lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):118:118 -> d
     8:8:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():132:132 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     1:1:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer():66:66 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
     1:1:void awaitMethodProcessing():136:136 -> h
     2:2:void com.android.tools.r8.threading.TaskCollection.await():133:133 -> h
     2:2:void awaitMethodProcessing():136 -> h
@@ -123694,20 +123659,20 @@
     4:4:void com.android.tools.r8.threading.TaskCollection.await():133:133 -> h
     4:4:void awaitMethodProcessing():137 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.xl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode ir -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder bytecodeMetadataBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c8;"}
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/f;"}
     com.android.tools.r8.utils.InternalOptions options -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.conversion.MethodConversionOptions conversionOptions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN;"}
     java.util.List switchPayloadInfos -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List fillArrayDataInfos -> h
@@ -123716,18 +123681,18 @@
     int maxOffset -> j
     int minOffset -> k
     com.android.tools.r8.ir.conversion.DexBuilder$Info[] instructionToInfo -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sl;"}
     com.android.tools.r8.ir.conversion.DexBuilder$Info previousNonFallthroughInfo -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sl;"}
     int inRegisterCount -> n
     int outRegisterCount -> o
     boolean hasBackwardsBranch -> p
     com.android.tools.r8.ir.code.BasicBlock nextBlock -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):156:156 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/QN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/UN;)V"}
     2:50:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):109:157 -> <init>
     51:51:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> <init>
     51:51:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):157 -> <init>
@@ -123737,7 +123702,7 @@
     57:62:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):160:165 -> <init>
     1:1:boolean isBuildingForComparison():194:194 -> a
     1:1:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):785 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/sl;)V"}
     2:3:void setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):819:820 -> a
     2:3:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):787 -> a
     4:7:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):790:793 -> a
@@ -123765,189 +123730,196 @@
     23:23:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450:450 -> a
     23:23:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):925:925 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):929 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931:931 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
     24:24:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     24:24:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):925:925 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):929 -> a
+    25:25:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
     25:25:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
     25:25:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    26:26:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
-    26:26:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
+    26:26:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
+    26:26:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
     26:26:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    27:27:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveDebugPosition():123:123 -> a
+    27:27:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     27:27:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    28:32:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):373:377 -> a
-    28:32:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    28:32:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    33:33:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> a
-    33:33:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):378 -> a
+    28:28:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveDebugPosition():123:123 -> a
+    28:28:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    33:33:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    28:28:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    29:33:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):373:377 -> a
+    29:33:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    29:33:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
     34:34:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> a
     34:34:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):378 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:34:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
     34:34:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    35:35:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    35:35:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):381 -> a
+    35:35:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> a
+    35:35:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):378 -> a
     35:35:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
     35:35:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    36:52:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):381:397 -> a
-    36:52:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    36:52:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    53:53:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
-    53:53:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):397 -> a
-    53:53:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    53:53:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    54:71:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):423:440 -> a
-    54:71:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
-    54:71:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    54:71:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    72:72:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:0 -> a
-    72:72:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":196,"2":197,"3":198},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
-    73:79:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):410:416 -> a
-    73:79:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    73:79:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    80:195:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:577 -> a
-    80:195:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
-    196:196:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):441:441 -> a
-    196:196:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
-    196:196:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    36:36:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
+    36:36:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):381 -> a
+    36:36:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    36:36:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    37:53:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):381:397 -> a
+    37:53:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    37:53:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    54:54:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
+    54:54:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):397 -> a
+    54:54:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    54:54:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    55:72:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):423:440 -> a
+    55:72:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
+    55:72:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    55:72:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    73:73:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:0 -> a
+    73:73:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":197,"2":198,"3":199},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
+    74:80:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):410:416 -> a
+    74:80:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    74:80:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
+    81:196:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:577 -> a
+    81:196:void com.android.tools.r8.internal.DexBuilder.removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.IRCode):0 -> a
     197:197:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):441:441 -> a
     197:197:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
     197:197:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
     198:198:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):441:441 -> a
     198:198:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
     198:198:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
-    199:204:void amendDebugPositionsForUnusedNonVoidMethods():582:587 -> a
-    205:205:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
-    206:206:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():73:73 -> a
-    206:206:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):590 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    199:199:boolean isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):441:441 -> a
+    199:199:void removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):404 -> a
+    199:199:void removeRedundantDebugPositions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    200:205:void amendDebugPositionsForUnusedNonVoidMethods():582:587 -> a
+    206:206:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     207:207:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():73:73 -> a
     207:207:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):590 -> a
-    208:208:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():78:78 -> a
-    208:208:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):591 -> a
-    209:211:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):592:594 -> a
-    212:212:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
-    212:212:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):594 -> a
-    213:213:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):595:595 -> a
-    214:214:boolean com.android.tools.r8.ir.code.Invoke.hasReturnTypeVoid(com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    214:214:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):595 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    208:208:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():73:73 -> a
+    208:208:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):590 -> a
+    209:209:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():78:78 -> a
+    209:209:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):591 -> a
+    210:212:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):592:594 -> a
+    213:213:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
+    213:213:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):594 -> a
+    214:214:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):595:595 -> a
     215:215:boolean com.android.tools.r8.ir.code.Invoke.hasReturnTypeVoid(com.android.tools.r8.graph.DexItemFactory):82:82 -> a
     215:215:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):595 -> a
-    216:219:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):596:599 -> a
-    220:220:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():78:78 -> a
-    220:220:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):600 -> a
-    221:221:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):601:601 -> a
-    222:222:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    222:222:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):602 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    216:216:boolean com.android.tools.r8.ir.code.Invoke.hasReturnTypeVoid(com.android.tools.r8.graph.DexItemFactory):82:82 -> a
+    216:216:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):595 -> a
+    217:220:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):596:599 -> a
+    221:221:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():78:78 -> a
+    221:221:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):600 -> a
+    222:222:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):601:601 -> a
     223:223:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     223:223:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):602 -> a
-    224:224:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):604:604 -> a
-    225:225:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
-    225:225:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):604 -> a
-    226:226:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():104:104 -> a
-    226:226:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):605 -> a
-    227:229:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):606:608 -> a
-    230:231:void requestOutgoingRegisters(int):652:653 -> a
-    232:232:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
-    233:235:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):748:750 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/dex/code/z1;)V"}
-    236:236:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:52 -> a
-    236:236:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):750 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:237:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider.getMetadata(com.android.tools.r8.ir.code.Instruction):47:47 -> a
-    237:237:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):53 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    224:224:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
+    224:224:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):602 -> a
+    225:225:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):604:604 -> a
+    226:226:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
+    226:226:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):604 -> a
+    227:227:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():104:104 -> a
+    227:227:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):605 -> a
+    228:230:void lambda$amendDebugPositionsForUnusedNonVoidMethods$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):606:608 -> a
+    231:232:void requestOutgoingRegisters(int):652:653 -> a
+    233:233:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
+    234:236:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):748:750 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/dex/code/z1;)V"}
+    237:237:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:52 -> a
     237:237:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):750 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     238:238:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider.getMetadata(com.android.tools.r8.ir.code.Instruction):47:47 -> a
     238:238:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):53 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     238:238:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):750 -> a
-    239:239:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):55:55 -> a
+    239:239:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider.getMetadata(com.android.tools.r8.ir.code.Instruction):47:47 -> a
+    239:239:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):53 -> a
     239:239:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):750 -> a
-    240:241:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):754:755 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;[Lcom/android/tools/r8/dex/code/z1;)V"}
-    242:242:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806:806 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/ql;"}
-    243:243:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    243:243:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806 -> a
+    240:240:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder.setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):55:55 -> a
+    240:240:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):750 -> a
+    241:242:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):754:755 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;[Lcom/android/tools/r8/dex/code/z1;)V"}
+    243:243:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806:806 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/sl;"}
+    244:244:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    244:244:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    244:245:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806:807 -> a
-    246:246:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    246:246:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):807 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    247:247:int instructionNumberToIndex(int):801:801 -> a
+    245:246:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):806:807 -> a
+    247:247:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     247:247:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):807 -> a
-    248:248:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):807:807 -> a
-    249:260:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):824:835 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/ql;"}
-    261:266:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):843:848 -> a
-    261:266:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):836 -> a
-    267:270:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):836:839 -> a
-    271:286:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):892:907 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;)Ljava/util/ArrayList;"}
-    287:287:int com.android.tools.r8.com.google.common.collect.HashBiMap.size():438:438 -> a
-    287:287:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909 -> a
-    288:288:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909:909 -> a
-    289:289:java.lang.Object com.android.tools.r8.com.google.common.collect.HashBiMap.put(java.lang.Object,java.lang.Object):296:296 -> a
-    289:289:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909 -> a
-    290:290:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    290:290:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):911 -> a
-    291:320:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):911:940 -> a
-    321:321:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1031:1031 -> a
-    321:321:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    322:329:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):816:823 -> a
-    322:329:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    322:329:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    330:330:java.util.List com.android.tools.r8.com.google.common.collect.Lists$ReverseList.getForwardList():839:839 -> a
-    330:330:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):823 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    330:330:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    330:330:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    331:334:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):824:827 -> a
-    331:334:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    331:334:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    335:338:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032:1035 -> a
-    335:338:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    339:339:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940:940 -> a
-    340:340:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1038:1038 -> a
-    340:340:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
-    341:365:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):942:966 -> a
-    366:366:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1031:1031 -> a
-    366:366:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    367:374:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):816:823 -> a
-    367:374:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    367:374:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    375:375:java.util.List com.android.tools.r8.com.google.common.collect.Lists$ReverseList.getForwardList():839:839 -> a
-    375:375:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):823 -> a
+    248:248:int instructionNumberToIndex(int):801:801 -> a
+    248:248:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):807 -> a
+    249:249:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):807:807 -> a
+    250:261:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):824:835 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/sl;"}
+    262:267:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):843:848 -> a
+    262:267:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):836 -> a
+    268:271:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):836:839 -> a
+    272:287:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):892:907 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)Ljava/util/ArrayList;"}
+    288:288:int com.android.tools.r8.com.google.common.collect.HashBiMap.size():438:438 -> a
+    288:288:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909 -> a
+    289:289:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909:909 -> a
+    290:290:java.lang.Object com.android.tools.r8.com.google.common.collect.HashBiMap.put(java.lang.Object,java.lang.Object):296:296 -> a
+    290:290:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):909 -> a
+    291:291:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
+    291:291:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):911 -> a
+    292:321:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):911:940 -> a
+    322:322:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1031:1031 -> a
+    322:322:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    323:330:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):816:823 -> a
+    323:330:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    323:330:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    331:331:java.util.List com.android.tools.r8.com.google.common.collect.Lists$ReverseList.getForwardList():839:839 -> a
+    331:331:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):823 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    375:375:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    375:375:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    376:379:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):824:827 -> a
-    376:379:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
-    376:379:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    380:383:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032:1035 -> a
-    380:383:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    384:384:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966:966 -> a
-    385:385:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1038:1038 -> a
-    385:385:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
-    386:387:int numberOfOverflowingRanges(java.util.List):972:973 -> a
-    386:387:java.util.List splitOverflowingRanges(java.util.List,java.util.List):986 -> a
+    331:331:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    331:331:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    332:335:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):824:827 -> a
+    332:335:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    332:335:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    336:339:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032:1035 -> a
+    336:339:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    340:340:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940:940 -> a
+    341:341:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1038:1038 -> a
+    341:341:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):940 -> a
+    342:366:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):942:966 -> a
+    367:367:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1031:1031 -> a
+    367:367:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    368:375:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):816:823 -> a
+    368:375:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    368:375:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    376:376:java.util.List com.android.tools.r8.com.google.common.collect.Lists$ReverseList.getForwardList():839:839 -> a
+    376:376:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):823 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    376:376:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    376:376:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    377:380:java.util.List com.android.tools.r8.com.google.common.collect.Lists.reverse(java.util.List):824:827 -> a
+    377:380:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032 -> a
+    377:380:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    381:384:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1032:1035 -> a
+    381:384:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    385:385:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966:966 -> a
+    386:386:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):1038:1038 -> a
+    386:386:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):966 -> a
+    387:388:int numberOfOverflowingRanges(java.util.List):972:973 -> a
+    387:388:java.util.List splitOverflowingRanges(java.util.List,java.util.List):986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/ArrayList;)Ljava/util/List;"}
-    388:415:java.util.List splitOverflowingRanges(java.util.List,java.util.List):992:1019 -> a
-    416:424:java.util.List splitOverflowingRanges(java.util.List,java.util.List):1017:1025 -> a
+    389:416:java.util.List splitOverflowingRanges(java.util.List,java.util.List):992:1019 -> a
+    417:425:java.util.List splitOverflowingRanges(java.util.List,java.util.List):1017:1025 -> a
     1:10:void rewriteIfs():626:635 -> b
     1:10:com.android.tools.r8.graph.DexCode build():222 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/J0;"}
@@ -124172,7 +124144,7 @@
     209:210:void com.android.tools.r8.graph.DexDebugEventBuilder.add(int,int,com.android.tools.r8.ir.code.Instruction):117:118 -> b
     209:210:com.android.tools.r8.graph.DexCode build():270 -> b
     211:211:com.android.tools.r8.graph.DexCode build():278:278 -> b
-    212:212:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():3005:3005 -> b
+    212:212:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():3011:3011 -> b
     212:212:com.android.tools.r8.graph.DexCode build():278 -> b
     213:256:com.android.tools.r8.graph.DexCode build():279:322 -> b
     257:260:com.android.tools.r8.dex.code.DexNop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):853:856 -> b
@@ -124334,17 +124306,17 @@
     403:403:com.android.tools.r8.graph.DexCode build():360 -> b
     404:404:com.android.tools.r8.graph.DexCode build():360:360 -> b
     1:1:com.android.tools.r8.utils.InternalOptions getOptions():1078:1078 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     1:1:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():1082:1082 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/regalloc/f;"}
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.ll:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.ir.code.Position currentMaterializedPosition -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.DebugPosition unresolvedPosition -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qh;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtUnresolvedPosition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.List val$toRemove -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> e
@@ -124355,7 +124327,7 @@
     1:3:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):491 -> a
     1:3:void com.android.tools.r8.internal.DexBuilder$1.accept(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     4:12:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):493:501 -> a
     4:12:void com.android.tools.r8.internal.DexBuilder$1.accept(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
     13:13:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
@@ -124392,7 +124364,7 @@
     35:36:void com.android.tools.r8.internal.DexBuilder$1.accept(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
     37:37:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> a
     37:37:void com.android.tools.r8.internal.DexBuilder$1.accept(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":608,"2":609,"3":610},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":608,"2":609,"3":610},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     565:582:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):528:545 -> a
     565:582:void com.android.tools.r8.internal.DexBuilder$1.accept(com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
     583:583:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():317:317 -> a
@@ -124432,65 +124404,65 @@
     608:608:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):531:531 -> a
     609:609:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):531:531 -> a
     610:610:void accept(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):531:531 -> a
-com.android.tools.r8.ir.conversion.DexBuilder$2 -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.ir.conversion.DexBuilder$2 -> com.android.tools.r8.internal.ml:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():1485:1485 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.nl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1255:1255 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1265:1265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1269:1269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     3:3:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1283:1283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     1:1:int getSize():1260:1260 -> c
     1:1:int maxSize():1278:1278 -> d
     1:1:int minSize():1273:1273 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.ml:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.ol:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pQ;"}
     com.android.tools.r8.dex.code.DexFillArrayData dex -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/code/w0;"}
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.dex.code.DexFillArrayData):1731:1733 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lQ;Lcom/android/tools/r8/dex/code/w0;)V"}
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.nl:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pQ;Lcom/android/tools/r8/dex/code/w0;)V"}
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.pl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.dex.code.DexInstruction instruction -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/code/z1;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):1162:1163 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/dex/code/z1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/dex/code/z1;)V"}
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1183:1184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1189:1189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1194:1195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     1:1:int getSize():1168:1168 -> c
     1:1:int maxSize():1178:1178 -> d
     1:1:int minSize():1173:1173 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.ql:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     int size -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1287:1287 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Goto):1292:1292 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hs;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.Goto):1289:1289 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     1:1:com.android.tools.r8.ir.code.Goto getJump():1296 -> a
     1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     2:2:com.android.tools.r8.ir.code.Goto getJump():1296:1296 -> a
     2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1360 -> a
     3:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1361:1405 -> a
     48:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1394:1398 -> a
     53:72:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1389:1408 -> a
     73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1319:1319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     74:74:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     74:74:com.android.tools.r8.ir.code.Goto getJump():1296 -> a
     74:74:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1320 -> a
@@ -124513,22 +124485,22 @@
     99:99:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1347 -> a
     100:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1347:1355 -> a
     109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1414:1414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     1:2:int getSize():1301:1302 -> c
     1:1:int maxSize():1313:1313 -> d
     1:1:int minSize():1307:1307 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.rl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     int size -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1418:1418 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.If):1423:1423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.If):1420:1420 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     1:1:com.android.tools.r8.ir.code.If getBranch():1439 -> a
     1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1466 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     2:2:com.android.tools.r8.ir.code.If getBranch():1439:1439 -> a
     2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1466 -> a
     3:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1467:1468 -> a
@@ -124584,7 +124556,7 @@
     122:122:com.android.tools.r8.ir.code.If getBranch():1439 -> a
     122:122:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1449 -> a
     122:122:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1534 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     123:123:com.android.tools.r8.ir.code.If getBranch():1439:1439 -> a
     123:123:boolean offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1449 -> a
     123:123:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1534 -> a
@@ -124631,7 +124603,7 @@
     148:148:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     148:148:com.android.tools.r8.ir.code.If getBranch():1439 -> a
     148:148:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1427 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/xl;)I"}
     149:149:com.android.tools.r8.ir.code.If getBranch():1439:1439 -> a
     149:149:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1427 -> a
     150:150:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
@@ -124646,7 +124618,7 @@
     154:154:int com.android.tools.r8.ir.conversion.DexBuilder.allocatedRegister(com.android.tools.r8.ir.code.Value,int):658:658 -> a
     154:154:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1428 -> a
     155:158:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1558:1561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     159:159:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     159:159:com.android.tools.r8.ir.code.If getBranch():1439 -> a
     159:159:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1562 -> a
@@ -124682,41 +124654,41 @@
     1:1:int getSize():1553:1553 -> c
     1:1:int maxSize():1548:1548 -> d
     1:1:int minSize():1543:1543 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.sl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.ir.code.Instruction ir -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():1090:1090 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1099:1099 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     2:9:void <init>(com.android.tools.r8.ir.code.Instruction):1094:1101 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     1:1:com.android.tools.r8.ir.code.Instruction getIR():1151:1151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:2:int getOffset():1121:1122 -> b
     int getSize() -> c
     int maxSize() -> d
     int minSize() -> e
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.tl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     int size -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Move):1572:1572 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bP;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.Move):1569:1569 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> a
     1:1:com.android.tools.r8.ir.code.Move getMove():1576 -> a
     1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1615 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     2:2:com.android.tools.r8.ir.code.Move getMove():1576:1576 -> a
     2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1615 -> a
     3:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1616:1659 -> a
@@ -124724,13 +124696,13 @@
     55:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1623:1662 -> a
     95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1633:1633 -> a
     96:101:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1589:1594 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     102:113:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1599:1610 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> b
     1:1:com.android.tools.r8.ir.code.Move getMove():1576 -> b
     1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1584 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     2:2:com.android.tools.r8.ir.code.Move getMove():1576:1576 -> b
     2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1584 -> b
     3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1584:1584 -> b
@@ -124750,7 +124722,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$Info.getIR():1151:1151 -> c
     1:1:com.android.tools.r8.ir.code.Move getMove():1576 -> c
     1:1:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1580 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     2:2:com.android.tools.r8.ir.code.Move getMove():1576:1576 -> c
     2:2:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1580 -> c
     3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1580:1580 -> c
@@ -124770,44 +124742,44 @@
     9:10:int getSize():1679:1680 -> c
     1:1:int maxSize():1673:1673 -> d
     1:1:int minSize():1667:1667 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.ul:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.dex.code.DexInstruction[] instructions -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/dex/code/z1;"}
     int size -> f
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):1206:1212 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;[Lcom/android/tools/r8/dex/code/z1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;[Lcom/android/tools/r8/dex/code/z1;)V"}
     1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1217:1217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;)I"}
     2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1222:1226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vl;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xl;Ljava/util/ArrayList;)V"}
     7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1247:1248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql;Lcom/android/tools/r8/internal/vl;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sl;Lcom/android/tools/r8/internal/xl;)Z"}
     1:1:int getSize():1242:1242 -> c
     1:1:int maxSize():1237:1237 -> d
     1:1:int minSize():1232:1232 -> e
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.vl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.ir.code.IntSwitch ir -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wA;"}
     com.android.tools.r8.dex.code.DexFormat31t dex -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/code/W0;"}
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.dex.code.DexFormat31t):1720:1722 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uA;Lcom/android/tools/r8/dex/code/W0;)V"}
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.ul:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wA;Lcom/android/tools/r8/dex/code/W0;)V"}
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.wl:
 # {"id":"sourceFile","fileName":"DexBuilder.java"}
     com.android.tools.r8.ir.code.CatchHandlers handlers -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     int start -> c
     int end -> d
     1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1703:1706 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r8;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t8;II)V"}
     1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1711:1711 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ul;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wl;)I"}
     1:1:int compareTo(java.lang.Object):1697:1697 -> compareTo
     2:2:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1711:1711 -> compareTo
     2:2:int compareTo(java.lang.Object):1697 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Yl:
 # {"id":"sourceFile","fileName":"DexSourceCode.java"}
     com.android.tools.r8.graph.DexCode code -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/J0;"}
@@ -124816,25 +124788,25 @@
     java.util.Map offsetToInstructionIndex -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.ir.conversion.SwitchPayloadResolver switchPayloadResolver -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
     com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver arrayFilledDataPayloadResolver -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G3;"}
     com.android.tools.r8.graph.DexCode$Try currentTryRange -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/J0$a;"}
     com.android.tools.r8.ir.code.CatchHandlers currentCatchHandlers -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t8;"}
     com.android.tools.r8.dex.code.DexInstruction currentDexInstruction -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/code/z1;"}
     boolean isBuildingPrelude -> i
     com.android.tools.r8.ir.code.Position currentPosition -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.CanonicalPositions canonicalPositions -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p8;"}
     java.util.List debugEntries -> l
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():56:56 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexItemFactory):82:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/B1;)V"}
     2:27:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexItemFactory):62:87 -> <init>
     28:32:java.util.List com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.computeEntries(com.android.tools.r8.graph.DexMethod,boolean):250:254 -> <init>
     28:32:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexItemFactory):89 -> <init>
@@ -124847,11 +124819,11 @@
     2:2:void doNothingWriteConsumer(java.lang.Integer,com.android.tools.r8.graph.DexType):158:158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Lcom/android/tools/r8/graph/I2;)V"}
     3:3:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     5:5:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):174:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     6:6:int instructionOffset(int):279:279 -> a
     6:6:void updateCurrentCatchHandlers(int,com.android.tools.r8.graph.DexItemFactory):221 -> a
     6:6:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):174 -> a
@@ -124888,7 +124860,7 @@
     29:30:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):176:177 -> a
     31:33:com.android.tools.r8.graph.DexDebugEntry getDebugEntryAtOffset(int):235:237 -> a
     31:33:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     34:34:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):199:199 -> a
     35:35:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():58:58 -> a
     35:35:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):199 -> a
@@ -124896,10 +124868,10 @@
     36:36:com.android.tools.r8.ir.code.Position getCanonicalPositionAppendCaller(com.android.tools.r8.graph.DexDebugEntry):263:263 -> a
     36:36:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):200 -> a
     37:38:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):285:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     39:39:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):285:285 -> a
     40:40:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     41:41:int com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver.getElementWidth(int):51:51 -> a
     41:41:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -124924,7 +124896,7 @@
     53:53:void com.android.tools.r8.ir.conversion.IRBuilder.addNewArrayFilledData(int,int,long,short[]):1803 -> a
     53:53:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):292 -> a
     54:61:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):325:332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
     62:62:void com.android.tools.r8.ir.conversion.IRBuilder.ensureNormalSuccessorBlock(int,int):2523:2523 -> a
     62:62:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):333 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -124974,7 +124946,7 @@
     120:120:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):382 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     121:130:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):404:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0$a;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0$a;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/t8;"}
     131:132:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):410:411 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/I2;Ljava/lang/Integer;)V"}
     133:141:void forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):419:427 -> a
@@ -124983,7 +124955,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/I2;Ljava/lang/Integer;)V"}
     1:1:boolean verifyRegister(int):103:103 -> b
     2:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):144:146 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     5:5:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.CanonicalPositions.getPreamblePosition():58:58 -> b
     5:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):146 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -124993,7 +124965,7 @@
     18:19:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):437:438 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0$a;Lcom/android/tools/r8/graph/B1;)Ljava/util/ArrayList;"}
     1:1:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):182:182 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     2:2:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):216:216 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     3:3:int instructionIndex(int):274:274 -> c
@@ -125019,9 +124991,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     1:4:int getMoveExceptionRegister(int):187:190 -> f
     5:5:com.android.tools.r8.ir.code.Position getCurrentPosition():205:205 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:int instructionOffset(int):279:279 -> g
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.Ho:
 # {"id":"sourceFile","fileName":"ExtraConstantIntParameter.java"}
     long value -> a
     boolean $assertionsDisabled -> b
@@ -125030,56 +125002,56 @@
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):23:23 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:3:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):29:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
     4:4:boolean isUnused():40:40 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     5:5:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Sb0;"}
     6:6:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):35:35 -> a
     6:6:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):13 -> a
     1:5:boolean equals(java.lang.Object):46:50 -> equals
     1:1:int hashCode():55:55 -> hashCode
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.Io:
 # {"id":"sourceFile","fileName":"ExtraParameter.java"}
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Sb0;"}
     boolean isUnused() -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedBooleanParameter -> com.android.tools.r8.internal.Go:
+com.android.tools.r8.ir.conversion.ExtraUnusedBooleanParameter -> com.android.tools.r8.internal.Jo:
 # {"id":"sourceFile","fileName":"ExtraUnusedBooleanParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.conversion.ExtraUnusedByteParameter -> com.android.tools.r8.internal.Ho:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.conversion.ExtraUnusedByteParameter -> com.android.tools.r8.internal.Ko:
 # {"id":"sourceFile","fileName":"ExtraUnusedByteParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.conversion.ExtraUnusedCharParameter -> com.android.tools.r8.internal.Io:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.conversion.ExtraUnusedCharParameter -> com.android.tools.r8.internal.Lo:
 # {"id":"sourceFile","fileName":"ExtraUnusedCharParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.conversion.ExtraUnusedIntParameter -> com.android.tools.r8.internal.Jo:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.conversion.ExtraUnusedIntParameter -> com.android.tools.r8.internal.Mo:
 # {"id":"sourceFile","fileName":"ExtraUnusedIntParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.Ko:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.No:
 # {"id":"sourceFile","fileName":"ExtraUnusedNullParameter.java"}
     com.android.tools.r8.graph.DexType type -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -125090,16 +125062,16 @@
     1:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):25:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     3:3:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     4:4:com.android.tools.r8.ir.analysis.value.SingleNullValue getValue(com.android.tools.r8.graph.AppView):36 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Sb0;"}
     5:5:com.android.tools.r8.ir.analysis.value.SingleNullValue getValue(com.android.tools.r8.graph.AppView):36:36 -> a
     5:5:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):14 -> a
     6:6:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):14:14 -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedParameter -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.ir.conversion.ExtraUnusedParameter -> com.android.tools.r8.internal.Oo:
 # {"id":"sourceFile","fileName":"ExtraUnusedParameter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -125129,41 +125101,41 @@
     32:32:boolean isUnused():42:42 -> a
     1:1:boolean equals(java.lang.Object):48:48 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.ir.conversion.ExtraUnusedPrimitiveParameter -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.ir.conversion.ExtraUnusedPrimitiveParameter -> com.android.tools.r8.internal.Po:
 # {"id":"sourceFile","fileName":"ExtraUnusedPrimitiveParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     1:1:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):32 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Ob0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Sb0;"}
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):32:32 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleConstValue getValue(com.android.tools.r8.graph.AppView):11 -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedShortParameter -> com.android.tools.r8.internal.No:
+com.android.tools.r8.ir.conversion.ExtraUnusedShortParameter -> com.android.tools.r8.internal.Qo:
 # {"id":"sourceFile","fileName":"ExtraUnusedShortParameter.java"}
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Wi0;"}
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.pp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aj0;"}
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.sp:
 # {"id":"sourceFile","fileName":"FieldOptimizationFeedback.java"}
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;I)V"}
     void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Fm;)V"}
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/B1;)V"}
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.wt:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.yt:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     boolean hasIncorrectStackMapTypes -> A
     com.android.tools.r8.ir.code.IRMetadata metadata -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kt;"}
     boolean $assertionsDisabled -> C
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap targets -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap offsets -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.Queue traceBlocksWorklist -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedList;"}
     boolean[] processedInstructions -> d
@@ -125173,14 +125145,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedList;"}
     java.util.LinkedList blocks -> g
     com.android.tools.r8.ir.code.BasicBlock entryBlock -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     int currentInstructionOffset -> j
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     com.android.tools.r8.ir.code.NumberGenerator basicBlockNumberGenerator -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     com.android.tools.r8.graph.ProgramMethod method -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.graph.ProgramMethod context -> n
@@ -125188,38 +125160,38 @@
     com.android.tools.r8.graph.AppView appView -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription prototypeChanges -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/j;"}
     com.android.tools.r8.ir.code.Value receiverValue -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.List argumentValues -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.conversion.SourceCode source -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fc0;"}
     boolean throwingInstructionInCurrentBlock -> u
     com.android.tools.r8.ir.code.Value previousLocalValue -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.List debugLocalEnds -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap uninitializedDebugLocalValues -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.List impreciseInstructions -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean hasImpreciseValues -> z
     1:1:void <clinit>():155:155 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):472:472 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Bc0;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/dS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Fc0;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/hS;)V"}
     2:110:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.SourceCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.code.NumberGenerator):373:481 -> <init>
     1:21:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/aj0;"}
     22:22:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
     23:27:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
     28:28:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
     29:29:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
     30:43:com.android.tools.r8.ir.analysis.type.TypeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
     44:45:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode):439:440 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bc0;)Lcom/android/tools/r8/internal/wt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fc0;)Lcom/android/tools/r8/internal/yt;"}
     46:47:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):462:463 -> a
     46:47:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode):445 -> a
     48:48:com.android.tools.r8.ir.conversion.IRBuilder create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.SourceCode):445:445 -> a
@@ -125262,10 +125234,10 @@
     66:68:void addThisArgument(int):985 -> a
     66:68:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):548 -> a
     69:69:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):554:554 -> a
-    70:70:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    70:70:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     70:70:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):555 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    71:71:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     71:71:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):555 -> a
     72:72:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
     72:72:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):556 -> a
@@ -125277,7 +125249,7 @@
     75:75:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):557 -> a
     76:82:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):562:568 -> a
     83:85:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):567:569 -> a
-    86:86:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    86:86:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     86:86:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):574 -> a
     87:87:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
     87:87:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):575 -> a
@@ -125317,7 +125289,7 @@
     118:118:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):597 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     119:119:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):597:597 -> a
-    120:120:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    120:120:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     120:120:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):599 -> a
     121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getArgumentType(int):198:198 -> a
     121:121:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):600 -> a
@@ -125345,7 +125317,7 @@
     135:135:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):602 -> a
     136:139:void buildArgumentsWithRewrittenPrototypeChanges(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):604:607 -> a
     140:156:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):618:634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     157:158:boolean isIndexProcessed(int):2484:2485 -> a
     157:158:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):636 -> a
     159:160:void ensureSubroutineProcessedInstructions():2502:2503 -> a
@@ -125753,21 +125725,21 @@
     585:585:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():699:699 -> a
     585:585:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):527 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
     586:586:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):528:528 -> a
     587:588:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):760:761 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     589:589:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     589:589:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1728 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     590:590:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     590:590:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1728 -> a
     591:591:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1728:1728 -> a
     592:592:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     592:592:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1728 -> a
     593:593:void add(com.android.tools.r8.ir.code.Instruction):975:975 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     594:594:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
     594:594:void add(com.android.tools.r8.ir.code.Instruction):976 -> a
     595:596:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1056:1057 -> a
@@ -125781,7 +125753,7 @@
     605:605:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1061 -> a
     606:606:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1062:1062 -> a
     607:609:void addDebugPosition(com.android.tools.r8.ir.code.Position):1067:1069 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     610:610:boolean com.android.tools.r8.ir.code.Position.equals(java.lang.Object):215:215 -> a
     610:610:void addDebugPosition(com.android.tools.r8.ir.code.Position):1069 -> a
     611:615:void addDebugPosition(com.android.tools.r8.ir.code.Position):1069:1073 -> a
@@ -125791,7 +125763,7 @@
     622:622:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
     622:622:void addDebugPosition(com.android.tools.r8.ir.code.Position):1084 -> a
     623:627:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1128:1132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;III)V"}
     628:628:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     628:628:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1132 -> a
     629:633:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1133:1137 -> a
@@ -125804,7 +125776,7 @@
     650:657:void internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1180:1187 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Z)V"}
     658:661:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1200:1203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;IJ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;IJ)V"}
     662:662:void addConstClass(int,com.android.tools.r8.graph.DexType):1230:1230 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;)V"}
     663:663:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):428:428 -> a
@@ -125815,24 +125787,24 @@
     667:667:void addConstClass(int,com.android.tools.r8.graph.DexType):1234:1234 -> a
     668:668:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1238:1238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y2;)V"}
-    669:669:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2589:2589 -> a
-    669:669:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2593 -> a
+    669:669:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2595:2595 -> a
+    669:669:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2599 -> a
     669:669:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1238 -> a
-    670:670:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2593:2593 -> a
+    670:670:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2599:2599 -> a
     670:670:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1238 -> a
     671:674:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1238:1241 -> a
     675:679:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1240:1244 -> a
     680:680:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1248:1248 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/E2;)V"}
-    681:681:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2597:2597 -> a
-    681:681:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2601 -> a
+    681:681:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2603:2603 -> a
+    681:681:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2607 -> a
     681:681:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1248 -> a
-    682:682:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2601:2601 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2607:2607 -> a
     682:682:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1248 -> a
     683:686:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1248:1251 -> a
     687:691:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1250:1254 -> a
     692:693:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1311:1312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;II)V"}
     694:694:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2364:2364 -> a
     694:694:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1314 -> a
     695:697:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1315:1317 -> a
@@ -125848,7 +125820,7 @@
     713:713:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
     713:713:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1480 -> a
     714:714:void addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1499:1499 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Kz;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Mz;I)V"}
     715:715:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
     715:715:void addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1499 -> a
     716:717:void addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1499:1500 -> a
@@ -125866,35 +125838,35 @@
     731:731:void addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1507:1507 -> a
     732:737:void addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1505:1510 -> a
     738:738:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530:1530 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/E2;Ljava/util/ArrayList;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/E2;Ljava/util/ArrayList;Z)V"}
     739:744:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1515:1520 -> a
     739:744:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
-    745:745:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2573:2573 -> a
-    745:745:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2577 -> a
+    745:745:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2579:2579 -> a
+    745:745:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2583 -> a
     745:745:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1520 -> a
     745:745:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
-    746:746:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2577:2577 -> a
+    746:746:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2583:2583 -> a
     746:746:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1520 -> a
     746:746:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
     747:750:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1520:1523 -> a
     747:750:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
-    751:751:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2573:2573 -> a
-    751:751:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():2585 -> a
+    751:751:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2579:2579 -> a
+    751:751:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():2591 -> a
     751:751:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1523 -> a
     751:751:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
-    752:752:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():2585:2585 -> a
+    752:752:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnVarHandle():2591:2591 -> a
     752:752:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1523 -> a
     752:752:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
     753:753:boolean verifyRepresentablePolymorphicInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem):1523:1523 -> a
     753:753:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1530 -> a
     754:754:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1531:1531 -> a
     755:759:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1541:1545 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Ljava/util/List;Ljava/util/List;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;Ljava/util/List;Ljava/util/List;Z)V"}
     760:763:void addInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1544:1547 -> a
     764:786:void addInvokeRegisters(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1611:1633 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;I[I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;I[I)V"}
     787:810:void addInvokeRange(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1674:1697 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/E2;II)V"}
     811:811:void checkInvokeArgumentRegisters(int,int):1720:1720 -> a
     812:812:void addReturn():1839:1839 -> a
     813:815:void addReturn(com.android.tools.r8.ir.code.Return):1844:1846 -> a
@@ -125934,17 +125906,17 @@
     887:902:void addSwitch(int,int[],int,int[]):1946 -> a
     903:903:void addSwitch(int,int[],int,int[]):1947:1947 -> a
     904:928:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2169:2193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/E5;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/internal/tW$a;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/ql0;Lcom/android/tools/r8/internal/xW$a;)Lcom/android/tools/r8/internal/bl0;"}
     929:931:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2252:2254 -> a
     929:931:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2195 -> a
     932:956:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2196:2220 -> a
     957:993:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2211:2247 -> a
     994:1024:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261:2291 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/bl0;"}
     1025:1025:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2262:2262 -> a
     1026:1026:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1026:1026:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1089 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     1027:1027:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1027:1027:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1090 -> a
     1028:1028:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> a
@@ -125954,13 +125926,13 @@
     1031:1031:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1094 -> a
     1032:1032:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1032:1032:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Ed;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/Gd;III)V"}
     1033:1033:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1033:1033:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1192 -> a
     1034:1037:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1193:1196 -> a
     1038:1038:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1038:1038:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/xS;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/BS;II)V"}
     1039:1039:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> a
     1039:1039:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2109 -> a
     1040:1041:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2110:2111 -> a
@@ -125968,21 +125940,21 @@
     1042:1042:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2112 -> a
     1043:1043:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> a
     1043:1043:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1767 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;II)V"}
     1044:1044:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> a
     1044:1044:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1768 -> a
     1045:1046:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1769:1770 -> a
     1047:1047:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> a
     1047:1047:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1771 -> a
     1048:1051:com.android.tools.r8.ir.code.Value readIntLiteral(long):2316:2319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/bl0;"}
     1052:1053:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2326:2327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;ILcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;ILcom/android/tools/r8/graph/j0;)Lcom/android/tools/r8/internal/bl0;"}
     1054:1055:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2331:2332 -> a
     1054:1055:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2326 -> a
     1056:1056:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2360:2360 -> a
     1056:1056:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     1057:1057:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2364:2364 -> a
     1057:1057:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2339 -> a
     1058:1060:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2142:2144 -> a
@@ -125993,7 +125965,7 @@
     1066:1067:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2351:2352 -> a
     1068:1068:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2364:2364 -> a
     1068:1068:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1009 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;)V"}
     1069:1070:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1010:1011 -> a
     1071:1071:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> a
     1071:1071:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1011 -> a
@@ -126009,7 +125981,7 @@
     1077:1077:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):1025:1025 -> a
     1077:1077:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1011 -> a
     1078:1078:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2382:2382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Kw;)V"}
     1079:1083:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2414:2418 -> a
     1079:1083:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2382 -> a
     1084:1084:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
@@ -126087,7 +126059,7 @@
     1167:1167:void addGoto(int):1381 -> a
     1168:1171:void addGoto(int):1382:1385 -> a
     1172:1175:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2558:2561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hD;)V"}
     1176:1176:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2560:2560 -> a
     1177:1178:void generateSplitEdgeBlocks():2575:2576 -> a
     1177:1178:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2562 -> a
@@ -126207,7 +126179,7 @@
     1237:1237:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2563 -> a
     1238:1238:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2564:2564 -> a
     1239:1239:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2712:2712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Z"}
     1:1:boolean canUseStackMapTypes():756:756 -> b
     2:3:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1037:1038 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/j0;)V"}
@@ -126226,7 +126198,7 @@
     22:22:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> b
     22:22:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):1051 -> b
     23:23:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1098:1098 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     24:24:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> b
     24:24:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1099 -> b
     25:25:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1100:1100 -> b
@@ -126236,7 +126208,7 @@
     29:29:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> b
     29:29:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1104 -> b
     30:34:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1161:1165 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;III)V"}
     35:38:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):773:776 -> b
     35:38:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1166 -> b
     39:39:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1168:1168 -> b
@@ -126262,11 +126234,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;)V"}
     64:64:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> b
     64:64:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1775 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;II)V"}
     65:65:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> b
     65:65:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1776 -> b
     66:66:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1778:1778 -> b
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2826:2826 -> b
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2832:2832 -> b
     67:67:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1778 -> b
     68:70:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1779:1781 -> b
     71:74:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2300:2303 -> b
@@ -126281,7 +126253,7 @@
     82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1785 -> b
     83:83:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2360:2360 -> b
     83:83:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2119 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/bl0;"}
     84:84:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2120:2120 -> b
     85:89:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2153:2157 -> b
     85:89:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2121 -> b
@@ -126300,13 +126272,13 @@
     106:106:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2136 -> b
     107:107:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2137:2137 -> b
     108:123:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2424:2439 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     124:124:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2716:2716 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)Z"}
     1:1:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):763:763 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1108:1108 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> c
     3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1109 -> c
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> c
@@ -126333,9 +126305,9 @@
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():485:485 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):685:685 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1118:1118 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> d
     4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1119 -> d
     5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1120:1120 -> d
@@ -126358,9 +126330,9 @@
     25:27:void addReturn(com.android.tools.r8.ir.code.Return):1844:1846 -> d
     25:27:void addReturn(int):1834 -> d
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens():489:489 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
     2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1276:1276 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> e
     3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1277 -> e
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> e
@@ -126373,7 +126345,7 @@
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():497:497 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     2:3:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1287:1288 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> f
     4:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1289 -> f
     5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1290:1290 -> f
@@ -126381,7 +126353,7 @@
     6:6:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1291 -> f
     7:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1293:1295 -> f
     10:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2446:2447 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tt;"}
     12:12:boolean isOffsetProcessed(int):2480:2480 -> f
     12:12:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2450 -> f
     13:14:boolean isIndexProcessed(int):2484:2485 -> f
@@ -126440,21 +126412,25 @@
     1:1:boolean isDebugMode():505:505 -> g
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramMethod():497:497 -> g
     2:2:boolean isDebugMode():505 -> g
-    3:3:boolean isDebugMode():505:505 -> g
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> g
-    4:4:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1330 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+    3:3:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> g
+    3:3:boolean isDebugMode():505 -> g
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4:4:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> g
+    4:4:boolean isDebugMode():505 -> g
     5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> g
-    5:5:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1331 -> g
-    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> g
-    6:6:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1332 -> g
-    7:8:com.android.tools.r8.ir.code.Mul com.android.tools.r8.ir.code.Mul.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:24 -> g
-    7:8:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1333 -> g
-    9:9:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1334:1334 -> g
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> g
-    10:10:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1335 -> g
+    5:5:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1330 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
+    6:6:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> g
+    6:6:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1331 -> g
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> g
+    7:7:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1332 -> g
+    8:9:com.android.tools.r8.ir.code.Mul com.android.tools.r8.ir.code.Mul.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:24 -> g
+    8:9:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1333 -> g
+    10:10:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1334:1334 -> g
+    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> g
+    11:11:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1335 -> g
     1:1:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1339:1339 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> h
     2:2:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1340 -> h
     3:3:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1341:1341 -> h
@@ -126466,7 +126442,7 @@
     8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> h
     8:8:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1345 -> h
     1:1:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1995:1995 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> i
     2:2:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1996 -> i
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> i
@@ -126479,7 +126455,7 @@
     8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> i
     8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):2001 -> i
     1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2005:2005 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> j
     2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2006 -> j
     3:3:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2007:2007 -> j
@@ -126491,7 +126467,7 @@
     8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> j
     8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2011 -> j
     1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1358:1358 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> k
     2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1359 -> k
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> k
@@ -126502,7 +126478,7 @@
     7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> k
     7:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1365 -> k
     1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1369:1370 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> l
     3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1371 -> l
     4:4:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1372:1372 -> l
@@ -126512,7 +126488,7 @@
     8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> l
     8:8:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1377 -> l
     1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1884:1884 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> m
     2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1885 -> m
     3:3:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1886:1886 -> m
@@ -126522,7 +126498,7 @@
     7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> m
     7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1892 -> m
     1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2015:2015 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> n
     2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2016 -> n
     3:3:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2017:2017 -> n
@@ -126532,7 +126508,7 @@
     7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> n
     7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):2021 -> n
     1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2035:2035 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> o
     2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2036 -> o
     3:3:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2037:2037 -> o
@@ -126543,7 +126519,7 @@
     7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):2041 -> o
     1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> p
     1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1875 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> p
     2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1876 -> p
     3:3:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> p
@@ -126552,7 +126528,7 @@
     6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> p
     6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1880 -> p
     1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2055:2055 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> q
     2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2056 -> q
     3:3:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2057:2057 -> q
@@ -126562,7 +126538,7 @@
     7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> q
     7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):2061 -> q
     1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2075:2075 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> r
     2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2076 -> r
     3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> r
@@ -126570,7 +126546,7 @@
     4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> r
     4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2078 -> r
     5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2080:2080 -> r
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2826:2826 -> r
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2832:2832 -> r
     6:6:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2080 -> r
     7:8:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2081:2082 -> r
     9:13:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):123:127 -> r
@@ -126582,11 +126558,11 @@
     18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> r
     18:18:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):2088 -> r
     1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2092:2092 -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;III)V"}
     2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2296:2296 -> s
     2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2093 -> s
     3:3:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2095:2095 -> s
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2826:2826 -> s
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canUseNotInstruction():2832:2832 -> s
     4:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2095 -> s
     5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2356:2356 -> s
     5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2096 -> s
@@ -126599,18 +126575,18 @@
     13:13:void addInstruction(com.android.tools.r8.ir.code.Instruction):2378:2378 -> s
     13:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2104 -> s
     1:7:java.lang.String toString():2726:2732 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.rt:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.tt:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalSuccessors -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     1:7:void <init>():274:280 -> <init>
     1:7:java.lang.String toString():344:350 -> toString
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.iterator():86:86 -> toString
@@ -126641,39 +126617,39 @@
     36:36:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():29 -> toString
     36:36:java.lang.String toString():364 -> toString
     37:41:java.lang.String toString():364:368 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.st:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.ut:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     com.android.tools.r8.graph.DexType guard -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     int sourceOffset -> e
     int targetOffset -> f
     1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,int,int):206:209 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/graph/I2;II)V"}
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.tt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/graph/I2;II)V"}
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.vt:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:4:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,int,int):225:228 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/PW;II)V"}
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.ut:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/TW;II)V"}
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.wt:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     java.util.List values -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:3:void <init>():236:238 -> <init>
     1:9:boolean equals(java.lang.Object):258:266 -> equals
     1:1:int hashCode():253:253 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.xt:
 # {"id":"sourceFile","fileName":"IRBuilder.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():186:186 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):191:194 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.Gt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.It:
 # {"id":"sourceFile","fileName":"IRConverter.java"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/z;"}
@@ -126683,7 +126659,7 @@
     com.android.tools.r8.graph.PrunedItems$ConcurrentBuilder prunedItemsBuilder -> D
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I5;"}
     com.android.tools.r8.utils.InternalOptions$NeverMergeGroup neverMerge -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lB;"}
     java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> F
     java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> G
     java.lang.String conflictingPrefixesErrorMessage -> H
@@ -126691,29 +126667,29 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.optimize.outliner.Outliner outliner -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sV;"}
     com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection rewriterPassCollection -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jd;"}
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/w;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D9;"}
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yo;"}
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/R1;"}
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/M;"}
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oc;"}
     com.android.tools.r8.utils.InternalOptions options -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/x;"}
     com.android.tools.r8.ir.optimize.membervaluepropagation.MemberValuePropagation memberValuePropagation -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tN;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AJ;"}
     com.android.tools.r8.ir.optimize.Inliner inliner -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/W;"}
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> o
@@ -126721,13 +126697,13 @@
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/I;"}
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fh;"}
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ui0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi0;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/In;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxer numberUnboxer -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mS;"}
     com.android.tools.r8.ir.optimize.RemoveVerificationErrorForUnknownReturnedValues removeVerificationErrorForUnknownReturnedValues -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/s0;"}
     com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> v
@@ -126750,11 +126726,11 @@
     27:46:com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection.create(com.android.tools.r8.graph.AppView):38:57 -> <init>
     27:46:void <init>(com.android.tools.r8.graph.AppView):163 -> <init>
     47:54:void <init>(com.android.tools.r8.graph.AppView):163:170 -> <init>
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> <init>
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> <init>
     55:55:void <init>(com.android.tools.r8.graph.AppView):174 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:56:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> <init>
-    56:56:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> <init>
+    56:56:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:56:void <init>(com.android.tools.r8.graph.AppView):174 -> <init>
     57:57:void <init>(com.android.tools.r8.graph.AppView):190:190 -> <init>
@@ -126770,10 +126746,10 @@
     84:84:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.graph.AppView.apiLevelCompute():1380:1380 -> <init>
     84:84:void <init>(com.android.tools.r8.graph.AppView):215 -> <init>
     85:92:void <init>(com.android.tools.r8.graph.AppView):215:222 -> <init>
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.canHaveVerifyErrorForUnknownUnusedReturnValue():3235:3235 -> <init>
+    93:93:boolean com.android.tools.r8.utils.InternalOptions.canHaveVerifyErrorForUnknownUnusedReturnValue():3241:3241 -> <init>
     93:93:void <init>(com.android.tools.r8.graph.AppView):222 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.canHaveVerifyErrorForUnknownUnusedReturnValue():3235:3235 -> <init>
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.canHaveVerifyErrorForUnknownUnusedReturnValue():3241:3241 -> <init>
     94:94:void <init>(com.android.tools.r8.graph.AppView):222 -> <init>
     95:113:void <init>(com.android.tools.r8.graph.AppView):223:241 -> <init>
     114:114:com.android.tools.r8.ir.optimize.enums.EnumUnboxer com.android.tools.r8.ir.optimize.enums.EnumUnboxer.create(com.android.tools.r8.graph.AppView):25:25 -> <init>
@@ -126803,7 +126779,7 @@
     1:1:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     1:1:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,java.util.concurrent.ExecutorService):409 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/QN$a;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/UN$a;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     2:2:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,java.util.concurrent.ExecutorService):409 -> a
     3:4:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,java.util.concurrent.ExecutorService):410:411 -> a
@@ -126820,7 +126796,7 @@
     20:20:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> a
     20:20:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):937 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/ph0;)V"}
     21:27:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):937:943 -> a
     28:28:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.onMethodPruned(com.android.tools.r8.graph.ProgramMethod):294:294 -> a
     28:28:void lambda$internalOnMethodPruned$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1134 -> a
@@ -126878,7 +126854,7 @@
     45:45:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):311:311 -> a
     45:45:void com.android.tools.r8.internal.IRConverter.workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():3130:3130 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():3136:3136 -> a
     46:46:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):311 -> a
     46:46:void com.android.tools.r8.internal.IRConverter.workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):0 -> a
     47:49:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):314:316 -> a
@@ -126892,12 +126868,12 @@
     376:377:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$2(com.android.tools.r8.graph.DexProgramClass):318:319 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     378:384:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):350:356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     385:385:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):354:354 -> a
     386:387:void optimizeSynthesizedMethods(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,java.util.concurrent.ExecutorService):367:368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/QN$a;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/UN$a;Ljava/util/concurrent/ExecutorService;)V"}
     388:390:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):375:377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/QN$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/UN$a;)V"}
     391:391:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):49:49 -> a
     391:391:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):378 -> a
     392:392:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.graph.AppView):63:63 -> a
@@ -126929,13 +126905,13 @@
     401:404:void com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction):101:104 -> a
     401:404:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):379 -> a
     405:405:void lambda$optimizeSynthesizedMethod$3(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):381:381 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     406:410:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,java.util.concurrent.ExecutorService):396:400 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/QN$a;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/UN$a;Ljava/util/concurrent/ExecutorService;)V"}
     411:411:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):463:463 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/ph0;"}
     412:419:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):501:508 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/ph0;"}
     420:420:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1074:1074 -> a
     420:420:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):508 -> a
     421:433:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):510:522 -> a
@@ -127051,7 +127027,7 @@
     756:757:boolean shouldMarkCallersForProcessing(com.android.tools.r8.graph.ProgramMethod):974:975 -> a
     756:757:void maybeMarkCallersForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):967 -> a
     756:757:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):834 -> a
-    758:758:int com.android.tools.r8.utils.InternalOptions$InlinerOptions.getSimpleInliningInstructionLimit():1801:1801 -> a
+    758:758:int com.android.tools.r8.utils.InternalOptions$InlinerOptions.getSimpleInliningInstructionLimit():1807:1807 -> a
     758:758:boolean shouldMarkCallersForProcessing(com.android.tools.r8.graph.ProgramMethod):976 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     758:758:void maybeMarkCallersForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):967 -> a
@@ -127108,7 +127084,7 @@
     784:784:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):834 -> a
     785:785:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):515:515 -> a
     786:786:void lambda$optimize$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):602:602 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/wr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/yr;)V"}
     787:788:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:139 -> a
     787:788:void lambda$optimize$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):602 -> a
     789:789:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
@@ -127122,7 +127098,7 @@
     791:791:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:141 -> a
     791:791:void lambda$optimize$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):602 -> a
     792:792:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606:606 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Hr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Jr;)V"}
     793:794:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):152:153 -> a
     793:794:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
     795:799:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):297:301 -> a
@@ -127434,33 +127410,33 @@
     882:882:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
     882:882:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):154 -> a
     882:882:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
-    883:883:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    883:883:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     883:883:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):357 -> a
     883:883:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):329 -> a
     883:883:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
     883:883:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):154 -> a
     883:883:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
-    884:884:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    884:884:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     884:884:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):357 -> a
     884:884:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):329 -> a
     884:884:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
     884:884:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):154 -> a
     884:884:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(5)"]}
-    885:885:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    885:885:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     885:885:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):357 -> a
     885:885:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):329 -> a
     885:885:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
     885:885:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):154 -> a
     885:885:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
-    886:886:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1635:1635 -> a
+    886:886:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1641:1641 -> a
     886:886:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):357 -> a
     886:886:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):329 -> a
     886:886:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
     886:886:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):154 -> a
     886:886:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(5)"]}
-    887:887:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1635:1635 -> a
+    887:887:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1641:1641 -> a
     887:887:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):357 -> a
     887:887:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):329 -> a
     887:887:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
@@ -127561,7 +127537,7 @@
     930:930:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.run(com.android.tools.r8.ir.code.IRCode):156:156 -> a
     930:930:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):606 -> a
     931:934:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):869:872 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/u;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/c8$a;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/u;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/e8$a;Lcom/android/tools/r8/internal/ph0;)V"}
     935:935:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isComposeMethodProcessor():0:0 -> a
     935:935:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):872 -> a
     936:944:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):873:881 -> a
@@ -127608,7 +127584,7 @@
     1040:1040:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):77:77 -> a
     1040:1040:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):914 -> a
     1041:1042:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):918:919 -> a
-    1043:1043:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2132:2132 -> a
+    1043:1043:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2138:2138 -> a
     1043:1043:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):919 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1044:1044:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):920:920 -> a
@@ -128542,9 +128518,9 @@
     1581:1581:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):167 -> a
     1581:1581:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):925 -> a
     1582:1582:void lambda$collectOptimizationInfo$8(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):870:870 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/d3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/d3;)V"}
     1583:1583:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):952:952 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)V"}
     1584:1587:com.android.tools.r8.ir.code.IRCode roundtripThroughLir(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1015:1018 -> a
     1584:1587:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):953 -> a
     1588:1591:void remapBytecodeMetadataProvider(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):1025:1028 -> a
@@ -128573,13 +128549,13 @@
     1606:1606:void printMethod(com.android.tools.r8.graph.ProgramMethod,java.lang.String):1101:1101 -> a
     1606:1606:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):960 -> a
     1607:1613:com.android.tools.r8.ir.code.IRCode doRoundtripWithStrategy(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirStrategy,java.lang.String,com.android.tools.r8.utils.Timing):1035:1041 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/VK;Ljava/lang/String;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ZK;Ljava/lang/String;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Dt;"}
     1614:1632:com.android.tools.r8.ir.code.IRCode doRoundtripWithStrategy(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirStrategy,java.lang.String,com.android.tools.r8.utils.Timing):1037:1055 -> a
     1633:1641:com.android.tools.r8.ir.code.IRCode doRoundtripWithStrategy(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirStrategy,java.lang.String,com.android.tools.r8.utils.Timing):1048:1056 -> a
     1642:1657:java.lang.String printMethodIR(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String,com.android.tools.r8.utils.InternalOptions):1079:1094 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/gB;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/iB;)Ljava/lang/String;"}
     1658:1666:void printMethod(com.android.tools.r8.graph.ProgramMethod,java.lang.String,com.android.tools.r8.utils.InternalOptions):1105:1113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;Lcom/android/tools/r8/internal/iB;)V"}
     1667:1671:void internalOnMethodPruned(com.android.tools.r8.graph.ProgramMethod):1132:1136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1672:1672:com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis.fieldAssignmentTracker():59:59 -> a
@@ -128651,14 +128627,14 @@
     10:10:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$1(com.android.tools.r8.graph.ProgramMethod):320:320 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     11:11:void lambda$processMethodsConcurrently$4(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):414:414 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/internal/QN$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/internal/UN$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     12:22:com.android.tools.r8.utils.Timing processDesugaredMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):432:442 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/ph0;"}
     23:24:void printPhase(java.lang.String):1068:1069 -> b
     1:1:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> c
     1:1:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):460 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/ph0;"}
     2:2:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> c
     2:2:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):460 -> c
     3:4:com.android.tools.r8.utils.Timing rewriteDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):460:461 -> c
@@ -128675,7 +128651,7 @@
     19:19:void com.android.tools.r8.ir.optimize.Inliner.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1293:1293 -> c
     19:19:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1162 -> c
     1:6:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):473:478 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/ph0;"}
     7:7:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):296:296 -> d
     7:7:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481 -> d
     8:8:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> d
@@ -128683,26 +128659,26 @@
     8:8:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481 -> d
     9:16:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):299:306 -> d
     9:16:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481 -> d
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> d
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> d
     17:17:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):306 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481 -> d
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> d
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> d
     18:18:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):306 -> d
     18:18:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481 -> d
     19:29:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):481:491 -> d
     30:31:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):482:483 -> d
-com.android.tools.r8.ir.conversion.IRFinalizer -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.ir.conversion.IRFinalizer -> com.android.tools.r8.internal.Jt:
 # {"id":"sourceFile","fileName":"IRFinalizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):17:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
     1:1:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/i0;"}
-com.android.tools.r8.ir.conversion.IRToCfFinalizer -> com.android.tools.r8.internal.Ot:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/i0;"}
+com.android.tools.r8.ir.conversion.IRToCfFinalizer -> com.android.tools.r8.internal.Qt:
 # {"id":"sourceFile","fileName":"IRToCfFinalizer.java"}
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/F;"}
@@ -128710,20 +128686,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/F;)V"}
     1:6:com.android.tools.r8.graph.CfCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):30:35 -> a
     1:6:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
-com.android.tools.r8.ir.conversion.IRToDexFinalizer -> com.android.tools.r8.internal.Pt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
+com.android.tools.r8.ir.conversion.IRToDexFinalizer -> com.android.tools.r8.internal.Rt:
 # {"id":"sourceFile","fileName":"IRToDexFinalizer.java"}
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/F;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():23:23 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.DeadCodeRemover):31:33 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/F;)V"}
     1:4:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):42:45 -> a
     1:4:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
     5:5:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):54:54 -> a
     5:5:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     5:5:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
@@ -128731,7 +128707,7 @@
     6:6:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):54 -> a
     6:6:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     6:6:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():2964:2964 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():2970:2970 -> a
     7:7:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):304 -> a
     7:7:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):54 -> a
     7:7:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
@@ -128770,7 +128746,7 @@
     52:52:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):55 -> a
     52:52:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     52:52:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():2948:2948 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():2954:2954 -> a
     53:53:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundDex2OatInliningIssue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):49 -> a
     53:53:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):55 -> a
     53:53:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
@@ -128862,7 +128838,7 @@
     98:98:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):59 -> a
     98:98:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     98:98:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():3159:3159 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveSwitchMaxIntBug():3165:3165 -> a
     99:99:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundSwitchMaxIntBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):124 -> a
     99:99:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):59 -> a
     99:99:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
@@ -128918,29 +128894,29 @@
     153:155:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):60:62 -> a
     153:155:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     153:155:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    156:156:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2989:2989 -> a
+    156:156:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2995:2995 -> a
     156:156:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):238 -> a
     156:156:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     156:156:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     156:156:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    157:157:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2989:2989 -> a
+    157:157:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2995:2995 -> a
     157:157:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     157:157:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     157:157:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     157:157:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    158:158:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2989:2989 -> a
+    158:158:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2995:2995 -> a
     158:158:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):238 -> a
     158:158:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     158:158:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     158:158:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    159:159:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2990:2990 -> a
+    159:159:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2996:2996 -> a
     159:159:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     159:159:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     159:159:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     159:159:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    160:160:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2990:2990 -> a
+    160:160:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():2996:2996 -> a
     160:160:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):238 -> a
     160:160:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     160:160:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
@@ -128965,7 +128941,7 @@
     184:184:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):63 -> a
     184:184:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
     184:184:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-    185:185:boolean com.android.tools.r8.utils.InternalOptions.canHaveInvokeInterfaceToObjectMethodBug():3210:3210 -> a
+    185:185:boolean com.android.tools.r8.utils.InternalOptions.canHaveInvokeInterfaceToObjectMethodBug():3216:3216 -> a
     185:185:void com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):434 -> a
     185:185:void workaroundBugs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):63 -> a
     185:185:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):46 -> a
@@ -129326,13 +129302,13 @@
     393:393:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
     394:394:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):50:50 -> a
     394:394:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):23 -> a
-com.android.tools.r8.ir.conversion.IRToLirFinalizer -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.ir.conversion.IRToLirFinalizer -> com.android.tools.r8.internal.St:
 # {"id":"sourceFile","fileName":"IRToLirFinalizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):18:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.lightir.LirCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):27:27 -> a
     1:1:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;)Lcom/android/tools/r8/graph/i0;"}
     2:2:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
     2:2:com.android.tools.r8.lightir.LirCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):32 -> a
     2:2:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):15 -> a
@@ -129340,14 +129316,14 @@
     3:4:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):15 -> a
     5:10:com.android.tools.r8.lightir.LirCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):29:34 -> a
     5:10:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing,java.lang.String):15 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.wJ:
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.AJ:
 # {"id":"sourceFile","fileName":"LensCodeRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():133:133 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):164:167 -> <init>
@@ -129355,7 +129331,7 @@
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.lens.MethodLookupResult.getPrototypeChanges():43:43 -> a
     1:1:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):1171 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;)Lcom/android/tools/r8/internal/Nw;"}
     2:2:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):1172:1172 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     3:3:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):1175 -> a
@@ -129397,7 +129373,7 @@
     41:41:boolean com.android.tools.r8.graph.lens.FieldLookupResult.hasWriteCastType():44:44 -> a
     41:41:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.lens.FieldLookupResult):1134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/Nw;"}
     42:44:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.lens.FieldLookupResult):1135:1137 -> a
     45:45:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():23:23 -> a
     45:45:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.lens.FieldLookupResult):1137 -> a
@@ -129428,7 +129404,7 @@
     68:68:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.lens.FieldLookupResult):1155 -> a
     69:73:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.lens.FieldLookupResult):1156:1160 -> a
     74:85:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):264:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/proto/j;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/proto/j;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)V"}
     86:87:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1319:1320 -> a
     86:87:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):277 -> a
     88:88:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
@@ -129506,22 +129482,22 @@
     2876:2883:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):286:293 -> a
     2884:3523:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):287:926 -> a
     3524:3524:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lambda$rewritePartialDefault$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/xJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/BJ;"}
     3525:3525:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):344:344 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3526:3532:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):382:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3533:3533:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     3533:3533:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3534:3534:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):39:39 -> a
     3534:3534:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):388 -> a
     3535:3535:void lambda$rewritePartialDefault$3(java.util.List,com.android.tools.r8.ir.conversion.ExtraParameter):420:420 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Fo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Io;)V"}
     3536:3536:java.util.Map lambda$rewritePartialDefault$4(com.android.tools.r8.ir.analysis.value.SingleConstValue):539:539 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ob0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sb0;)Ljava/util/Map;"}
     3537:3545:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleConstValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):543:551 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Ob0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Fo;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Sb0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Io;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/bl0;"}
     3546:3546:com.android.tools.r8.ir.code.MaterializingInstructionsInfo com.android.tools.r8.ir.code.MaterializingInstructionsInfo.create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Position):20:20 -> a
     3546:3546:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleConstValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):548 -> a
     3547:3547:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleConstValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):545:545 -> a
@@ -129529,12 +129505,12 @@
     3548:3548:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleConstValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):545 -> a
     3549:3554:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleConstValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):552:557 -> a
     3555:3555:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$6(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):737:737 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cb;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eb;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3556:3556:boolean com.android.tools.r8.ir.code.CheckCast.ignoreCompatRules():81:81 -> a
     3556:3556:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$6(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):737 -> a
     3557:3557:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$6(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):737:737 -> a
     3558:3558:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$8(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):792:792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3559:3559:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstanceOf.value():52:52 -> a
     3559:3559:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$8(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):792 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -129542,19 +129518,19 @@
     3560:3560:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$8(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):792 -> a
     3561:3561:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$8(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):792:792 -> a
     3562:3562:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$9(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):804:804 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PB;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3563:3563:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     3563:3563:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$9(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):804 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3564:3564:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$9(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):804:804 -> a
     3565:3565:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$10(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):816:816 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3566:3566:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     3566:3566:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$10(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):816 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3567:3567:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$10(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):816:816 -> a
     3568:3568:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$12(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):840:840 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mQ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     3569:3569:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NewArrayEmpty.size():58:58 -> a
     3569:3569:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$12(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):840 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -129562,15 +129538,15 @@
     3570:3570:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$12(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):840 -> a
     3571:3571:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$12(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):840:840 -> a
     3572:3572:void lambda$rewritePartialDefault$13(java.util.Set,com.android.tools.r8.ir.code.Value):911:911 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/bl0;)V"}
     3573:3579:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):1089:1095 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;)V"}
     3580:3580:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):1091:1091 -> a
     3581:3581:boolean lambda$removeUnusedArguments$14(com.android.tools.r8.ir.code.UnusedArgument,com.android.tools.r8.ir.code.Instruction):1094:1094 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ok0;Lcom/android/tools/r8/internal/Kw;)Z"}
     3582:3590:java.util.Deque getUnappliedLenses(com.android.tools.r8.graph.ProgramMethod):1100:1108 -> a
     3582:3590:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     3591:3591:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     3591:3591:java.util.Deque getUnappliedLenses(com.android.tools.r8.graph.ProgramMethod):1109 -> a
     3591:3591:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):191 -> a
@@ -129693,7 +129669,7 @@
     3669:3676:void rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):958 -> a
     3669:3676:void rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):226 -> a
     3669:3676:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):201 -> a
-    3677:3677:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    3677:3677:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     3677:3677:void rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):971 -> a
     3677:3677:void rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):226 -> a
     3677:3677:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):201 -> a
@@ -129847,9 +129823,9 @@
     3754:3754:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):201 -> a
     3755:3755:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):210:210 -> a
     3756:3756:boolean lambda$insertCastForFieldAssignmentIfNeeded$15(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1153:1153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     3757:3757:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1220:1220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/O90;Lcom/android/tools/r8/graph/proto/j;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/S90;Lcom/android/tools/r8/graph/proto/j;)V"}
     3758:3758:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getRewrittenReturnInfo():157:157 -> a
     3758:3758:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1221 -> a
     3759:3759:boolean com.android.tools.r8.graph.proto.RewrittenTypeInfo.hasCastType():59:59 -> a
@@ -129885,7 +129861,7 @@
     3785:3785:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1244 -> a
     3786:3791:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1245:1250 -> a
     3792:3793:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.lens.FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1255:1256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/l1;"}
     3794:3794:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReboundReference():57:57 -> a
     3794:3794:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.lens.FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1256 -> a
     3795:3795:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.lens.FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1256:1256 -> a
@@ -129905,7 +129881,7 @@
     3808:3808:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.lens.FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1266 -> a
     3809:3809:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.lens.FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1266:1266 -> a
     3810:3810:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1277:1277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     3811:3811:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     3811:3811:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1277 -> a
     3812:3814:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1290:1292 -> a
@@ -129922,11 +129898,11 @@
     3827:3828:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1299:1300 -> a
     3827:3828:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):1277 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):828:828 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     2:2:boolean lambda$insertCastForReturnIfNeeded$17(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1230:1230 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     1:9:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):751:759 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/Kw;"}
     10:10:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):36:36 -> c
     10:10:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):759 -> c
     11:11:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):752:752 -> c
@@ -129940,54 +129916,54 @@
     20:20:com.android.tools.r8.ir.code.StaticGet com.android.tools.r8.ir.code.StaticGet$Builder.build():287:287 -> c
     20:20:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):758 -> c
     21:21:boolean lambda$insertCastsForInvokeArgumentsIfNeeded$16(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1201:1201 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
-com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.tJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
+com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.xJ:
 # {"id":"sourceFile","fileName":"LensCodeRewriter.java"}
     com.android.tools.r8.ir.code.InvokeMethod val$invoke -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NB;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$graphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.DexMethod val$invokedMethod -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.lens.GraphLens val$codeLens -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AJ;"}
     1:1:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):462:462 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wJ;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AJ;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)V"}
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():470:472 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aj0;"}
     1:1:com.android.tools.r8.ir.code.Position getPosition():477:477 -> getPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():465:465 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j0;"}
-com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.uJ:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.yJ:
 # {"id":"sourceFile","fileName":"LensCodeRewriter.java"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens graphLens -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.DexMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:4:void <init>(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):141:144 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.vJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)V"}
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.zJ:
 # {"id":"sourceFile","fileName":"LensCodeRewriter.java"}
     com.android.tools.r8.ir.code.IRCode code -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.code.Instruction current -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nw;"}
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AJ;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1342:1342 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):1350:1354 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wJ;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Lw;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AJ;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Nw;Ljava/util/Set;)V"}
     1:3:com.android.tools.r8.ir.code.Instruction replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1363:1365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Kw;"}
     4:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):172:174 -> a
     4:6:com.android.tools.r8.ir.code.Instruction replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1365 -> a
     7:7:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):96:96 -> a
@@ -130003,14 +129979,14 @@
     19:19:com.android.tools.r8.ir.code.Instruction replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1375 -> a
     20:21:com.android.tools.r8.ir.code.Instruction replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1376:1377 -> a
     22:22:com.android.tools.r8.ir.code.Instruction replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):1373:1373 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.xJ:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.BJ:
 # {"id":"sourceFile","fileName":"LensCodeRewriterUtils.java"}
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/d1;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Map protoFixupCache -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map rewrittenCallSiteCache -> e
@@ -130029,7 +130005,7 @@
     18:18:void <init>(com.android.tools.r8.graph.AppView,boolean):56 -> <init>
     19:20:void <init>(com.android.tools.r8.graph.AppView,boolean):56:57 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)V"}
     22:44:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):43:65 -> <init>
     1:4:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):73:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/D0;"}
@@ -130129,7 +130105,7 @@
     39:39:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):98 -> b
 com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> R8$$REMOVED$$CLASS$$93:
 # {"id":"sourceFile","fileName":"LibraryDesugaredChecker.java"}
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.BJ:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.FJ:
 # {"id":"sourceFile","fileName":"LibraryDesugaredChecker.java"}
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -130168,12 +130144,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)V"}
     41:42:void registerField(com.android.tools.r8.graph.DexField):85:86 -> a
     41:42:void registerField(com.android.tools.r8.graph.DexEncodedField):97 -> a
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.AJ:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.EJ:
 # {"id":"sourceFile","fileName":"LibraryDesugaredChecker.java"}
     com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FJ;"}
     1:2:void <init>(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:123 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FJ;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):155:155 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):180:180 -> a
@@ -130213,45 +130189,45 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     2:3:boolean registerMethod(com.android.tools.r8.graph.DexMethod):131:132 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.conversion.LirConverter -> com.android.tools.r8.internal.BK:
+com.android.tools.r8.ir.conversion.LirConverter -> com.android.tools.r8.internal.FK:
 # {"id":"sourceFile","fileName":"LirConverter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2182:2182 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2188:2188 -> a
     2:2:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47 -> a
     3:5:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):47:49 -> a
-    6:6:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2196:2196 -> a
+    6:6:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2202:2202 -> a
     6:6:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):49 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2196:2196 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2202:2202 -> a
     7:7:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2196:2196 -> a
+    8:8:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2202:2202 -> a
     8:8:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):49 -> a
-    9:9:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2197:2197 -> a
+    9:9:void com.android.tools.r8.utils.InternalOptions$TestingOptions.enterLirSupportedPhase():2203:2203 -> a
     9:9:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:35:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):50:75 -> a
     36:59:void enterLirSupportedPhase(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):56:79 -> a
     60:60:void lambda$enterLirSupportedPhase$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hd;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Jd;Lcom/android/tools/r8/graph/D2;)V"}
     61:61:boolean lambda$enterLirSupportedPhase$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Z"}
     62:65:void lambda$enterLirSupportedPhase$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hd;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Jd;Lcom/android/tools/r8/graph/C5;)V"}
     66:71:void lambda$enterLirSupportedPhase$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):64:69 -> a
     72:72:com.android.tools.r8.lightir.LirEncodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getEncodingStrategy():23:23 -> a
     72:72:void lambda$enterLirSupportedPhase$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):70 -> a
     73:73:void lambda$enterLirSupportedPhase$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):71:71 -> a
     74:79:void lambda$enterLirSupportedPhase$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):67:72 -> a
     80:80:void lambda$rewriteLirWithUnappliedLens$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.DexProgramClass):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/graph/D2;)V"}
     81:81:boolean lambda$rewriteLirWithUnappliedLens$3(com.android.tools.r8.graph.DexEncodedMethod):120:120 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     82:83:void rewriteLirMethodWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):133:134 -> a
     82:83:void lambda$rewriteLirWithUnappliedLens$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/graph/C5;)V"}
     84:86:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirCode.rewriteWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):840:842 -> a
     84:86:void rewriteLirMethodWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):134 -> a
     84:86:void lambda$rewriteLirWithUnappliedLens$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):121 -> a
@@ -130305,7 +130281,7 @@
     101:101:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirCode.rewriteWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):848 -> a
     101:101:void rewriteLirMethodWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):134 -> a
     101:101:void lambda$rewriteLirWithUnappliedLens$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):121 -> a
-    102:102:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():171:171 -> a
+    102:102:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():169:169 -> a
     102:102:boolean com.android.tools.r8.lightir.LirLensCodeRewriter.hasNonTrivialMethodChanges():327 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     102:102:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirLensCodeRewriter.rewrite():303 -> a
@@ -130467,14 +130443,14 @@
     175:175:void rewriteLirMethodWithLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):136:136 -> a
     175:175:void lambda$rewriteLirWithUnappliedLens$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):121 -> a
     176:202:void finalizeLirToOutputFormat(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):145:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     203:217:void finalizeLirToOutputFormat(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):164:178 -> a
     218:218:void finalizeLirToOutputFormat(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):177:177 -> a
     219:219:void lambda$finalizeLirToOutputFormat$7(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hd;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Jd;Lcom/android/tools/r8/graph/D2;)V"}
     220:231:void finalizeLirMethodToOutputFormat(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection):186:197 -> a
     220:231:void lambda$finalizeLirToOutputFormat$6(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hd;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Jd;Lcom/android/tools/r8/graph/C5;)V"}
     232:247:void finalizeLirMethodToOutputFormat(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection):196:211 -> a
     232:247:void lambda$finalizeLirToOutputFormat$6(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection,com.android.tools.r8.graph.ProgramMethod):169 -> a
     248:248:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> a
@@ -130486,53 +130462,53 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     260:260:boolean verifyLirOnly(com.android.tools.r8.graph.AppView):222:222 -> a
     1:10:void rewriteLirWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):87:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     11:26:void rewriteLirWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):94:109 -> b
     27:34:void rewriteLirWithUnappliedLens(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):115:122 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     35:45:void rewriteLirWithUnappliedLens(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):116:126 -> b
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.QN:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.UN:
 # {"id":"sourceFile","fileName":"MethodConversionOptions.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     boolean isGeneratingClassFiles() -> a
     1:8:com.android.tools.r8.ir.conversion.IRFinalizer getFinalizer(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.graph.AppView):48:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/F;)Lcom/android/tools/r8/internal/Ht;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/F;)Lcom/android/tools/r8/internal/Jt;"}
     9:9:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)I"}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2182:2182 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2188:2188 -> a
     10:10:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):65 -> a
     11:11:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):68:68 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     12:12:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     13:13:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):68 -> a
     14:14:com.android.tools.r8.ir.conversion.MethodConversionOptions$Target determineTarget(com.android.tools.r8.graph.AppView):71:71 -> a
     boolean isGeneratingDex() -> b
     1:2:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forD8(com.android.tools.r8.graph.AppView):39:40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UN$a;"}
     boolean isGeneratingLir() -> c
     1:5:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forLirPhase(com.android.tools.r8.graph.AppView):31:35 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UN$a;"}
     boolean isPeepholeOptimizationsEnabled() -> d
     1:4:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):22:25 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/QN$a;"}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.isPostLirPhase():2219:2219 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/UN$a;"}
+    5:5:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.isPostLirPhase():2225:2225 -> d
     5:5:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):25 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):25:26 -> d
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> d
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> d
     8:8:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):26 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> d
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> d
     9:9:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):26 -> d
     10:10:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions forPostLirPhase(com.android.tools.r8.graph.AppView):27:27 -> d
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions nonConverting():44:44 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UN$a;"}
     boolean shouldFinalizeAfterLensCodeRewriter() -> f
-com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.QN$a:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.UN$a:
 # {"id":"sourceFile","fileName":"MethodConversionOptions.java"}
     com.android.tools.r8.ir.conversion.MethodConversionOptions$Target target -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
@@ -130548,14 +130524,14 @@
     1:1:boolean isGeneratingLir():107:107 -> c
     1:1:boolean isPeepholeOptimizationsEnabled():122:122 -> d
     1:1:boolean shouldFinalizeAfterLensCodeRewriter():127:127 -> f
-com.android.tools.r8.ir.conversion.MethodConversionOptions$ThrowingMethodConversionOptions -> com.android.tools.r8.internal.RN:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$ThrowingMethodConversionOptions -> com.android.tools.r8.internal.VN:
 # {"id":"sourceFile","fileName":"MethodConversionOptions.java"}
     1:1:void <init>():134:134 -> <init>
     1:1:boolean isGeneratingClassFiles():144:144 -> a
     1:1:boolean isGeneratingDex():149:149 -> b
     1:1:boolean isGeneratingLir():139:139 -> c
     1:1:boolean isPeepholeOptimizationsEnabled():154:154 -> d
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.dO:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.hO:
 # {"id":"sourceFile","fileName":"MethodOptimizationFeedback.java"}
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/ir/optimize/O;)V"}
@@ -130568,21 +130544,21 @@
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;I)V"}
     void setAbstractFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Lk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Pk0;)V"}
     void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C7;)V"}
     void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qc;)V"}
     void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Fm;)V"}
     void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/In;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ln;)V"}
     void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/rw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/tw;)V"}
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Ljava/util/BitSet;)V"}
     void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/BitSet;)V"}
     void unsetForceInline(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -130596,47 +130572,47 @@
     void setParametersWithBitwiseOperations(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/BitSet;)V"}
     void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback$1 -> com.android.tools.r8.internal.cO:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback$1 -> com.android.tools.r8.internal.gO:
 # {"id":"sourceFile","fileName":"MethodOptimizationFeedback.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():154:154 -> <clinit>
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.lO:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.pO:
 # {"id":"sourceFile","fileName":"MethodProcessor.java"}
     1:1:void <init>():10:10 -> <init>
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:com.android.tools.r8.optimize.compose.ComposeMethodProcessor asComposeMethodProcessor():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Se;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ue;"}
     void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.ir.conversion.PostMethodProcessor asPostMethodProcessor():37:37 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hX;"}
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor asPrimaryMethodProcessor():29:29 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OX;"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
     1:1:boolean isD8MethodProcessor():0:0 -> f
     1:1:boolean isPrimaryMethodProcessor():25:25 -> g
-com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer -> com.android.tools.r8.internal.nO:
+com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer -> com.android.tools.r8.internal.rO:
 # {"id":"sourceFile","fileName":"MethodProcessorEventConsumer.java"}
     1:1:void <init>():19:19 -> <init>
     1:1:void finished(com.android.tools.r8.graph.AppView):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer$EmptyMethodProcessorEventConsumer -> com.android.tools.r8.internal.mO:
+com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer$EmptyMethodProcessorEventConsumer -> com.android.tools.r8.internal.qO:
 # {"id":"sourceFile","fileName":"MethodProcessorEventConsumer.java"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer$EmptyMethodProcessorEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qO;"}
     1:1:void <clinit>():44:44 -> <clinit>
     1:1:void <init>():47:47 -> <init>
     1:1:void acceptInstanceInitializerOutline(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):78:78 -> a
@@ -130663,12 +130639,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptUtilityThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):100:100 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.oO:
+com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.sO:
 # {"id":"sourceFile","fileName":"MethodProcessorWithWave.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet wave -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet waveExtension -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     1:4:void <init>():10:13 -> <init>
     5:5:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> <init>
     5:5:void <init>():13 -> <init>
@@ -130683,7 +130659,7 @@
     1:1:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):27:27 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():17:17 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     1:1:void prepareForWaveExtensionProcessing():31:31 -> h
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> h
     2:2:void prepareForWaveExtensionProcessing():31 -> h
@@ -130696,18 +130672,18 @@
     9:9:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> h
     9:9:void prepareForWaveExtensionProcessing():35 -> h
     10:10:void prepareForWaveExtensionProcessing():35:35 -> h
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.HU:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.LU:
 # {"id":"sourceFile","fileName":"OneTimeMethodProcessor.java"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer eventConsumer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qO;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Db0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hb0;"}
     1:4:void <init>(com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.utils.collections.ProgramMethodSet):30:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mO;Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qO;Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/CY;)V"}
     1:1:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GU;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KU;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     2:2:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -130715,50 +130691,50 @@
     3:3:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):111 -> a
     4:11:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):112:119 -> a
     12:12:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod,int):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GU;Lcom/android/tools/r8/graph/C5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KU;Lcom/android/tools/r8/graph/C5;I)V"}
     1:1:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):91:91 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():77:77 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     1:1:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer():86:86 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.FU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.JU:
 # {"id":"sourceFile","fileName":"OneTimeMethodProcessor.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer eventConsumer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qO;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     1:1:void <init>(com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):130:130 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;)V"}
     2:9:void <init>(com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):125:132 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder add(com.android.tools.r8.graph.ProgramMethod):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/FU;"}
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.GU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/JU;"}
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.KU:
 # {"id":"sourceFile","fileName":"OneTimeMethodProcessor.java"}
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.dX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.hX:
 # {"id":"sourceFile","fileName":"PostMethodProcessor.java"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l8;"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer eventConsumer -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rO;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet processed -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     java.util.Deque waves -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.utils.collections.ProgramMethodSet):54:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d8;Lcom/android/tools/r8/internal/nO;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/f8;Lcom/android/tools/r8/internal/rO;Lcom/android/tools/r8/internal/CY;)V"}
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.utils.collections.ProgramMethodSet):42:55 -> <init>
     16:18:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation com.android.tools.r8.ir.conversion.callgraph.CallGraph.createCallSiteInformation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):63:65 -> <init>
     16:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.utils.collections.ProgramMethodSet):55 -> <init>
@@ -130766,12 +130742,12 @@
     1:1:java.util.Set com.android.tools.r8.ir.conversion.callgraph.Node.getCallers():136:136 -> a
     1:1:void lambda$createWaves$1(com.android.tools.r8.ir.conversion.callgraph.Node,java.util.function.Consumer):206 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;Ljava/util/function/Consumer;)V"}
     2:3:void lambda$createWaves$1(com.android.tools.r8.ir.conversion.callgraph.Node,java.util.function.Consumer):206:207 -> a
     4:4:java.util.Set com.android.tools.r8.ir.conversion.callgraph.Node.getCallers():136:136 -> a
     4:4:void lambda$createWaves$2(com.android.tools.r8.ir.conversion.callgraph.Node):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)V"}
     5:8:void lambda$createWaves$2(com.android.tools.r8.ir.conversion.callgraph.Node):201:204 -> a
     9:9:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
     9:9:void lambda$createWaves$2(com.android.tools.r8.ir.conversion.callgraph.Node):202 -> a
@@ -130779,12 +130755,12 @@
     10:10:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
     10:10:void lambda$createWaves$2(com.android.tools.r8.ir.conversion.callgraph.Node):202 -> a
     11:14:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.callgraph.CallGraph):196:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d8;)Ljava/util/ArrayDeque;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f8;)Ljava/util/ArrayDeque;"}
     15:15:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.callgraph.CallGraph):198:198 -> a
     16:16:void lambda$createWaves$0(java.util.function.Consumer,com.android.tools.r8.ir.conversion.callgraph.Node):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/pR;)V"}
     17:17:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HX;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     18:18:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     18:18:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):222 -> a
     19:21:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):223:225 -> a
@@ -130851,10 +130827,10 @@
     69:69:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):253 -> a
     70:70:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):254:254 -> a
     71:73:com.android.tools.r8.utils.Timing lambda$forEachMethod$4(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):238:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HX;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/ph0;"}
     74:76:com.android.tools.r8.utils.Timing lambda$forEachMethod$4(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):239:241 -> a
     1:1:com.android.tools.r8.ir.conversion.PostMethodProcessor asPostMethodProcessor():90:90 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hX;"}
     1:1:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):95:95 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.contains(com.android.tools.r8.graph.DexClassAndMethod):83:83 -> c
@@ -130869,7 +130845,7 @@
     7:7:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.contains(com.android.tools.r8.graph.DexClassAndMethod):83:83 -> c
     7:7:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):96 -> c
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():75:75 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     2:2:boolean lambda$forEachMethod$3(com.android.tools.r8.graph.ProgramMethod):226:226 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     3:3:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.contains(com.android.tools.r8.graph.DexClassAndMethod):83:83 -> d
@@ -130908,15 +130884,15 @@
     16:16:void markCallersForProcessing(com.android.tools.r8.graph.ProgramMethod):66 -> e
     17:20:void markCallersForProcessing(com.android.tools.r8.graph.ProgramMethod):67:70 -> e
     21:21:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer():80:80 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.cX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.gX:
 # {"id":"sourceFile","fileName":"PostMethodProcessor.java"}
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocessBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TL;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():99:99 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.lens.GraphLens):103:105 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     1:1:void add(com.android.tools.r8.graph.ProgramMethod):110:110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.add(com.android.tools.r8.graph.ProgramMethod):64:64 -> a
@@ -130926,17 +130902,17 @@
     3:3:void add(com.android.tools.r8.graph.ProgramMethod):110 -> a
     4:4:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):114:114 -> a
     4:4:void lambda$addAll$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod):118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/C5;)V"}
     5:5:void addAll(java.util.Collection,com.android.tools.r8.graph.lens.GraphLens):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ns;)V"}
     6:6:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;)V"}
     7:7:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/cX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/gX;"}
     8:8:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):143:143 -> a
     8:8:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):148 -> a
     9:9:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nO;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/dX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rO;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/hX;"}
     10:10:java.util.Set com.android.tools.r8.shaking.AppInfoWithLiveness.getReprocessMethods():634:634 -> a
     10:10:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -130952,24 +130928,24 @@
     36:36:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):186 -> a
     37:38:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):186:187 -> a
     39:39:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/w2;)V"}
     40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):128:128 -> a
     40:40:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):168 -> a
     41:44:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):168:171 -> a
     45:45:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
     45:45:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):171 -> a
     46:46:void dump(com.android.tools.r8.utils.DeterminismChecker):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl;)V"}
     1:1:boolean lambda$build$2(com.android.tools.r8.graph.ProgramMethod):185:185 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter -> com.android.tools.r8.internal.GX:
+com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter -> com.android.tools.r8.internal.KX:
 # {"id":"sourceFile","fileName":"PrimaryD8L8IRConverter.java"}
     com.android.tools.r8.utils.Timing timing -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     boolean $assertionsDisabled -> K
     1:1:void <clinit>():46:46 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):51:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)V"}
     1:2:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):18:19 -> a
     1:2:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
@@ -131001,22 +130977,22 @@
     39:43:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):269:273 -> a
     39:43:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):78 -> a
     44:46:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):81:83 -> a
-    47:47:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    47:47:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     47:47:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:48:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:48:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):83 -> a
     49:49:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84:84 -> a
     50:50:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
     50:50:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84 -> a
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     51:51:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     51:51:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84 -> a
     52:52:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    52:52:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    52:52:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     52:52:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84 -> a
@@ -131079,12 +131055,12 @@
     111:116:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):84 -> a
     117:117:void com.android.tools.r8.ir.desugar.itf.L8InnerOuterAttributeEraser.run():28:28 -> a
     117:117:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):85 -> a
-    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     118:118:void com.android.tools.r8.ir.desugar.itf.L8InnerOuterAttributeEraser.run():28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     118:118:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):85 -> a
     119:119:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    119:119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    119:119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     119:119:void com.android.tools.r8.ir.desugar.itf.L8InnerOuterAttributeEraser.run():28 -> a
     119:119:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):85 -> a
@@ -131156,13 +131132,13 @@
     187:187:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> a
     187:187:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):358 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/Ie;)V"}
     188:188:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> a
     188:188:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):358 -> a
     189:190:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):358:359 -> a
     191:191:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):357:357 -> a
     192:192:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;Ljava/util/concurrent/ExecutorService;)V"}
     193:196:com.android.tools.r8.ir.conversion.ClassConverter com.android.tools.r8.ir.conversion.ClassConverter.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryD8L8IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):57:60 -> a
     193:196:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):284 -> a
     197:197:com.android.tools.r8.ir.conversion.ClassConverterResult$Builder com.android.tools.r8.ir.conversion.ClassConverterResult.builder():21:21 -> a
@@ -131196,25 +131172,25 @@
     218:218:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):294 -> a
     219:219:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):297:297 -> a
     220:223:void prepareDesugaring(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,java.util.concurrent.ExecutorService):326:329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Ljava/util/concurrent/ExecutorService;)V"}
     224:234:void prepareDesugaring(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,java.util.concurrent.ExecutorService):328:338 -> a
     235:235:void lambda$prepareDesugaring$3(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):331:331 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/D2;)V"}
     236:236:boolean lambda$prepareDesugaring$1(com.android.tools.r8.graph.DexEncodedMethod):332:332 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     237:237:void lambda$prepareDesugaring$2(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):334:334 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     238:238:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     238:238:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;)V"}
     239:239:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     239:239:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):107 -> a
     240:256:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):114:130 -> a
-    257:257:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    257:257:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     257:257:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    258:258:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    258:258:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     258:258:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):130 -> a
     259:259:boolean com.android.tools.r8.graph.DexProgramClass.hasClassFileVersion():828:828 -> a
     259:259:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):130 -> a
@@ -131223,18 +131199,18 @@
     263:268:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):390:395 -> a
     263:268:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):376 -> a
     263:268:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):361 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/ph0;"}
     269:274:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):377:382 -> a
     269:274:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):361 -> a
     275:275:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):377:377 -> a
     275:275:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):361 -> a
     276:276:void clearNestAttributes():402:402 -> a
     277:281:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):414:418 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Ljava/util/concurrent/ExecutorService;)V"}
     282:282:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$5(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):416:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/yh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ah;)V"}
     1:1:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):306:306 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/KA;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/MA;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions com.android.tools.r8.ir.conversion.D8MethodProcessor.getProfileCollectionAdditions():61:61 -> b
     2:2:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):309 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -131257,22 +131233,22 @@
     18:18:void reportNestDesugarDependencies():407:407 -> b
     1:1:boolean lambda$postProcessingDesugaringForD8$0(com.android.tools.r8.graph.ProgramMethod):316:316 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.KX:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.OX:
 # {"id":"sourceFile","fileName":"PrimaryMethodProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l8;"}
     com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer eventConsumer -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rO;"}
     java.util.Deque waves -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):51:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d8;Lcom/android/tools/r8/internal/nO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/f8;Lcom/android/tools/r8/internal/rO;)V"}
     4:6:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation com.android.tools.r8.ir.conversion.callgraph.CallGraph.createCallSiteInformation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):63:65 -> <init>
     4:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):53 -> <init>
     7:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):53:54 -> <init>
@@ -131280,7 +131256,7 @@
     9:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):55 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):55:55 -> <init>
     1:1:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HX;Lcom/android/tools/r8/internal/JX;Lcom/android/tools/r8/internal/IX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/NX;Lcom/android/tools/r8/internal/MX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     2:2:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):121 -> a
     3:5:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):122:124 -> a
@@ -131304,10 +131280,10 @@
     43:43:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):144 -> a
     44:44:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):146:146 -> a
     45:47:com.android.tools.r8.utils.Timing lambda$forEachMethod$0(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):133:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HX;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/ph0;"}
     48:50:com.android.tools.r8.utils.Timing lambda$forEachMethod$0(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):134:136 -> a
     1:1:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor asPrimaryMethodProcessor():80:80 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OX;"}
     2:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):85:85 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     3:3:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.contains(com.android.tools.r8.graph.DexClassAndMethod):83:83 -> c
@@ -131317,30 +131293,30 @@
     4:4:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):85 -> c
     5:6:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):85:86 -> c
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():91:91 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     1:1:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer():70:70 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
     1:1:boolean isPrimaryMethodProcessor():75:75 -> g
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.HX:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.LX:
 # {"id":"sourceFile","fileName":"PrimaryMethodProcessor.java"}
     com.android.tools.r8.utils.Timing apply(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/lh0;"}
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.IX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/ph0;"}
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.MX:
 # {"id":"sourceFile","fileName":"PrimaryMethodProcessor.java"}
     void notifyWaveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.JX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.NX:
 # {"id":"sourceFile","fileName":"PrimaryMethodProcessor.java"}
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;)V"}
-com.android.tools.r8.ir.conversion.PrimaryR8IRConverter -> com.android.tools.r8.internal.LX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;)V"}
+com.android.tools.r8.ir.conversion.PrimaryR8IRConverter -> com.android.tools.r8.internal.PX:
 # {"id":"sourceFile","fileName":"PrimaryR8IRConverter.java"}
     com.android.tools.r8.utils.Timing timing -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     boolean $assertionsDisabled -> K
     1:1:void <clinit>():28:28 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):33:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)V"}
     1:1:com.android.tools.r8.graph.DexApplication lambda$optimize$0(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication):44:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/graph/x0;"}
     2:2:com.android.tools.r8.graph.DexApplication internalOptimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):55:55 -> a
@@ -131471,20 +131447,20 @@
     217:217:void lambda$internalOptimize$1(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):71:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/d3;)V"}
     218:218:com.android.tools.r8.utils.Timing lambda$internalOptimize$2(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/KX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/OX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/ph0;"}
     219:219:com.android.tools.r8.utils.Timing lambda$internalOptimize$2(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:96 -> a
     220:220:void lambda$internalOptimize$3(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/d3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/d3;)V"}
     221:221:com.android.tools.r8.ir.conversion.PostMethodProcessor lambda$internalOptimize$4(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,java.util.concurrent.ExecutorService):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nO;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/dX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rO;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/hX;"}
     222:222:com.android.tools.r8.utils.Timing lambda$internalOptimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/dX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/hX;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/ph0;"}
     223:223:com.android.tools.r8.utils.Timing lambda$internalOptimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):187:187 -> a
     224:224:void clearDexMethodCompilationState():236:236 -> a
     225:225:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;)V"}
     226:226:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):257:257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Ljava/util/concurrent/ExecutorService;)V"}
     227:227:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed.refineAppInfoWithLiveness(com.android.tools.r8.shaking.AppInfoWithLiveness):92:92 -> a
     227:227:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):257 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -131495,7 +131471,7 @@
     231:231:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     232:235:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):260:263 -> a
-    236:236:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2132:2132 -> a
+    236:236:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2138:2138 -> a
     236:236:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):263 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     237:237:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):264:264 -> a
@@ -131510,7 +131486,7 @@
     241:242:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):264 -> a
     243:247:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):266:270 -> a
     248:248:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):277:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;)V"}
     249:249:void com.android.tools.r8.ir.conversion.IRConverter.unsetFieldAccessAnalysis():292:292 -> a
     249:249:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):278 -> a
     250:255:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):279:284 -> a
@@ -131547,33 +131523,33 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:void com.android.tools.r8.graph.PrunedItems$Builder.clearRemovedMethods():247:247 -> b
     29:29:void pruneItems(java.util.concurrent.ExecutorService):292 -> b
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.Bc0:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.Fc0:
 # {"id":"sourceFile","fileName":"SourceCode.java"}
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/graph/j0;"}
     void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
     1:1:com.android.tools.r8.graph.DexType getPhiTypeForBlock(int,int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/tW$a;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/xW$a;)Lcom/android/tools/r8/graph/I2;"}
     2:2:boolean hasValidTypesFromStackMap():84:84 -> a
     void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     boolean verifyCurrentInstructionCanThrow() -> b
     boolean verifyRegister(int) -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     int instructionIndex(int) -> c
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
@@ -131585,10 +131561,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     int instructionCount() -> e
     com.android.tools.r8.ir.code.Position getCurrentPosition() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     int getMoveExceptionRegister(int) -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.fg0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.jg0:
 # {"id":"sourceFile","fileName":"SwitchPayloadResolver.java"}
     java.util.Map unresolvedPayload -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -131603,52 +131579,52 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/b4;)V"}
     21:21:int[] absoluteTargets(int):68:68 -> a
     1:1:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.eg0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.ig0:
 # {"id":"sourceFile","fileName":"SwitchPayloadResolver.java"}
     int userOffset -> a
     int[] absoluteTargets -> b
     int[] keys -> c
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.sg0:
+com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.wg0:
 # {"id":"sourceFile","fileName":"SyntheticStraightLineSourceCode.java"}
     java.util.List instructionBuilders -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.ir.code.Position position -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:3:void <init>(java.util.List,com.android.tools.r8.ir.code.Position):21:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/TW;)V"}
     1:1:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     2:2:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     3:3:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     4:4:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():133:133 -> a
     4:4:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):66 -> a
     5:5:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/graph/j0;"}
     6:6:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
     7:7:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     8:8:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     9:9:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     1:1:boolean verifyCurrentInstructionCanThrow():107:107 -> b
     2:2:boolean verifyRegister(int):112:112 -> b
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.conversion.IRBuilder.getMethod():493:493 -> b
     3:3:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):45 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.conversion.IRBuilder.getMethod():493:493 -> b
     4:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):45 -> b
     5:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> b
     6:6:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> b
     1:1:int instructionIndex(int):33:33 -> c
     2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):71:71 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     3:3:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):140:140 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     1:1:void clear():62:62 -> clear
@@ -131659,29 +131635,29 @@
     2:2:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):81:81 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():76:76 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     2:2:int getMoveExceptionRegister(int):123:123 -> f
     1:1:int instructionOffset(int):38:38 -> g
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.Vi0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.Zi0:
 # {"id":"sourceFile","fileName":"TypeConstraintResolver.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yt;"}
     java.util.Map unificationParents -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():52:52 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRBuilder):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yt;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRBuilder):56:60 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint constraintForType(com.android.tools.r8.ir.analysis.type.TypeElement):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/ql0;"}
     2:2:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
     2:2:com.android.tools.r8.ir.code.ValueTypeConstraint constraintForType(com.android.tools.r8.ir.analysis.type.TypeElement):65 -> a
     3:3:com.android.tools.r8.ir.code.ValueTypeConstraint constraintForType(com.android.tools.r8.ir.analysis.type.TypeElement):65:65 -> a
     4:26:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):69:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ql0;)Lcom/android/tools/r8/internal/aj0;"}
     27:27:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):89:89 -> a
     28:28:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):87:87 -> a
     29:29:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):85:85 -> a
@@ -131690,7 +131666,7 @@
     44:44:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):79:79 -> a
     45:45:com.android.tools.r8.ir.analysis.type.TypeElement typeForConstraint(com.android.tools.r8.ir.code.ValueTypeConstraint):77:77 -> a
     46:47:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):140:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
     48:50:java.util.ArrayList constrainValues(boolean,java.util.List):160:162 -> a
     48:50:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):144 -> a
     51:51:void com.android.tools.r8.ir.conversion.IRBuilder.constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):769:769 -> a
@@ -131713,7 +131689,7 @@
     57:67:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):145:155 -> a
     68:68:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):148:148 -> a
     69:82:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):172:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Ljava/util/function/Consumer;)V"}
     83:83:void com.android.tools.r8.ir.conversion.IRBuilder.constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):769:769 -> a
     83:83:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -131730,7 +131706,7 @@
     87:87:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):185 -> a
     88:88:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186:186 -> a
     89:99:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):194:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/ql0;"}
     100:100:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value):212:212 -> a
     100:100:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):204 -> a
     101:101:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
@@ -131749,7 +131725,7 @@
     110:110:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):201 -> a
     111:111:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):202:202 -> a
     112:115:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):216:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/gv;)V"}
     116:116:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     116:116:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):222 -> a
     117:123:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):222:228 -> a
@@ -131771,26 +131747,26 @@
     138:138:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):233 -> a
     139:141:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):233:235 -> a
     142:161:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):247:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     162:164:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):274:276 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.d8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.f8:
 # {"id":"sourceFile","fileName":"CallGraph.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>(java.util.Map):45:45 -> <init>
     1:5:com.android.tools.r8.ir.conversion.callgraph.CallGraph createForTesting(java.util.Collection):53:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/d8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/f8;"}
     6:6:com.android.tools.r8.ir.conversion.callgraph.CallGraph createForTesting(java.util.Collection):56:56 -> a
     7:7:com.android.tools.r8.ir.conversion.callgraph.CallGraph createForTesting(java.util.Collection):55:55 -> a
     8:8:com.android.tools.r8.graph.DexMethod lambda$createForTesting$0(com.android.tools.r8.ir.conversion.callgraph.Node):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)Lcom/android/tools/r8/graph/w2;"}
     9:9:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves(java.util.function.Consumer):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/CY;"}
     10:11:void lambda$extractLeaves$1(java.util.function.Consumer,com.android.tools.r8.ir.conversion.callgraph.Node):76:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/pR;)V"}
     12:13:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):87:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/CY;"}
     14:14:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create():30:30 -> a
     14:14:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):88 -> a
     15:27:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):89:101 -> a
@@ -131801,23 +131777,23 @@
     29:29:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):101 -> a
     30:30:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):101:101 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():69:69 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():82:82 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yY;"}
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.e8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.g8:
 # {"id":"sourceFile","fileName":"CallGraphBase.java"}
     java.util.Map nodes -> a
     1:2:void <init>(java.util.Map):16:17 -> <init>
     1:1:java.util.Collection getNodes():29:29 -> a
     1:1:boolean isEmpty():21:21 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.h8:
 # {"id":"sourceFile","fileName":"CallGraphBuilder.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/d8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f8;"}
     2:3:void populateGraph(java.util.concurrent.ExecutorService):26:27 -> a
     2:3:void com.android.tools.r8.internal.CallGraphBuilder.populateGraph(java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -131833,7 +131809,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):38:45 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.i8:
 # {"id":"sourceFile","fileName":"CallGraphBuilderBase.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -131845,12 +131821,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView):19:24 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/mR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qR;"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase lambda$getOrCreateNode$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/mR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/qR;"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getOrCreateNode(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/mR;"}
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.j8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qR;"}
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.l8:
 # {"id":"sourceFile","fileName":"CallSiteInformation.java"}
     1:1:void <init>():23:23 -> <init>
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -131863,18 +131839,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.j8:
 # {"id":"sourceFile","fileName":"CallSiteInformation.java"}
     com.android.tools.r8.ir.conversion.MethodProcessorWithWave methodProcessor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sO;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap singleCallerMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
     java.util.Set multiCallerInlineCandidates -> c
     java.util.Set noSingleCallerInliningInto -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():79:79 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):93:93 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d8;Lcom/android/tools/r8/internal/oO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/f8;Lcom/android/tools/r8/internal/sO;)V"}
     2:2:com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.newIdentityHashMap():22:22 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):86 -> <init>
     3:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):86:96 -> <init>
@@ -131904,13 +131880,13 @@
     43:43:int com.android.tools.r8.ir.conversion.callgraph.Node.getNumberOfCallSites():158:158 -> <init>
     43:43:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):129 -> <init>
     44:44:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):131:131 -> <init>
-    45:45:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):214:214 -> <init>
+    45:45:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):216:216 -> <init>
     45:45:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):131 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):215:215 -> <init>
+    46:46:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):217:217 -> <init>
     46:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):131 -> <init>
-    47:47:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():220:220 -> <init>
-    47:47:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):216 -> <init>
+    47:47:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():222:222 -> <init>
+    47:47:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):218 -> <init>
     47:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):131 -> <init>
     48:48:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> <init>
     48:48:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):134 -> <init>
@@ -131928,7 +131904,7 @@
     59:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):150 -> <init>
     60:63:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph,com.android.tools.r8.ir.conversion.MethodProcessorWithWave):150:153 -> <init>
     1:3:boolean lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod):103:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/C5;)Z"}
     4:4:boolean lambda$new$1(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SyntheticNaming):138:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/synthesis/Q;)Z"}
     5:5:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.isSingleCallerInlineableInPostMethodProcessor(com.android.tools.r8.synthesis.SyntheticNaming):240:240 -> a
@@ -131971,10 +131947,10 @@
     12:12:void notifyMethodInlined(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):201:201 -> c
     1:2:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):207:208 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.k8:
 # {"id":"sourceFile","fileName":"CallSiteInformation.java"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k8;"}
     1:1:void <clinit>():53:53 -> <clinit>
     1:1:void <init>():51:51 -> <init>
     1:1:boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):57:57 -> a
@@ -131987,7 +131963,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):76:76 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.qh:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     java.util.Deque stack -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
@@ -132009,16 +131985,16 @@
     1:1:void <clinit>():24:24 -> <clinit>
     1:81:void <init>():24:104 -> <init>
     1:2:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):111:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/oh$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/qh$a;"}
     3:10:void prepareForNewTraversal():122:129 -> a
     3:10:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):113 -> a
     11:13:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):114:116 -> a
     14:20:void reset():133:139 -> a
     14:20:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):117 -> a
     21:22:void lambda$traverse$0(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):242:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph;Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rh;Lcom/android/tools/r8/internal/vh;)V"}
     23:43:com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):259:279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/vC;)Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/xC;)Lcom/android/tools/r8/internal/vh;"}
     44:65:com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):278:299 -> a
     66:79:com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):298:311 -> a
     80:84:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):398:402 -> a
@@ -132031,9 +132007,9 @@
     109:109:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):433:433 -> a
     109:109:com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):321 -> a
     110:110:java.util.Set lambda$removeCallEdge$2(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):366:366 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Ljava/util/Set;"}
     111:115:boolean removeIncomingEdgeOnStack(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo,java.util.function.BiConsumer):378:382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/rh;Ljava/util/function/BiConsumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/th;Ljava/util/function/BiConsumer;)Z"}
     116:120:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):398:402 -> a
     116:120:boolean verifyCycleSatisfies(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,java.util.function.Predicate):407 -> a
     116:120:boolean removeIncomingEdgeOnStack(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo,java.util.function.BiConsumer):382 -> a
@@ -132044,9 +132020,9 @@
     122:124:boolean removeIncomingEdgeOnStack(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo,java.util.function.BiConsumer):382 -> a
     125:128:boolean removeIncomingEdgeOnStack(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo,java.util.function.BiConsumer):385:388 -> a
     129:129:boolean lambda$removeIncomingEdgeOnStack$4(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo,java.util.LinkedList):384:384 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/rh;Ljava/util/LinkedList;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/th;Ljava/util/LinkedList;)Z"}
     130:131:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):440:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;)Z"}
     132:132:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
     132:132:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):441 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -132054,7 +132030,7 @@
     133:133:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):441 -> a
     134:134:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):441:441 -> a
     135:135:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordCallEdgeRemoval$5(com.android.tools.r8.graph.DexEncodedMethod):446:446 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/CY;"}
     136:136:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(int):45:45 -> a
     136:136:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordCallEdgeRemoval$5(com.android.tools.r8.graph.DexEncodedMethod):446 -> a
     1:7:void traverse(java.util.Collection):199:205 -> b
@@ -132086,24 +132062,24 @@
     47:55:void traverse(java.util.Collection):234 -> b
     56:71:void traverse(java.util.Collection):235:250 -> b
     72:72:void lambda$traverse$1(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):251:251 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph;Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rh;Lcom/android/tools/r8/internal/vh;)V"}
     73:73:java.util.Set lambda$removeFieldReadEdge$3(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):370:370 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Ljava/util/Set;"}
     74:76:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):445:447 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;)V"}
     1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):366:366 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;)V"}
     1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):370:370 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.nh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;)V"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.ph:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode caller -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode callee -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/th;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.oh$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/vh;)V"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.qh$a:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     java.util.Map removedCallEdges -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -132115,61 +132091,61 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.size():145:145 -> a
     3:3:int numberOfRemovedCallEdges():64 -> a
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.rh:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode callerOrReader -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
     java.util.Iterator calleesAndWriters -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xC;"}
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode,java.util.Iterator):182:184 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;Lcom/android/tools/r8/internal/vC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/xC;)V"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator():194:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ph;"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.qh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rh;"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.sh:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode node -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
     1:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):163:164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode():174:174 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qh;"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.rh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sh;"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.th:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     int index -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode predecessor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/th;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
     boolean processed -> c
     1:3:void <init>(int,com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):47:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/th;)V"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.sh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/vh;)V"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.uh:
 # {"id":"sourceFile","fileName":"CycleEliminator.java"}
     1:1:void <init>():142:142 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator():156:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ph;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rh;"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode():148:148 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qh;"}
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode -> com.android.tools.r8.internal.th:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sh;"}
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode -> com.android.tools.r8.internal.vh:
 # {"id":"sourceFile","fileName":"CycleEliminatorNode.java"}
     com.android.tools.r8.graph.ProgramMethod getProgramMethod() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     java.util.Set getCalleesWithDeterministicOrder() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/TreeSet;"}
     boolean hasCallee(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     java.util.Set getWritersWithDeterministicOrder() -> c
     boolean hasWriter(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     com.android.tools.r8.graph.DexEncodedMethod getMethod() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1;"}
     void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     void removeCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode) -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.Mt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.Ot:
 # {"id":"sourceFile","fileName":"IRProcessingCallGraphBuilderBase.java"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():15:15 -> <clinit>
@@ -132179,7 +132155,7 @@
     boolean verifyAllMethodsWithCodeExists() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:4:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):22:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/d8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f8;"}
     5:5:boolean verifyNoRedundantFieldReadEdges():54:54 -> a
     5:5:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):25 -> a
     6:6:java.util.Set com.android.tools.r8.ir.conversion.callgraph.Node.getReadersWithDeterministicOrder():149:149 -> a
@@ -132201,7 +132177,7 @@
     21:21:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):34 -> a
     22:29:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):35:42 -> a
     30:30:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
     31:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.preprocessCallGraphBeforeCycleElimination(java.util.Map):365:365 -> a
     31:31:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -132219,15 +132195,15 @@
     39:43:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):30 -> a
     44:44:com.android.tools.r8.ir.conversion.callgraph.Node createNode(com.android.tools.r8.graph.ProgramMethod):47:47 -> a
     44:44:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/mR;"}
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.Nt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qR;"}
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.Pt:
 # {"id":"sourceFile","fileName":"IRProcessingCallGraphUseRegistry.java"}
     com.android.tools.r8.graph.FieldAccessInfoCollection fieldAccessInfoCollection -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j3;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.NodeBase,java.util.function.Function,java.util.Map,java.util.function.Predicate):35:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lR;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/pR;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Predicate;)V"}
     3:3:com.android.tools.r8.graph.FieldAccessInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getFieldAccessInfoCollection():714:714 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.NodeBase,java.util.function.Function,java.util.Map,java.util.function.Predicate):36 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -132281,12 +132257,12 @@
     23:23:void processFieldRead(com.android.tools.r8.graph.DexField):83 -> i
     1:15:void processFieldWrite(com.android.tools.r8.graph.DexField):89:103 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
-com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.IB:
+com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.KB:
 # {"id":"sourceFile","fileName":"InvokeExtractor.java"}
     com.android.tools.r8.graph.AppView appViewWithLiveness -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.callgraph.NodeBase currentMethod -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qR;"}
     java.util.function.Function nodeFactory -> g
     java.util.Map possibleProgramTargetsCache -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -132294,11 +132270,11 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.NodeBase,java.util.function.Function,java.util.Map,java.util.function.Predicate):40:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/mR;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/qR;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;Ljava/util/function/Predicate;)V"}
     1:1:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.LookupLambdaTarget.getImplementationMethod():43:43 -> a
     1:1:void lambda$processInvokeWithDynamicDispatch$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupLambdaTarget):151 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/x4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/x4;)V"}
     2:2:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     2:2:void lambda$processInvokeWithDynamicDispatch$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupLambdaTarget):152 -> a
     3:3:void lambda$processInvokeWithDynamicDispatch$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupLambdaTarget):153:153 -> a
@@ -132311,7 +132287,7 @@
     13:13:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):56 -> a
     14:23:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):60:69 -> a
     24:28:void processInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):73:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)V"}
     29:29:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     29:29:void processInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -132347,7 +132323,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     107:109:void processSingleTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):110:112 -> a
     110:121:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):117:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;)V"}
     122:122:int com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.size():145:145 -> a
     122:122:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):163 -> a
     123:124:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):163:164 -> a
@@ -132355,10 +132331,10 @@
     125:125:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
     126:127:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):165:166 -> a
     128:133:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):131:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/CY;"}
     134:140:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):135:141 -> a
     141:142:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):143:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/y4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/y4;)V"}
     143:143:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     143:143:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):144 -> a
     144:144:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupMethodTarget):145:145 -> a
@@ -132374,7 +132350,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):199:199 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.lR:
+com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.pR:
 # {"id":"sourceFile","fileName":"Node.java"}
     int numberOfCallSites -> c
     java.util.Set callees -> d
@@ -132391,35 +132367,35 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:16:void <init>(com.android.tools.r8.graph.ProgramMethod):15:29 -> <init>
     1:1:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean):11:11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;Z)V"}
     2:2:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):11:11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;)V"}
     3:17:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node):64:78 -> a
     3:17:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):11 -> a
     18:24:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node):72:78 -> a
     18:24:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):11 -> a
     25:25:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     26:26:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.Node):168:168 -> a
     26:26:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11 -> a
     27:27:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)V"}
     28:37:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node,boolean):43:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;Z)V"}
     38:38:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node,boolean):50:50 -> a
     39:50:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node,boolean):46:57 -> a
     1:1:boolean hasCallee(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     2:2:java.util.Set getCalleesWithDeterministicOrder():145:145 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/TreeSet;"}
     3:3:boolean hasCallee(com.android.tools.r8.ir.conversion.callgraph.Node):163:163 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)Z"}
     1:1:boolean hasWriter(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     2:2:boolean hasWriter(com.android.tools.r8.ir.conversion.callgraph.Node):178:178 -> c
     2:2:boolean hasWriter(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11 -> c
     3:6:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.Node):93:96 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)V"}
     7:7:boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.Node):173:173 -> c
     7:7:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.Node):97 -> c
     8:8:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.Node):97:97 -> c
@@ -132428,7 +132404,7 @@
     2:2:int compareTo(com.android.tools.r8.ir.conversion.callgraph.Node):191:191 -> compareTo
     2:2:int compareTo(java.lang.Object):11 -> compareTo
     1:1:void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     2:5:void removeReader(com.android.tools.r8.ir.conversion.callgraph.Node):102:105 -> d
     2:5:void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11 -> d
     6:6:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.Node):168:168 -> d
@@ -132437,46 +132413,46 @@
     7:7:void removeReader(com.android.tools.r8.ir.conversion.callgraph.Node):106:106 -> d
     7:7:void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11 -> d
     8:13:void removeReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node):83:88 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;)V"}
     14:14:void removeReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.Node):85:85 -> d
     1:1:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     2:10:void cleanCalleesAndWritersForRemoval():110:118 -> e
     1:1:boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11:11 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     2:2:boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.Node):173:173 -> f
     2:2:boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):11 -> f
     1:9:void cleanCallersAndReadersForRemoval():123:131 -> g
     1:1:boolean isLeaf():186:186 -> h
     1:1:boolean isRoot():182:182 -> i
     1:30:java.lang.String toString():196:225 -> toString
-com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.mR:
+com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.qR:
 # {"id":"sourceFile","fileName":"NodeBase.java"}
     com.android.tools.r8.graph.ProgramMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):14:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;Z)V"}
     void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;)V"}
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():23:23 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/j1;"}
-com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.dW:
+com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.hW:
 # {"id":"sourceFile","fileName":"PartialCallGraphBuilder.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet):20:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/CY;)V"}
     3:3:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet):21 -> <init>
     4:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet):21:22 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/d8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f8;"}
     2:3:void populateGraph(java.util.concurrent.ExecutorService):27:28 -> a
     4:4:void populateGraph(java.util.concurrent.ExecutorService):27:27 -> a
     5:5:boolean verifyAllMethodsWithCodeExists():44:44 -> a
@@ -132496,7 +132472,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):33:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     3:3:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):35 -> a
     4:4:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveConstString():119:119 -> a
@@ -132504,7 +132480,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():28:28 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):41:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:5:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.conversion.passes.CodeRewriterPass.appView():33:33 -> b
     5:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):46 -> b
     6:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):46:47 -> b
@@ -132515,7 +132491,7 @@
 com.android.tools.r8.ir.conversion.passes.ArrayConstructionSimplifier -> com.android.tools.r8.internal.E3:
 # {"id":"sourceFile","fileName":"ArrayConstructionSimplifier.java"}
     com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$p;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():84:84 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):89:90 -> <init>
@@ -132523,14 +132499,14 @@
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveNewArrayEmpty():264:264 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():95:95 -> b
     2:4:java.util.ArrayList findOptimizableArrays(com.android.tools.r8.ir.code.IRCode):115:117 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:8:com.android.tools.r8.utils.ValueUtils$ArrayValues analyzeCandidate(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.IRCode):129:132 -> b
     5:8:java.util.ArrayList findOptimizableArrays(com.android.tools.r8.ir.code.IRCode):119 -> b
     5:8:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):100 -> b
@@ -132764,95 +132740,95 @@
     216:216:void applyChanges(com.android.tools.r8.ir.code.IRCode,java.util.List):365:365 -> b
     216:216:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):105 -> b
     217:217:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):106:106 -> b
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor -> com.android.tools.r8.internal.s6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     boolean associativeAndCommutative -> b
     com.android.tools.r8.ir.conversion.passes.BinopDescriptor ADD -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SUB -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor MUL -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor DIV -> f
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SUB -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor REM -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor AND -> h
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor MUL -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor OR -> i
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor DIV -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor XOR -> j
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor REM -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s6;"}
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor AND -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SHL -> k
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor OR -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o6;"}
-    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SHR -> l
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor XOR -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p6;"}
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SHL -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q6;"}
+    com.android.tools.r8.ir.conversion.passes.BinopDescriptor SHR -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r6;"}
     com.android.tools.r8.ir.conversion.passes.BinopDescriptor USHR -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i6;"}
     1:232:void <clinit>():34:265 -> <clinit>
     1:2:void <init>(java.lang.String,int,boolean):289:290 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Z)V"}
     1:1:boolean isShift():0:0 -> a
     2:2:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     3:3:java.lang.Integer leftAbsorbing(boolean):310:310 -> a
     4:4:long evaluate(long,long):322:322 -> a
     1:1:java.lang.Integer leftIdentity(boolean):302:302 -> b
     1:1:java.lang.Integer rightAbsorbing(boolean):314:314 -> c
     1:1:java.lang.Integer rightIdentity(boolean):306:306 -> d
     2:2:int evaluate(int,int):318:318 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$1 -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$1 -> com.android.tools.r8.internal.j6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):34:34 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     2:2:long evaluate(long,long):57:57 -> a
     1:1:java.lang.Integer leftIdentity(boolean):42:42 -> b
     1:1:java.lang.Integer rightIdentity(boolean):47:47 -> d
     2:2:int evaluate(int,int):52:52 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$10 -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$10 -> com.android.tools.r8.internal.i6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):265:265 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):268:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     2:2:java.lang.Integer leftAbsorbing(boolean):278:278 -> a
     1:1:java.lang.Integer rightIdentity(boolean):273:273 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$2 -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$2 -> com.android.tools.r8.internal.k6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):60:60 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     2:2:long evaluate(long,long):78:78 -> a
     1:1:java.lang.Integer rightIdentity(boolean):68:68 -> d
     2:2:int evaluate(int,int):73:73 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$3 -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$3 -> com.android.tools.r8.internal.l6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):81:81 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:com.android.tools.r8.ir.code.Mul com.android.tools.r8.ir.code.Mul.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:24 -> a
     1:2:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     3:3:java.lang.Integer leftAbsorbing(boolean):99:99 -> a
     4:4:long evaluate(long,long):114:114 -> a
     1:1:java.lang.Integer leftIdentity(boolean):89:89 -> b
     1:1:java.lang.Integer rightAbsorbing(boolean):104:104 -> c
     1:1:java.lang.Integer rightIdentity(boolean):94:94 -> d
     2:2:int evaluate(int,int):109:109 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$4 -> com.android.tools.r8.internal.k6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$4 -> com.android.tools.r8.internal.m6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):118:118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Integer rightIdentity(boolean):121:121 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$5 -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$5 -> com.android.tools.r8.internal.n6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):125:125 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:com.android.tools.r8.ir.code.And com.android.tools.r8.ir.code.And.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:24 -> a
     1:2:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     3:3:java.lang.Integer leftAbsorbing(boolean):143:143 -> a
     4:4:long evaluate(long,long):158:158 -> a
     1:1:java.lang.Integer com.android.tools.r8.ir.conversion.passes.BinopDescriptor.allBitsSet(boolean):298:298 -> b
@@ -132861,13 +132837,13 @@
     1:1:int evaluate(int,int):153:153 -> d
     2:2:java.lang.Integer com.android.tools.r8.ir.conversion.passes.BinopDescriptor.allBitsSet(boolean):298:298 -> d
     2:2:java.lang.Integer rightIdentity(boolean):138 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$6 -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$6 -> com.android.tools.r8.internal.o6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):161:161 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:com.android.tools.r8.ir.code.Or com.android.tools.r8.ir.code.Or.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:23 -> a
     1:2:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     3:3:long evaluate(long,long):194:194 -> a
     4:4:java.lang.Integer com.android.tools.r8.ir.conversion.passes.BinopDescriptor.allBitsSet(boolean):298:298 -> a
     4:4:java.lang.Integer leftAbsorbing(boolean):179 -> a
@@ -132876,39 +132852,39 @@
     1:1:java.lang.Integer rightAbsorbing(boolean):184 -> c
     1:1:java.lang.Integer rightIdentity(boolean):174:174 -> d
     2:2:int evaluate(int,int):189:189 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$7 -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$7 -> com.android.tools.r8.internal.p6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):197:197 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:2:com.android.tools.r8.ir.code.Xor com.android.tools.r8.ir.code.Xor.create(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:23 -> a
     1:2:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     3:3:long evaluate(long,long):220:220 -> a
     1:1:java.lang.Integer leftIdentity(boolean):205:205 -> b
     1:1:java.lang.Integer rightIdentity(boolean):210:210 -> d
     2:2:int evaluate(int,int):215:215 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$8 -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$8 -> com.android.tools.r8.internal.q6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):223:223 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):226:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     2:2:java.lang.Integer leftAbsorbing(boolean):236:236 -> a
     3:3:boolean isShift():241:241 -> a
     1:1:java.lang.Integer rightIdentity(boolean):231:231 -> d
-com.android.tools.r8.ir.conversion.passes.BinopDescriptor$9 -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.ir.conversion.passes.BinopDescriptor$9 -> com.android.tools.r8.internal.r6:
 # {"id":"sourceFile","fileName":"BinopDescriptor.java"}
     1:1:void <init>(java.lang.String,int,boolean):244:244 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.ir.code.Binop instantiate(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):247:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/h6;"}
     2:2:java.lang.Integer leftAbsorbing(boolean):257:257 -> a
     3:3:boolean isShift():262:262 -> a
     1:1:java.lang.Integer rightIdentity(boolean):252:252 -> d
-com.android.tools.r8.ir.conversion.passes.BinopRewriter -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.ir.conversion.passes.BinopRewriter -> com.android.tools.r8.internal.t6:
 # {"id":"sourceFile","fileName":"BinopRewriter.java"}
     java.util.Map descriptors -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
@@ -132920,12 +132896,12 @@
     14:14:void <init>(com.android.tools.r8.graph.AppView):46 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.AppView):46:46 -> <init>
     1:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):71:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     3:3:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):73 -> a
     4:4:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):73:73 -> a
     5:5:com.android.tools.r8.ir.code.Binop instantiateBinop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):374:374 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/q6;)Lcom/android/tools/r8/internal/f6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/s6;)Lcom/android/tools/r8/internal/h6;"}
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     6:6:com.android.tools.r8.ir.code.Binop instantiateBinop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):374 -> a
     7:7:com.android.tools.r8.ir.code.Binop instantiateBinop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):374:374 -> a
@@ -132938,7 +132914,7 @@
     11:12:com.android.tools.r8.ir.code.Binop instantiateBinop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):376:377 -> a
     13:13:com.android.tools.r8.ir.code.Value insertNewConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):387:387 -> a
     13:13:void rewriteIntoConstThenBinop(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.Value,boolean,com.android.tools.r8.ir.code.IRCode):352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/q6;Lcom/android/tools/r8/internal/q6;Lcom/android/tools/r8/internal/ig;Lcom/android/tools/r8/internal/ig;Lcom/android/tools/r8/internal/Xk0;ZLcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/s6;Lcom/android/tools/r8/internal/s6;Lcom/android/tools/r8/internal/kg;Lcom/android/tools/r8/internal/kg;Lcom/android/tools/r8/internal/bl0;ZLcom/android/tools/r8/internal/Dt;)V"}
     14:14:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     14:14:com.android.tools.r8.ir.code.Value insertNewConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.conversion.passes.BinopDescriptor):387 -> a
     14:14:void rewriteIntoConstThenBinop(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.Value,boolean,com.android.tools.r8.ir.code.IRCode):352 -> a
@@ -132955,7 +132931,7 @@
     28:31:void rewriteIntoConstThenBinop(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.conversion.passes.BinopDescriptor,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.Value,boolean,com.android.tools.r8.ir.code.IRCode):353 -> a
     32:33:com.android.tools.r8.ir.code.ConstNumber getConstNumberIfConstant(com.android.tools.r8.ir.code.Value):481:482 -> a
     32:33:com.android.tools.r8.ir.code.ConstNumber getConstNumber(com.android.tools.r8.ir.code.Value):447 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/ig;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/kg;"}
     34:34:com.android.tools.r8.ir.code.ConstNumber getConstNumber(com.android.tools.r8.ir.code.Value):452:452 -> a
     35:36:com.android.tools.r8.ir.code.ConstNumber getConstNumberIfConstant(com.android.tools.r8.ir.code.Value):481:482 -> a
     35:36:com.android.tools.r8.ir.code.ConstNumber getConstNumber(com.android.tools.r8.ir.code.Value):452 -> a
@@ -132967,7 +132943,7 @@
     43:44:com.android.tools.r8.ir.code.ConstNumber getConstNumber(com.android.tools.r8.ir.code.Value):458 -> a
     45:52:com.android.tools.r8.ir.code.ConstNumber getConstNumber(com.android.tools.r8.ir.code.Value):462:469 -> a
     53:53:boolean simplify(com.android.tools.r8.ir.code.Binop,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,java.lang.Integer,com.android.tools.r8.ir.code.Value,java.lang.Integer,com.android.tools.r8.ir.code.Value):496:496 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f6;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/ig;Ljava/lang/Integer;Lcom/android/tools/r8/internal/Xk0;Ljava/lang/Integer;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h6;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/kg;Ljava/lang/Integer;Lcom/android/tools/r8/internal/bl0;Ljava/lang/Integer;Lcom/android/tools/r8/internal/bl0;)Z"}
     54:54:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     54:54:boolean simplify(com.android.tools.r8.ir.code.Binop,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,java.lang.Integer,com.android.tools.r8.ir.code.Value,java.lang.Integer,com.android.tools.r8.ir.code.Value):496 -> a
     55:57:boolean simplify(com.android.tools.r8.ir.code.Binop,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,java.lang.Integer,com.android.tools.r8.ir.code.Value,java.lang.Integer,com.android.tools.r8.ir.code.Value):497:499 -> a
@@ -132976,7 +132952,7 @@
     59:73:boolean simplify(com.android.tools.r8.ir.code.Binop,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ConstNumber,java.lang.Integer,com.android.tools.r8.ir.code.Value,java.lang.Integer,com.android.tools.r8.ir.code.Value):499:513 -> a
     1:1:java.lang.String getRewriterId():66:66 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):79:82 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> b
     6:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):82 -> b
     7:11:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):83:87 -> b
@@ -133300,7 +133276,7 @@
     226:226:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis():1341:1341 -> b
     226:226:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):97 -> b
     227:229:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):98:100 -> b
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier -> com.android.tools.r8.internal.u7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():67:67 -> <clinit>
@@ -133309,7 +133285,7 @@
     1:1:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> a
     1:1:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):743 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/uA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/wA;)V"}
     2:2:int[] com.android.tools.r8.ir.code.Switch.targetBlockIndices():43:43 -> a
     2:2:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):744 -> a
     3:5:void rewriteSingleKeySwitchToIf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):744:746 -> a
@@ -133332,7 +133308,7 @@
     20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     20:20:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):313 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Zt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/bu;)Z"}
     21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     21:21:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):313 -> a
     22:27:boolean simplifyNonIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):314:319 -> a
@@ -133413,7 +133389,7 @@
     149:149:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     149:149:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):80 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     150:150:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveIf():158:158 -> a
     150:150:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):80 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -133421,11 +133397,11 @@
     151:151:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):80 -> a
     152:152:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):80:80 -> a
     153:153:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):455:455 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Zt;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/bu;I)V"}
     154:155:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):450:451 -> a
     154:155:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):455 -> a
     156:172:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):562:578 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     173:173:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
     173:173:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):578 -> a
     174:176:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):579:581 -> a
@@ -133442,12 +133418,12 @@
     183:186:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):598:601 -> a
     183:186:void com.android.tools.r8.internal.BranchSimplifier.rewriteIfToGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.If,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Zt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     187:187:void com.android.tools.r8.internal.BranchSimplifier.rewriteIfToGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.If,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0:0 -> a
     188:188:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):602:602 -> a
     188:188:void com.android.tools.r8.internal.BranchSimplifier.rewriteIfToGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.If,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock):0 -> a
     189:190:boolean rewriteIfWithObjectsIsNullOrNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):633:634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;)Z"}
     191:191:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> a
     191:191:boolean rewriteIfWithObjectsIsNullOrNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):634 -> a
     192:192:boolean rewriteIfWithObjectsIsNullOrNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):634:634 -> a
@@ -133468,7 +133444,7 @@
     209:209:boolean rewriteIfWithObjectsIsNullOrNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):647 -> a
     210:211:boolean rewriteIfWithObjectsIsNullOrNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):647:648 -> a
     212:234:boolean rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):769:791 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/uA;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/wA;)Z"}
     235:235:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> a
     235:235:boolean rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):791 -> a
     236:250:boolean rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):792:806 -> a
@@ -133652,9 +133628,9 @@
     369:369:boolean rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):857 -> a
     370:370:boolean rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):858:858 -> a
     371:371:int lambda$rewriteIntSwitch$0(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval):787:787 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mB;Lcom/android/tools/r8/internal/q7;Lcom/android/tools/r8/internal/q7;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oB;Lcom/android/tools/r8/internal/s7;Lcom/android/tools/r8/internal/s7;)I"}
     372:379:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval):954:961 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/q7;Lcom/android/tools/r8/internal/q7;)Lcom/android/tools/r8/internal/q7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/s7;Lcom/android/tools/r8/internal/s7;)Lcom/android/tools/r8/internal/s7;"}
     380:380:long com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):945:945 -> a
     380:380:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval):963 -> a
     381:381:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):123:123 -> a
@@ -133674,9 +133650,9 @@
     385:385:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval):967:967 -> a
     386:386:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval):964:964 -> a
     387:398:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval,int):977:988 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Ljava/util/PriorityQueue;Lcom/android/tools/r8/internal/q7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Ljava/util/PriorityQueue;Lcom/android/tools/r8/internal/s7;)V"}
     399:399:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):1090:1090 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/internal/aA;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/internal/cA;)I"}
     400:400:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):123:123 -> a
     400:400:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):1090 -> a
     401:408:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):1090:1097 -> a
@@ -133714,7 +133690,7 @@
     456:456:int com.android.tools.r8.ir.code.ConstNumber.estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):184 -> a
     456:456:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):1097 -> a
     457:473:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1118:1134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/uA;Ljava/util/List;Lcom/android/tools/r8/internal/Kz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/wA;Ljava/util/List;Lcom/android/tools/r8/internal/Mz;)V"}
     474:477:void com.android.tools.r8.ir.code.BasicBlock.detachAllSuccessors():1029:1032 -> a
     474:477:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1134 -> a
     478:488:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1135:1145 -> a
@@ -133785,13 +133761,13 @@
     2:2:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):682:682 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode):677 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):93 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2738:2738 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2744:2744 -> b
     3:3:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):682 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode):677 -> b
     3:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):93 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2738:2738 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2744:2744 -> b
     4:4:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):682 -> b
     4:4:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult rewriteSwitch(com.android.tools.r8.ir.code.IRCode):677 -> b
     4:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):93 -> b
@@ -133993,9 +133969,9 @@
     99:99:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):95 -> b
     100:102:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:98 -> b
     1:1:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult noChange():85:85 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ld;"}
     2:10:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):104:112 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/n7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/p7;"}
     11:16:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):656:661 -> c
     11:16:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):113 -> c
     17:17:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> c
@@ -134240,49 +134216,49 @@
     260:260:boolean com.android.tools.r8.ir.optimize.AffectedValues.isEmpty():109:109 -> c
     260:260:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):155 -> c
     261:261:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):155:155 -> c
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$1 -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$1 -> com.android.tools.r8.internal.o7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$IfType -> a
     1:1:void <clinit>():265:265 -> <clinit>
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult -> com.android.tools.r8.internal.n7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult -> com.android.tools.r8.internal.p7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     boolean anyAffectedValues -> d
     boolean anySimplifications -> e
     com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult ALL_CHANGED -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p7;"}
     com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult ONLY_SIMPLIFICATIONS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p7;"}
     com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult NO_CHANGE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p7;"}
     boolean $assertionsDisabled -> i
     1:16:void <clinit>():158:173 -> <clinit>
     1:4:void <init>(boolean,boolean):179:182 -> <init>
     1:4:com.android.tools.r8.ir.conversion.passes.BranchSimplifier$ControlFlowSimplificationResult create(boolean,boolean):163:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZ)Lcom/android/tools/r8/internal/n7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZ)Lcom/android/tools/r8/internal/p7;"}
     5:5:com.android.tools.r8.utils.OptionalBool hasChanged():200:200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     6:6:boolean anySimplifications():195:195 -> a
     6:6:com.android.tools.r8.utils.OptionalBool hasChanged():201 -> a
     7:7:com.android.tools.r8.utils.OptionalBool hasChanged():201:201 -> a
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$IfBuilder -> com.android.tools.r8.internal.o7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$IfBuilder -> com.android.tools.r8.internal.q7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():1260:1260 -> <clinit>
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$InstructionBuilder -> com.android.tools.r8.internal.p7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$InstructionBuilder -> com.android.tools.r8.internal.r7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     int blockNumber -> a
     com.android.tools.r8.ir.code.Position position -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Position):1187:1188 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval -> com.android.tools.r8.internal.q7:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$Interval -> com.android.tools.r8.internal.s7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():907:907 -> <clinit>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):911:911 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/aA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/cA;)V"}
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):909:909 -> <init>
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
     3:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):909 -> <init>
@@ -134294,7 +134270,7 @@
     12:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):915 -> <init>
     1:1:int getMax():924:924 -> a
     1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):933 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mB;)J"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oB;)J"}
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
     2:2:int getMax():924 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -134316,19 +134292,19 @@
     10:10:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):940 -> a
     11:12:long com.android.tools.r8.ir.code.IntSwitch.packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode,long):135:136 -> a
     11:12:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):940 -> a
-com.android.tools.r8.ir.conversion.passes.BranchSimplifier$SwitchBuilder -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.ir.conversion.passes.BranchSimplifier$SwitchBuilder -> com.android.tools.r8.internal.t7:
 # {"id":"sourceFile","fileName":"BranchSimplifier.java"}
     com.android.tools.r8.ir.code.Value value -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     1:1:void <init>(com.android.tools.r8.ir.code.Position):1206:1206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.Position):1202:1202 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):1231:1231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kt;)Lcom/android/tools/r8/internal/I5;"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defaultReturnValue(int):44:44 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):1232 -> a
     3:3:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):1234:1234 -> a
@@ -134353,21 +134329,21 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):1253 -> a
     32:33:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):1253:1254 -> a
     34:34:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):1243:1243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/G5;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/I5;)Ljava/lang/Integer;"}
     1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):1249:1249 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/G5;)Ljava/lang/Integer;"}
-com.android.tools.r8.ir.conversion.passes.ClassGetNameOptimizer -> com.android.tools.r8.internal.bc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/I5;)Ljava/lang/Integer;"}
+com.android.tools.r8.ir.conversion.passes.ClassGetNameOptimizer -> com.android.tools.r8.internal.dc:
 # {"id":"sourceFile","fileName":"ClassGetNameOptimizer.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):40:40 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):50:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     1:1:java.lang.String getRewriterId():45:45 -> b
     2:11:boolean rewriteClassGetName(com.android.tools.r8.ir.code.IRCode):66:75 -> b
     2:11:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):59 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     12:12:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> b
     12:12:boolean rewriteClassGetName(com.android.tools.r8.ir.code.IRCode):75 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -134436,50 +134412,55 @@
     192:192:boolean rewriteClassGetName(com.android.tools.r8.ir.code.IRCode):220 -> b
     192:192:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):59 -> b
     193:193:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):60:60 -> b
-com.android.tools.r8.ir.conversion.passes.ClassGetNameOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.ir.conversion.passes.ClassGetNameOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.cc:
 # {"id":"sourceFile","fileName":"ClassGetNameOptimizer.java"}
     com.android.tools.r8.ir.conversion.passes.ClassGetNameOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ac;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc;"}
     1:1:void <clinit>():226:226 -> <clinit>
     1:1:void <init>():229:229 -> <init>
     1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):242:262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/po;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.conversion.passes.CodeRewriterPass -> com.android.tools.r8.internal.Gd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/so;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/C5;)Z"}
+com.android.tools.r8.ir.conversion.passes.CodeRewriterPass -> com.android.tools.r8.internal.Id:
 # {"id":"sourceFile","fileName":"CodeRewriterPass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):25:28 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     1:1:com.android.tools.r8.graph.AppView appView():33:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y;"}
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult lambda$run$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     3:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.Timing):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Ld;"}
     4:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult lambda$run$1(com.android.tools.r8.ir.code.IRCode):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Ld;"}
     6:12:boolean verifyConsistentCode(com.android.tools.r8.ir.code.IRCode,boolean,java.lang.String):64:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ZLjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ZLjava/lang/String;)V"}
     13:13:boolean verifyConsistentCode(com.android.tools.r8.ir.code.IRCode,boolean,java.lang.String):68:68 -> a
     14:14:boolean isDebugMode(com.android.tools.r8.graph.ProgramMethod):79:79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
+    15:15:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    15:15:boolean isDebugMode(com.android.tools.r8.graph.ProgramMethod):79 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16:16:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    16:16:boolean isDebugMode(com.android.tools.r8.graph.ProgramMethod):79 -> a
     java.lang.String getRewriterId() -> b
     1:1:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):93:93 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):100:100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     1:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):53:54 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     3:3:boolean isAcceptingSSA():0:0 -> c
     3:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):54 -> c
     4:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):54:56 -> c
@@ -134487,30 +134468,30 @@
     7:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):56 -> c
     8:11:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):56:59 -> c
     12:12:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult noChange():75:75 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jd;"}
-com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection -> com.android.tools.r8.internal.Hd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ld;"}
+com.android.tools.r8.ir.conversion.passes.CodeRewriterPassCollection -> com.android.tools.r8.internal.Jd:
 # {"id":"sourceFile","fileName":"CodeRewriterPassCollection.java"}
     java.util.List passes -> a
     1:1:void <init>(com.android.tools.r8.ir.conversion.passes.CodeRewriterPass[]):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Gd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Id;)V"}
     2:3:void <init>(java.util.List):33:34 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.conversion.passes.CodeRewriterPass[]):30 -> <init>
     4:5:void <init>(java.util.List):33:34 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     1:7:com.android.tools.r8.utils.Pair run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.Timing,java.lang.String,com.android.tools.r8.utils.InternalOptions):68:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/lh0;Ljava/lang/String;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/ph0;Ljava/lang/String;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/MV;"}
     8:11:com.android.tools.r8.utils.Pair run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.Timing,java.lang.String,com.android.tools.r8.utils.InternalOptions):73:76 -> a
-com.android.tools.r8.ir.conversion.passes.CommonSubexpressionElimination -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.ir.conversion.passes.CommonSubexpressionElimination -> com.android.tools.r8.internal.xe:
 # {"id":"sourceFile","fileName":"CommonSubexpressionElimination.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     1:1:java.lang.String getRewriterId():35:35 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):46:46 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     3:4:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):196:197 -> b
     3:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):47 -> b
     5:6:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):187:188 -> b
@@ -134591,14 +134572,14 @@
     79:79:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):202:202 -> b
     79:79:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):47 -> b
     80:84:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):83:87 -> b
-com.android.tools.r8.ir.conversion.passes.CommonSubexpressionElimination$CSEExpressionEquivalence -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.ir.conversion.passes.CommonSubexpressionElimination$CSEExpressionEquivalence -> com.android.tools.r8.internal.we:
 # {"id":"sourceFile","fileName":"CommonSubexpressionElimination.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():90:90 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.InternalOptions):94:95 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):90:90 -> a
     2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):103:103 -> a
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):90 -> a
@@ -134607,7 +134588,7 @@
     3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):90 -> a
     4:4:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):103:103 -> a
     4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):90 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():2881:2881 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():2887:2887 -> a
     5:5:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):103 -> a
     5:5:boolean doEquivalent(java.lang.Object,java.lang.Object):90 -> a
     6:10:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):107:111 -> a
@@ -134714,21 +134695,21 @@
     64:64:int doHash(com.android.tools.r8.ir.code.Instruction):147 -> a
     64:64:int doHash(java.lang.Object):90 -> a
     65:70:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):154:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.conversion.passes.ConstResourceNumberRemover -> com.android.tools.r8.internal.jg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.conversion.passes.ConstResourceNumberRemover -> com.android.tools.r8.internal.lg:
 # {"id":"sourceFile","fileName":"ConstResourceNumberRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveResourceConstNumber():111:111 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():25:25 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):36:39 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isResourceConstNumber():0:0 -> b
     6:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39 -> b
     7:8:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):40:41 -> b
@@ -134739,25 +134720,25 @@
     10:10:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):42 -> b
     11:11:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):42:42 -> b
     12:17:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):41:46 -> b
-com.android.tools.r8.ir.conversion.passes.ConstResourceNumberRewriter -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.conversion.passes.ConstResourceNumberRewriter -> com.android.tools.r8.internal.mg:
 # {"id":"sourceFile","fileName":"ConstResourceNumberRewriter.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):32:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     4:4:boolean isRClass(com.android.tools.r8.graph.DexProgramClass):38:38 -> a
     4:4:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):34 -> a
     5:5:boolean verifyConsistentCode(com.android.tools.r8.ir.code.IRCode,boolean,java.lang.String):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ZLjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ZLjava/lang/String;)V"}
     1:1:java.lang.String getRewriterId():27:27 -> b
     2:14:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):44:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ConstNumber.dest():78:78 -> b
     15:15:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):57 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):57:57 -> b
     17:24:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):56:63 -> b
-com.android.tools.r8.ir.conversion.passes.DexConstantOptimizer -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.ir.conversion.passes.DexConstantOptimizer -> com.android.tools.r8.internal.Il:
 # {"id":"sourceFile","fileName":"DexConstantOptimizer.java"}
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/z;"}
@@ -134766,9 +134747,9 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):60:61 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/z;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:5:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):160:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> a
     6:6:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -134779,7 +134760,7 @@
     11:11:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):168 -> a
     12:12:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):168:168 -> a
     13:21:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):238:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/z;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/z;)V"}
     22:30:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):245:253 -> a
     31:31:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     31:31:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):254 -> a
@@ -134795,7 +134776,7 @@
     40:40:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():695:695 -> a
     40:40:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):261 -> a
     41:74:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):261:294 -> a
-    75:75:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():2909:2909 -> a
+    75:75:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():2915:2915 -> a
     75:75:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):294 -> a
     76:76:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> a
     76:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):294 -> a
@@ -134807,7 +134788,7 @@
     79:79:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):298 -> a
     80:99:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ConstantCanonicalizer):298:317 -> a
     100:107:boolean lambda$shortenLiveRanges$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):268:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;)Z"}
     108:109:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.ConstNumber.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):68:69 -> a
     108:109:boolean lambda$shortenLiveRanges$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):275 -> a
     110:114:boolean lambda$shortenLiveRanges$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):276:280 -> a
@@ -134815,7 +134796,7 @@
     115:115:boolean lambda$shortenLiveRanges$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):280 -> a
     116:116:boolean lambda$shortenLiveRanges$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):282:282 -> a
     117:118:com.android.tools.r8.ir.code.InstructionListIterator insertInstructionWithShortenedLiveRange(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):326:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/Nw;"}
     119:119:com.android.tools.r8.ir.code.Position getPositionForMovedNonThrowingInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):359:359 -> a
     119:119:com.android.tools.r8.ir.code.InstructionListIterator insertInstructionWithShortenedLiveRange(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):329 -> a
     120:120:boolean com.android.tools.r8.ir.code.Position.isSome():159:159 -> a
@@ -134835,10 +134816,10 @@
     133:133:com.android.tools.r8.ir.code.InstructionListIterator insertInstructionWithShortenedLiveRange(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):337 -> a
     134:144:com.android.tools.r8.ir.code.InstructionListIterator insertInstructionWithShortenedLiveRange(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):340:350 -> a
     145:145:boolean lambda$insertInstructionWithShortenedLiveRange$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:335 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     146:150:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.function.Predicate):371:375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/ZI;Ljava/util/IdentityHashMap;Ljava/util/function/Predicate;)V"}
-    151:151:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():2909:2909 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/dJ;Ljava/util/IdentityHashMap;Ljava/util/function/Predicate;)V"}
+    151:151:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():2915:2915 -> a
     151:151:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.function.Predicate):375 -> a
     152:152:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.function.Predicate):375:375 -> a
     153:153:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> a
@@ -134914,15 +134895,15 @@
     271:272:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.function.Predicate):466 -> a
     273:279:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.function.Predicate):489:495 -> a
     280:280:boolean lambda$shortenLiveRangesInsideBlock$3(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):459:459 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/bl0;)Z"}
     281:281:java.util.LinkedHashMap lambda$shortenLiveRangesInsideBlock$4(com.android.tools.r8.ir.code.BasicBlock):491:491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/util/LinkedHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/util/LinkedHashMap;"}
     1:1:java.lang.String getRewriterId():66:66 -> b
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> b
     2:2:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):89 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     3:16:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):89:102 -> b
     3:16:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):71 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
@@ -135053,23 +135034,23 @@
     116:116:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):71 -> b
     117:118:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):72:73 -> b
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$0(com.android.tools.r8.ir.code.IRCode):241:241 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/nm;"}
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> c
     2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$0(com.android.tools.r8.ir.code.IRCode):241 -> c
-com.android.tools.r8.ir.conversion.passes.DexItemBasedConstStringRemover -> com.android.tools.r8.internal.Ml:
+com.android.tools.r8.ir.conversion.passes.DexItemBasedConstStringRemover -> com.android.tools.r8.internal.Ol:
 # {"id":"sourceFile","fileName":"DexItemBasedConstStringRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):18:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveDexItemBasedConstString():127:127 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():23:23 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):34:36 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:5:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> b
     5:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39 -> b
     6:6:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():60:60 -> b
@@ -135077,12 +135058,12 @@
     7:7:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.conversion.passes.CodeRewriterPass.appView():33:33 -> b
     7:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39 -> b
     8:13:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39:44 -> b
-com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter -> com.android.tools.r8.internal.Rp:
 # {"id":"sourceFile","fileName":"FilledNewArrayRewriter.java"}
     com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$p;"}
     java.util.Set NOTHING -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F40;"}
     1:1:void <clinit>():48:48 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <clinit>
     2:2:void <clinit>():48 -> <clinit>
@@ -135092,17 +135073,17 @@
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveNewArrayFilled():268:268 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():59:59 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
-com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache -> com.android.tools.r8.internal.Mp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
+com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache -> com.android.tools.r8.internal.Pp:
 # {"id":"sourceFile","fileName":"FilledNewArrayRewriter.java"}
     com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$p;"}
     java.util.Map constantOccurrences -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map constantValue -> c
@@ -135110,7 +135091,7 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():567:567 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions,com.android.tools.r8.ir.code.NewArrayFilled):576:576 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB$p;Lcom/android/tools/r8/internal/kQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB$p;Lcom/android/tools/r8/internal/oQ;)V"}
     2:7:void <init>(com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions,com.android.tools.r8.ir.code.NewArrayFilled):572:577 -> <init>
     8:8:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> <init>
     8:8:void <init>(com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions,com.android.tools.r8.ir.code.NewArrayFilled):578 -> <init>
@@ -135121,7 +135102,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:20:void <init>(com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions,com.android.tools.r8.ir.code.NewArrayFilled):585:587 -> <init>
     1:9:com.android.tools.r8.ir.code.Value getValue(com.android.tools.r8.ir.code.Value):595:603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/bl0;"}
     10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
     10:10:com.android.tools.r8.ir.code.Value getValue(com.android.tools.r8.ir.code.Value):603 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135134,7 +135115,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;Ljava/lang/Integer;)Ljava/lang/Integer;"}
     1:3:com.android.tools.r8.graph.DexItem getConstant(com.android.tools.r8.ir.code.Value):653:655 -> b
     1:3:void putNewValue(com.android.tools.r8.ir.code.Value):665 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     4:4:com.android.tools.r8.graph.DexItem getConstant(com.android.tools.r8.ir.code.Value):656 -> b
     4:4:void putNewValue(com.android.tools.r8.ir.code.Value):665 -> b
@@ -135154,18 +135135,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Y3;)V"}
     50:50:java.lang.Integer lambda$seenOcourence$1(com.android.tools.r8.graph.DexItem,java.lang.Integer):706:706 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/n1;Ljava/lang/Integer;)Ljava/lang/Integer;"}
-com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$FilledNewArrayCodeRewriter -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$FilledNewArrayCodeRewriter -> com.android.tools.r8.internal.Qp:
 # {"id":"sourceFile","fileName":"FilledNewArrayRewriter.java"}
     boolean mayHaveRedundantBlocks -> a
     java.util.Set toRemove -> b
     com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Op;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rp;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():72:72 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter):72:75 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Op;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rp;)V"}
     1:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):78:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Kd;"}
     8:8:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     8:8:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):85 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135243,11 +135224,11 @@
     127:127:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):110 -> a
     128:153:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):110:135 -> a
     154:155:void lambda$rewriteCode$0(java.util.Set,com.android.tools.r8.ir.code.Value):113:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/bl0;)V"}
     156:159:boolean isDefinedByNewArrayFilledOfConstants(com.android.tools.r8.ir.code.Value):151:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     160:160:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;)Z"}
     161:161:int com.android.tools.r8.ir.code.NewArrayFilled.size():241:241 -> a
     161:161:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):249 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135257,62 +135238,62 @@
     164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.NewArrayFilled.getArrayType():61:61 -> a
     164:164:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):254 -> a
     165:184:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):255:274 -> a
-    185:185:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1626:1626 -> a
+    185:185:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1632:1632 -> a
     185:185:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):274 -> a
-    186:186:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1626:1626 -> a
+    186:186:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1632:1632 -> a
     186:186:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):274 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    187:187:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1626:1626 -> a
+    187:187:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1632:1632 -> a
     187:187:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):274 -> a
-    188:188:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1627:1627 -> a
+    188:188:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1633:1633 -> a
     188:188:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):274 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    189:189:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1627:1627 -> a
+    189:189:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfStrings():1633:1633 -> a
     189:189:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):274 -> a
     190:190:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276:276 -> a
-    191:191:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    191:191:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     191:191:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276 -> a
-    192:192:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    192:192:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     192:192:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    193:193:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1634:1634 -> a
+    193:193:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1640:1640 -> a
     193:193:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276 -> a
-    194:194:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1635:1635 -> a
+    194:194:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1641:1641 -> a
     194:194:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    195:195:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1635:1635 -> a
+    195:195:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfNonStringObjects():1641:1641 -> a
     195:195:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):276 -> a
     196:196:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):279:279 -> a
-    197:197:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1648:1648 -> a
+    197:197:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1654:1654 -> a
     197:197:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    198:198:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1648:1648 -> a
+    198:198:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1654:1654 -> a
     198:198:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):279 -> a
-    199:199:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1649:1649 -> a
+    199:199:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1655:1655 -> a
     199:199:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    200:200:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1649:1649 -> a
+    200:200:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canUseFilledNewArrayOfArrays():1655:1655 -> a
     200:200:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):279 -> a
     201:206:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):280:285 -> a
-    207:207:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1641:1641 -> a
+    207:207:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1647:1647 -> a
     207:207:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    208:208:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1641:1641 -> a
+    208:208:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1647:1647 -> a
     208:208:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
-    209:209:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1642:1642 -> a
+    209:209:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1648:1648 -> a
     209:209:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    210:210:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1642:1642 -> a
+    210:210:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1648:1648 -> a
     210:210:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
-    211:211:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2530:2530 -> a
-    211:211:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1642 -> a
+    211:211:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2536:2536 -> a
+    211:211:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1648 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     211:211:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
-    212:215:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2530:2533 -> a
-    212:215:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1642 -> a
+    212:215:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2536:2539 -> a
+    212:215:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1648 -> a
     212:215:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
-    216:216:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2531:2531 -> a
-    216:216:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1642 -> a
+    216:216:boolean com.android.tools.r8.utils.InternalOptions.canHaveBugPresentUntilInclusive(com.android.tools.r8.utils.AndroidApiLevel):2537:2537 -> a
+    216:216:boolean com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions.canHaveSubTypesInFilledNewArrayBug():1648 -> a
     216:216:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285 -> a
     217:217:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):285:285 -> a
     218:218:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
@@ -135331,7 +135312,7 @@
     230:257:boolean canStoreElementInNewArrayFilled(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):304:331 -> a
     230:257:boolean canUseNewArrayFilled(com.android.tools.r8.ir.code.NewArrayFilled):290 -> a
     258:258:com.android.tools.r8.ir.code.NewArrayEmpty rewriteToNewArrayEmpty(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):358:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/kQ;)Lcom/android/tools/r8/internal/iQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/oQ;)Lcom/android/tools/r8/internal/mQ;"}
     259:259:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     259:259:com.android.tools.r8.ir.code.NewArrayEmpty rewriteToNewArrayEmpty(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):358 -> a
     260:260:com.android.tools.r8.ir.code.NewArrayEmpty rewriteToNewArrayEmpty(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):359:359 -> a
@@ -135365,7 +135346,7 @@
     281:281:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     281:281:com.android.tools.r8.ir.code.NewArrayEmpty rewriteToNewArrayEmpty(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):372 -> a
     282:284:void rewriteToArrayPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):440:442 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/kQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/oQ;)V"}
     285:285:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     285:285:void rewriteToArrayPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):446 -> a
     286:286:void rewriteToArrayPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):446:446 -> a
@@ -135382,7 +135363,7 @@
     320:321:boolean com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache.checkAllOccurrenceProcessed():715:716 -> a
     320:321:void rewriteToArrayPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayFilled):477 -> a
     322:327:com.android.tools.r8.ir.code.Value getPutValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache):487:492 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Mp;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/mQ;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Pp;)Lcom/android/tools/r8/internal/bl0;"}
     328:328:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.getBlock():68:68 -> a
     328:328:com.android.tools.r8.ir.code.Value getPutValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache):493 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135457,7 +135438,7 @@
     416:416:com.android.tools.r8.ir.code.Value getPutValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache):531:531 -> a
     417:417:com.android.tools.r8.ir.code.Value getPutValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.conversion.passes.FilledNewArrayRewriter$ConstantMaterializingInstructionCache):524:524 -> a
     418:418:void addArrayPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Value):549:549 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/iQ;ILcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/mQ;ILcom/android/tools/r8/internal/bl0;)V"}
     419:419:com.android.tools.r8.ir.code.ConstNumber$Builder com.android.tools.r8.ir.code.ConstNumber.builder():54:54 -> a
     419:419:void addArrayPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Value):549 -> a
     420:420:void addArrayPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Value):550:550 -> a
@@ -135483,7 +135464,7 @@
     432:432:void addArrayPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Value):561:561 -> a
     433:436:void addArrayPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockInstructionListIterator,com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Value):560:563 -> a
     1:1:boolean canUseNewArrayFilledData(com.android.tools.r8.ir.code.NewArrayFilled):336:336 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;)Z"}
     2:2:int com.android.tools.r8.ir.code.NewArrayFilled.size():241:241 -> b
     2:2:boolean canUseNewArrayFilledData(com.android.tools.r8.ir.code.NewArrayFilled):341 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135499,22 +135480,22 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> c
     1:1:boolean isNewArrayFilledOfConstants(com.android.tools.r8.ir.code.NewArrayFilled):142 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;)Z"}
     2:3:boolean isNewArrayFilledOfConstants(com.android.tools.r8.ir.code.NewArrayFilled):142:143 -> c
-com.android.tools.r8.ir.conversion.passes.InitClassRemover -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.ir.conversion.passes.InitClassRemover -> com.android.tools.r8.internal.Jv:
 # {"id":"sourceFile","fileName":"InitClassRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):19:19 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveInitClass():162:162 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():24:24 -> b
     2:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):35:39 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     7:7:com.android.tools.r8.graph.lens.InitClassLens com.android.tools.r8.graph.AppView.initClassLens():704:704 -> b
     7:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135537,7 +135518,7 @@
     19:19:com.android.tools.r8.ir.code.StaticGet com.android.tools.r8.ir.code.StaticGet$Builder.build():287:287 -> b
     19:19:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):44 -> b
     20:24:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):45:49 -> b
-com.android.tools.r8.ir.conversion.passes.KnownArrayLengthRewriter -> com.android.tools.r8.internal.xI:
+com.android.tools.r8.ir.conversion.passes.KnownArrayLengthRewriter -> com.android.tools.r8.internal.wI:
 # {"id":"sourceFile","fileName":"KnownArrayLengthRewriter.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():20:20 -> <clinit>
@@ -135546,13 +135527,13 @@
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):33 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveArrayLength():95:95 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):33 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():28:28 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39:42 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
     6:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):42 -> b
     7:8:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):46:47 -> b
@@ -135574,23 +135555,23 @@
     30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.NewArrayEmpty.size():58:58 -> b
     30:30:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):65 -> b
     31:53:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):66:88 -> b
-com.android.tools.r8.ir.conversion.passes.MoveResultRewriter -> com.android.tools.r8.internal.aP:
+com.android.tools.r8.ir.conversion.passes.MoveResultRewriter -> com.android.tools.r8.internal.eP:
 # {"id":"sourceFile","fileName":"MoveResultRewriter.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):42 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):42:42 -> a
     4:4:void lambda$rewriteCode$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Assume):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/y4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/y4;)V"}
     1:1:java.lang.String getRewriterId():37:37 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):50:52 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:5:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:50 -> b
     5:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):52 -> b
     6:6:com.android.tools.r8.ir.analysis.type.TypeAnalysis com.android.tools.r8.ir.analysis.type.TypeAnalysis.setKeepRedundantBlocksAfterAssumeRemoval(boolean):63:63 -> b
@@ -135634,14 +135615,14 @@
     87:87:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.narrowingWithAssumeRemoval(java.lang.Iterable):96:96 -> b
     87:87:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):127 -> b
     88:90:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):129:131 -> b
-com.android.tools.r8.ir.conversion.passes.NaturalIntLoopRemover -> com.android.tools.r8.internal.VP:
+com.android.tools.r8.ir.conversion.passes.NaturalIntLoopRemover -> com.android.tools.r8.internal.ZP:
 # {"id":"sourceFile","fileName":"NaturalIntLoopRemover.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):37:37 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135653,7 +135634,7 @@
     5:5:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):67:67 -> a
     1:1:java.lang.String getRewriterId():42:42 -> b
     2:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):48:49 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     4:9:boolean isComparisonBlock(com.android.tools.r8.ir.code.BasicBlock):72:77 -> b
     4:9:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):50 -> b
     10:10:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):51:51 -> b
@@ -135924,28 +135905,28 @@
     192:192:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> b
     192:192:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):56 -> b
     193:195:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):57:59 -> b
-com.android.tools.r8.ir.conversion.passes.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations -> com.android.tools.r8.internal.UP:
+com.android.tools.r8.ir.conversion.passes.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations -> com.android.tools.r8.internal.YP:
 # {"id":"sourceFile","fileName":"NaturalIntLoopRemover.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():295:295 -> <clinit>
-com.android.tools.r8.ir.conversion.passes.OriginalFieldWitnessRemover -> com.android.tools.r8.internal.cV:
+com.android.tools.r8.ir.conversion.passes.OriginalFieldWitnessRemover -> com.android.tools.r8.internal.gV:
 # {"id":"sourceFile","fileName":"OriginalFieldWitnessRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):19:19 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveOriginalFieldWitness():115:115 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():24:24 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):35:38 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     6:6:boolean com.android.tools.r8.ir.code.Instruction.isOriginalFieldWitness():0:0 -> b
     6:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):38 -> b
     7:13:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):39:45 -> b
-com.android.tools.r8.ir.conversion.passes.ParentConstructorHoistingCodeRewriter -> com.android.tools.r8.internal.QV:
+com.android.tools.r8.ir.conversion.passes.ParentConstructorHoistingCodeRewriter -> com.android.tools.r8.internal.UV:
 # {"id":"sourceFile","fileName":"ParentConstructorHoistingCodeRewriter.java"}
     java.util.List sideEffectFreeConstructorCalls -> e
     boolean $assertionsDisabled -> f
@@ -135953,7 +135934,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:24:boolean hoistSideEffectFreeConstructorCallIntoPredecessorBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,java.util.Deque):113:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/GB;Ljava/util/ArrayDeque;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/IB;Ljava/util/ArrayDeque;)Z"}
     25:25:java.lang.Object com.android.tools.r8.utils.CollectionUtils.getFirstOrDefault(java.util.Collection,java.lang.Object):29:29 -> a
     25:25:boolean hoistSideEffectFreeConstructorCallIntoPredecessorBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,java.util.Deque):137 -> a
     26:26:java.lang.Object com.android.tools.r8.utils.CollectionUtils.getFirst(java.util.Collection):25:25 -> a
@@ -135961,9 +135942,9 @@
     26:26:boolean hoistSideEffectFreeConstructorCallIntoPredecessorBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,java.util.Deque):137 -> a
     27:27:boolean hoistSideEffectFreeConstructorCallIntoPredecessorBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,java.util.Deque):136:136 -> a
     28:28:void lambda$hoistSideEffectFreeConstructorCallIntoPredecessorBlock$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)V"}
     29:29:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     30:30:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     30:30:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -135971,19 +135952,19 @@
     31:31:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):144 -> a
     32:40:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):147:155 -> a
     41:41:boolean lambda$hoistingMayRemoveInstancePutToUninitializedThis$2(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Instruction):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;Lcom/android/tools/r8/internal/Kw;)Z"}
     42:42:com.android.tools.r8.utils.TraversalContinuation lambda$hoistingMayRemoveInstancePutToUninitializedThis$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList,com.android.tools.r8.ir.code.BasicBlock):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/Oh0;"}
     43:49:com.android.tools.r8.utils.TraversalContinuation lambda$hoistingMayRemoveInstancePutToUninitializedThis$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList,com.android.tools.r8.ir.code.BasicBlock):180:186 -> a
     50:59:boolean lambda$computeSideEffectFreeConstructorCalls$5(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):203:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;)Z"}
     60:60:boolean isInstancePutToUninitializedThis(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):218:218 -> a
     60:60:boolean lambda$hoistingMayRemoveInstancePutToUninitializedThis$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:java.lang.String getRewriterId():49:49 -> b
     2:5:java.util.List getOrComputeSideEffectFreeConstructorCalls(com.android.tools.r8.ir.code.IRCode):192:195 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):54 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     6:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):54:54 -> b
     7:7:void hoistSideEffectFreeConstructorCall(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect):62:62 -> b
     7:7:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):55 -> b
@@ -136040,14 +136021,14 @@
     51:52:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):57:58 -> b
     53:53:boolean isInstancePutToUninitializedThis(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):218:218 -> b
     53:53:boolean lambda$hoistingMayRemoveInstancePutToUninitializedThis$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):182 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:3:java.util.List computeSideEffectFreeConstructorCalls(com.android.tools.r8.ir.code.IRCode):199:201 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Ljava/util/List;"}
     4:4:java.util.List computeSideEffectFreeConstructorCalls(com.android.tools.r8.ir.code.IRCode):200:200 -> c
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> d
     1:1:boolean hoistingMayRemoveInstancePutToUninitializedThis(com.android.tools.r8.ir.code.IRCode):159 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveInstancePut():170:170 -> d
     2:2:boolean hoistingMayRemoveInstancePutToUninitializedThis(com.android.tools.r8.ir.code.IRCode):159 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136060,15 +136041,15 @@
     14:25:boolean hoistingMayRemoveInstancePutToUninitializedThis(com.android.tools.r8.ir.code.IRCode):167:178 -> d
     26:26:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> d
     26:26:boolean hoistingMayRemoveInstancePutToUninitializedThis(com.android.tools.r8.ir.code.IRCode):188 -> d
-com.android.tools.r8.ir.conversion.passes.RedundantConstNumberRemover -> com.android.tools.r8.internal.l20:
+com.android.tools.r8.ir.conversion.passes.RedundantConstNumberRemover -> com.android.tools.r8.internal.p20:
 # {"id":"sourceFile","fileName":"RedundantConstNumberRemover.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):46:46 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():3144:3144 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():3150:3150 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
     3:8:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):56:61 -> a
     9:9:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
@@ -136078,7 +136059,7 @@
     10:10:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/ZI;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/ZI;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/dJ;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/dJ;)Z"}
     12:12:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
     12:12:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136098,7 +136079,7 @@
     40:54:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):254:268 -> a
     1:1:java.lang.String getRewriterId():51:51 -> b
     2:13:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):66:77 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     14:14:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> b
     14:14:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):78 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136143,12 +136124,12 @@
     86:86:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):166:166 -> b
     1:17:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):172:188 -> c
     1:17:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$rewriteCode$0(com.android.tools.r8.ir.code.IRCode):67 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/IL;"}
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$rewriteCode$1(com.android.tools.r8.ir.code.IRCode):68:68 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/nm;"}
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> d
     2:2:com.android.tools.r8.ir.code.DominatorTree lambda$rewriteCode$1(com.android.tools.r8.ir.code.IRCode):68 -> d
-com.android.tools.r8.ir.conversion.passes.SplitBranch -> com.android.tools.r8.internal.Hc0:
+com.android.tools.r8.ir.conversion.passes.SplitBranch -> com.android.tools.r8.internal.Lc0:
 # {"id":"sourceFile","fileName":"SplitBranch.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
@@ -136157,7 +136138,7 @@
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     1:1:boolean isNumberAgainstConstNumberIf(com.android.tools.r8.ir.code.If):155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;)Z"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     2:2:boolean isNumberAgainstConstNumberIf(com.android.tools.r8.ir.code.If):155 -> a
     3:3:boolean isNumberAgainstConstNumberIf(com.android.tools.r8.ir.code.If):155:155 -> a
@@ -136178,7 +136159,7 @@
     16:16:void retargetGotos(java.util.Map):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;)V"}
     17:20:void lambda$retargetGotos$0(com.android.tools.r8.ir.code.Goto,com.android.tools.r8.ir.code.BasicBlock):83:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fs;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hs;Lcom/android/tools/r8/internal/I5;)V"}
     21:21:void com.android.tools.r8.ir.code.Phi.removeOperand(int):204:204 -> a
     21:21:void lambda$retargetGotos$0(com.android.tools.r8.ir.code.Goto,com.android.tools.r8.ir.code.BasicBlock):86 -> a
     22:28:void com.android.tools.r8.ir.code.Goto.setTarget(com.android.tools.r8.ir.code.BasicBlock):48:54 -> a
@@ -136247,7 +136228,7 @@
     120:121:void recordNewTargetForGoto(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,java.util.Map):209:210 -> a
     120:121:java.util.Map findGotosToRetarget(java.util.List):145 -> a
     122:126:void lambda$findGotosToRetarget$1(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):105:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;Lcom/android/tools/r8/internal/G5;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/I5;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Bm0;)V"}
     127:127:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     127:127:void lambda$findGotosToRetarget$1(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):110 -> a
     128:128:void lambda$findGotosToRetarget$1(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):110:110 -> a
@@ -136257,7 +136238,7 @@
     147:147:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     147:147:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     148:148:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveIf():158:158 -> a
     148:148:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136265,10 +136246,10 @@
     149:149:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):48 -> a
     150:150:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):48:48 -> a
     151:151:boolean lambda$computeCandidates$2(com.android.tools.r8.ir.code.BasicBlock):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     1:1:java.lang.String getRewriterId():42:42 -> b
     2:10:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):61:69 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     11:12:com.android.tools.r8.ir.optimize.AffectedValues com.android.tools.r8.ir.code.IRCode.removeUnreachableBlocks():1540:1541 -> b
     11:12:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):70 -> b
     13:13:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.optimize.AffectedValues):1349:1349 -> b
@@ -136278,7 +136259,7 @@
     15:15:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):72 -> b
     16:17:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):76:77 -> b
     1:4:java.util.List computeCandidates(com.android.tools.r8.ir.code.IRCode):172:175 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Ljava/util/ArrayList;"}
     5:5:com.android.tools.r8.ir.code.Value nonConstNumberOperand(com.android.tools.r8.ir.code.If):166:166 -> c
     5:5:java.util.List computeCandidates(com.android.tools.r8.ir.code.IRCode):178 -> c
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> c
@@ -136293,27 +136274,33 @@
     9:9:com.android.tools.r8.ir.code.Value nonConstNumberOperand(com.android.tools.r8.ir.code.If):168 -> c
     9:9:java.util.List computeCandidates(com.android.tools.r8.ir.code.IRCode):178 -> c
     10:14:java.util.List computeCandidates(com.android.tools.r8.ir.code.IRCode):179:183 -> c
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter -> com.android.tools.r8.internal.yf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter -> com.android.tools.r8.internal.Cf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):116:116 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):925:925 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):929 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931:931 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):925:925 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):929 -> a
+    3:3:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126 -> a
-    4:4:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126:126 -> a
-    5:5:boolean verifyConsistentCode(com.android.tools.r8.ir.code.IRCode,boolean,java.lang.String):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;ZLjava/lang/String;)V"}
-    6:12:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):221:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)Z"}
+    4:4:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInDebugMode(com.android.tools.r8.graph.ProgramMethod):931 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.shouldCompileMethodInReleaseMode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):935 -> a
+    4:4:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126 -> a
+    5:5:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):126:126 -> a
+    6:6:boolean verifyConsistentCode(com.android.tools.r8.ir.code.IRCode,boolean,java.lang.String):155:155 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;ZLjava/lang/String;)V"}
+    7:13:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):221:227 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)Z"}
     1:1:java.lang.String getRewriterId():121:121 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):135:135 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     3:14:java.util.List getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):160:171 -> b
     3:14:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):135 -> b
     15:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):861:862 -> b
@@ -136557,27 +136544,27 @@
     146:147:com.android.tools.r8.ir.optimize.AffectedValues com.android.tools.r8.ir.code.IRCode.removeUnreachableBlocks():1540:1541 -> b
     146:147:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):145 -> b
     148:150:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):147:149 -> b
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.sf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.wf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.Phi idValue -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.ir.code.Phi):832:832 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.Phi):830:830 -> <init>
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.Phi):830 -> <init>
     4:7:void <init>(com.android.tools.r8.ir.code.Phi):830:833 -> <init>
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.rf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.vf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     1:1:void <init>():691:691 -> <init>
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     1:1:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):810 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf0;Lcom/android/tools/r8/internal/uA;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/sf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wf0;Lcom/android/tools/r8/internal/wA;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/wf0;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     2:2:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):810 -> a
     3:15:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):811:823 -> a
@@ -136594,7 +136581,7 @@
     21:21:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> a
     21:21:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):758 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf0;Lcom/android/tools/r8/internal/Zt;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/sf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wf0;Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/wf0;"}
     22:22:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):759:759 -> a
     23:23:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):724:724 -> a
     23:23:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):761 -> a
@@ -136630,7 +136617,7 @@
     73:73:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):724:724 -> a
     73:73:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):780 -> a
     74:74:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):730:730 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf0;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/sf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wf0;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/wf0;"}
     75:75:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):724:724 -> a
     75:75:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):733 -> a
     76:83:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):735:742 -> a
@@ -136639,57 +136626,57 @@
     85:87:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):747:749 -> a
     88:88:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):724:724 -> a
     88:88:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):753 -> a
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.uf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.yf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.Map mapping -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     com.android.tools.r8.ir.code.Value value -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Map,com.android.tools.r8.ir.code.Value):297:301 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/Xk0;)V"}
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.tf0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/bl0;)V"}
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.xf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():232:232 -> <clinit>
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.wf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.Af0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.Value stringHashValue -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():342:342 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):675:675 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):673:673 -> <init>
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():140:140 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):673 -> <init>
     4:8:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):673:677 -> <init>
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.vf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.zf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     com.android.tools.r8.ir.code.BasicBlock continuationBlock -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.code.Phi intermediateIdValue -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xW;"}
     com.android.tools.r8.ir.code.Value stringValue -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():344:344 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):355:357 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/internal/bl0;)V"}
     4:20:com.android.tools.r8.ir.code.Phi getIntermediateIdValueOrElse(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):373:389 -> <init>
     4:20:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):358 -> <init>
     21:22:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):358:359 -> <init>
     1:3:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):431:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wf0;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/wf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Af0;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/Af0;"}
     4:4:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> a
     4:4:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):476 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136810,13 +136797,13 @@
     73:77:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extendWithSwitch(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.IntSwitch):550:554 -> a
     73:77:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):436 -> a
     78:113:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):568:603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;ILcom/android/tools/r8/internal/M20;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;ILcom/android/tools/r8/internal/Q20;Ljava/util/Set;)Z"}
     114:114:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> a
     114:114:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):607 -> a
     115:139:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):607:631 -> a
     140:140:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):621:621 -> a
     141:144:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):639:642 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/M20;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/Q20;)Z"}
     145:145:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> a
     145:145:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):642 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -136831,26 +136818,26 @@
     151:151:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):647 -> a
     152:165:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):649:662 -> a
     1:27:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):445:471 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wf0;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/wf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Af0;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/Af0;"}
     28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1658:1660 -> b
     28:30:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):471 -> b
     31:31:com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):472:472 -> b
-com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$Utils -> com.android.tools.r8.internal.xf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchConverter$Utils -> com.android.tools.r8.internal.Bf0:
 # {"id":"sourceFile","fileName":"StringSwitchConverter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():841:841 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):849:850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fD;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hD;)Lcom/android/tools/r8/internal/I5;"}
     3:3:com.android.tools.r8.ir.code.IfType com.android.tools.r8.ir.code.If.getType():78:78 -> a
     3:3:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):851 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:9:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):851:856 -> a
-com.android.tools.r8.ir.conversion.passes.StringSwitchRemover -> com.android.tools.r8.internal.Cf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchRemover -> com.android.tools.r8.internal.Gf0:
 # {"id":"sourceFile","fileName":"StringSwitchRemover.java"}
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/E;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rd;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):62:64 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/E;)V"}
     4:4:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> <init>
@@ -136864,14 +136851,14 @@
     1:1:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveStringSwitch():300:300 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():69:69 -> b
     2:5:boolean prepareForStringSwitchRemoval(com.android.tools.r8.ir.code.IRCode):130:133 -> b
     2:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):77 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     6:12:java.util.List com.android.tools.r8.ir.code.BasicBlock.getNormalPredecessors():390:396 -> b
     6:12:boolean prepareForStringSwitchRemoval(com.android.tools.r8.ir.code.IRCode):133 -> b
     6:12:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):77 -> b
@@ -136929,22 +136916,22 @@
     59:59:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):91 -> b
     60:60:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:96 -> b
     61:82:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):92:113 -> b
-com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.zf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.Df0:
 # {"id":"sourceFile","fileName":"StringSwitchRemover.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.Map structure -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     com.android.tools.r8.ir.conversion.passes.StringSwitchRemover this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gf0;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():205:205 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.conversion.passes.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):217:221 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cf0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/qf0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gf0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/uf0;Ljava/util/Set;)V"}
     1:2:java.util.Map createStructure(com.android.tools.r8.ir.code.StringSwitch):225:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qf0;)Ljava/util/LinkedHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uf0;)Ljava/util/LinkedHashMap;"}
     3:3:void com.android.tools.r8.ir.code.StringSwitch.forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):61:61 -> a
     3:3:java.util.Map createStructure(com.android.tools.r8.ir.code.StringSwitch):226 -> a
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):91:91 -> a
@@ -136998,27 +136985,27 @@
     74:74:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):365 -> a
     74:74:void removeStringSwitch():283 -> a
     75:84:void removeStringSwitch():284:293 -> a
-com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.Af0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.Ef0:
 # {"id":"sourceFile","fileName":"StringSwitchRemover.java"}
     com.android.tools.r8.ir.code.BasicBlock hashSwitchBlock -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock hashSwitchFallthroughBlock -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock idSwitchBlock -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock idSwitchFallthroughBlock -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap structure -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     int nextStringId -> k
     com.android.tools.r8.ir.conversion.passes.StringSwitchRemover this$0 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gf0;"}
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():297:297 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.conversion.passes.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):314:320 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cf0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/qf0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gf0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/uf0;Ljava/util/Set;)V"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap createStructure(com.android.tools.r8.ir.code.StringSwitch):329:330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qf0;)Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uf0;)Lcom/android/tools/r8/internal/Fz;"}
     3:3:void com.android.tools.r8.ir.code.StringSwitch.forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):61:61 -> a
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap createStructure(com.android.tools.r8.ir.code.StringSwitch):330 -> a
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):91:91 -> a
@@ -137027,7 +137014,7 @@
     5:5:void com.android.tools.r8.ir.code.StringSwitch.forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):62:62 -> a
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap createStructure(com.android.tools.r8.ir.code.StringSwitch):330 -> a
     6:12:void lambda$createStructure$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock):332:338 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/I5;)V"}
     13:14:void removeStringSwitch():347:348 -> a
     15:15:void com.android.tools.r8.ir.code.BasicBlock.removePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues):410:410 -> a
     15:15:void removeStringSwitch():348 -> a
@@ -137240,44 +137227,44 @@
     181:182:void removeStringSwitch():415:416 -> a
     183:183:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     183:183:void removeStringSwitch():417 -> a
-com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.Bf0:
+com.android.tools.r8.ir.conversion.passes.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.Ff0:
 # {"id":"sourceFile","fileName":"StringSwitchRemover.java"}
     com.android.tools.r8.ir.code.IRCode code -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.ListIterator blockIterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M5;"}
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Position position -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.Value stringValue -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:5:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):194:198 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/qf0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/uf0;Ljava/util/Set;)V"}
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):199 -> <init>
     7:7:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):199:199 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.passes.SwitchCaseEliminator -> com.android.tools.r8.internal.cg0:
+com.android.tools.r8.ir.conversion.passes.SwitchCaseEliminator -> com.android.tools.r8.internal.gg0:
 # {"id":"sourceFile","fileName":"SwitchCaseEliminator.java"}
     com.android.tools.r8.ir.code.BasicBlock block -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock defaultTarget -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L5;"}
     com.android.tools.r8.ir.code.Switch theSwitch -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ag0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eg0;"}
     int alwaysHitCase -> e
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     boolean liveFallthrough -> g
     boolean mayHaveIntroducedUnreachableBlocks -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet switchCasesToBeRemoved -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mA;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator):36:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ag0;Lcom/android/tools/r8/internal/J5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eg0;Lcom/android/tools/r8/internal/L5;)V"}
     2:12:void <init>(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator):30:40 -> <init>
     1:2:boolean canBeOptimized():49:50 -> a
     3:3:boolean isFallthroughLive():73:73 -> a
@@ -137436,16 +137423,16 @@
     112:112:void replaceSwitchByGoto():151 -> d
     112:112:void optimize():105 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-com.android.tools.r8.ir.conversion.passes.ThrowCatchOptimizer -> com.android.tools.r8.internal.Og0:
+com.android.tools.r8.ir.conversion.passes.ThrowCatchOptimizer -> com.android.tools.r8.internal.Sg0:
 # {"id":"sourceFile","fileName":"ThrowCatchOptimizer.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():46:46 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):49:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:4:boolean isSingleHandlerTrivial(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):362:364 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;)Z"}
     5:5:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     5:5:boolean isSingleHandlerTrivial(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):364 -> a
     6:6:boolean isSingleHandlerTrivial(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):368:368 -> a
@@ -137472,7 +137459,7 @@
     1:1:java.lang.String getRewriterId():54:54 -> b
     2:22:boolean optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):219:239 -> b
     2:22:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     23:23:boolean optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):241 -> b
     23:23:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):64 -> b
@@ -137569,7 +137556,7 @@
     107:107:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):64 -> b
     108:111:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):65:68 -> b
     1:7:void optimizeRedundantCatchRethrowInstructions(com.android.tools.r8.ir.code.IRCode):332:338 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     8:8:boolean com.android.tools.r8.ir.code.CatchHandlers$1.hasNext():158:158 -> c
     8:8:void optimizeRedundantCatchRethrowInstructions(com.android.tools.r8.ir.code.IRCode):338 -> c
     9:10:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():163:164 -> c
@@ -137587,7 +137574,7 @@
     1:12:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):76:87 -> d
     1:12:boolean com.android.tools.r8.internal.ThrowCatchOptimizer.rewriteThrowNullPointerException(com.android.tools.r8.internal.IRCode):0 -> d
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
     13:13:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1883:1883 -> d
     13:13:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):87 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -137674,7 +137661,7 @@
     76:76:boolean com.android.tools.r8.internal.ThrowCatchOptimizer.rewriteThrowNullPointerException(com.android.tools.r8.internal.IRCode):0 -> d
     77:77:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):0:0 -> d
     77:77:boolean com.android.tools.r8.internal.ThrowCatchOptimizer.rewriteThrowNullPointerException(com.android.tools.r8.internal.IRCode):0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     78:78:void insertNotNullCheck(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position):464:464 -> d
     78:78:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):141 -> d
     78:78:boolean com.android.tools.r8.internal.ThrowCatchOptimizer.rewriteThrowNullPointerException(com.android.tools.r8.internal.IRCode):0 -> d
@@ -137715,14 +137702,14 @@
     130:130:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):141 -> d
     131:131:void insertNotNullCheck(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position):464:464 -> d
     131:131:boolean rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):141 -> d
-com.android.tools.r8.ir.conversion.passes.TrivialCheckCastAndInstanceOfRemover -> com.android.tools.r8.internal.Qh0:
+com.android.tools.r8.ir.conversion.passes.TrivialCheckCastAndInstanceOfRemover -> com.android.tools.r8.internal.Uh0:
 # {"id":"sourceFile","fileName":"TrivialCheckCastAndInstanceOfRemover.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):40:40 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):50:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     3:3:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -137737,9 +137724,9 @@
     7:7:com.android.tools.r8.ir.analysis.type.TypeAnalysis com.android.tools.r8.ir.analysis.type.TypeAnalysis.setKeepRedundantBlocksAfterAssumeRemoval(boolean):63:63 -> a
     7:7:void lambda$rewriteCode$0(com.android.tools.r8.ir.analysis.type.TypeAnalysis):108 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Si0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)V"}
     8:8:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):303:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xw;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zw;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/Dt;)Z"}
     9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.InstanceOf.type():44:44 -> a
     9:9:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):307 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -137767,10 +137754,10 @@
     30:30:boolean replaceInstanceOfByTrue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator):389 -> a
     30:30:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):333 -> a
     31:31:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):335:335 -> a
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsNonNull():2759:2759 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsNonNull():2765:2765 -> a
     32:32:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsNonNull():2759:2759 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsNonNull():2765:2765 -> a
     33:33:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):335 -> a
     34:34:boolean replaceInstanceOfByNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceOf):396:396 -> a
     34:34:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):336 -> a
@@ -137830,12 +137817,12 @@
     72:72:boolean replaceInstanceOfByTrue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator):389 -> a
     72:72:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):375 -> a
     73:73:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):362:362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     74:78:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):406:410 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:java.lang.String getRewriterId():45:45 -> b
     2:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):60:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     4:4:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1450:1450 -> b
     4:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):82 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -138092,25 +138079,25 @@
     277:277:com.android.tools.r8.ir.analysis.type.TypeAnalysis com.android.tools.r8.ir.analysis.type.TypeAnalysis.setKeepRedundantBlocksAfterAssumeRemoval(boolean):63:63 -> b
     277:277:void lambda$rewriteCode$1(com.android.tools.r8.ir.analysis.type.TypeAnalysis):115 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Si0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)V"}
     1:1:com.android.tools.r8.ir.analysis.type.TypeAnalysis com.android.tools.r8.ir.analysis.type.TypeAnalysis.setKeepRedundantBlocksAfterAssumeRemoval(boolean):63:63 -> c
     1:1:void lambda$rewriteCode$2(com.android.tools.r8.ir.analysis.type.TypeAnalysis):143 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Si0;)V"}
-com.android.tools.r8.ir.conversion.passes.TrivialGotosCollapser -> com.android.tools.r8.internal.Th0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)V"}
+com.android.tools.r8.ir.conversion.passes.TrivialGotosCollapser -> com.android.tools.r8.internal.Xh0:
 # {"id":"sourceFile","fileName":"TrivialGotosCollapser.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):29:29 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     3:3:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):149:149 -> a
     3:3:void com.android.tools.r8.internal.TrivialGotosCollapser.collapseTrivialGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,java.util.ArrayList):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Ljava/util/ArrayList;)V"}
     4:4:void com.android.tools.r8.internal.TrivialGotosCollapser.collapseTrivialGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,java.util.ArrayList):0:0 -> a
     5:5:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):163:163 -> a
     5:5:void com.android.tools.r8.internal.TrivialGotosCollapser.collapseTrivialGoto(com.android.tools.r8.internal.IRCode,com.android.tools.r8.internal.BasicBlock,com.android.tools.r8.internal.BasicBlock,java.util.ArrayList):0 -> a
@@ -138123,13 +138110,13 @@
     2:15:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):49:62 -> b
     2:15:com.android.tools.r8.internal.CodeRewriterResult com.android.tools.r8.internal.TrivialGotosCollapser.rewriteCode(com.android.tools.r8.internal.IRCode):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     16:33:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):173:190 -> b
     16:33:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):63 -> b
     16:33:com.android.tools.r8.internal.CodeRewriterResult com.android.tools.r8.internal.TrivialGotosCollapser.rewriteCode(com.android.tools.r8.internal.IRCode):0 -> b
     34:34:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):0:0 -> b
     34:34:com.android.tools.r8.internal.CodeRewriterResult com.android.tools.r8.internal.TrivialGotosCollapser.rewriteCode(com.android.tools.r8.internal.IRCode):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":70,"2":71,"3":72},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":70,"2":71,"3":72},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     35:35:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):191:191 -> b
     35:35:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):63 -> b
     35:35:com.android.tools.r8.internal.CodeRewriterResult com.android.tools.r8.internal.TrivialGotosCollapser.rewriteCode(com.android.tools.r8.internal.IRCode):0 -> b
@@ -138159,11 +138146,11 @@
     72:72:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):191:191 -> b
     72:72:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):63 -> b
     73:82:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):96:105 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     1:10:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):120:129 -> c
     1:10:void com.android.tools.r8.internal.TrivialGotosCollapser.removedTrivialGotos(com.android.tools.r8.internal.IRCode):0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     11:11:void com.android.tools.r8.internal.TrivialGotosCollapser.removedTrivialGotos(com.android.tools.r8.internal.IRCode):0:0 -> c
     12:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):131:132 -> c
     12:13:void com.android.tools.r8.internal.TrivialGotosCollapser.removedTrivialGotos(com.android.tools.r8.internal.IRCode):0 -> c
@@ -138172,12 +138159,12 @@
     21:21:void com.android.tools.r8.internal.TrivialGotosCollapser.removedTrivialGotos(com.android.tools.r8.internal.IRCode):0:0 -> c
     22:22:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):135:135 -> c
     22:22:void com.android.tools.r8.internal.TrivialGotosCollapser.removedTrivialGotos(com.android.tools.r8.internal.IRCode):0 -> c
-com.android.tools.r8.ir.conversion.passes.TrivialPhiSimplifier -> com.android.tools.r8.internal.Uh0:
+com.android.tools.r8.ir.conversion.passes.TrivialPhiSimplifier -> com.android.tools.r8.internal.Yh0:
 # {"id":"sourceFile","fileName":"TrivialPhiSimplifier.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:9:void ensureDirectStringNewToInit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     10:20:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):59:69 -> a
     10:20:void ensureDirectStringNewToInit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):44 -> a
     21:22:void ensureDirectStringNewToInit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):45:46 -> a
@@ -138190,9 +138177,9 @@
     26:26:void ensureDirectStringNewToInit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):44 -> a
     27:27:void ensureDirectStringNewToInit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:55 -> a
     28:34:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):73:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;Ljava/util/Set;Ljava/util/Set;)V"}
     35:35:void replaceTrivialPhis(com.android.tools.r8.ir.code.Value):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     36:38:java.util.List com.android.tools.r8.algorithms.scc.SCC.computeSCC(java.lang.Object):33:35 -> a
     36:38:void replaceTrivialPhis(com.android.tools.r8.ir.code.Value):90 -> a
     39:59:void replaceTrivialPhis(com.android.tools.r8.ir.code.Value):91:111 -> a
@@ -138207,39 +138194,39 @@
     65:65:void replaceTrivialPhis(com.android.tools.r8.ir.code.Value):115:115 -> a
     66:66:void com.android.tools.r8.ir.code.BasicBlock.removePhi(com.android.tools.r8.ir.code.Phi):872:872 -> a
     66:66:void replaceTrivialPhis(com.android.tools.r8.ir.code.Value):115 -> a
-com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult -> com.android.tools.r8.internal.Ld:
 # {"id":"sourceFile","fileName":"CodeRewriterResult.java"}
     com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult NO_CHANGE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kd;"}
     com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult HAS_CHANGED -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kd;"}
     com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult NONE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ld;"}
     1:3:void <clinit>():13:15 -> <clinit>
     com.android.tools.r8.utils.OptionalBool hasChanged() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     1:1:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult hasChanged(boolean):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Id;"}
-com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult$DefaultCodeRewriterResult -> com.android.tools.r8.internal.Id:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Kd;"}
+com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult$DefaultCodeRewriterResult -> com.android.tools.r8.internal.Kd:
 # {"id":"sourceFile","fileName":"CodeRewriterResult.java"}
     boolean hasChanged -> d
     1:2:void <init>(boolean):25:26 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool hasChanged():31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
 com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> R8$$REMOVED$$CLASS$$94:
 # {"id":"sourceFile","fileName":"AccessorMethodSourceCode.java"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.r5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.t5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o5;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():86:86 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):91:94 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):103:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     7:7:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):177:177 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):108 -> a
     8:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):124:125 -> a
@@ -138265,12 +138252,12 @@
     17:17:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):108 -> a
     18:19:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):186:187 -> a
     18:19:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):108 -> a
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     20:20:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):108 -> a
     21:21:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187 -> a
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):108 -> a
@@ -138330,22 +138317,22 @@
     57:57:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):119:119 -> a
     57:57:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BackportedMethodRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.internal.BackportedMethodRewriter$MethodProvider):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/l5;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/n5;)Lcom/android/tools/r8/internal/wk;"}
     58:58:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BackportedMethodRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.internal.BackportedMethodRewriter$MethodProvider):0:0 -> a
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):137 -> a
     59:59:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BackportedMethodRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.internal.BackportedMethodRewriter$MethodProvider):0 -> a
     60:60:java.util.Collection lambda$desugarInstruction$1(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n5;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     61:63:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)Ljava/util/List;"}
     64:72:java.util.List generateListOfBackportedMethods(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):151:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/gB;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/iB;)Ljava/util/List;"}
     73:76:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):283:286 -> a
     73:76:java.util.List generateListOfBackportedMethods(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):159 -> a
     77:83:java.util.List generateListOfBackportedMethods(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):160:166 -> a
     84:84:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     85:85:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):59:59 -> a
     85:85:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):173 -> a
     86:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createSynthesizedType(java.lang.String):3057:3058 -> a
@@ -138353,40 +138340,40 @@
     86:87:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):173 -> a
     88:151:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):60:123 -> a
     88:151:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):173 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.i5:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder com.android.tools.r8.internal.BackportedMethodRewriter$$ExternalSyntheticOutline0.m(com.android.tools.r8.internal.DesugarDescription$DesugarCallback):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.j5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     1:1:void <init>():2164:2164 -> <init>
     1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):2168:2168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.i5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.k5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m5;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1850:1851 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/k5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/m5;)V"}
     1:10:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1862:1871 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     11:11:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setCallerPosition(com.android.tools.r8.ir.code.Position):290:290 -> a
     11:11:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1871 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:17:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1871:1876 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.l5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r5;"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1886:1886 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/p5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/r5;)V"}
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1891:1892 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1886 -> <init>
     4:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1891:1892 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/p5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/r5;I)V"}
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.disableAndroidApiLevelCheck():130:130 -> a
     1:1:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1922 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -138404,7 +138391,7 @@
     8:8:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     8:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1915 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/C5;"}
     9:9:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1915 -> a
     10:13:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1915:1918 -> a
@@ -138412,7 +138399,7 @@
     15:15:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1896:1896 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     16:16:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1907:1907 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     17:17:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getMethodContext():236:236 -> a
     17:17:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1908 -> a
     18:19:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1908:1909 -> a
@@ -138426,26 +138413,26 @@
     26:26:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1929:1929 -> a
     27:27:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1937:1937 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/E2;"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.k5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.m5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):2160:2160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     2:2:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):2160 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.l5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.n5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):1832:1833 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.m5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.o5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     java.util.Map typeMinApi -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map rewritable -> c
@@ -138463,7 +138450,7 @@
     16:16:java.util.Map initializeTypeMinApi(com.android.tools.r8.graph.DexItemFactory):312:312 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView):229 -> <init>
     17:17:void <init>(com.android.tools.r8.graph.AppView):229:229 -> <init>
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.enableBackportedMethodRewriting():2678:2678 -> <init>
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.enableBackportedMethodRewriting():2684:2684 -> <init>
     18:18:void <init>(com.android.tools.r8.graph.AppView):230 -> <init>
     19:21:void <init>(com.android.tools.r8.graph.AppView):234:236 -> <init>
     22:22:boolean typeIsAbsentOrPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):359:359 -> <init>
@@ -138533,7 +138520,7 @@
     33:33:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,int):103 -> a
     33:33:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(com.android.tools.r8.graph.DexItemFactory,int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):1230 -> a
     34:34:boolean minApiMatchDatabaseMinApi(com.android.tools.r8.com.google.common.collect.ImmutableMap):318:318 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)V"}
     35:35:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):320:320 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/y2;)V"}
     36:36:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.graph.AppView.apiLevelCompute():1380:1380 -> a
@@ -138561,7 +138548,7 @@
     134:177:void initializeMathExactApis(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):867:910 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;)V"}
     178:179:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1819:1820 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n5;)V"}
     1:1:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateSetOf(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
     1:1:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$2(int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):1210 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/G;"}
@@ -138651,11 +138638,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     1:12:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1446:1457 -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():3167:3167 -> o
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():3173:3173 -> o
     13:13:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1457 -> o
     14:18:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1458:1462 -> o
     19:63:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1456:1500 -> o
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():3167:3167 -> o
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.canParseNumbersWithPlusPrefix():3173:3173 -> o
     64:64:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1500 -> o
     65:69:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1501:1505 -> o
     70:146:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1499:1575 -> o
@@ -138667,34 +138654,34 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     1:7:void initializeAndroidVMethodProviders(com.android.tools.r8.graph.DexItemFactory):1760:1766 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.p5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.graph.DexType receiverType -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1954:1955 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/p5;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/r5;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1960:1960 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/E2;"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.o5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.q5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1969:1969 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/p5;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/r5;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1974:1974 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.p5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.r5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     com.android.tools.r8.graph.CfCode create(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/G;"}
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$ThreadLocalSubclassGenerator -> R8$$REMOVED$$CLASS$$95:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$ThreadLocalWithInitialWithSupplierGenerator -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$ThreadLocalWithInitialWithSupplierGenerator -> com.android.tools.r8.internal.s5:
 # {"id":"sourceFile","fileName":"BackportedMethodRewriter.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):2002:2002 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):2007:2007 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     2:2:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):2018:2018 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     3:3:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):2021 -> a
     4:7:java.util.Collection rewriteInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):2021:2024 -> a
@@ -138786,7 +138773,7 @@
     73:87:void com.android.tools.r8.internal.BackportedMethodRewriter$ThreadLocalWithInitialWithSupplierGenerator.lambda$rewriteInvoke$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
     88:88:void lambda$rewriteInvoke$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> a
     88:88:void com.android.tools.r8.internal.BackportedMethodRewriter$ThreadLocalWithInitialWithSupplierGenerator.lambda$rewriteInvoke$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":117,"2":118,"3":119},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":117,"2":118,"3":119},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     89:89:void com.android.tools.r8.ir.desugar.BackportedMethodRewriter$ThreadLocalSubclassGenerator.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):2116:2116 -> a
     89:89:void com.android.tools.r8.ir.desugar.BackportedMethodRewriter$ThreadLocalSubclassGenerator.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView):2073 -> a
     89:89:void lambda$rewriteInvoke$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):2026 -> a
@@ -138871,7 +138858,7 @@
     119:119:void lambda$rewriteInvoke$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):2026 -> a
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$rewriteInvoke$0(com.android.tools.r8.synthesis.SyntheticNaming):2023:2023 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.B7:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.D7:
 # {"id":"sourceFile","fileName":"BufferCovariantReturnTypeRewriter.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -138880,16 +138867,16 @@
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.cf.code.CfInvoke):49:49 -> a
     1:1:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BufferCovariantReturnTypeRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/wk;"}
     2:2:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BufferCovariantReturnTypeRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0:0 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.cf.code.CfInvoke):61 -> a
     3:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.BufferCovariantReturnTypeRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
     4:4:java.util.Collection lambda$desugarInstruction$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     5:7:boolean isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):88:90 -> a
     5:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     8:11:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):32:35 -> a
     12:26:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):66:80 -> a
     12:26:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):36 -> a
@@ -138897,33 +138884,33 @@
     34:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):361:361 -> a
     34:34:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):44 -> a
     35:36:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):44:45 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.N8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaring.java"}
     void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
     java.lang.String uniqueIdentifier() -> b
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.Q8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaringCollection.java"}
     1:1:void <init>():21:21 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/S8;)V"}
     1:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):24:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/O8;"}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Q8;"}
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):25 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):25 -> a
     5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31:31 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):27 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     6:6:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):27 -> a
     7:7:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31 -> a
     7:7:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):27 -> a
@@ -138947,12 +138934,12 @@
     13:13:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):29:29 -> a
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer.create(com.android.tools.r8.graph.AppView):20:20 -> a
     14:14:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):32 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer.create(com.android.tools.r8.graph.AppView):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):32 -> a
     16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer.create(com.android.tools.r8.graph.AppView):20 -> a
     16:16:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):32 -> a
@@ -138974,12 +138961,12 @@
     31:31:com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaring com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaring.create(com.android.tools.r8.graph.AppView):58:58 -> a
     31:31:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):42 -> a
     32:37:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):44:49 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.O8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaringCollection.java"}
     1:1:void <init>():90:90 -> <init>
     1:1:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Q8;)V"}
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.N8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/S8;)V"}
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.P8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaringCollection.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -138990,20 +138977,20 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):62:65 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/ArrayList;)V"}
     1:5:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):72:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/S8;)V"}
     6:19:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):72:85 -> a
     20:20:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):78:78 -> a
     21:21:void lambda$synthesizeClasses$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/L8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/N8;)V"}
     22:24:com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext com.android.tools.r8.contexts.CompilationContext$ProcessorContext.createClassSynthesisDesugaringContext(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):108:110 -> a
     22:24:void lambda$synthesizeClasses$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):82 -> a
     25:25:void lambda$synthesizeClasses$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):83:83 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.Q8:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.S8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaringEventConsumer.java"}
     1:1:void <init>():29:29 -> <init>
     java.util.Set getSynthesizedClasses() -> a
     1:1:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer createForR8(com.android.tools.r8.graph.AppView):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Q8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/S8;"}
     2:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):36:36 -> a
     2:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer createForR8(com.android.tools.r8.graph.AppView):43 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions):43:43 -> a
@@ -139018,7 +139005,7 @@
     5:7:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer createForR8(com.android.tools.r8.graph.AppView):43 -> a
     1:1:void finished(com.android.tools.r8.graph.AppView):46:46 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer$D8R8CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer$D8R8CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.R8:
 # {"id":"sourceFile","fileName":"CfClassSynthesizerDesugaringEventConsumer.java"}
     java.util.Set synthesizedClasses -> a
     1:4:void <init>():50:53 -> <init>
@@ -139041,54 +139028,54 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):104:104 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CfDesugaringInfo -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.ir.desugar.CfDesugaringInfo -> com.android.tools.r8.internal.h9:
 # {"id":"sourceFile","fileName":"CfDesugaringInfo.java"}
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.C9:
 # {"id":"sourceFile","fileName":"CfInstructionDesugaring.java"}
     com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     1:1:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     2:2:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:boolean hasPreciseNeedsDesugaring():40:40 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.B9:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.D9:
 # {"id":"sourceFile","fileName":"CfInstructionDesugaringCollection.java"}
     1:1:void <init>():30:30 -> <init>
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;)V"}
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Ljava/util/Collection;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/androidapi/a;)Lcom/android/tools/r8/internal/qR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/androidapi/a;)Lcom/android/tools/r8/internal/uR;"}
     2:2:boolean com.android.tools.r8.utils.InternalOptions$DesugarState.isOff():168:168 -> a
     2:2:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):34 -> a
     3:12:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):34:43 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     13:13:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     14:14:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):43 -> a
     15:16:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):174:175 -> a
     15:16:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):44 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     17:17:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):44 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     18:18:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):175 -> a
     18:18:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):44 -> a
     19:20:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):175:176 -> a
@@ -139100,20 +139087,20 @@
     22:25:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):44 -> a
     26:35:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection.createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):186:195 -> a
     26:35:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):46 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.G9:
 # {"id":"sourceFile","fileName":"CfInstructionDesugaringEventConsumer.java"}
     1:1:void <init>():58:58 -> <init>
     java.util.List finalizeDesugaring() -> a
     boolean verifyNothingToFinalize() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.E9:
 # {"id":"sourceFile","fileName":"CfInstructionDesugaringEventConsumer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.ClassConverterResult$Builder classConverterResultBuilder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zb;"}
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xh;"}
     java.util.Map pendingInvokeSpecialBridges -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     java.util.List synthesizedLambdaClasses -> e
@@ -139121,16 +139108,16 @@
     java.util.List synthesizedConstantDynamicClasses -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer outermostEventConsumer -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G9;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():114:114 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,com.android.tools.r8.ir.conversion.D8MethodProcessor):131:131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xb;Lcom/android/tools/r8/internal/vh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Zb;Lcom/android/tools/r8/internal/xh;)V"}
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,com.android.tools.r8.ir.conversion.D8MethodProcessor):121:134 -> <init>
     1:1:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getVirtualMethod():28:28 -> a
     1:1:void lambda$finalizeInvokeSpecialDesugaring$4(java.util.function.Consumer,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):422 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/TB;)V"}
     2:2:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getVirtualMethodCode():32:32 -> a
     2:2:void lambda$finalizeInvokeSpecialDesugaring$4(java.util.function.Consumer,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):423 -> a
     3:3:void lambda$finalizeInvokeSpecialDesugaring$4(java.util.function.Consumer,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):423:423 -> a
@@ -139144,7 +139131,7 @@
     9:9:void lambda$acceptBackportedClass$1(com.android.tools.r8.graph.ProgramMethod):204:204 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     10:11:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):235:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
     12:12:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getNewDirectMethod():24:24 -> a
     12:12:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):236 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -139158,9 +139145,9 @@
     19:19:void acceptVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):264:264 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y5;)V"}
     20:22:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):268:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     23:25:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):276:278 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/graph/C5;)V"}
     26:26:void acceptConstantDynamicRewrittenBootstrapMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):285:285 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
     27:27:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):294:294 -> a
@@ -139179,7 +139166,7 @@
     38:40:java.util.List finalizeDesugaring():401 -> a
     41:61:void finalizeInvokeSpecialDesugaring(java.util.function.Consumer):407:427 -> a
     62:64:void finalizeLambdaDesugaring(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.function.Consumer):435:437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xb;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zb;Ljava/util/function/Consumer;)V"}
     65:65:void com.android.tools.r8.ir.desugar.LambdaClass$Target.ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):491:491 -> a
     65:65:void finalizeLambdaDesugaring(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.function.Consumer):437 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -139189,7 +139176,7 @@
     1:1:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getNewDirectMethod():24:24 -> b
     1:1:void lambda$finalizeInvokeSpecialDesugaring$3(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):411 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
     2:2:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getVirtualMethod():28:28 -> b
     2:2:void lambda$finalizeInvokeSpecialDesugaring$3(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):413 -> b
     3:3:void lambda$finalizeInvokeSpecialDesugaring$3(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):413:413 -> b
@@ -139269,7 +139256,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):171:171 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.F9:
 # {"id":"sourceFile","fileName":"CfInstructionDesugaringEventConsumer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -139299,12 +139286,12 @@
     4:4:void acceptTypeSwitchClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):685:685 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     5:7:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):689:691 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
     8:13:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):696:701 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     14:14:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):698:698 -> a
     15:20:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):707:712 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/graph/C5;)V"}
     21:21:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):709:709 -> a
     22:22:void acceptConstantDynamicRewrittenBootstrapMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):719:719 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
@@ -139331,7 +139318,7 @@
     1:1:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getVirtualMethod():28:28 -> b
     1:1:void lambda$finalizeInvokeSpecialDesugaring$0(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):774 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
     2:2:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getVirtualMethodCode():32:32 -> b
     2:2:void lambda$finalizeInvokeSpecialDesugaring$0(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):775 -> b
     3:3:void lambda$finalizeInvokeSpecialDesugaring$0(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):775:775 -> b
@@ -139403,17 +139390,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):557:557 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.la:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaring.java"}
     void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.ma:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.oa:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringCollection.java"}
     1:1:void <init>():21:21 -> <init>
     void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/EA;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/ma;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GA;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/oa;"}
     2:3:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):58:59 -> a
     2:3:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
     4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.hasRetargeting():208:208 -> a
@@ -139425,12 +139412,12 @@
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
     6:6:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):60:60 -> a
     6:6:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     7:7:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
     8:8:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):60 -> a
     8:8:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
@@ -139451,39 +139438,39 @@
     27:32:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):82:87 -> a
     27:32:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):28 -> a
     33:33:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,java.util.function.Predicate):31:31 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.ma:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringCollection.java"}
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ka;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ma;"}
     1:1:void <clinit>():105:105 -> <clinit>
     1:1:void <init>():108:108 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.la:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.na:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringCollection.java"}
     java.util.List desugarings -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:2:void <init>(java.util.List):50:51 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     1:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):96:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.pa:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.ra:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringEventConsumer.java"}
     1:1:void <init>():35:35 -> <init>
     void finalizeDesugaring() -> a
     java.util.Set getNewlyLiveMethods() -> b
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.na:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.pa:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringEventConsumer.java"}
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xh;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D9;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():67:67 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):78:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Lcom/android/tools/r8/internal/B9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Lcom/android/tools/r8/internal/D9;)V"}
     2:2:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):73:73 -> <init>
     3:3:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection):73 -> <init>
@@ -139491,7 +139478,7 @@
     1:3:void addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):84:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     4:4:void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BA;)V"}
     5:5:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):98:98 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     6:6:void acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):108:108 -> a
@@ -139499,7 +139486,7 @@
     7:7:void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass):114:114 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I0;)V"}
     8:8:void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;)V"}
     9:9:void acceptInterfaceMethodDesugaringForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):125:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     10:10:void acceptThrowingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):131:131 -> a
@@ -139545,19 +139532,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):136:136 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.qa:
 # {"id":"sourceFile","fileName":"CfPostProcessingDesugaringEventConsumer.java"}
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/P;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D9;"}
     java.util.function.BiConsumer missingClassConsumer -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():174:174 -> <clinit>
     1:4:void <init>(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,java.util.function.BiConsumer):184:187 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/B9;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/D9;Ljava/util/function/BiConsumer;)V"}
     1:1:void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BA;)V"}
     2:2:void finalizeDesugaring():206:206 -> a
     3:4:void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass):211:212 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I0;)V"}
@@ -139566,7 +139553,7 @@
     6:6:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):222:222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     7:7:void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;)V"}
     8:8:void acceptInterfaceMethodDesugaringForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):239:239 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     9:9:void acceptThrowingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):245:245 -> a
@@ -139589,16 +139576,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):250:250 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.fh:
 # {"id":"sourceFile","fileName":"CovariantReturnTypeAnnotationTransformer.java"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():56:56 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):63:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;)V"}
     1:1:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):100:100 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/LinkedList;Ljava/util/LinkedList;)V"}
     2:3:boolean hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):302:303 -> a
@@ -139611,11 +139598,11 @@
     20:20:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):111 -> a
     21:21:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):115:115 -> a
     22:22:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/LinkedList;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/fh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/LinkedList;Ljava/util/LinkedList;Lcom/android/tools/r8/internal/hh;)V"}
     23:23:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> a
     23:23:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):126 -> a
     24:24:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer,com.android.tools.r8.graph.ProgramMethod):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/fh;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/hh;Lcom/android/tools/r8/graph/C5;)V"}
     25:26:boolean methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):137:138 -> a
     25:26:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer,com.android.tools.r8.graph.ProgramMethod):128 -> a
     27:27:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):287:287 -> a
@@ -139649,7 +139636,7 @@
     41:44:void buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):153:156 -> a
     41:44:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer,com.android.tools.r8.graph.ProgramMethod):130 -> a
     45:49:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):169:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/fh;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/hh;)Lcom/android/tools/r8/graph/j1;"}
     50:50:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
     50:50:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):173 -> a
     51:51:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
@@ -139671,7 +139658,7 @@
     64:64:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     64:64:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):185 -> a
     65:67:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):186:188 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     68:68:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):188 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     69:70:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):191:192 -> a
@@ -139700,12 +139687,12 @@
     93:93:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):195:195 -> a
     94:94:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
     94:94:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):196 -> a
-    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     95:95:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     96:96:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     96:96:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):197 -> a
-    97:97:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     97:97:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):197 -> a
     98:104:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):198:204 -> a
     105:109:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):201:205 -> a
@@ -139731,138 +139718,138 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;)Z"}
     2:2:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):287:287 -> b
     2:2:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):112 -> b
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.hh:
 # {"id":"sourceFile","fileName":"CovariantReturnTypeAnnotationTransformerEventConsumer.java"}
     void acceptCovariantReturnTypeBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer$EmptyCovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer$EmptyCovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.gh:
 # {"id":"sourceFile","fileName":"CovariantReturnTypeAnnotationTransformerEventConsumer.java"}
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer$EmptyCovariantReturnTypeAnnotationTransformerEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh;"}
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:void acceptCovariantReturnTypeBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.xk:
+com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.zk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     com.android.tools.r8.ir.desugar.DesugarDescription NOTHING -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zk;"}
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():28:28 -> <init>
     1:1:boolean needsDesugaring():33:33 -> a
     2:2:java.util.Collection desugarInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qR;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uR;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     1:1:void scan():30:30 -> b
-com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.tk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     1:1:void <init>():77:77 -> <init>
-com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.sk:
+com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.uk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     java.util.Collection desugarInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.tk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.vk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vk;"}
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:void <init>():89:89 -> <init>
     com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder com.android.tools.r8.internal.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.internal.DesugarDescription$DesugarCallback) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.vk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.xk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     java.util.List scanEffects -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback desugarRewrite -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uk;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():112:112 -> <clinit>
     1:4:void <init>():112:115 -> <init>
     1:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):119:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wk;)Lcom/android/tools/r8/internal/rk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yk;)Lcom/android/tools/r8/internal/tk;"}
     3:5:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):126:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription build():134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xk;"}
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.uk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zk;"}
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.wk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xk;"}
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder):134:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xk;)V"}
     1:1:boolean needsDesugaring():142:142 -> a
     2:4:java.util.Collection desugarInstruction(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):156:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/qR;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/uR;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     1:1:void scan():137:137 -> b
-com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.yk:
 # {"id":"sourceFile","fileName":"DesugarDescription.java"}
     void scan() -> a
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Qm:
 # {"id":"sourceFile","fileName":"EmptyCfInstructionDesugaringCollection.java"}
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Om;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qm;"}
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():26:26 -> <init>
     1:1:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     3:3:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;)V"}
     4:4:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Ljava/util/Collection;"}
     5:5:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     6:6:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     7:7:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     8:8:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     9:9:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):99:99 -> a
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Vq:
 # {"id":"sourceFile","fileName":"FreshLocalProvider.java"}
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.bC:
 # {"id":"sourceFile","fileName":"InvokeToPrivateRewriter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):29:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     6:12:com.android.tools.r8.graph.DexEncodedMethod privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):59:65 -> a
     6:12:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):34 -> a
     13:15:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):36:38 -> a
     16:16:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):42:42 -> a
     16:16:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeToPrivateRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/wk;"}
     17:17:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeToPrivateRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0:0 -> a
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):54 -> a
     18:18:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeToPrivateRewriter.desugarInstruction(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
     19:19:java.util.Collection lambda$desugarInstruction$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     20:20:java.util.Collection lambda$desugarInstruction$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):53 -> a
 com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> R8$$REMOVED$$CLASS$$96:
 # {"id":"sourceFile","fileName":"LambdaBridgeMethodSourceCode.java"}
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.PI:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.TI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring desugaring -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZI;"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VI;"}
     com.android.tools.r8.graph.DexMethod constructor -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.DexMethod factoryMethod -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SI;"}
     com.android.tools.r8.graph.DexProgramClass clazz -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     boolean $assertionsDisabled -> i
@@ -139870,7 +139857,7 @@
     1:1:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):80:80 -> <init>
     1:1:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/internal/UI;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ZI;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/internal/YI;Z)V"}
     2:13:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):71:82 -> <init>
     2:13:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassBuilder.getType():79:79 -> <init>
@@ -140059,7 +140046,7 @@
     154:159:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
     160:160:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):0:0 -> <init>
     160:160:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":219,"2":220,"3":221},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":219,"2":220,"3":221},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     161:161:void synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):166:166 -> <init>
     161:161:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> <init>
     161:161:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):105 -> <init>
@@ -140089,7 +140076,7 @@
     186:186:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
     187:187:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):0:0 -> <init>
     187:187:void com.android.tools.r8.internal.LambdaClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.LambdaDescriptor,com.android.tools.r8.internal.LambdaInstructionDesugaring$DesugarInvoke,boolean):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":222,"2":223,"3":224},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":222,"2":223,"3":224},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     188:188:void synthesizeVirtualMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):181:181 -> <init>
     188:188:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> <init>
     188:188:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):105 -> <init>
@@ -140171,7 +140158,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/l1;"}
     7:7:com.android.tools.r8.graph.DexField getCaptureField(int):140:140 -> a
     8:9:boolean canAccessModifyLambdaImplMethod():288:289 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):2543:2543 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):2549:2549 -> a
     10:10:boolean canAccessModifyLambdaImplMethod():289 -> a
     11:14:boolean isPrivateOrStaticInterfaceMethodInvokeThatWillBeDesugared():281:284 -> a
     11:14:boolean canAccessModifyLambdaImplMethod():290 -> a
@@ -140188,10 +140175,10 @@
     22:23:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isDirectTargetedLambdaImplementationMethod(com.android.tools.r8.graph.DexMethodHandle):49:50 -> a
     22:23:boolean canAccessModifyLambdaImplMethod():293 -> a
     24:47:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceOrInterfaceTarget(com.android.tools.r8.graph.ProgramMethod):373:396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/OI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/SI;"}
     48:51:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceOrInterfaceTarget(com.android.tools.r8.graph.ProgramMethod):395:398 -> a
     1:6:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):298:303 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/OI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/SI;"}
     7:7:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):210:210 -> b
     7:7:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):303 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -140213,7 +140200,7 @@
     1:2:com.android.tools.r8.graph.DexProgramClass getLambdaProgramClass():109:110 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D2;"}
     3:23:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):250:270 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/OI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/SI;"}
     24:24:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):252:252 -> c
     25:26:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):360:361 -> c
     25:26:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):256 -> c
@@ -140249,7 +140236,7 @@
     9:21:boolean doesNotNeedAccessor(com.android.tools.r8.graph.ProgramMethod):277 -> d
     22:66:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.needsAccessor(com.android.tools.r8.graph.ProgramMethod):240:284 -> d
     22:66:boolean doesNotNeedAccessor(com.android.tools.r8.graph.ProgramMethod):277 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.HI:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.LI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.AppView appView -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -140263,9 +140250,9 @@
     1:5:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView):775:779 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/x2;Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/y;)V"}
     1:6:com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget create(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):759:764 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/HI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/LI;"}
     7:24:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):787:804 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
     25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     25:25:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):804 -> a
     26:27:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):804:805 -> a
@@ -140293,11 +140280,11 @@
     88:95:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):807:814 -> a
     96:96:com.android.tools.r8.graph.DexMethod getImplementationMethod():820:820 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.II:
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.MI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):516:516 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z)V"}
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.JI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z)V"}
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.NI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.DexMethod implMethod -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -140308,7 +140295,7 @@
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):675:677 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)V"}
     1:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):687:692 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
     7:7:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
     7:7:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
     7:7:void com.android.tools.r8.graph.MethodCollection.resetCaches():76 -> a
@@ -140317,14 +140304,14 @@
     8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):310:310 -> a
     8:8:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):692 -> a
     9:9:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):727:727 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     10:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     11:11:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):727 -> a
     12:20:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):727:735 -> a
     21:21:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):695:695 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     22:22:boolean com.android.tools.r8.graph.DexEncodedMethod.isDirectMethod():537:537 -> a
     22:22:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):695 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -140342,7 +140329,7 @@
     34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     34:34:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):703 -> a
     35:38:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):703:706 -> a
-    39:39:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    39:39:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     39:39:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):706 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):707:707 -> a
@@ -140356,18 +140343,18 @@
     52:52:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):709:709 -> a
     53:53:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
     53:53:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):716 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     54:54:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):716 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     55:55:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):717 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    56:56:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     56:56:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):717 -> a
     57:60:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):718:721 -> a
     61:61:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):720:720 -> a
     62:62:com.android.tools.r8.graph.DexMethod getImplementationMethod():741:741 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.KI:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.OI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.AppView appView -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -140378,7 +140365,7 @@
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):575:577 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y;)V"}
     1:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):586:591 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
     7:7:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
     7:7:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):258 -> a
@@ -140386,21 +140373,21 @@
     8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):259:259 -> a
     8:8:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):591 -> a
     9:9:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):631:631 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     10:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):631 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     11:11:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):631 -> a
     12:20:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):631:639 -> a
     21:21:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     22:22:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
     22:22:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):596 -> a
     23:28:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):597:602 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):604 -> a
     30:33:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):604:607 -> a
-    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     34:34:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):607 -> a
     35:35:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):608:608 -> a
     36:36:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1572:1572 -> a
@@ -140413,64 +140400,64 @@
     47:47:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
     48:48:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
     48:48:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     49:49:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
     50:50:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     50:50:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):618 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    51:51:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):618 -> a
     52:55:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):619:622 -> a
     56:60:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):621:625 -> a
     61:61:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):624:624 -> a
     62:62:com.android.tools.r8.graph.DexMethod getImplementationMethod():645:645 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.LI:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.PI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.DexType exceptionType -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexType,boolean):655:656 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;Z)V"}
     1:1:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:663 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.MI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.QI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):531:531 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z)V"}
     1:3:com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget create(com.android.tools.r8.ir.desugar.LambdaDescriptor):524:526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)Lcom/android/tools/r8/internal/MI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)Lcom/android/tools/r8/internal/QI;"}
     4:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):538:538 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.NI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.RI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.ProgramMethod target -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod,boolean):548:549 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;)V"}
     1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):557:560 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.OI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.SI:
 # {"id":"sourceFile","fileName":"LambdaClass.java"}
     com.android.tools.r8.graph.DexMethod callTarget -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.code.InvokeType invokeType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     boolean isInterface -> c
     boolean hasEnsuredAccessibility -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():462:462 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):470:475 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z)V"}
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mq;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
     1:1:com.android.tools.r8.graph.DexMethod getImplementationMethod():502:502 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
 com.android.tools.r8.ir.desugar.LambdaClassFactorySourceCode -> R8$$REMOVED$$CLASS$$97:
 # {"id":"sourceFile","fileName":"LambdaClassFactorySourceCode.java"}
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.QI:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.UI:
 # {"id":"sourceFile","fileName":"LambdaConstructorSourceCode.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.RI:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.VI:
 # {"id":"sourceFile","fileName":"LambdaDescriptor.java"}
     java.lang.String uniqueId -> a
     com.android.tools.r8.graph.DexMethod mainMethod -> b
@@ -140489,7 +140476,7 @@
     com.android.tools.r8.graph.DexType targetHolder -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VI;"}
     boolean $assertionsDisabled -> k
     1:8:void <clinit>():35:42 -> <clinit>
     9:9:void <init>():58:58 -> <clinit>
@@ -140576,7 +140563,7 @@
     88:91:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):311:314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/h;)Z"}
     92:121:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):326:355 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/VI;"}
     122:123:boolean isEnforcedSignatureValid(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod):468:469 -> a
     122:123:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):351 -> a
     124:133:boolean isSameOrDerivedReturnType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488:497 -> a
@@ -140589,7 +140576,7 @@
     177:207:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):388 -> a
     208:209:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):356:357 -> a
     210:211:void lambda$infer$0(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):392:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/I2;)V"}
     212:218:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):455:461 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;ILjava/lang/Class;)Lcom/android/tools/r8/graph/N2;"}
     219:219:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):456:456 -> a
@@ -140599,7 +140586,7 @@
     226:226:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514 -> a
     227:230:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):513:516 -> a
     231:241:com.android.tools.r8.ir.desugar.LambdaDescriptor rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):524:534 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/xJ;)Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/BJ;)Lcom/android/tools/r8/internal/VI;"}
     242:242:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.map(java.util.function.Function):76:76 -> a
     242:242:com.android.tools.r8.ir.desugar.LambdaDescriptor rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):534 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -140610,12 +140597,12 @@
     247:247:com.android.tools.r8.ir.desugar.LambdaDescriptor rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):534 -> a
     248:251:com.android.tools.r8.ir.desugar.LambdaDescriptor rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):535:538 -> a
     252:252:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):532:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:2:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):296:297 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/VI;"}
     3:3:com.android.tools.r8.graph.DexType lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):534:534 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.XI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.bJ:
 # {"id":"sourceFile","fileName":"LambdaMainMethodSourceCode.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():45:45 -> <clinit>
@@ -140633,7 +140620,7 @@
     47:69:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):124:146 -> a
     70:70:boolean isSameOrAdaptableTo(byte,byte):171:171 -> a
     71:75:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):177:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/UI;)Lcom/android/tools/r8/graph/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/YI;)Lcom/android/tools/r8/graph/G;"}
     76:82:com.android.tools.r8.graph.CfCode buildThrowingCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):329:335 -> a
     76:82:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):182 -> a
     83:83:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> a
@@ -140720,7 +140707,7 @@
     292:292:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):314 -> a
     293:298:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):316:321 -> a
     299:301:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):406:408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;ZLcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/B1;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;ZLcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/B1;)I"}
     302:302:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromDexType(com.android.tools.r8.graph.DexType):106:106 -> a
     302:302:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):408 -> a
     303:308:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):408:413 -> a
@@ -140733,29 +140720,29 @@
     314:314:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):414:414 -> a
     315:315:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):412:412 -> a
     316:362:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):501:547 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/uu;)V"}
     363:367:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):536:540 -> a
     368:371:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):528:531 -> a
     372:372:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):522:522 -> a
     373:416:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):514:557 -> a
     1:25:void internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):427:451 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;ZLcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;ZLcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/B1;)V"}
     26:27:void addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):562:563 -> b
     26:27:void internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):453 -> b
     28:43:void internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):454:469 -> b
     44:45:void addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):568:569 -> b
     44:45:void internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470 -> b
     46:67:void internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):475:496 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.WI:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.aJ:
 # {"id":"sourceFile","fileName":"LambdaMainMethodSourceCode.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:com.android.tools.r8.ir.code.NumericType[] com.android.tools.r8.ir.code.NumericType.values():10:10 -> <clinit>
     1:1:void <clinit>():512 -> <clinit>
     2:2:void <clinit>():512:512 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.qL:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.uL:
 # {"id":"sourceFile","fileName":"LocalStackAllocator.java"}
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.qR:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.uR:
 # {"id":"sourceFile","fileName":"NonEmptyCfInstructionDesugaringCollection.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -140764,11 +140751,11 @@
     java.util.List yieldingDesugarings -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring nestBasedAccessDesugaring -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gQ;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter interfaceMethodRewriter -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HA;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dk;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):69:69 -> <init>
@@ -140779,7 +140766,7 @@
     29:33:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):83:87 -> <init>
     34:34:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.create(com.android.tools.r8.graph.AppView):73:73 -> <init>
     34:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):91 -> <init>
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():685:685 -> <init>
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():684:684 -> <init>
     35:35:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.create(com.android.tools.r8.graph.AppView):73 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):91 -> <init>
@@ -140801,13 +140788,13 @@
     61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarer com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarer.create(com.android.tools.r8.graph.AppView):36:36 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):104 -> <init>
     62:64:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):106:108 -> <init>
-    65:69:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2682:2686 -> <init>
+    65:69:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2688:2692 -> <init>
     65:69:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):108 -> <init>
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2669:2669 -> <init>
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2686 -> <init>
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2675:2675 -> <init>
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2692 -> <init>
     70:70:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):108 -> <init>
     71:71:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):109:109 -> <init>
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2688:2688 -> <init>
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.enableTryWithResourcesDesugaring():2694:2694 -> <init>
     72:72:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):108 -> <init>
     73:74:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):111:112 -> <init>
     75:75:com.android.tools.r8.ir.desugar.records.RecordDesugaring com.android.tools.r8.ir.desugar.records.RecordDesugaring.create(com.android.tools.r8.graph.AppView):78:78 -> <init>
@@ -140823,14 +140810,14 @@
     116:116:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <init>
     116:116:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):145 -> <init>
     117:124:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):145:152 -> <init>
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> <init>
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> <init>
     125:125:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):152 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:126:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> <init>
+    126:126:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> <init>
     126:126:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):152 -> <init>
     127:130:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):154:157 -> <init>
-    131:131:boolean com.android.tools.r8.utils.InternalOptions.canUseDesugarBufferCovariantReturnType():693:693 -> <init>
-    131:131:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarBufferCovariantReturnType():697 -> <init>
+    131:131:boolean com.android.tools.r8.utils.InternalOptions.canUseDesugarBufferCovariantReturnType():692:692 -> <init>
+    131:131:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarBufferCovariantReturnType():696 -> <init>
     131:131:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):157 -> <init>
     132:132:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):158:158 -> <init>
     133:133:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter.hasBackports():98:98 -> <init>
@@ -140847,15 +140834,15 @@
     140:140:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):166 -> <init>
     141:143:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):168:170 -> <init>
     1:3:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):218:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     4:4:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):219:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/internal/C9;)V"}
     5:7:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):225:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     8:8:void lambda$scan$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):226:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/C9;)V"}
     9:18:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):235:244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;)V"}
     19:19:int com.android.tools.r8.graph.CfCode.getMaxStack():250:250 -> a
     19:19:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):244 -> a
     20:21:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):244:245 -> a
@@ -140881,7 +140868,7 @@
     116:116:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):321 -> a
     117:117:void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):323:323 -> a
     118:118:java.util.Collection lambda$desugar$5(boolean,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/pR;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/z9;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/tR;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/graph/G;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/B9;)Ljava/util/Collection;"}
     119:119:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
     119:119:java.util.Collection lambda$desugar$5(boolean,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):283 -> a
     120:129:java.util.Collection lambda$desugar$5(boolean,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):285:294 -> a
@@ -140914,16 +140901,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     162:162:java.util.Collection lambda$desugar$5(boolean,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.IntBox,com.android.tools.r8.cf.code.CfInstruction):311:311 -> a
     163:163:void lambda$desugar$4(com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.cf.code.CfInstruction):307:307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pR;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tR;Lcom/android/tools/r8/internal/B9;)V"}
     164:164:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl.updateBytecodeSize(int):260:260 -> a
     164:164:void lambda$desugar$4(com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.cf.code.CfInstruction):307 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     165:165:void com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl.updateBytecodeSize(int):260:260 -> a
     165:165:void lambda$desugar$4(com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl,com.android.tools.r8.cf.code.CfInstruction):307 -> a
     166:166:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$6(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):328:328 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C9;)Z"}
     167:177:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):360:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Ljava/util/Collection;"}
     178:192:java.util.Collection applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):398:412 -> a
     178:192:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):361 -> a
     193:204:java.util.Collection applyDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.Iterator):403:414 -> a
@@ -140938,19 +140925,19 @@
     257:257:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):436:436 -> a
     258:258:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):433:433 -> a
     259:259:boolean lambda$needsDesugaring$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):437:437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Z"}
     260:260:boolean lambda$needsDesugaring$10(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):442:442 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;)Z"}
     261:261:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,java.util.Iterator,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):453:453 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/graph/C5;Ljava/util/Iterator;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/C5;Ljava/util/Iterator;Lcom/android/tools/r8/internal/C9;)V"}
     262:278:void lambda$verifyNoOtherDesugaringNeeded$12(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):455:471 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;Lcom/android/tools/r8/internal/C9;)V"}
     279:281:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):479:481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     282:283:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):488:489 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     284:284:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):496:496 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     285:285:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):928:928 -> a
     285:285:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):497 -> a
     286:286:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getPostProcessingDesugaringR8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):928:928 -> a
@@ -140966,25 +140953,25 @@
     5:5:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):209:209 -> b
     6:6:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):205:205 -> b
     7:7:void lambda$prepare$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):220:220 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/internal/C9;)V"}
     8:8:void lambda$scan$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):227:227 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/A9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/C9;)V"}
     9:9:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$7(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):335:335 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C9;)Z"}
     10:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):441:443 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Z"}
     13:13:boolean lambda$needsDesugaring$11(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):445:445 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;)Z"}
     1:18:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):328:345 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     19:19:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$8(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):341:341 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A9;)Z"}
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl -> com.android.tools.r8.internal.pR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C9;)Z"}
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl -> com.android.tools.r8.internal.tR:
 # {"id":"sourceFile","fileName":"NonEmptyCfInstructionDesugaringCollection.java"}
     int bytecodeSizeUpperBound -> a
     1:2:void <init>(com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection,int):250:251 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-com.android.tools.r8.ir.desugar.OutlineArrayCloneFromInterfaceMethodDesugaring -> com.android.tools.r8.internal.hV:
+com.android.tools.r8.ir.desugar.OutlineArrayCloneFromInterfaceMethodDesugaring -> com.android.tools.r8.internal.lV:
 # {"id":"sourceFile","fileName":"OutlineArrayCloneFromInterfaceMethodDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -140993,7 +140980,7 @@
     1:13:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):37:49 -> a
     1:13:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.OutlineArrayCloneFromInterfaceMethodDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     14:15:boolean com.android.tools.r8.graph.DexItemFactory.isArrayClone(com.android.tools.r8.graph.DexMethod):1698:1699 -> a
     14:15:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):49 -> a
     14:15:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.OutlineArrayCloneFromInterfaceMethodDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -141005,7 +140992,7 @@
     19:19:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.OutlineArrayCloneFromInterfaceMethodDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     20:20:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     20:20:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.OutlineArrayCloneFromInterfaceMethodDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":23,"2":24,"3":25},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):71 -> a
     21:21:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.OutlineArrayCloneFromInterfaceMethodDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -141018,7 +141005,7 @@
     25:25:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     25:25:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):53 -> a
     26:26:java.util.Collection lambda$compute$2(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     27:27:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     27:27:java.util.Collection lambda$compute$2(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):57 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141051,7 +141038,7 @@
     65:66:com.android.tools.r8.graph.Code createCode(com.android.tools.r8.graph.DexMethod):84 -> a
     67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):152:152 -> a
     67:67:com.android.tools.r8.graph.Code createCode(com.android.tools.r8.graph.DexMethod):84 -> a
-com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.lY:
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.pY:
 # {"id":"sourceFile","fileName":"ProgramAdditions.java"}
     java.util.Map additions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -141083,7 +141070,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/C5;"}
 com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode -> R8$$REMOVED$$CLASS$$98:
 # {"id":"sourceFile","fileName":"ServiceLoaderSourceCode.java"}
-com.android.tools.r8.ir.desugar.TypeRewriter -> com.android.tools.r8.internal.gj0:
+com.android.tools.r8.ir.desugar.TypeRewriter -> com.android.tools.r8.internal.kj0:
 # {"id":"sourceFile","fileName":"TypeRewriter.java"}
     1:1:void <init>():15:15 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
@@ -141098,7 +141085,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/y;)Z"}
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.TypeRewriter$EmptyTypeRewriter -> com.android.tools.r8.internal.ej0:
+com.android.tools.r8.ir.desugar.TypeRewriter$EmptyTypeRewriter -> com.android.tools.r8.internal.ij0:
 # {"id":"sourceFile","fileName":"TypeRewriter.java"}
     1:1:void <init>():103:103 -> <init>
     1:1:com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType):112:112 -> a
@@ -141109,7 +141096,7 @@
     4:4:void forAllRewrittenTypes(java.util.function.Consumer):124:124 -> a
     1:1:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):107:107 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.TypeRewriter$MachineTypeRewriter -> com.android.tools.r8.internal.fj0:
+com.android.tools.r8.ir.desugar.TypeRewriter$MachineTypeRewriter -> com.android.tools.r8.internal.jj0:
 # {"id":"sourceFile","fileName":"TypeRewriter.java"}
     java.util.Map rewriteType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -141117,7 +141104,7 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():47:47 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification):52:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;)V"}
     3:3:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getRewriteDerivedTypeOnly():127:127 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification):54 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification):54:54 -> <init>
@@ -141131,51 +141118,51 @@
     9:9:void forAllRewrittenTypes(java.util.function.Consumer):99:99 -> a
     1:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):59:69 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover -> com.android.tools.r8.internal.xk0:
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover -> com.android.tools.r8.internal.Bk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     java.util.List matchers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):386:387 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     3:4:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):144:145 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.AppView):388 -> <init>
-    5:5:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> <init>
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609 -> <init>
+    5:5:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> <init>
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615 -> <init>
     5:5:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):145 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView):388 -> <init>
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2609:2609 -> <init>
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokeCustom():2615:2615 -> <init>
     6:6:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):145 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView):388 -> <init>
     7:7:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):146:146 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.AppView):388 -> <init>
     8:9:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):194:195 -> <init>
     8:9:void <init>(com.android.tools.r8.graph.AppView):389 -> <init>
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2577:2577 -> <init>
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.canUseInvokePolymorphicOnMethodHandle():2583:2583 -> <init>
     10:10:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):195 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView):389 -> <init>
     11:11:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):196:196 -> <init>
     11:11:void <init>(com.android.tools.r8.graph.AppView):389 -> <init>
     12:13:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):251:252 -> <init>
     12:13:void <init>(com.android.tools.r8.graph.AppView):390 -> <init>
-    14:14:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2589:2589 -> <init>
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2593 -> <init>
+    14:14:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2595:2595 -> <init>
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2599 -> <init>
     14:14:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):252 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.AppView):390 -> <init>
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2593:2593 -> <init>
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodHandle():2599:2599 -> <init>
     15:15:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):252 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.AppView):390 -> <init>
     16:16:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):253:253 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView):390 -> <init>
     17:18:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):296:297 -> <init>
     17:18:void <init>(com.android.tools.r8.graph.AppView):391 -> <init>
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2601:2601 -> <init>
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantMethodType():2607:2607 -> <init>
     19:19:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):297 -> <init>
     19:19:void <init>(com.android.tools.r8.graph.AppView):391 -> <init>
     20:20:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):298:298 -> <init>
     20:20:void <init>(com.android.tools.r8.graph.AppView):391 -> <init>
     21:21:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):341:341 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.AppView):392 -> <init>
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantDynamic():2617:2617 -> <init>
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.canUseConstantDynamic():2623:2623 -> <init>
     22:22:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher.addIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):342 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:22:void <init>(com.android.tools.r8.graph.AppView):392 -> <init>
@@ -141183,8 +141170,8 @@
     23:23:void <init>(com.android.tools.r8.graph.AppView):392 -> <init>
     24:24:void <init>(com.android.tools.r8.graph.AppView):393:393 -> <init>
     1:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):398:404 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher -> com.android.tools.r8.internal.rk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher -> com.android.tools.r8.internal.vk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):348:348 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -141193,13 +141180,13 @@
     2:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):359:363 -> a
     2:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     7:7:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):379 -> a
     8:8:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     9:11:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):374:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():114:114 -> a
     12:12:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):377 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141208,11 +141195,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):377 -> a
     14:14:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):377:377 -> a
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher -> com.android.tools.r8.internal.sk0:
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher -> com.android.tools.r8.internal.wk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):258:258 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2589:2589 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodHandleApiLevel():2595:2595 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):258 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):258:258 -> <init>
     1:1:com.android.tools.r8.errors.UnsupportedFeatureDiagnostic makeDiagnostic(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):263:263 -> a
@@ -141220,18 +141207,18 @@
     2:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):269:272 -> a
     2:5:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     6:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.compute(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):288 -> a
     7:7:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodHandleMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     8:11:java.util.Collection lambda$compute$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):283:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher -> com.android.tools.r8.internal.tk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher -> com.android.tools.r8.internal.xk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):303:303 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2597:2597 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.constantMethodTypeApiLevel():2603:2603 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):303 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):303:303 -> <init>
     1:1:com.android.tools.r8.errors.UnsupportedFeatureDiagnostic makeDiagnostic(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):308:308 -> a
@@ -141239,14 +141226,14 @@
     2:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):314:317 -> a
     2:5:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     6:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.compute(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):333 -> a
     7:7:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$ConstMethodTypeMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     8:11:java.util.Collection lambda$compute$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):328:331 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InstructionMatcher -> com.android.tools.r8.internal.uk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InstructionMatcher -> com.android.tools.r8.internal.yk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -141260,7 +141247,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/String;Lcom/android/tools/r8/internal/y2;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.utils.AndroidApiLevel):60:65 -> <init>
     com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     com.android.tools.r8.errors.UnsupportedFeatureDiagnostic makeDiagnostic(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/MethodPosition;)Lcom/android/tools/r8/errors/UnsupportedFeatureDiagnostic;"}
     1:1:void report(com.android.tools.r8.graph.ProgramMethod):76:76 -> a
@@ -141276,7 +141263,7 @@
     10:10:void report(com.android.tools.r8.graph.ProgramMethod):81 -> a
     11:11:void report(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     12:13:void invokeThrowingStub(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):89:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/uu;)V"}
     14:14:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations.uncheckedGetMethod():248:248 -> a
     14:14:void invokeThrowingStub(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):92 -> a
     15:16:void invokeThrowingStub(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):94:95 -> a
@@ -141286,15 +141273,15 @@
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.add(java.lang.Object[]):832:832 -> a
     18:18:void invokeThrowingStub(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):93 -> a
     19:24:com.android.tools.r8.cf.code.CfConstString createMessageString():100:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e9;"}
     25:25:com.android.tools.r8.cf.code.CfConstString createMessageString():103:103 -> a
     26:27:void pop(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):112:113 -> a
     26:27:void lambda$pop$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexType):119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/I2;)V"}
     28:28:void pop(com.android.tools.r8.graph.DexProto,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/uu;)V"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder pushReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):124:124 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/uu;"}
     2:4:com.android.tools.r8.cf.code.CfInstruction createDefaultValueForType(com.android.tools.r8.graph.DexType):131:133 -> b
     2:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder pushReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):125 -> b
     5:5:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromDexType(com.android.tools.r8.graph.DexType):106:106 -> b
@@ -141303,11 +141290,11 @@
     6:9:com.android.tools.r8.cf.code.CfInstruction createDefaultValueForType(com.android.tools.r8.graph.DexType):133:136 -> b
     6:9:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder pushReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):125 -> b
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder pushReturnValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):125:125 -> b
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher -> com.android.tools.r8.internal.vk0:
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher -> com.android.tools.r8.internal.zk0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):151:151 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2605:2605 -> <init>
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokeCustomApiLevel():2611:2611 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):151 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):151:151 -> <init>
     1:1:com.android.tools.r8.errors.UnsupportedFeatureDiagnostic makeDiagnostic(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):156:156 -> a
@@ -141315,13 +141302,13 @@
     2:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):162:166 -> a
     2:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     7:7:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):186 -> a
     8:8:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokeDynamicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     9:10:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):177:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     11:11:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.cf.code.CfInvokeDynamic.getCallSite():151:151 -> a
     11:11:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141332,11 +141319,11 @@
     16:16:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():118:118 -> a
     16:16:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):183 -> a
     17:18:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):183:184 -> a
-com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher -> com.android.tools.r8.internal.wk0:
+com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher -> com.android.tools.r8.internal.Ak0:
 # {"id":"sourceFile","fileName":"UnrepresentableInDexInstructionRemover.java"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):201:202 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2573:2573 -> <init>
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.invokePolymorphicOnMethodHandleApiLevel():2579:2579 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView):202 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView):201:201 -> <init>
     1:1:com.android.tools.r8.errors.UnsupportedFeatureDiagnostic makeDiagnostic(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):211:211 -> a
@@ -141344,7 +141331,7 @@
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):217:217 -> a
     2:2:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     3:3:boolean isPolymorphicInvoke(com.android.tools.r8.cf.code.CfInvoke):206:206 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):218 -> a
     3:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -141355,7 +141342,7 @@
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):243 -> a
     6:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.UnrepresentableInDexInstructionRemover$InvokePolymorphicMatcher.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     7:11:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):232:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     12:13:void com.android.tools.r8.ir.desugar.UnrepresentableInDexInstructionRemover$InstructionMatcher.pop(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):112:113 -> a
     12:13:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):236 -> a
     14:17:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):238:241 -> a
@@ -141376,7 +141363,7 @@
     6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):65:65 -> <init>
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.builder():35:35 -> a
     1:1:com.android.tools.r8.graph.Code lambda$setCodeForFieldInstruction$9(boolean,com.android.tools.r8.graph.DexField,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     2:8:com.android.tools.r8.graph.Code lambda$setCodeForFieldInstruction$9(boolean,com.android.tools.r8.graph.DexField,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):309:315 -> a
     9:13:com.android.tools.r8.graph.Code lambda$setCodeForFieldInstruction$9(boolean,com.android.tools.r8.graph.DexField,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):314:318 -> a
     14:14:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setSourceMethod(com.android.tools.r8.graph.DexMethod):73:73 -> a
@@ -141398,13 +141385,13 @@
     26:26:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setInstanceField(com.android.tools.r8.graph.DexField):62:62 -> a
     26:26:void lambda$setCodeForFieldInstruction$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.synthetic.FieldAccessorBuilder):312 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ap;)V"}
     27:27:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setInstanceField(com.android.tools.r8.graph.DexField):63:63 -> a
     27:27:void lambda$setCodeForFieldInstruction$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.synthetic.FieldAccessorBuilder):312 -> a
     28:29:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):71:72 -> a
     28:29:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ApiInvokeOutlinerDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     30:30:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.AppView.computedMinApiLevel():1384:1384 -> a
     30:30:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):72 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141413,7 +141400,7 @@
     31:34:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ApiInvokeOutlinerDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     35:35:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     35:35:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ApiInvokeOutlinerDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":37,"2":38,"3":39},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":37,"2":38,"3":39},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     36:36:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     36:36:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93 -> a
     36:36:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ApiInvokeOutlinerDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -141424,7 +141411,7 @@
     39:39:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     39:39:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):76 -> a
     40:40:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     41:43:java.util.Collection desugarLibraryCall(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):196:198 -> a
     41:43:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):86 -> a
     44:44:boolean com.android.tools.r8.cf.code.CfInstruction.isInstanceOf():0:0 -> a
@@ -141441,7 +141428,7 @@
     56:56:com.android.tools.r8.graph.DexEncodedMember lambda$getComputedApiLevelInstructionOnHolderWithMinApi$1(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexClass):144:144 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/graph/h1;"}
     57:60:com.android.tools.r8.graph.DexReference getReferenceFromInstruction(com.android.tools.r8.cf.code.CfInstruction):153:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/graph/F2;"}
     61:61:boolean com.android.tools.r8.cf.code.CfInstruction.isInstanceOf():0:0 -> a
     61:61:com.android.tools.r8.graph.DexReference getReferenceFromInstruction(com.android.tools.r8.cf.code.CfInstruction):157 -> a
     62:62:com.android.tools.r8.graph.DexReference getReferenceFromInstruction(com.android.tools.r8.cf.code.CfInstruction):158:158 -> a
@@ -141451,12 +141438,12 @@
     67:83:com.android.tools.r8.graph.DexEncodedMember simpleLookupInClassHierarchy(com.android.tools.r8.graph.DexLibraryClass,java.util.function.Function):170:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;Ljava/util/function/Function;)Lcom/android/tools/r8/graph/h1;"}
     84:84:com.android.tools.r8.utils.TraversalContinuation lambda$simpleLookupInClassHierarchy$3(java.util.function.Function,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Oh0;"}
     85:85:com.android.tools.r8.utils.TraversalContinuation$Break com.android.tools.r8.utils.TraversalContinuation.doBreak(java.lang.Object):152:152 -> a
     85:85:com.android.tools.r8.utils.TraversalContinuation lambda$simpleLookupInClassHierarchy$3(java.util.function.Function,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):182 -> a
     86:86:com.android.tools.r8.utils.TraversalContinuation lambda$simpleLookupInClassHierarchy$3(java.util.function.Function,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):184:184 -> a
     87:91:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):213:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Le;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/C5;"}
     92:92:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     92:92:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):218 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141466,7 +141453,7 @@
     96:98:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureOutlineMethod$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming):224:226 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     99:99:void lambda$ensureOutlineMethod$5(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/synthesis/M;)V"}
     100:100:com.android.tools.r8.graph.MethodAccessFlags$Builder com.android.tools.r8.graph.MethodAccessFlags.builder():65:65 -> a
     100:100:void lambda$ensureOutlineMethod$5(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):232 -> a
     101:101:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():372:372 -> a
@@ -141500,7 +141487,7 @@
     119:124:void lambda$ensureOutlineMethod$5(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):247:252 -> a
     125:125:void lambda$ensureOutlineMethod$5(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):250:250 -> a
     126:129:void setCodeForInvoke(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):261:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)V"}
     130:132:boolean verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):360:362 -> a
     130:132:void setCodeForInvoke(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):265 -> a
     133:134:void setCodeForInvoke(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):265:266 -> a
@@ -141516,7 +141503,7 @@
     139:139:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     139:139:void setCodeForInvoke(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):269 -> a
     140:142:void setCodeForFieldInstruction(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):290:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/C5;)V"}
     143:143:boolean com.android.tools.r8.cf.code.CfInstruction.isInstanceFieldPut():0:0 -> a
     143:143:void setCodeForFieldInstruction(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):294 -> a
     144:144:boolean com.android.tools.r8.cf.code.CfInstruction.isInstanceFieldGet():0:0 -> a
@@ -141529,7 +141516,7 @@
     157:157:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     157:157:void setCodeForFieldInstruction(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):307 -> a
     158:161:void setCodeForCheckCast(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfCheckCast,com.android.tools.r8.graph.DexItemFactory):324:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/K8;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/M8;Lcom/android/tools/r8/graph/B1;)V"}
     162:162:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     162:162:void setCodeForCheckCast(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfCheckCast,com.android.tools.r8.graph.DexItemFactory):327 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141552,7 +141539,7 @@
     173:173:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.CheckCastSourceCode.generateCfCode():39 -> a
     173:173:com.android.tools.r8.graph.Code lambda$setCodeForCheckCast$10(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):331 -> a
     174:177:void setCodeForInstanceOf(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInstanceOf,com.android.tools.r8.graph.DexItemFactory):336:339 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/y9;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/A9;Lcom/android/tools/r8/graph/B1;)V"}
     178:178:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     178:178:void setCodeForInstanceOf(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInstanceOf,com.android.tools.r8.graph.DexItemFactory):339 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141560,7 +141547,7 @@
     180:180:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     180:180:void setCodeForInstanceOf(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfInstanceOf,com.android.tools.r8.graph.DexItemFactory):340 -> a
     181:184:void setCodeForConstClass(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfConstClass,com.android.tools.r8.graph.DexItemFactory):348:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/V8;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/X8;Lcom/android/tools/r8/graph/B1;)V"}
     185:185:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     185:185:void setCodeForConstClass(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.cf.code.CfConstClass,com.android.tools.r8.graph.DexItemFactory):351 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141570,11 +141557,11 @@
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setStaticField(com.android.tools.r8.graph.DexField):78:78 -> b
     1:1:void lambda$setCodeForFieldInstruction$8(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.synthetic.FieldAccessorBuilder):313 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/ap;)V"}
     2:2:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.setStaticField(com.android.tools.r8.graph.DexField):79:79 -> b
     2:2:void lambda$setCodeForFieldInstruction$8(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.synthetic.FieldAccessorBuilder):313 -> b
     3:4:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelInstructionOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):98:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/androidapi/f;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/androidapi/f;"}
     5:5:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.AppView.computedMinApiLevel():1384:1384 -> b
     5:5:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelInstructionOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):99 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -141662,13 +141649,13 @@
 # {"id":"sourceFile","fileName":"ApiInvokeOutlinerDesugaringEventConsumer.java"}
     void acceptOutlinedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer -> com.android.tools.r8.internal.f5:
+com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer -> com.android.tools.r8.internal.h5:
 # {"id":"sourceFile","fileName":"BackportedMethodDesugaringEventConsumer.java"}
     void acceptBackportedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptBackportedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.s5:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.u5:
 # {"id":"sourceFile","fileName":"BackportedMethods.java"}
     1:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):2242:2258 -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/G;"}
@@ -143120,13 +143107,13 @@
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> z0
     18:18:com.android.tools.r8.graph.CfCode MethodMethods_getParameterCount(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):5862 -> z0
     19:19:com.android.tools.r8.graph.CfCode MethodMethods_getParameterCount(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):5863:5863 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.S6:
 # {"id":"sourceFile","fileName":"BooleanMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q9;)Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;)Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.de:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S9;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.fe:
 # {"id":"sourceFile","fileName":"CollectionMethodGenerators.java"}
     1:2:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):41:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;ILcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/G;"}
@@ -143153,117 +143140,117 @@
     19:20:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):63 -> a
     21:21:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):152:152 -> a
     21:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):63 -> a
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.ge:
 # {"id":"sourceFile","fileName":"CollectionMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToCollectionMethod(java.lang.String):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/m5;"}
     2:4:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToCollectionMethod$0(java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):29:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
 com.android.tools.r8.ir.desugar.backports.ContentProviderClientMethodRewrites -> R8$$REMOVED$$CLASS$$99:
 # {"id":"sourceFile","fileName":"ContentProviderClientMethodRewrites.java"}
-com.android.tools.r8.ir.desugar.backports.ContentProviderClientMethodRewrites$1 -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.ir.desugar.backports.ContentProviderClientMethodRewrites$1 -> com.android.tools.r8.internal.Vg:
 # {"id":"sourceFile","fileName":"ContentProviderClientMethodRewrites.java"}
     1:1:void <init>():26:26 -> <init>
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.backports.DrmManagerClientMethodRewrites -> com.android.tools.r8.internal.rm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.backports.DrmManagerClientMethodRewrites -> com.android.tools.r8.internal.tm:
 # {"id":"sourceFile","fileName":"DrmManagerClientMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteClose():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteClose$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.rq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.tq:
 # {"id":"sourceFile","fileName":"FloatMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteHashCode():16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> a
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.RL:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.VL:
 # {"id":"sourceFile","fileName":"LongMethodRewrites.java"}
     1:1:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteCompare$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteCompare():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
-com.android.tools.r8.ir.desugar.backports.MediaDrmMethodRewrites -> com.android.tools.r8.internal.WM:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
+com.android.tools.r8.ir.desugar.backports.MediaDrmMethodRewrites -> com.android.tools.r8.internal.aN:
 # {"id":"sourceFile","fileName":"MediaDrmMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteClose():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteClose$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.MediaMetadataRetrieverMethodRewrites -> com.android.tools.r8.internal.XM:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.MediaMetadataRetrieverMethodRewrites -> com.android.tools.r8.internal.bN:
 # {"id":"sourceFile","fileName":"MediaMetadataRetrieverMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteClose():18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteClose$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.vS:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.zS:
 # {"id":"sourceFile","fileName":"NumericMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToAddInstruction():29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:3:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToAddInstruction$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):30:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToInvokeMath():19:19 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToInvokeMath$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):20:23 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.uS:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.yS:
 # {"id":"sourceFile","fileName":"NumericMethodRewrites.java"}
     1:1:void <init>():36:36 -> <init>
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.CU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.GU:
 # {"id":"sourceFile","fileName":"ObjectsMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToArraysHashCode():22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteToArraysHashCode$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.BU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.FU:
 # {"id":"sourceFile","fileName":"ObjectsMethodRewrites.java"}
     1:1:void <init>():27:27 -> <init>
     1:2:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):33:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.RU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.VU:
 # {"id":"sourceFile","fileName":"OptionalMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter createRewriter(java.util.function.Function,java.lang.String):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/String;)Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/String;)Lcom/android/tools/r8/internal/m5;"}
     2:5:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):21:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/String;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/String;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
     6:6:com.android.tools.r8.cf.code.CfInstruction lambda$createRewriter$0(java.util.function.Function,java.lang.String,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):23:23 -> a
     7:7:com.android.tools.r8.graph.DexType lambda$rewriteDoubleOrElseGet$2(com.android.tools.r8.graph.DexItemFactory):33:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     8:8:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteDoubleOrElseGet():33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     1:1:com.android.tools.r8.graph.DexType lambda$rewriteIntOrElseGet$3(com.android.tools.r8.graph.DexItemFactory):37:37 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteIntOrElseGet():37:37 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     1:1:com.android.tools.r8.graph.DexType lambda$rewriteLongOrElseGet$4(com.android.tools.r8.graph.DexItemFactory):41:41 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteLongOrElseGet():41:41 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     1:1:com.android.tools.r8.graph.DexType lambda$rewriteOrElseGet$1(com.android.tools.r8.graph.DexItemFactory):29:29 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteOrElseGet():29:29 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
-com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.Dc0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.Hc0:
 # {"id":"sourceFile","fileName":"SparseArrayMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSet():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteSet$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.backports.TypedArrayMethodRewrites -> com.android.tools.r8.internal.uj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.backports.TypedArrayMethodRewrites -> com.android.tools.r8.internal.yj0:
 # {"id":"sourceFile","fileName":"TypedArrayMethodRewrites.java"}
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteClose():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/m5;"}
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteClose$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/z9;"}
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.pg:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/B9;"}
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.rg:
 # {"id":"sourceFile","fileName":"ConstantDynamicClass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ug;"}
     com.android.tools.r8.graph.DexMethod getConstMethod -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass$Behaviour behaviour -> d
@@ -143280,7 +143267,7 @@
     1:1:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic):96:96 -> <init>
     1:1:void com.android.tools.r8.internal.ConstantDynamicClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfConstDynamic):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/W8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Y8;)V"}
     2:11:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic):89:98 -> <init>
     2:11:void com.android.tools.r8.internal.ConstantDynamicClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfConstDynamic):0 -> <init>
     12:12:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference com.android.tools.r8.cf.code.CfConstDynamic.getReference():60:60 -> <init>
@@ -143410,7 +143397,7 @@
     98:98:void com.android.tools.r8.internal.ConstantDynamicClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfConstDynamic):0 -> <init>
     99:99:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic):0:0 -> <init>
     99:99:void com.android.tools.r8.internal.ConstantDynamicClass.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfConstDynamic):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":228,"2":229,"3":230},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":228,"2":229,"3":230},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     100:100:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():91:91 -> <init>
     100:100:void synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):248 -> <init>
     100:100:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):225 -> <init>
@@ -143683,7 +143670,7 @@
     230:230:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic):156 -> <init>
     1:2:boolean shouldRewriteBootstrapMethodSignature():169:170 -> a
     1:2:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):361 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sg;)V"}
     3:11:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):361:369 -> a
     12:12:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
     12:12:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
@@ -143692,14 +143679,14 @@
     13:13:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):259:259 -> a
     13:13:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):369 -> a
     14:14:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):394:394 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     15:15:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):394 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     16:16:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):394 -> a
     17:28:void rewriteBootstrapMethodSignatureIfNeeded(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):394:405 -> a
     29:29:java.util.Collection desugarConstDynamicInstruction(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/jc0;"}
     30:30:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference com.android.tools.r8.cf.code.CfConstDynamic.getReference():60:60 -> a
     30:30:java.util.Collection desugarConstDynamicInstruction(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -143732,7 +143719,7 @@
     57:57:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):429 -> a
     58:61:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):430:433 -> a
     62:63:com.android.tools.r8.cf.code.CfInstruction lambda$adaptCode$1(com.android.tools.r8.cf.code.CfInstruction):423:424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/B9;"}
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):372:372 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     2:2:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> b
@@ -143746,7 +143733,7 @@
     7:7:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):377 -> b
     8:11:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):377:380 -> b
-    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> b
+    12:12:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> b
     12:12:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):380 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):381:381 -> b
@@ -143758,21 +143745,21 @@
     17:17:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):383:383 -> b
     18:18:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> b
     18:18:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):384 -> b
-    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     19:19:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):384 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> b
     20:20:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):385 -> b
-    21:21:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    21:21:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     21:21:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):385 -> b
     22:23:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):386:387 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer -> com.android.tools.r8.internal.sg:
 # {"id":"sourceFile","fileName":"ConstantDynamicDesugaringEventConsumer.java"}
     void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptConstantDynamicRewrittenBootstrapMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.tg:
 # {"id":"sourceFile","fileName":"ConstantDynamicInstructionDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -143799,7 +143786,7 @@
     9:9:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):54:54 -> a
     9:9:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ConstantDynamicInstructionDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     10:10:boolean com.android.tools.r8.cf.code.CfInstruction.isConstDynamic():0:0 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):54 -> a
     10:10:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ConstantDynamicInstructionDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -143838,7 +143825,7 @@
     27:57:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ConstantDynamicInstructionDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     58:58:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     58:58:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ConstantDynamicInstructionDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):114 -> a
     59:59:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.ConstantDynamicInstructionDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -143849,15 +143836,15 @@
     62:62:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     62:62:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97 -> a
     63:63:java.util.Collection lambda$compute$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     64:65:java.util.Collection desugarConstDynamicInstruction(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):133:134 -> a
     64:65:java.util.Collection lambda$compute$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):107 -> a
     66:67:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):120:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     68:68:java.util.Map lambda$ensureConstantDynamicClass$2(com.android.tools.r8.graph.DexType):153:153 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Map;"}
     69:70:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass createConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):176:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/internal/pg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/internal/rg;"}
     71:71:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     71:71:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass createConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -143871,16 +143858,16 @@
     90:90:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createConstantDynamicClass$3(com.android.tools.r8.synthesis.SyntheticNaming):181:181 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     91:91:void lambda$createConstantDynamicClass$4(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/W8;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Y8;Lcom/android/tools/r8/synthesis/V;)V"}
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription report(java.lang.String,com.android.tools.r8.graph.ProgramMethod):40:40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;)Lcom/android/tools/r8/internal/wk;"}
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):103:103 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription report(java.lang.String,com.android.tools.r8.graph.ProgramMethod):41 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription report(java.lang.String,com.android.tools.r8.graph.ProgramMethod):48:48 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugarDescription report(java.lang.String,com.android.tools.r8.graph.ProgramMethod):48 -> b
     5:7:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):151:153 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W8;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/internal/pg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y8;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/internal/rg;"}
     8:8:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):152:152 -> b
     9:9:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference com.android.tools.r8.cf.code.CfConstDynamic.getReference():60:60 -> b
     9:9:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):155 -> b
@@ -143892,7 +143879,7 @@
     18:18:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference com.android.tools.r8.cf.code.CfConstDynamic.getReference():60:60 -> b
     18:18:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):163 -> b
     19:21:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):163:165 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.ug:
 # {"id":"sourceFile","fileName":"ConstantDynamicReference.java"}
     int symbolicReferenceId -> b
     com.android.tools.r8.graph.DexString name -> c
@@ -143910,11 +143897,11 @@
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():22:22 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int lambda$specify$0(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sg;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ug;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):30:30 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:7:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):40:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/og;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/sg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qg;Lcom/android/tools/r8/graph/c4;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ug;"}
     8:8:java.lang.String com.android.tools.r8.org.objectweb.asm.ConstantDynamic.getName():80:80 -> a
     8:8:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.util.function.Supplier):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -143956,16 +143943,16 @@
     1:6:boolean equals(java.lang.Object):59:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:java.lang.String toString():92:92 -> toString
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender -> com.android.tools.r8.internal.Ek:
 # {"id":"sourceFile","fileName":"DesugaredLibraryAmender.java"}
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/d1;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.androidapi.ComputedApiLevel minAPILevel -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/f;"}
     1:4:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,com.android.tools.r8.androidapi.ComputedApiLevel):57:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/androidapi/f;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/androidapi/f;)V"}
     1:1:void run(com.android.tools.r8.graph.AppView):36:36 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:2:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getAmendLibraryMethods():200:200 -> a
@@ -144014,7 +144001,7 @@
     48:48:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     48:48:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):100 -> a
     49:50:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):101:102 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    51:51:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     51:51:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:53:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):104:105 -> a
@@ -144030,11 +144017,11 @@
     78:80:com.android.tools.r8.graph.DexLibraryClass getLibraryClass(com.android.tools.r8.graph.DexReference):114:116 -> a
     81:93:com.android.tools.r8.graph.DexLibraryClass getLibraryClass(com.android.tools.r8.graph.DexReference):115:127 -> a
     94:94:com.android.tools.r8.graph.DexLibraryClass getLibraryClass(com.android.tools.r8.graph.DexReference):123:123 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.Vk:
 # {"id":"sourceFile","fileName":"DesugaredLibrarySpecification.java"}
     java.lang.String getJsonSource() -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/aM;"}
     boolean isLibraryCompilation() -> b
     java.util.Set getMaintainTypeOrPrefixForTesting() -> c
     com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel() -> d
@@ -144042,16 +144029,16 @@
     java.util.List getExtraKeepRules() -> e
     java.lang.String getSynthesizedLibraryClassesPackagePrefix() -> f
     boolean isEmpty() -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Wk:
 # {"id":"sourceFile","fileName":"DesugaredLibrarySpecificationParser.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecification(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;ZI)Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;ZI)Lcom/android/tools/r8/internal/Vk;"}
     2:2:void lambda$parseDesugaredLibrarySpecification$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;)V"}
     3:10:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecificationforTesting(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int,java.util.function.Consumer):43:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;ZILjava/util/function/Consumer;)Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;ZILjava/util/function/Consumer;)Lcom/android/tools/r8/internal/Vk;"}
     11:11:void ensureConfigurationFormatVersion(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):101:101 -> a
     11:11:boolean isMachineSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):84 -> a
     11:11:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecificationforTesting(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int,java.util.function.Consumer):58 -> a
@@ -144092,7 +144079,7 @@
     43:43:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecificationforTesting(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int,java.util.function.Consumer):52 -> a
     44:44:void ensureConfigurationFormatVersion(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):101:101 -> a
     44:44:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;)Z"}
     45:45:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> a
     45:45:void ensureConfigurationFormatVersion(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144113,18 +144100,18 @@
     52:52:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
     52:52:void ensureConfigurationFormatVersion(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):102 -> a
     52:52:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):92 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.oh0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.sh0:
 # {"id":"sourceFile","fileName":"TopLevelFlagsBuilder.java"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder setSupportAllCallbacksFromLibrary(boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/oh0;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.Ak:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/sh0;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.Ck:
 # {"id":"sourceFile","fileName":"DesugaredLibraryAPICallbackSynthesizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zk;"}
     java.util.Set trackedCallBackAPIs -> d
     java.util.function.Predicate isLiveMethod -> e
     boolean $assertionsDisabled -> f
@@ -144132,7 +144119,7 @@
     1:9:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):42:50 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Predicate;)V"}
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     2:3:com.android.tools.r8.contexts.CompilationContext$MainThreadContext com.android.tools.r8.contexts.CompilationContext$ProcessorContext.createMainThreadContext():101:102 -> a
     2:3:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):61 -> a
     4:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):62:63 -> a
@@ -144175,12 +144162,12 @@
     33:33:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     34:46:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):129:141 -> a
     34:46:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
-    47:47:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    47:47:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     47:47:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):141 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:47:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     48:48:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:48:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):141 -> a
     48:48:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
@@ -144197,12 +144184,12 @@
     51:51:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     52:53:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):145:146 -> a
     52:53:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
-    54:54:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    54:54:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     54:54:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     54:54:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     55:55:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):146 -> a
     55:55:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
@@ -144216,13 +144203,13 @@
     58:74:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:173 -> a
     58:74:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):149 -> a
     58:74:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
-    75:75:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    75:75:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     75:75:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     75:75:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):149 -> a
     75:75:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     76:76:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    76:76:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    76:76:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     76:76:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):173 -> a
     76:76:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):149 -> a
@@ -144291,24 +144278,24 @@
     114:115:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):91 -> a
     116:116:void generateTrackingWarnings():207:207 -> a
     116:116:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):92 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Dk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryAPIConverter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Set precedingDesugarings -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set emulatedMethods -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zk;"}
     java.util.Set trackedAPIs -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():34:34 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):65:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ev;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gv;Ljava/util/Set;)V"}
     1:4:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90:93 -> a
     1:4:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryAPIConverter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     5:11:boolean invokeNeedsDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):79:85 -> a
     5:11:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):94 -> a
     5:11:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryAPIConverter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -144390,7 +144377,7 @@
     56:58:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryAPIConverter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     59:59:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryAPIConverter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":61,"2":62,"3":63},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":61,"2":62,"3":63},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     60:60:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     60:60:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):115 -> a
     60:60:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryAPIConverter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -144401,7 +144388,7 @@
     63:63:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     63:63:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):98 -> a
     64:64:boolean isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk;Lcom/android/tools/r8/graph/y;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Zk;Lcom/android/tools/r8/graph/y;)Z"}
     65:65:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     65:65:boolean isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144413,9 +144400,9 @@
     69:69:boolean isVivifiedType(com.android.tools.r8.graph.DexType):125:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     70:70:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Z"}
     71:71:boolean lambda$isAlreadyDesugared$2(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;)Z"}
     72:86:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):197:211 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/w2;"}
     87:97:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):220:230 -> a
@@ -144425,7 +144412,7 @@
     101:104:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):237:240 -> a
     105:107:java.util.Collection rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):251:253 -> a
     105:107:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     108:114:boolean shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):281:287 -> a
     108:114:java.util.Collection rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):255 -> a
     108:114:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):108 -> a
@@ -144474,18 +144461,18 @@
     144:144:java.util.Collection rewriteLibraryInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):267:267 -> a
     144:144:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):108 -> a
     1:1:void generateTrackingWarnings():215:215 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider -> com.android.tools.r8.internal.Ek:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider -> com.android.tools.r8.internal.Gk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryConversionCfProvider.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zk;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():56:56 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer):63:66 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Zk;)V"}
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     1:1:void lambda$addOutlineParameterConversionInstructions$7(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144502,7 +144489,7 @@
     7:7:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     7:7:void lambda$generateOutlinedAPIConversion$4(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):244 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/synthesis/M;)V"}
     8:8:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():91:91 -> a
     8:8:void lambda$generateOutlinedAPIConversion$4(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):245 -> a
     9:9:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):99:99 -> a
@@ -144515,7 +144502,7 @@
     13:15:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedWrapperConversionWithoutCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):134:136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
     16:19:com.android.tools.r8.graph.ProgramMethod generateCallbackConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer,com.android.tools.r8.contexts.CompilationContext$MainThreadContext):185:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pa;Lcom/android/tools/r8/internal/Fe;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ra;Lcom/android/tools/r8/internal/He;)Lcom/android/tools/r8/graph/C5;"}
     20:28:com.android.tools.r8.graph.ProgramMethod generateCallbackConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer,com.android.tools.r8.contexts.CompilationContext$MainThreadContext):187:195 -> a
     29:36:com.android.tools.r8.graph.ProgramMethod generateCallbackConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer,com.android.tools.r8.contexts.CompilationContext$MainThreadContext):194:201 -> a
     37:37:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):596:596 -> a
@@ -144524,9 +144511,9 @@
     38:38:com.android.tools.r8.graph.ProgramMethod generateCallbackConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer,com.android.tools.r8.contexts.CompilationContext$MainThreadContext):201 -> a
     39:55:com.android.tools.r8.graph.ProgramMethod generateCallbackConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer,com.android.tools.r8.contexts.CompilationContext$MainThreadContext):202:218 -> a
     56:56:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$generateCallbackConversion$0(com.android.tools.r8.contexts.CompilationContext$MainThreadContext,com.android.tools.r8.graph.DexProgramClass):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Le;"}
     57:58:com.android.tools.r8.graph.ProgramMethod generateOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):227:228 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/C5;"}
     59:59:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):3141:3141 -> a
     59:59:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):3145 -> a
     59:59:com.android.tools.r8.graph.ProgramMethod generateOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):228 -> a
@@ -144543,14 +144530,14 @@
     72:75:com.android.tools.r8.graph.ProgramMethod generateOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):237:240 -> a
     76:98:com.android.tools.r8.graph.ProgramMethod generateOutlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):238:260 -> a
     99:99:com.android.tools.r8.graph.Code lambda$generateOutlinedAPIConversion$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     100:100:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):596:596 -> a
     100:100:com.android.tools.r8.graph.Code lambda$generateOutlinedAPIConversion$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):253 -> a
     101:101:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):591:591 -> a
     101:101:com.android.tools.r8.graph.Code lambda$generateOutlinedAPIConversion$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):253 -> a
     102:106:com.android.tools.r8.graph.Code lambda$generateOutlinedAPIConversion$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):255:259 -> a
     107:114:java.util.Collection generateInlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):272:279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Ljava/util/ArrayList;"}
     115:127:java.util.Collection generateInlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):274:286 -> a
     128:151:java.util.Collection generateInlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):281:304 -> a
     152:163:void addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.graph.DexMethod):434:445 -> a
@@ -144564,7 +144551,7 @@
     175:188:java.util.Collection generateInlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):320:333 -> a
     189:197:java.util.Collection generateInlinedAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):329:337 -> a
     198:203:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):353:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;)V"}
     204:206:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):357:359 -> a
     207:207:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     207:207:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):361 -> a
@@ -144590,7 +144577,7 @@
     266:266:com.android.tools.r8.graph.CfCode computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):427 -> a
     266:266:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):374 -> a
     267:267:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):520:520 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/al;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)[Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)[Lcom/android/tools/r8/graph/w2;"}
     268:270:com.android.tools.r8.graph.DexMethod[] internalComputeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):559:561 -> a
     268:270:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):520 -> a
     271:277:com.android.tools.r8.graph.DexMethod getApiGenericConversion(com.android.tools.r8.graph.DexMethod,int):577:583 -> a
@@ -144599,9 +144586,9 @@
     278:281:com.android.tools.r8.graph.DexMethod[] internalComputeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):563:566 -> a
     278:281:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):520 -> a
     282:282:com.android.tools.r8.graph.DexMethod lambda$computeParameterConversions$10(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):524:524 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/al;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     283:283:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):540:540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)[Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)[Lcom/android/tools/r8/graph/w2;"}
     284:286:com.android.tools.r8.graph.DexMethod[] internalComputeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):559:561 -> a
     284:286:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):540 -> a
     287:293:com.android.tools.r8.graph.DexMethod getApiGenericConversion(com.android.tools.r8.graph.DexMethod,int):577:583 -> a
@@ -144610,7 +144597,7 @@
     294:297:com.android.tools.r8.graph.DexMethod[] internalComputeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):563:566 -> a
     294:297:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):540 -> a
     298:298:com.android.tools.r8.graph.DexMethod lambda$computeParameterConversions$11(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):544:544 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/dl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     299:316:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexType):609:626 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/w2;"}
     317:326:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexType):624:633 -> a
@@ -144620,11 +144607,11 @@
     1:2:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversionWithoutCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):72:73 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
     3:3:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$generateCallbackConversion$1(com.android.tools.r8.contexts.CompilationContext$MainThreadContext,com.android.tools.r8.graph.DexProgramClass):199:199 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Le;"}
     4:4:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$generateOutlinedAPIConversion$2(com.android.tools.r8.synthesis.SyntheticNaming):239:239 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     5:5:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):469:469 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/al;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/w2;"}
     6:6:com.android.tools.r8.graph.DexMethod internalComputeReturnConversion(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):505:505 -> b
     6:6:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):469 -> b
     7:7:com.android.tools.r8.graph.DexMethod getReturnApiGenericConversion(com.android.tools.r8.graph.DexMethod):573:573 -> b
@@ -144637,9 +144624,9 @@
     15:17:com.android.tools.r8.graph.DexMethod internalComputeReturnConversion(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):507:509 -> b
     15:17:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):469 -> b
     18:18:com.android.tools.r8.graph.DexMethod lambda$computeReturnConversion$8(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):472:472 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/al;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     19:19:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):488:488 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/graph/w2;"}
     20:20:com.android.tools.r8.graph.DexMethod internalComputeReturnConversion(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):505:505 -> b
     20:20:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):488 -> b
     21:21:com.android.tools.r8.graph.DexMethod getReturnApiGenericConversion(com.android.tools.r8.graph.DexMethod):573:573 -> b
@@ -144652,8 +144639,8 @@
     29:31:com.android.tools.r8.graph.DexMethod internalComputeReturnConversion(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):507:509 -> b
     29:31:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):488 -> b
     32:32:com.android.tools.r8.graph.DexMethod lambda$computeReturnConversion$9(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):491:491 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Jk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/dl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Lk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryEnumConversionSynthesizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -144696,12 +144683,12 @@
     43:47:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):117:121 -> a
     48:50:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):120:122 -> a
     51:55:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):128:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Q8;)V"}
-    56:56:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/S8;)V"}
+    56:56:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     56:56:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132 -> a
     58:62:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132:136 -> a
@@ -144713,7 +144700,7 @@
     65:71:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):137:143 -> a
     72:72:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):138:138 -> a
     73:75:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):148:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/al;)Lcom/android/tools/r8/graph/E0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/cl;)Lcom/android/tools/r8/graph/E0;"}
     76:76:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     76:76:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):151 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144751,16 +144738,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getExistingProgramEnumConversionMethod$8(com.android.tools.r8.synthesis.SyntheticNaming):118:118 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Zk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer enumConverter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lk;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider conversionCfProvider -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ek;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gk;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():99:99 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView):106:110 -> <init>
@@ -144783,7 +144770,7 @@
     20:20:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):164 -> a
     21:21:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):167:167 -> a
     22:25:com.android.tools.r8.graph.DexMethod ensureApiGenericConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):174:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/al;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cl;)Lcom/android/tools/r8/graph/w2;"}
     26:26:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     26:26:com.android.tools.r8.graph.DexMethod ensureApiGenericConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144814,7 +144801,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/o;)V"}
     44:44:com.android.tools.r8.contexts.CompilationContext$UniqueContext com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext.createUniqueContext(com.android.tools.r8.graph.DexProgramClass):202:202 -> a
     44:44:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$synthesizeProgramWrappersVirtualMethods$19(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass):812 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Le;"}
     45:45:int com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.incrementAndGetNextId():143:143 -> a
     45:45:com.android.tools.r8.contexts.CompilationContext$UniqueContext com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext.createUniqueContext(com.android.tools.r8.graph.DexProgramClass):202 -> a
     45:45:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$synthesizeProgramWrappersVirtualMethods$19(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass):812 -> a
@@ -144830,7 +144817,7 @@
     50:50:com.android.tools.r8.contexts.CompilationContext$UniqueContext com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext.createUniqueContext(com.android.tools.r8.graph.DexProgramClass):203:203 -> a
     50:50:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$synthesizeProgramWrappersVirtualMethods$19(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass):812 -> a
     51:52:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):205:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/al;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     53:53:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):405:405 -> a
     53:53:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):208 -> a
     54:54:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):405:405 -> a
@@ -144865,7 +144852,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:88:com.android.tools.r8.graph.DexMethod ensureConversionMethod(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):228:229 -> a
     89:89:com.android.tools.r8.graph.DexMethod ensureArrayConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):280:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/el;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     90:90:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     90:90:com.android.tools.r8.graph.DexMethod ensureArrayConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):282 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144902,7 +144889,7 @@
     178:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$ArrayConversionCfCodeProvider.generateCfCode():135:138 -> a
     178:181:com.android.tools.r8.graph.Code lambda$ensureArrayConversionMethod$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):299 -> a
     182:182:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):313:313 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/dl;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Supplier;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     183:183:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):405:405 -> a
     183:183:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):316 -> a
     184:184:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):405:405 -> a
@@ -144943,16 +144930,16 @@
     242:242:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):384:384 -> a
     243:247:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):395:399 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
-    248:248:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    248:248:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     248:248:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):399 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     249:249:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     249:249:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):399 -> a
     250:251:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):399:400 -> a
     252:262:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):429:439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/al;)Lcom/android/tools/r8/internal/Vk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/cl;)Lcom/android/tools/r8/internal/Xk;"}
     263:263:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor.getMethods():25:25 -> a
     263:263:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -144972,12 +144959,12 @@
     312:314:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):465 -> a
     315:315:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):465:465 -> a
     316:316:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):471:471 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Vk;"}
-    317:317:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Xk;"}
+    317:317:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     317:317:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):471 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     318:318:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    318:318:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    318:318:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     318:318:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):471 -> a
     319:321:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):471:473 -> a
@@ -144997,7 +144984,7 @@
     335:337:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):478 -> a
     338:338:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):478:478 -> a
     339:340:com.android.tools.r8.graph.DexProgramClass getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind):482:483 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Wk;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Yk;)Lcom/android/tools/r8/graph/D2;"}
     341:341:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     341:341:com.android.tools.r8.graph.DexProgramClass getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind):484 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -145014,7 +145001,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/g1;"}
     352:352:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):505:505 -> a
     352:352:void synthesizeProgramConversionMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):569 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wk;Lcom/android/tools/r8/graph/D2;Ljava/util/List;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yk;Lcom/android/tools/r8/graph/D2;Ljava/util/List;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
     353:353:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):505:505 -> a
     353:353:void synthesizeProgramConversionMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):570 -> a
     354:358:void synthesizeProgramConversionMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):571:575 -> a
@@ -145033,12 +145020,12 @@
     380:380:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.ProgramOrClasspathDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):878:878 -> a
     380:380:void synthesizeProgramConversionMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):581 -> a
     381:381:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):513:513 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Wk;Lcom/android/tools/r8/internal/Q8;)Lcom/android/tools/r8/graph/D2;"}
-    382:382:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Yk;Lcom/android/tools/r8/internal/S8;)Lcom/android/tools/r8/graph/D2;"}
+    382:382:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     382:382:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):513 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     383:383:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    383:383:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    383:383:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     383:383:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):513 -> a
     384:385:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):513:514 -> a
@@ -145053,13 +145040,13 @@
     390:401:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):519:530 -> a
     402:402:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):518:518 -> a
     403:403:void lambda$ensureProgramWrapper$9(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):524:524 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wk;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yk;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/V;)V"}
     404:404:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind.getWrappingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126:126 -> a
     404:404:void lambda$ensureProgramWrapper$9(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):524 -> a
     405:405:void lambda$ensureProgramWrapper$9(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):526:526 -> a
     406:406:void lambda$ensureProgramWrapper$9(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):523:523 -> a
     407:408:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.lang.Iterable,java.util.function.BiFunction):541:542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wk;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/al;Ljava/util/List;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/graph/I0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yk;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/cl;Ljava/util/List;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/graph/I0;"}
     409:409:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     409:409:com.android.tools.r8.graph.DexClasspathClass ensureClasspathWrapper(com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.lang.Iterable,java.util.function.BiFunction):543 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -145233,7 +145220,7 @@
     587:587:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.apiconverter.WrapperConstructorCfCodeProvider.generateCfCode():50 -> a
     587:587:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$16(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):664 -> a
     588:589:java.util.Collection synthesizeHashCodeAndEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):683:684 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/xu;"}
     590:590:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateWrapperHashCode(com.android.tools.r8.graph.DexField):106:106 -> a
     590:590:java.util.Collection synthesizeHashCodeAndEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):684 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -145277,9 +145264,9 @@
     642:642:java.util.Collection synthesizeHashCodeAndEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):685 -> a
     643:643:java.util.Collection synthesizeHashCodeAndEquals(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):683:683 -> a
     644:666:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):741:763 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
     667:676:void lambda$synthesizeClasses$17(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor):748:757 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ym0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Cm0;)V"}
     677:677:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor.getMethods():25:25 -> a
     677:677:void lambda$synthesizeClasses$17(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor):757 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -145287,20 +145274,20 @@
     682:692:void synthesizeProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):782:792 -> a
     682:692:void lambda$synthesizeClasses$17(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor):758 -> a
     693:693:void lambda$synthesizeClasses$18(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable):765:765 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;Ljava/lang/Iterable;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;Ljava/lang/Iterable;)V"}
     694:694:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$20(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):808:808 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
     695:695:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):81:81 -> a
     695:695:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$20(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):808 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     696:697:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):81:82 -> a
     696:697:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$20(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):808 -> a
-    698:698:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    698:698:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     698:698:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):82 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     698:698:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$20(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):808 -> a
     699:699:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    699:699:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    699:699:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     699:699:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):82 -> a
     699:699:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$20(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):808 -> a
@@ -145329,7 +145316,7 @@
     7:7:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):148:148 -> b
     8:8:com.android.tools.r8.contexts.CompilationContext$UniqueContext com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext.createUniqueContext(com.android.tools.r8.graph.DexProgramClass):202:202 -> b
     8:8:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$synthesizeProgramWrappersVirtualMethods$21(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass):826 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Je;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Le;"}
     9:9:int com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext.incrementAndGetNextId():143:143 -> b
     9:9:com.android.tools.r8.contexts.CompilationContext$UniqueContext com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext.createUniqueContext(com.android.tools.r8.graph.DexProgramClass):202 -> b
     9:9:com.android.tools.r8.contexts.CompilationContext$UniqueContext lambda$synthesizeProgramWrappersVirtualMethods$21(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass):826 -> b
@@ -145360,16 +145347,16 @@
     30:30:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     30:30:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):701 -> b
     31:33:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):702:704 -> b
-    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     34:34:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):705 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:35:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):706:706 -> b
-    36:36:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    36:36:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     36:36:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):706 -> b
     37:37:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.Code):707:707 -> b
     38:38:java.lang.String uniqueIdentifier():730:730 -> b
     39:41:void synthesizeProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext):801:803 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;Ljava/lang/Iterable;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;Ljava/lang/Iterable;)V"}
     42:46:java.util.Collection synthesizeVirtualMethodsForWrapper(java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField,java.util.function.BiFunction):671:675 -> b
     42:46:void synthesizeProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext):804 -> b
     47:61:void synthesizeProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext):803:817 -> b
@@ -145378,7 +145365,7 @@
     67:78:void synthesizeProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext):817:828 -> b
     79:79:void synthesizeProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexProgramClass,java.lang.Iterable,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext):827:827 -> b
     80:80:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$22(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):822:822 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/j1;"}
     81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.generateVivifiedWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):144:144 -> b
     81:81:com.android.tools.r8.graph.DexEncodedMethod lambda$synthesizeProgramWrappersVirtualMethods$22(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):822 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -145404,7 +145391,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$isSyntheticWrapper$1(com.android.tools.r8.synthesis.SyntheticNaming):148:148 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Xk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizer.java"}
     com.android.tools.r8.graph.DexMethod conversion -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -145412,12 +145399,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:415 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind -> com.android.tools.r8.internal.Yk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizer.java"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind WRAPPER -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yk;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperKind VIVIFIED_WRAPPER -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yk;"}
     1:2:void <clinit>():114:115 -> <clinit>
     1:1:void <init>(java.lang.String,int):113:113 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
@@ -145427,19 +145414,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getKindSelector$1(com.android.tools.r8.synthesis.SyntheticNaming):121:121 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.el:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizerEventConsumer.java"}
     void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer -> com.android.tools.r8.internal.al:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizerEventConsumer.java"}
     void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer -> com.android.tools.r8.internal.bl:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizerEventConsumer.java"}
     void acceptAPIConversionOutline(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.al:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.cl:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizerEventConsumer.java"}
     void acceptGenericApiConversionStub(com.android.tools.r8.graph.DexClasspathClass) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
@@ -145447,35 +145434,35 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.dl:
 # {"id":"sourceFile","fileName":"DesugaredLibraryWrapperSynthesizerEventConsumer.java"}
     void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     void acceptEnumConversionProgramClass(com.android.tools.r8.graph.DexProgramClass) -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarer -> com.android.tools.r8.internal.Gk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarer -> com.android.tools.r8.internal.Ik:
 # {"id":"sourceFile","fileName":"DesugaredLibraryDisableDesugarer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerHelper helper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jk;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):29:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):50:50 -> a
     1:1:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryDisableDesugarer.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     2:2:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryDisableDesugarer.compute(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction):61 -> a
     3:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryDisableDesugarer.compute(com.android.tools.r8.internal.CfInstruction):0 -> a
     4:4:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     5:5:java.util.Collection lambda$compute$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):60 -> a
     6:10:com.android.tools.r8.cf.code.CfInstruction rewriteInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):66:70 -> a
     6:10:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     11:11:com.android.tools.r8.cf.code.CfInstruction rewriteTypeInstruction(com.android.tools.r8.cf.code.CfTypeInstruction):97:97 -> a
     11:11:com.android.tools.r8.cf.code.CfInstruction rewriteInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):70 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):42 -> a
@@ -145524,7 +145511,7 @@
     34:34:com.android.tools.r8.cf.code.CfInstruction rewriteInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):76 -> a
     34:34:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):42 -> a
     35:37:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):44:46 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerHelper -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerHelper -> com.android.tools.r8.internal.Jk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryDisableDesugarerHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -145545,16 +145532,16 @@
     19:31:void warnIfInvalidResolution(com.android.tools.r8.graph.MemberResolutionResult,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E4;Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/y5;)V"}
     32:34:void warnIfInvalidResolution(com.android.tools.r8.graph.MemberResolutionResult,com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):100:102 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerPostProcessor -> com.android.tools.r8.internal.Ik:
+com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerPostProcessor -> com.android.tools.r8.internal.Kk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryDisableDesugarerPostProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.disabledesugarer.DesugaredLibraryDisableDesugarerHelper helper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jk;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):41:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     6:6:void rewriteMultiDexProgramClass(com.android.tools.r8.graph.DexProgramClass):52:52 -> a
     6:6:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):45 -> a
     7:10:void rewriteMultiDexProgramClass(com.android.tools.r8.graph.DexProgramClass):51:54 -> a
@@ -145568,21 +145555,21 @@
     18:21:com.android.tools.r8.graph.DexEncodedField[] rewriteFields(java.util.List,com.android.tools.r8.graph.DexProgramClass):62:65 -> a
     22:22:com.android.tools.r8.graph.DexEncodedField[] lambda$rewriteFields$0(int):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)[Lcom/android/tools/r8/graph/g1;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.at:
 # {"id":"sourceFile","fileName":"HumanDesugaredLibrarySpecification.java"}
     boolean libraryCompilation -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qt;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags rewritingFlags -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ft;"}
     1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,boolean):24:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ot;Lcom/android/tools/r8/internal/dt;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qt;Lcom/android/tools/r8/internal/ft;Z)V"}
     1:1:java.lang.String getJsonSource():89:89 -> a
     2:2:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags.getJsonSource():70:70 -> a
     2:2:java.lang.String getJsonSource():89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/aM;"}
     1:1:boolean isLibraryCompilation():56:56 -> b
     1:1:java.util.Set getMaintainTypeOrPrefixForTesting():79:79 -> c
     2:2:java.util.Set com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.getMaintainPrefix():229:229 -> c
@@ -145593,47 +145580,47 @@
     1:1:java.util.List getExtraKeepRules():84:84 -> e
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():61:61 -> f
     1:1:boolean isEmpty():37:37 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.bt:
 # {"id":"sourceFile","fileName":"HumanDesugaredLibrarySpecificationParser.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanMethodParser methodParser -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dt;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanFieldParser fieldParser -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/at;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ct;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean libraryCompilation -> e
     int minAPILevel -> f
     com.android.tools.r8.origin.Origin origin -> g
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XC;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():37:37 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):90:96 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;ZI)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;ZI)V"}
     1:7:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):117:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/lang/String;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/lang/String;)Lcom/android/tools/r8/internal/UC;"}
     8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):118:118 -> a
     9:10:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):127:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/Ys;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/at;"}
     11:11:void lambda$parse$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;)V"}
     12:18:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):141:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/Ys;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/at;"}
     19:25:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags parseRewritingFlags():177:183 -> a
     19:25:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):149 -> a
     26:29:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags parseRewritingFlags():182:185 -> a
     26:29:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):149 -> a
     30:33:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):151:154 -> a
     34:54:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):190:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/qt;"}
     55:61:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):209:215 -> a
     62:81:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):214:233 -> a
     82:82:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
     82:82:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;Lcom/android/tools/r8/internal/ft$a;)V"}
     83:83:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
     83:83:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):237 -> a
     84:88:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):237:241 -> a
@@ -145644,7 +145631,7 @@
     91:91:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):242 -> a
     92:96:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):242:246 -> a
     97:97:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/internal/ft$a;)V"}
     98:98:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> a
     98:98:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -146359,57 +146346,57 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> b
     9:9:java.lang.String parseJson(com.android.tools.r8.StringResource):166 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.dt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.ft:
 # {"id":"sourceFile","fileName":"HumanRewritingFlags.java"}
     java.util.Map rewritePrefix -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set dontRewritePrefix -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set maintainPrefix -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map rewriteDerivedPrefix -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map emulatedInterfaces -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetStaticField -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map covariantRetarget -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetMethodToType -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetMethodEmulatedDispatchToType -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetMethodToMethod -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetMethodEmulatedDispatchToMethod -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map apiGenericTypesConversion -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map legacyBackport -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map customConversions -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set dontRetarget -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map wrapperConversions -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set neverOutlineApi -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map amendLibraryMethod -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map amendLibraryField -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:20:void <init>(java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map):66:85 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder builder(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/ft$a;"}
     2:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.<init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):333:352 -> a
     2:21:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder builder(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):192 -> a
     22:22:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.<init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):333:333 -> a
     22:22:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder builder(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):192 -> a
     23:23:java.util.Map getAmendLibraryField():293:293 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder newBuilder(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):196:196 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/ft$a;"}
     2:2:java.util.Map getAmendLibraryMethod():289:289 -> b
     1:1:java.util.Map getCustomConversions():277:277 -> c
     1:1:java.util.Set getDontRetarget():281:281 -> d
@@ -146420,10 +146407,10 @@
     1:1:java.util.Map getRewritePrefix():221:221 -> i
     1:1:java.util.Map getWrapperConversions():285:285 -> j
     1:8:boolean isEmpty():297:304 -> k
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.dt$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.ft$a:
 # {"id":"sourceFile","fileName":"HumanRewritingFlags.java"}
     com.android.tools.r8.utils.Reporter reporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.origin.Origin origin -> b
     java.util.Map rewritePrefix -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -146464,44 +146451,44 @@
     boolean $assertionsDisabled -> v
     1:1:void <clinit>():307:307 -> <clinit>
     1:26:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map):378:403 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;)V"}
     1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):408:419 -> a
     13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):423:423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/ft$a;"}
     14:16:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putRewriteDerivedPrefix(java.lang.String,java.lang.String,java.lang.String):443:445 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     17:17:java.util.Map lambda$putRewriteDerivedPrefix$0(java.lang.String):444:444 -> a
     18:22:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putSpecifiedEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):464:468 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/et;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/gt;)Lcom/android/tools/r8/internal/ft$a;"}
     23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:473 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
     24:24:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder retargetMethodEmulatedDispatchToType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):500:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
     25:25:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder retargetStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):536:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/ft$a;"}
     26:31:void addApiGenericTypesConversion(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexMethod):545:550 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ILcom/android/tools/r8/graph/w2;)V"}
     32:32:com.android.tools.r8.graph.DexMethod[] lambda$addApiGenericTypesConversion$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):547:547 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)[Lcom/android/tools/r8/graph/w2;"}
     33:33:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder addDontRetargetLibMember(com.android.tools.r8.graph.DexType):563:563 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
     34:34:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):568:568 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G4;)V"}
     35:35:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder amendLibraryField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags):578:578 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/g3;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/g3;)Lcom/android/tools/r8/internal/ft$a;"}
     36:55:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags build():583:602 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ft;"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putMaintainPrefix(java.lang.String):437:437 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ft$a;"}
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder addWrapperConversion(com.android.tools.r8.graph.DexType):482:482 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder addWrapperConversion(com.android.tools.r8.graph.DexType,java.util.Set):486:486 -> b
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder addWrapperConversion(com.android.tools.r8.graph.DexType):482 -> b
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder retargetMethodToType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):491:491 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
     5:5:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putLegacyBackport(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):554:554 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/dt$a;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor -> com.android.tools.r8.internal.et:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ft$a;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor -> com.android.tools.r8.internal.gt:
 # {"id":"sourceFile","fileName":"HumanRewritingFlags.java"}
     com.android.tools.r8.graph.DexType rewrittenType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -146513,7 +146500,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Z"}
     2:2:boolean containsEmulatedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):159:159 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor merge(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/et;)Lcom/android/tools/r8/internal/et;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gt;)Lcom/android/tools/r8/internal/gt;"}
     4:4:com.android.tools.r8.graph.DexType getRewrittenType():125:125 -> a
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor merge(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):148 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -146542,7 +146529,7 @@
     2:2:java.util.Set getEmulatedMethods():129:129 -> hashCode
     2:2:int hashCode():144 -> hashCode
     3:3:int hashCode():144:144 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$LegacyHumanEmulatedInterfaceDescriptor -> com.android.tools.r8.internal.ft:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$LegacyHumanEmulatedInterfaceDescriptor -> com.android.tools.r8.internal.ht:
 # {"id":"sourceFile","fileName":"HumanRewritingFlags.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):168:168 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
@@ -146550,11 +146537,11 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType):168 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType):168:168 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor merge(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):178:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/et;)Lcom/android/tools/r8/internal/et;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gt;)Lcom/android/tools/r8/internal/gt;"}
     2:4:boolean containsEmulatedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):184:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Z"}
     5:7:boolean containsEmulatedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):185:187 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.qt:
 # {"id":"sourceFile","fileName":"HumanTopLevelFlags.java"}
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y2;"}
@@ -146567,18 +146554,18 @@
     1:7:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.List):34:40 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder builder():54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pt;"}
     1:1:java.util.List getExtraKeepRules():78:78 -> b
     1:1:java.lang.String getIdentifier():66:66 -> c
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():58:58 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y2;"}
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():62:62 -> e
     1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags testing():49:50 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qt;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> f
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags testing():50 -> f
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags testing():50:50 -> f
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.nt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.pt:
 # {"id":"sourceFile","fileName":"HumanTopLevelFlags.java"}
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y2;"}
@@ -146597,22 +146584,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):114:114 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder setSupportAllCallbacksFromLibrary(boolean):81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/oh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/sh0;"}
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setExtraKeepRules(java.util.List):119:119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     5:12:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags build():124:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qt;"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setJsonSource(java.lang.String):108:108 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):114:114 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):98:98 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.dP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.hP:
 # {"id":"sourceFile","fileName":"MultiAPILevelHumanDesugaredLibrarySpecification.java"}
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qt;"}
     java.util.Map commonFlags -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map libraryFlags -> d
@@ -146620,18 +146607,18 @@
     java.util.Map programFlags -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags,java.util.Map,java.util.Map,java.util.Map):24:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/ot;Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/qt;Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
     1:1:java.util.Map getCommonFlags():41:41 -> a
     1:1:java.util.Map getLibraryFlags():45:45 -> b
     1:1:java.util.Map getProgramFlags():49:49 -> c
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():37:37 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ot;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.eP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qt;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.iP:
 # {"id":"sourceFile","fileName":"MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void lambda$deduplicateWrapperFlags$0(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,java.util.Set):139:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.addWrapperConversion(com.android.tools.r8.graph.DexType,java.util.Set):486:486 -> a
     3:3:void lambda$deduplicateWrapperFlags$0(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,java.util.Set):141 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -146643,9 +146630,9 @@
     6:6:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.addWrapperConversion(com.android.tools.r8.graph.DexType,java.util.Set):486:486 -> a
     6:6:void lambda$deduplicateWrapperFlags$0(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,java.util.Set):143 -> a
     7:10:void deduplicateAmendLibraryMemberFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):154:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;)V"}
     11:11:void lambda$deduplicateAmendLibraryMemberFlags$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G4;)V"}
     12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):568:568 -> a
     12:12:void lambda$deduplicateAmendLibraryMemberFlags$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):160 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -146657,23 +146644,23 @@
     15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):568:568 -> a
     15:15:void lambda$deduplicateAmendLibraryMemberFlags$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):162 -> a
     16:22:void lambda$deduplicateRewriteDifferentPrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.util.Map):176:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/util/Map;)V"}
     23:23:void lambda$deduplicateRewriteDifferentPrefix$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String,java.lang.String):178:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     24:27:void lambda$deduplicateRewriteDifferentPrefix$3(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):184:187 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;)V"}
     28:32:void lambda$deduplicateRewritePrefix$5(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):203:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;)V"}
     33:33:void deduplicateEmulatedInterfaceFlags(java.util.Map,java.util.Map,java.util.function.BiConsumer,java.util.function.BiConsumer):217:217 -> a
     34:37:void lambda$deduplicateEmulatedInterfaceFlags$6(java.util.Map,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):219:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/et;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/gt;)V"}
     38:41:void lambda$deduplicateFlags$7(java.util.Map,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexType):235:238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/I2;)V"}
     42:42:void deduplicateFlags(java.util.Set,java.util.Set,java.util.function.Consumer,java.util.function.Consumer):245:245 -> a
     43:46:void lambda$deduplicateFlags$8(java.util.Set,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexItem):247:250 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/n1;)V"}
     1:8:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):89:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;)V"}
     9:18:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):92:101 -> b
     19:19:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):97:97 -> b
     20:20:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.getRetargetMethodEmulatedDispatchToType():253:253 -> b
@@ -146687,18 +146674,18 @@
     55:63:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):118:126 -> b
     64:64:void deduplicateFlags(java.util.Map,java.util.Map,java.util.function.BiConsumer,java.util.function.BiConsumer):233:233 -> b
     1:2:void deduplicateRewriteDifferentPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):173:174 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;)V"}
     1:2:void deduplicateRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):200:201 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;)V"}
     1:4:void deduplicateWrapperFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):134:137 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/internal/dt$a;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.gP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/internal/ft$a;)V"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.kP:
 # {"id":"sourceFile","fileName":"MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>():58:58 -> <init>
     1:1:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dP;Lcom/android/tools/r8/StringConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hP;Lcom/android/tools/r8/StringConsumer;)V"}
     2:7:void internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):68:73 -> a
     2:7:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):63 -> a
     8:13:void internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):71:76 -> a
@@ -146721,7 +146708,7 @@
     36:49:int lambda$rewritingFlagsToString$0(com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange):96 -> a
     50:50:void lambda$rewritingFlagsToString$1(java.util.TreeMap,java.lang.String,java.util.Map):111:111 -> a
     51:52:void lambda$rewritingFlagsToString$2(java.util.TreeMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):126:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeMap;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/et;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeMap;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/gt;)V"}
     53:53:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor.isLegacy():0:0 -> a
     53:53:void lambda$rewritingFlagsToString$2(java.util.TreeMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):127 -> a
     54:56:void lambda$rewritingFlagsToString$2(java.util.TreeMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):127:129 -> a
@@ -146747,7 +146734,7 @@
     88:88:void lambda$mapToString$6(java.util.Map,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):226:226 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/n1;)V"}
     89:90:java.util.Map mapArrayToString(java.util.Map):231:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)Ljava/util/TreeMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)Ljava/util/TreeMap;"}
     91:91:void lambda$mapArrayToString$7(java.util.Map,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexMethod[]):232:232 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/n1;[Lcom/android/tools/r8/graph/w2;)V"}
     92:104:java.lang.Object[] arrayToString(com.android.tools.r8.graph.DexMethod[]):237:249 -> a
@@ -146826,14 +146813,14 @@
     101:101:java.util.Set com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.getNeverOutlineApi():265:265 -> c
     101:101:java.util.List rewritingFlagsToString(java.util.Map):170 -> c
     102:110:java.util.List rewritingFlagsToString(java.util.Map):170:178 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.fP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.jP:
 # {"id":"sourceFile","fileName":"MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter.java"}
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter):89:89 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.hP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.lP:
 # {"id":"sourceFile","fileName":"MultiAPILevelHumanDesugaredLibrarySpecificationParser.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)V"}
     1:1:com.android.tools.r8.com.google.gson.JsonObject com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.getJsonConfig():108:108 -> a
     1:1:java.util.Map parseAllFlags(java.lang.String):40 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Ljava/util/HashMap;"}
@@ -146866,27 +146853,27 @@
     27:28:java.util.Map parseAllFlags(java.lang.String):53 -> a
     29:31:java.util.Map parseAllFlags(java.lang.String):53:55 -> a
     1:1:void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder):29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;)V"}
     1:9:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):27:35 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/dP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/hP;"}
     10:11:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.getOrigin():112:113 -> c
     10:11:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):36 -> c
     12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):36:36 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.jJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.nJ:
 # {"id":"sourceFile","fileName":"LegacyDesugaredLibrarySpecification.java"}
     boolean libraryCompilation -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags topLevelFlags -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags rewritingFlags -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tJ;"}
     1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,boolean):33:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sJ;Lcom/android/tools/r8/internal/pJ;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wJ;Lcom/android/tools/r8/internal/tJ;Z)V"}
     1:1:java.lang.String getJsonSource():122:122 -> a
     2:2:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.getJsonSource():83:83 -> a
     2:2:java.lang.String getJsonSource():122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/aM;"}
     4:7:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):84:87 -> a
     4:7:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):129 -> a
     8:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():50:50 -> a
@@ -146951,32 +146938,32 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:5:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags.isEmpty():123:125 -> isEmpty
     3:5:boolean isEmpty():41 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.kJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.oJ:
 # {"id":"sourceFile","fileName":"LegacyDesugaredLibrarySpecificationParser.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean libraryCompilation -> c
     int minAPILevel -> d
     com.android.tools.r8.origin.Origin origin -> e
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XC;"}
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca0;"}
     boolean $assertionsDisabled -> h
     1:4:void <clinit>():29:32 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):69:73 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;ZI)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;ZI)V"}
     1:7:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):94:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/lang/String;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/lang/String;)Lcom/android/tools/r8/internal/UC;"}
     8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):95:95 -> a
     9:10:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):104:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/jJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/nJ;"}
     11:11:void lambda$parse$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder):105:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;)V"}
     12:18:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):118:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/jJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/nJ;"}
     19:24:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags parseRewritingFlags():154:159 -> a
     19:24:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):126 -> a
     25:25:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
@@ -147009,13 +146996,13 @@
     40:40:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):126 -> a
     41:44:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):128:131 -> a
     45:74:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):168:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/sJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/wJ;"}
     75:81:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):196:202 -> a
     82:101:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):201:220 -> a
     102:102:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):182:182 -> a
     103:103:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):175:175 -> a
     104:104:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder):234:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/internal/pJ$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/internal/tJ$a;)V"}
     105:105:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> a
     105:105:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder):234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -147292,38 +147279,38 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> b
     9:9:java.lang.String parseJson(com.android.tools.r8.StringResource):143 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.pJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.tJ:
 # {"id":"sourceFile","fileName":"LegacyRewritingFlags.java"}
     java.util.Map rewritePrefix -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map emulateLibraryInterface -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map retargetCoreLibMember -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map backportCoreLibraryMember -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map customConversions -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.List dontRewriteInvocation -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Set dontRetargetLibMember -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set wrapperConversions -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,java.util.Set,java.util.Set):48:56 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/pJ$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/tJ$a;"}
     2:13:void com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):144:155 -> a
     2:13:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):72 -> a
     14:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):144:144 -> a
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):72 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.pJ$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.tJ$a:
 # {"id":"sourceFile","fileName":"LegacyRewritingFlags.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.origin.Origin origin -> c
     java.util.Map rewritePrefix -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -147342,18 +147329,18 @@
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():128:128 -> <clinit>
     1:14:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,java.util.Set,java.util.Set):169:182 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/origin/Origin;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/origin/Origin;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V"}
     1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):187:198 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/String;)V"}
     13:13:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):188:188 -> a
     14:14:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> a
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/pJ$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/tJ$a;"}
     15:15:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> a
     15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):257 -> a
     16:16:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):258:258 -> a
     17:26:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags build():294:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tJ;"}
     1:5:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):240:244 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)V"}
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> b
@@ -147365,9 +147352,9 @@
     18:18:void validate():313:313 -> b
     19:19:void validate():309:309 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):202:202 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/pJ$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/tJ$a;"}
     1:3:int sharpIndex(java.lang.String,java.lang.String):281:283 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.sJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.wJ:
 # {"id":"sourceFile","fileName":"LegacyTopLevelFlags.java"}
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y2;"}
@@ -147380,13 +147367,13 @@
     1:7:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.List):37:43 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder builder():67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vJ;"}
     1:7:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():57:63 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wJ;"}
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> b
     8:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():63 -> b
     9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():63:63 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.rJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.vJ:
 # {"id":"sourceFile","fileName":"LegacyTopLevelFlags.java"}
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y2;"}
@@ -147404,37 +147391,37 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):128:128 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder setSupportAllCallbacksFromLibrary(boolean):94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/oh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/sh0;"}
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setExtraKeepRules(java.util.List):133:133 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     5:5:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags build():138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wJ;"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setJsonSource(java.lang.String):122:122 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):128:128 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)V"}
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):112:112 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.iP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.mP:
 # {"id":"sourceFile","fileName":"MultiAPILevelLegacyDesugaredLibrarySpecification.java"}
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags topLevelFlags -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap libraryFlags -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap programFlags -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lx;"}
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):23:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/sJ;Lcom/android/tools/r8/internal/Jx;Lcom/android/tools/r8/internal/Jx;Lcom/android/tools/r8/internal/Jx;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.jP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/wJ;Lcom/android/tools/r8/internal/Lx;Lcom/android/tools/r8/internal/Lx;Lcom/android/tools/r8/internal/Lx;)V"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.nP:
 # {"id":"sourceFile","fileName":"MultiAPILevelLegacyDesugaredLibrarySpecificationParser.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)V"}
     1:1:com.android.tools.r8.com.google.gson.JsonObject com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.getJsonConfig():85:85 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Lx;"}
     2:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:41 -> a
     5:5:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):41 -> a
@@ -147456,18 +147443,18 @@
     21:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):49 -> a
     23:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):49:51 -> a
     1:1:void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder):28:28 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;)V"}
     1:9:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:34 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/iP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/mP;"}
     10:11:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.getOrigin():89:90 -> c
     10:11:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):35 -> c
     12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):35:35 -> c
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.AbstractGenerateFiles -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.a:
 # {"id":"sourceFile","fileName":"AbstractGenerateFiles.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification desugaredLibrarySpecification -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vk;"}
     com.android.tools.r8.StringResource desugaredLibrarySpecificationResource -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/t0;"}
     java.util.Collection desugaredLibraryImplementation -> d
@@ -147478,7 +147465,7 @@
     boolean $assertionsDisabled -> h
     1:4:void <clinit>():20:23 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringResource,java.util.Collection,java.nio.file.Path,java.util.Collection):37:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/t0;Ljava/util/Collection;Ljava/nio/file/Path;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/t0;Ljava/util/Collection;Ljava/nio/file/Path;Ljava/util/Collection;)V"}
     3:5:com.android.tools.r8.utils.InternalOptions createOptions(com.android.tools.r8.utils.Reporter):48:50 -> <init>
     3:5:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringResource,java.util.Collection,java.nio.file.Path,java.util.Collection):39 -> <init>
     6:6:com.android.tools.r8.utils.InternalOptions com.android.tools.r8.profile.art.ArtProfileOptions.getOptions():53:53 -> <init>
@@ -147498,7 +147485,7 @@
     boolean androidPlatformBuild -> k
     com.android.tools.r8.StringConsumer outputConsumer -> l
     1:4:void <init>(int,boolean,com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringResource,java.util.Collection,com.android.tools.r8.StringConsumer,java.util.Collection):37:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZLcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/t0;Ljava/util/Collection;Lcom/android/tools/r8/StringConsumer;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IZLcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/t0;Ljava/util/Collection;Lcom/android/tools/r8/StringConsumer;Ljava/util/Collection;)V"}
     1:9:void lambda$run$0(com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand):55:63 -> a
     10:13:void writeOutput(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.util.List):82:85 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;Lcom/android/tools/r8/internal/y2;Ljava/util/ArrayList;)V"}
@@ -147515,7 +147502,7 @@
     boolean version -> b
     int minApi -> c
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.StringResource desugarLibrarySpecification -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/t0;"}
     java.util.Collection desugarLibraryImplementation -> f
@@ -147525,7 +147512,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean androidPlatformBuild -> i
     1:10:void <init>(int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringResource,java.util.Collection,com.android.tools.r8.StringConsumer,java.util.Collection,boolean):52:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/t0;Ljava/util/ArrayList;Lcom/android/tools/r8/StringConsumer;Ljava/util/ArrayList;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/t0;Ljava/util/ArrayList;Lcom/android/tools/r8/StringConsumer;Ljava/util/ArrayList;Z)V"}
     11:20:void <init>(boolean,boolean):64:73 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):131:131 -> builder
     1:1:java.util.Collection getDesugarLibraryImplementation():98:98 -> getDesugarLibraryImplementation
@@ -147535,7 +147522,7 @@
     1:1:int getMinApi():86:86 -> getMinApi
     1:1:com.android.tools.r8.StringConsumer getOutputConsumer():102:102 -> getOutputConsumer
     1:1:com.android.tools.r8.utils.Reporter getReporter():127:127 -> getReporter
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:3:java.lang.String getUsageMessage():118:120 -> getUsageMessage
     4:4:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand$DesugaredMethodsListCommandParser.getFlags():253:253 -> getUsageMessage
     4:4:java.lang.String getUsageMessage():121 -> getUsageMessage
@@ -147586,12 +147573,12 @@
     1:1:boolean isVersion():114:114 -> isVersion
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand parse(java.lang.String[]):77:77 -> parse
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand parse(java.lang.String[],com.android.tools.r8.utils.Reporter):82:82 -> parse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsListCommand;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsListCommand;"}
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand$Builder -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand$Builder:
 # {"id":"sourceFile","fileName":"DesugaredMethodsListCommand.java"}
     int minApi -> a
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.StringResource desugarLibrarySpecification -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/t0;"}
     java.util.Collection desugarLibraryImplementation -> d
@@ -147629,14 +147616,14 @@
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand$DesugaredMethodsListCommandParser -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.d:
 # {"id":"sourceFile","fileName":"DesugaredMethodsListCommand.java"}
     1:27:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand parse(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):269:295 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsListCommand;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsListCommand;"}
     28:39:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.DesugaredMethodsListCommand parse(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):294:305 -> a
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.GenerateDesugaredLibraryLintFiles -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.e:
 # {"id":"sourceFile","fileName":"GenerateDesugaredLibraryLintFiles.java"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringResource,java.util.Collection,java.nio.file.Path,java.util.Collection):41:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/t0;Ljava/util/Collection;Ljava/nio/file/Path;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/t0;Ljava/util/Collection;Ljava/nio/file/Path;Ljava/util/Collection;)V"}
     1:1:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;Lcom/android/tools/r8/internal/y2;)Ljava/lang/String;"}
     2:41:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses):67:106 -> a
@@ -147814,11 +147801,11 @@
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.m:
 # {"id":"sourceFile","fileName":"SupportedClasses.java"}
     java.util.Map supportedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     java.util.List extraMethods -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
     1:3:void <init>(java.util.Map,java.util.List):36:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iv;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kv;Ljava/util/List;)V"}
     1:1:void forEachClass(java.util.function.Consumer):42:42 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableSortedMap.values():875:875 -> a
     2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableSortedMap.values():65 -> a
@@ -147844,7 +147831,7 @@
     2:2:void com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder.forEachFieldsAndMethods(com.android.tools.r8.utils.TriConsumer):134:134 -> a
     2:2:void lambda$forEachClassFieldsAndMethods$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/n;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/n;)V"}
     3:3:void com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder.forEachFieldsAndMethods(com.android.tools.r8.utils.TriConsumer):134:134 -> a
     3:3:void lambda$forEachClassFieldsAndMethods$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder):214 -> a
     4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder.build():183:183 -> a
@@ -147857,7 +147844,7 @@
     6:10:void lambda$build$5(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder):293 -> a
     11:11:void lambda$build$5(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder):293:293 -> a
     12:14:void forEachClassFieldsAndMethods(com.android.tools.r8.utils.TriConsumer):212:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;)V"}
     15:17:void forEachClassAndField(java.util.function.BiConsumer):224:226 -> a
     18:18:void lambda$forEachClassAndField$2(java.util.function.BiConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$SupportedClass$Builder):226:226 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/n;)V"}
@@ -147908,7 +147895,7 @@
     java.util.List unsupportedFields -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
     java.util.List unsupportedMethods -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$ClassAnnotation ADDITIONNAL_MEMBERS_ON_CLASS -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/l;"}
     1:1:void <clinit>():326:326 -> <clinit>
@@ -147970,15 +147957,15 @@
     com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$ClassAnnotation classAnnotation -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/l;"}
     java.util.SortedMap supportedMethods -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     java.util.SortedMap supportedFields -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kv;"}
     java.util.Map methodAnnotations -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map fieldAnnotations -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:7:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$ClassAnnotation,java.util.SortedMap,java.util.SortedMap,java.util.Map,java.util.Map):67:73 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/l;Lcom/android/tools/r8/internal/iv;Lcom/android/tools/r8/internal/iv;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/ir/desugar/desugaredlibrary/lint/l;Lcom/android/tools/r8/internal/kv;Lcom/android/tools/r8/internal/kv;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
     1:1:void forEachFieldAndAnnotation(java.util.function.BiConsumer):105:105 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableSortedMap.values():875:875 -> a
     2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableSortedMap.values():65 -> a
@@ -148031,7 +148018,7 @@
 com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClassesGenerator -> com.android.tools.r8.ir.desugar.desugaredlibrary.lint.o:
 # {"id":"sourceFile","fileName":"SupportedClassesGenerator.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DirectMappedDexApplication appForMax -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/c3;"}
     com.android.tools.r8.utils.AndroidApiLevel minApi -> c
@@ -148043,9 +148030,9 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():57:57 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.Collection):69:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Collection;)V"}
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.Collection,com.android.tools.r8.utils.AndroidApiLevel,boolean,boolean):78:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Collection;Lcom/android/tools/r8/internal/y2;ZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Collection;Lcom/android/tools/r8/internal/y2;ZZ)V"}
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses.builder():195:195 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.Collection,com.android.tools.r8.utils.AndroidApiLevel,boolean,boolean):62 -> <init>
     4:21:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.Collection,com.android.tools.r8.utils.AndroidApiLevel,boolean,boolean):62:79 -> <init>
@@ -148096,10 +148083,10 @@
     49:51:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification getMachineSpecification(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.StringResource):457:459 -> a
     49:51:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):150 -> a
     52:53:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):151:152 -> a
-    54:54:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1189:1189 -> a
+    54:54:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1195:1195 -> a
     54:54:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):152 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:55:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1190:1190 -> a
+    55:55:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1196:1196 -> a
     55:55:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):152 -> a
     56:61:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):153:158 -> a
     62:65:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):283:286 -> a
@@ -148114,13 +148101,13 @@
     70:70:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):162 -> a
     71:117:void annotatePartialDesugaringMembers(com.android.tools.r8.StringResource):165:211 -> a
     118:140:void lambda$annotatePartialDesugaringMembers$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):167:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WL;Ljava/util/List;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Ljava/util/List;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j1;)V"}
     141:152:void lambda$annotatePartialDesugaringMembers$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):185:196 -> a
     153:162:void lambda$annotatePartialDesugaringMembers$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):194:203 -> a
     163:172:void lambda$annotatePartialDesugaringMembers$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):198:207 -> a
     173:174:void lambda$annotatePartialDesugaringMembers$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):171:172 -> a
     175:175:void lambda$annotatePartialDesugaringMembers$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WL;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/g1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/y;ILcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/g1;)V"}
     176:191:void lambda$annotatePartialDesugaringMembers$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):213:228 -> a
     192:201:void lambda$annotatePartialDesugaringMembers$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):227:236 -> a
     202:202:void lambda$annotatePartialDesugaringMembers$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.AppView,int,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):235:235 -> a
@@ -148136,10 +148123,10 @@
     228:230:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification getMachineSpecification(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.StringResource):457:459 -> a
     228:230:void collectSupportedMembersInMinApi(java.util.Collection,com.android.tools.r8.StringResource):271 -> a
     231:232:void collectSupportedMembersInMinApi(java.util.Collection,com.android.tools.r8.StringResource):273:274 -> a
-    233:233:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1189:1189 -> a
+    233:233:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1195:1195 -> a
     233:233:void collectSupportedMembersInMinApi(java.util.Collection,com.android.tools.r8.StringResource):274 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    234:234:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1190:1190 -> a
+    234:234:void com.android.tools.r8.utils.InternalOptions.resetDesugaredLibrarySpecificationForTesting():1196:1196 -> a
     234:234:void collectSupportedMembersInMinApi(java.util.Collection,com.android.tools.r8.StringResource):274 -> a
     235:243:void collectSupportedMembersInMinApi(java.util.Collection,com.android.tools.r8.StringResource):275:283 -> a
     244:245:java.util.List generateListOfBackportedMethods():372:373 -> a
@@ -148227,7 +148214,7 @@
     9:21:java.util.Set getParallelMethods():483:495 -> c
     22:28:java.util.Set getParallelMethods():494:500 -> c
     29:31:java.util.Set getParallelMethods():499:501 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.lh:
 # {"id":"sourceFile","fileName":"CustomConversionDescriptor.java"}
     com.android.tools.r8.graph.DexMethod to -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -148246,7 +148233,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):19:19 -> <init>
     1:1:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
     2:2:com.android.tools.r8.graph.DexMethod getTo():23:23 -> a
     2:2:java.lang.Object[] com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.exportCustomConversionDescriptor(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -148260,7 +148247,7 @@
     5:6:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):33 -> a
     1:5:boolean equals(java.lang.Object):42:46 -> equals
     1:1:int hashCode():51:51 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.yi:
 # {"id":"sourceFile","fileName":"DerivedMethod.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -148272,7 +148259,7 @@
     4:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSyntheticKind$Kind):31:33 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)V"}
     1:1:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
     2:2:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getHolderKind(com.android.tools.r8.graph.AppView):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -148302,19 +148289,19 @@
     17:17:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getHolderKind(com.android.tools.r8.graph.AppView):41 -> a
     1:5:boolean equals(java.lang.Object):76:80 -> equals
     1:1:int hashCode():85:85 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.in:
 # {"id":"sourceFile","fileName":"EmulatedDispatchMethodDescriptor.java"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod interfaceMethod -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yi;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod emulatedDispatchMethod -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yi;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod forwardingMethod -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yi;"}
     java.util.LinkedHashMap dispatchCases -> d
     1:5:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,java.util.LinkedHashMap):49:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/wi;Ljava/util/LinkedHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/yi;Ljava/util/LinkedHashMap;)V"}
     1:1:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getInterfaceMethod():57:57 -> a
     2:2:java.lang.Object[] com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.exportEmulatedDispatchMethodDescriptor(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -148338,7 +148325,7 @@
     9:10:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):75 -> a
     1:8:boolean equals(java.lang.Object):83:90 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.in:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.kn:
 # {"id":"sourceFile","fileName":"EmulatedInterfaceDescriptor.java"}
     com.android.tools.r8.graph.DexType rewrittenType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -148347,7 +148334,7 @@
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):24:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/IdentityHashMap;)V"}
     1:1:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
     2:2:com.android.tools.r8.graph.DexType getRewrittenType():30:30 -> a
     2:2:java.lang.Object[] com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.exportEmulatedInterfaceDescriptor(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):341 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -148361,19 +148348,19 @@
     5:6:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):40 -> a
     1:5:boolean equals(java.lang.Object):49:53 -> equals
     1:1:int hashCode():58:58 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.WL:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.aM:
 # {"id":"sourceFile","fileName":"MachineDesugaredLibrarySpecification.java"}
     boolean libraryCompilation -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags topLevelFlags -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hM;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags rewritingFlags -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fM;"}
     int leadingVersionNumberCache -> d
     1:1:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/dM;Lcom/android/tools/r8/internal/bM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/hM;Lcom/android/tools/r8/internal/fM;)V"}
     2:28:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):35:61 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification withOnlyRewriteTypeForTesting(java.util.Map):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;)Lcom/android/tools/r8/internal/aM;"}
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags.builder():29:29 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification withOnlyRewriteTypeForTesting(java.util.Map):49 -> a
     3:4:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification withOnlyRewriteTypeForTesting(java.util.Map):50:51 -> a
@@ -148390,7 +148377,7 @@
     11:11:java.lang.String getJsonSource():99 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor getEmulatedInterfaceEmulatedDispatchMethodDescriptor(com.android.tools.r8.graph.DexMethod):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/gn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/in;"}
     13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags.getEmulatedInterfaceEmulatedDispatchMethodDescriptor(com.android.tools.r8.graph.DexMethod):225:225 -> a
     13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor getEmulatedInterfaceEmulatedDispatchMethodDescriptor(com.android.tools.r8.graph.DexMethod):168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -148407,12 +148394,12 @@
     21:22:boolean isContextTypeMaintainedOrRewritten(com.android.tools.r8.graph.DexReference):240:241 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)Z"}
     23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):247:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/aM;"}
     24:24:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():84:84 -> a
     24:24:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):247 -> a
     25:25:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing):247:247 -> a
     26:31:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification withPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String):270:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/aM;"}
     1:1:boolean isLibraryCompilation():71:71 -> b
     2:2:boolean isEmulatedInterfaceRewrittenType(com.android.tools.r8.graph.DexType):176:176 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
@@ -148440,7 +148427,7 @@
     1:1:java.util.List getExtraKeepRules():108:108 -> e
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():89:89 -> f
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification empty():38:38 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZL;"}
     2:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags.empty():30:31 -> g
     2:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification empty():39 -> g
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> g
@@ -148465,43 +148452,43 @@
     1:1:java.util.Set getMaintainType():123:123 -> l
     1:1:java.util.Map getRewriteType():119:119 -> m
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags getRewritingFlags():79:79 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fM;"}
     1:1:java.util.Map getStaticFieldRetarget():131:131 -> o
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags getTopLevelFlags():75:75 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hM;"}
     1:1:java.util.Map getWrappers():180:180 -> q
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.VL:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.ZL:
 # {"id":"sourceFile","fileName":"MachineDesugaredLibrarySpecification.java"}
     1:1:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):39:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dM;Lcom/android/tools/r8/internal/bM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hM;Lcom/android/tools/r8/internal/fM;)V"}
     1:1:boolean isSupported(com.android.tools.r8.graph.DexReference):42:42 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)Z"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.XL:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.bM:
 # {"id":"sourceFile","fileName":"MachineDesugaredLibrarySpecificationParser.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineMethodParser methodParser -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dM;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineFieldParser fieldParser -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cM;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean libraryCompilation -> e
     int minAPILevel -> f
     com.android.tools.r8.origin.Origin origin -> g
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XC;"}
     java.util.Map packageMap -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ju;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lu;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():64:64 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):88:94 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;ZI)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;ZI)V"}
     1:7:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):115:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/lang/String;)Lcom/android/tools/r8/internal/SC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/lang/String;)Lcom/android/tools/r8/internal/UC;"}
     8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):116:116 -> a
     9:11:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject):131:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/VC;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Ljava/lang/String;Lcom/android/tools/r8/internal/XC;)Lcom/android/tools/r8/internal/aM;"}
     12:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags parseTopLevelFlags(java.lang.String):185:191 -> a
     12:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject):138 -> a
     19:19:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.get(java.lang.String):185:185 -> a
@@ -148545,11 +148532,11 @@
     55:55:void parsePackageMap():151 -> a
     56:56:void parsePackageMap():151:151 -> a
     57:57:void lambda$parsePackageMap$0(com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder,java.util.Map$Entry):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iu;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ku;Ljava/util/Map$Entry;)V"}
     58:59:void setOrigin(com.android.tools.r8.StringResource):168:169 -> a
     58:59:java.lang.String parseJson(com.android.tools.r8.StringResource):155 -> a
     58:59:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;)Lcom/android/tools/r8/internal/aM;"}
     60:62:java.lang.String parseJson(com.android.tools.r8.StringResource):158:160 -> a
     60:62:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):125 -> a
     63:63:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):126:126 -> a
@@ -148565,7 +148552,7 @@
     67:67:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
     67:67:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;Lcom/android/tools/r8/internal/aM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;Lcom/android/tools/r8/internal/eM;)V"}
     68:68:java.util.Iterator com.android.tools.r8.com.google.gson.JsonArray.iterator():216:216 -> a
     68:68:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):204 -> a
     69:73:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):204:208 -> a
@@ -148576,7 +148563,7 @@
     76:76:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):209 -> a
     77:81:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):209:213 -> a
     82:82:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):220:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/internal/aM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/internal/eM;)V"}
     83:83:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> a
     83:83:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -149410,10 +149397,10 @@
     537:537:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.amendLibraryField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags):453:453 -> a
     537:537:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):348 -> a
     538:540:void require(com.android.tools.r8.com.google.gson.JsonArray,int,java.lang.String):366:368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;ILjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;ILjava/lang/String;)V"}
     541:541:void require(com.android.tools.r8.com.google.gson.JsonArray,int,java.lang.String):367:367 -> a
     542:542:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod parseDerivedMethod(com.android.tools.r8.com.google.gson.JsonArray):413:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;)Lcom/android/tools/r8/internal/wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;)Lcom/android/tools/r8/internal/yi;"}
     543:543:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonArray.get(int):228:228 -> a
     543:543:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod parseDerivedMethod(com.android.tools.r8.com.google.gson.JsonArray):414 -> a
     544:544:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod parseDerivedMethod(com.android.tools.r8.com.google.gson.JsonArray):414:414 -> a
@@ -149437,7 +149424,7 @@
     567:568:com.android.tools.r8.graph.DexType stringDescriptorToDexType(java.lang.String):464:465 -> a
     569:569:com.android.tools.r8.graph.DexType stringDescriptorToDexType(java.lang.String):464:464 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor parseEmulatedDispatchDescriptor(com.android.tools.r8.com.google.gson.JsonArray):402:402 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;)Lcom/android/tools/r8/internal/gn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;)Lcom/android/tools/r8/internal/in;"}
     2:2:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonArray.get(int):228:228 -> b
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor parseEmulatedDispatchDescriptor(com.android.tools.r8.com.google.gson.JsonArray):403 -> b
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor parseEmulatedDispatchDescriptor(com.android.tools.r8.com.google.gson.JsonArray):403:403 -> b
@@ -149501,51 +149488,51 @@
     29:29:java.util.LinkedHashMap parseEmulatedDispatchMap(com.android.tools.r8.com.google.gson.JsonObject):393 -> b
     29:29:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor parseEmulatedDispatchDescriptor(com.android.tools.r8.com.google.gson.JsonArray):407 -> b
     30:30:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor parseEmulatedDispatchDescriptor(com.android.tools.r8.com.google.gson.JsonArray):408:408 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.bM:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.fM:
 # {"id":"sourceFile","fileName":"MachineRewritingFlags.java"}
     java.util.Map rewriteType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     java.util.Set maintainType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map rewriteDerivedTypeOnly -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     java.util.Map staticFieldRetarget -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map covariantRetarget -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map staticRetarget -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map nonEmulatedVirtualRetarget -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map emulatedVirtualRetarget -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map emulatedVirtualRetargetThroughEmulatedInterface -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map apiGenericTypesConversion -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map emulatedInterfaces -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.LinkedHashMap wrappers -> l
     java.util.Map legacyBackport -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set dontRetarget -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map customConversions -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set neverOutlineApi -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map amendLibraryMethod -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map amendLibraryField -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():26:26 -> <clinit>
     1:20:void <init>(java.util.Map,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.LinkedHashMap,java.util.Map,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map):50:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ev;Ljava/util/Map;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/gv;Ljava/util/Map;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;)V"}
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor.getFrom():27:27 -> a
     1:1:boolean lambda$isCustomConversionRewrittenType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/jh;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lh;)Z"}
     2:2:boolean lambda$isCustomConversionRewrittenType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):185:185 -> a
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor.getTo():23:23 -> a
     3:3:boolean lambda$isCustomConversionRewrittenType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):186 -> a
@@ -149553,7 +149540,7 @@
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getRewrittenType():30:30 -> a
     5:5:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor descriptorWithPostPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):291 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/in;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/kn;"}
     6:6:com.android.tools.r8.graph.DexType typeWithPostPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):341:341 -> a
     6:6:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor descriptorWithPostPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):291 -> a
     7:7:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor descriptorWithPostPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):292:292 -> a
@@ -149563,17 +149550,17 @@
     25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getRewrittenType():30:30 -> a
     25:25:boolean lambda$isEmulatedInterfaceRewrittenType$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)Z"}
     26:27:boolean isCustomConversionRewrittenType(com.android.tools.r8.graph.DexType):182:183 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     28:28:boolean isCustomConversionRewrittenType(com.android.tools.r8.graph.DexType):182:182 -> a
     29:29:java.util.Map getAmendLibraryField():202:202 -> a
     30:31:java.util.Map customConversionsWithPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):265:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/Du;"}
     32:32:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     32:32:java.util.Map customConversionsWithPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):273 -> a
     33:33:void lambda$customConversionsWithPostPrefix$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):268:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/jh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lh;)V"}
     34:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor.getTo():23:23 -> a
     34:34:void lambda$customConversionsWithPostPrefix$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -149583,9 +149570,9 @@
     37:37:void lambda$customConversionsWithPostPrefix$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):272:272 -> a
     38:38:void lambda$customConversionsWithPostPrefix$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):268:268 -> a
     39:39:void lambda$emulatedInterfacesWithPostPrefix$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):280:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)V"}
     40:40:void lambda$descriptorWithPostPrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):297:297 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kn;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/in;)V"}
     41:41:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getInterfaceMethod():57:57 -> a
     41:41:void lambda$descriptorWithPostPrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):297 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -149619,7 +149606,7 @@
     57:57:void lambda$descriptorWithPostPrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):307:307 -> a
     58:58:void lambda$descriptorWithPostPrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):299:299 -> a
     59:60:java.util.Map typeMapWithPostPrefix(java.util.Map,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):314:315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Du;"}
     61:61:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     61:61:java.util.Map typeMapWithPostPrefix(java.util.Map,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):316 -> a
     62:63:com.android.tools.r8.graph.DexMethod methodWithPostPrefix(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):322:323 -> a
@@ -149643,19 +149630,19 @@
     77:77:com.android.tools.r8.graph.DexMethod methodWithPostPrefix(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):321:321 -> a
     78:78:com.android.tools.r8.graph.DexType typeWithPostPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):341:341 -> a
     78:78:void lambda$typeMapWithPostPrefix$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):315 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     79:79:void lambda$typeMapWithPostPrefix$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):315:315 -> a
     1:1:java.util.Map getAmendLibraryMethod():198:198 -> b
     2:3:boolean isEmulatedInterfaceRewrittenType(com.android.tools.r8.graph.DexType):215:216 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     4:4:boolean isEmulatedInterfaceRewrittenType(com.android.tools.r8.graph.DexType):215:215 -> b
     5:6:java.util.Map emulatedInterfacesWithPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):278:279 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/Du;"}
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> b
     7:7:java.util.Map emulatedInterfacesWithPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):281 -> b
     1:1:java.util.Map getApiGenericConversion():155:155 -> c
     2:17:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags withPostPrefix(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.lang.String):242:257 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/bM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/internal/fM;"}
     1:1:java.util.Map getCovariantRetarget():135:135 -> d
     1:1:java.util.Map getCustomConversions():190:190 -> e
     1:1:java.util.Set getDontRetarget():177:177 -> f
@@ -149671,43 +149658,43 @@
     1:1:java.util.Map getStaticRetarget():139:139 -> p
     1:1:java.util.LinkedHashMap getWrappers():169:169 -> q
     1:5:boolean hasRetargeting():206:210 -> r
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.aM:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.eM:
 # {"id":"sourceFile","fileName":"MachineRewritingFlags.java"}
     java.util.Map rewriteType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder maintainType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     java.util.Map rewriteDerivedTypeOnly -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder staticFieldRetarget -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder covariantRetarget -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder staticRetarget -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder nonEmulatedVirtualRetarget -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedVirtualRetarget -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedVirtualRetargetThroughEmulatedInterface -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder apiGenericTypesConversion -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder emulatedInterfaces -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     java.util.LinkedHashMap wrappers -> l
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder legacyBackport -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder dontRetarget -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder customConversions -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder neverOutlineApi -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder amendLibraryMethod -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder amendLibraryField -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():344:344 -> <clinit>
     1:4:void <init>():346:349 -> <init>
@@ -149735,9 +149722,9 @@
     7:7:void amendLibraryField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags):453:453 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/g3;)V"}
     8:15:void validate(java.util.Set):461:468 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;)V"}
     16:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags build():477:479 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fM;"}
     19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags build():483 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -149794,12 +149781,12 @@
 # {"id":"sourceFile","fileName":"MachineSyntheticKind.java"}
 com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSyntheticKind$Kind -> R8$$REMOVED$$CLASS$$100:
 # {"id":"sourceFile","fileName":"MachineSyntheticKind.java"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSyntheticKind$Kind$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cM:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSyntheticKind$Kind$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.gM:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     int com.android.tools.r8.internal.MachineSyntheticKind$Kind$EnumUnboxingLocalUtility.getId(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.dM:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.hM:
 # {"id":"sourceFile","fileName":"MachineTopLevelFlags.java"}
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y2;"}
@@ -149814,16 +149801,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V"}
     1:1:java.util.List getExtraKeepRules():70:70 -> a
     2:13:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags withPostPrefix(java.lang.String):78:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/dM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/hM;"}
     1:1:java.lang.String getExtraKeepRulesConcatenated():74:74 -> b
     1:1:java.lang.String getIdentifier():58:58 -> c
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():50:50 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y2;"}
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():54:54 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.kP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.oP:
 # {"id":"sourceFile","fileName":"MultiAPILevelMachineDesugaredLibrarySpecification.java"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags topLevelFlags -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hM;"}
     java.util.Map commonFlags -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map libraryFlags -> c
@@ -149831,8 +149818,8 @@
     java.util.Map programFlags -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,java.util.Map,java.util.Map,java.util.Map):24:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dM;Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.mP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hM;Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.qP:
 # {"id":"sourceFile","fileName":"MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -149845,7 +149832,7 @@
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getMethod():53:53 -> a
     1:1:java.lang.Object[] exportDerivedMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):315 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;)[Ljava/lang/Object;"}
     2:2:java.lang.Object[] exportDerivedMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):315:315 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSyntheticKind$Kind com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getMachineHolderKind():37:37 -> a
     3:3:java.lang.Object[] exportDerivedMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):318 -> a
@@ -149860,7 +149847,7 @@
     11:24:int com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange.deterministicOrder(com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange):73:86 -> a
     11:24:int lambda$rewritingFlagsToString$0(com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange):114 -> a
     25:25:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kP;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/graph/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oP;Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/graph/B1;)V"}
     26:26:void internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):81:81 -> a
     26:26:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory):76 -> a
     27:27:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification.getTopLevelFlags():37:37 -> a
@@ -149967,12 +149954,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/g;)V"}
     130:131:java.util.LinkedHashMap specificationDescriptorLinkedHashMapToJsonStruct(java.util.LinkedHashMap):211:212 -> a
     132:132:void lambda$specificationDescriptorLinkedHashMapToJsonStruct$3(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItem,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.SpecificationDescriptor):212:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/Gc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/Kc0;)V"}
     133:134:java.util.TreeMap mapToJsonStruct(java.util.Map):217:218 -> a
     135:135:void lambda$mapToJsonStruct$4(java.util.TreeMap,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):218:218 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeMap;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/graph/n1;)V"}
     136:136:void lambda$specificationDescriptorMapToJsonStruct$5(java.util.TreeMap,com.android.tools.r8.graph.DexItem,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.SpecificationDescriptor):225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeMap;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/Gc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeMap;Lcom/android/tools/r8/graph/n1;Lcom/android/tools/r8/internal/Kc0;)V"}
     137:139:java.util.List collectionToJsonStruct(java.util.Collection):230:232 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Ljava/util/ArrayList;"}
     140:140:void lambda$collectionToJsonStruct$6(java.util.List,com.android.tools.r8.graph.DexItem):231:231 -> a
@@ -149988,15 +149975,15 @@
     1:5:void writeMembersWithFlags(java.lang.String,java.util.Map,java.util.Map):173:177 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/Map;Ljava/util/LinkedHashMap;)V"}
     6:7:java.util.TreeMap specificationDescriptorMapToJsonStruct(java.util.Map):224:225 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.lP:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.pP:
 # {"id":"sourceFile","fileName":"MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.java"}
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):94:94 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.SpecificationDescriptor -> com.android.tools.r8.internal.Gc0:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.SpecificationDescriptor -> com.android.tools.r8.internal.Kc0:
 # {"id":"sourceFile","fileName":"SpecificationDescriptor.java"}
     java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor -> com.android.tools.r8.internal.ym0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor -> com.android.tools.r8.internal.Cm0:
 # {"id":"sourceFile","fileName":"WrapperDescriptor.java"}
     java.util.List methods -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
@@ -150006,7 +149993,7 @@
     1:4:void <init>(java.util.List,java.util.List,boolean):18:21 -> <init>
     1:1:java.util.List getSubwrappers():29:29 -> a
     2:2:java.lang.Object[] toJsonStruct(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;)[Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qP;)[Ljava/lang/Object;"}
     3:3:java.util.List getMethods():25:25 -> a
     3:3:java.lang.Object[] com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecificationJsonExporter.exportWrapperDescriptor(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor):348 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150039,7 +150026,7 @@
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     java.util.Map MODIFIERS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:8:void <clinit>():19:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):30:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
@@ -150063,7 +150050,7 @@
     14:14:void parseMethod(java.lang.String):24:24 -> b
     void returnType(com.android.tools.r8.graph.DexType) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanFieldParser -> com.android.tools.r8.internal.at:
+com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanFieldParser -> com.android.tools.r8.internal.ct:
 # {"id":"sourceFile","fileName":"HumanFieldParser.java"}
     com.android.tools.r8.graph.FieldAccessFlags$Builder flagBuilder -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/f3;"}
@@ -150105,7 +150092,7 @@
     1:2:com.android.tools.r8.graph.DexField getField():33:34 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/l1;"}
     1:1:boolean parsingFinished():29:29 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanMethodParser -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.HumanMethodParser -> com.android.tools.r8.internal.dt:
 # {"id":"sourceFile","fileName":"HumanMethodParser.java"}
     com.android.tools.r8.graph.MethodAccessFlags$Builder flagBuilder -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F4;"}
@@ -150151,25 +150138,25 @@
     3:4:void returnType(com.android.tools.r8.graph.DexType):84:85 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:boolean parsingFinished():33:33 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineFieldParser -> com.android.tools.r8.internal.YL:
+com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineFieldParser -> com.android.tools.r8.internal.cM:
 # {"id":"sourceFile","fileName":"MachineFieldParser.java"}
     java.util.function.Function typeParser -> j
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):15:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/Function;)V"}
     1:1:com.android.tools.r8.graph.DexType stringTypeToDexType(java.lang.String):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineMethodParser -> com.android.tools.r8.internal.ZL:
+com.android.tools.r8.ir.desugar.desugaredlibrary.memberparser.MachineMethodParser -> com.android.tools.r8.internal.dM:
 # {"id":"sourceFile","fileName":"MachineMethodParser.java"}
     java.util.function.Function typeParser -> k
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):15:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/Function;)V"}
     1:1:com.android.tools.r8.graph.DexType stringTypeToDexType(java.lang.String):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibRewriterEventConsumer -> com.android.tools.r8.internal.zk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibRewriterEventConsumer -> com.android.tools.r8.internal.Bk:
 # {"id":"sourceFile","fileName":"DesugaredLibRewriterEventConsumer.java"}
     void acceptDesugaredLibraryBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryCfMethods -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryCfMethods -> com.android.tools.r8.internal.Fk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryCfMethods.java"}
     1:25:com.android.tools.r8.graph.CfCode DesugaredLibraryBridge_fromArgType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):46:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/G;"}
@@ -150205,22 +150192,22 @@
     421:421:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> a
     421:421:com.android.tools.r8.graph.CfCode DesugaredLibraryBridge_fromArgType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):230 -> a
     422:422:com.android.tools.r8.graph.CfCode DesugaredLibraryBridge_fromArgType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):230:230 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryLibRewriter -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryLibRewriter -> com.android.tools.r8.internal.Nk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryLibRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map rewritings -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):40:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Du;)V"}
     1:31:java.util.Map computeMap(com.android.tools.r8.graph.AppView):58:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Du;"}
     32:32:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
     32:32:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryLibRewriter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     33:33:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     33:33:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150232,7 +150219,7 @@
     35:39:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryLibRewriter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     40:40:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryLibRewriter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":43,"2":44,"3":45},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":43,"2":44,"3":45},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     41:41:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     41:41:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):121 -> a
     41:41:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryLibRewriter.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -150247,7 +150234,7 @@
     46:46:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$compute$0(com.android.tools.r8.synthesis.SyntheticNaming):95:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     47:47:java.util.Collection lambda$compute$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     48:55:java.util.Collection lambda$compute$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):111:118 -> a
     56:56:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.disableAndroidApiLevelCheck():130:130 -> a
     56:56:void lambda$ensureBridge$4(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):141 -> a
@@ -150266,7 +150253,7 @@
     64:64:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     64:64:void lambda$ensureBridge$4(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):144 -> a
     65:66:com.android.tools.r8.graph.DexMethod ensureBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod):131:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/w2;"}
     67:67:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     67:67:com.android.tools.r8.graph.DexMethod ensureBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150278,12 +150265,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureBridge$2(com.android.tools.r8.synthesis.SyntheticNaming):136:136 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Mk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Ok:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uk;"}
     java.util.Map staticFieldRetarget -> c
     java.util.Map covariantRetarget -> d
     java.util.Map staticRetarget -> e
@@ -150313,7 +150300,7 @@
     16:16:void <init>(com.android.tools.r8.graph.AppView):50:50 -> <init>
     1:3:void visit(java.util.function.Consumer):55:57 -> a
     4:4:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     5:5:boolean com.android.tools.r8.cf.code.CfInstruction.isStaticFieldGet():0:0 -> a
     5:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):62 -> a
     6:8:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):63:65 -> a
@@ -150334,21 +150321,21 @@
     38:38:com.android.tools.r8.ir.desugar.DesugarDescription createWithTarget(java.util.function.BiFunction):108:108 -> a
     38:38:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryRetargeter.createWithTarget(java.util.function.BiFunction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/wk;"}
     39:39:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryRetargeter.createWithTarget(java.util.function.BiFunction):0:0 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription createWithTarget(java.util.function.BiFunction):126 -> a
     40:40:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.DesugaredLibraryRetargeter.createWithTarget(java.util.function.BiFunction):0 -> a
     41:44:java.util.Collection lambda$createWithTarget$0(java.util.function.BiFunction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):120:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     45:45:java.util.Collection lambda$computeStaticFieldGetDescription$1(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     46:48:com.android.tools.r8.ir.desugar.DesugarDescription ensureInvokeRetargetingResult(com.android.tools.r8.graph.DexMethod):167:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/zk;"}
     49:66:com.android.tools.r8.ir.desugar.DesugarDescription computeNonStaticRetarget(com.android.tools.r8.graph.DexMethod,boolean):175:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/zk;"}
     67:67:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$3(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/w2;"}
     68:68:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):102:102 -> a
     68:68:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$3(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150356,12 +150343,12 @@
     69:69:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$3(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180 -> a
     70:70:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$3(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):181:181 -> a
     71:73:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):186:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/w2;"}
     74:74:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):186:186 -> a
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription computeStaticFieldGetDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):131:131 -> b
     1:1:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryRetargeter.computeStaticFieldGetDescription(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     2:5:com.android.tools.r8.graph.DexField fieldRetarget(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.graph.ProgramMethod):152:155 -> b
     2:5:com.android.tools.r8.ir.desugar.DesugarDescription computeStaticFieldGetDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):132 -> b
     2:5:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryRetargeter.computeStaticFieldGetDescription(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> b
@@ -150379,7 +150366,7 @@
     14:16:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryRetargeter.computeStaticFieldGetDescription(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> b
     17:17:com.android.tools.r8.ir.desugar.DesugarDescription computeStaticFieldGetDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> b
     17:17:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryRetargeter.computeStaticFieldGetDescription(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19,"2":20,"3":21},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19,"2":20,"3":21},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription computeStaticFieldGetDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):148 -> b
     18:18:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.DesugaredLibraryRetargeter.computeStaticFieldGetDescription(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> b
@@ -150390,19 +150377,19 @@
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> b
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription computeStaticFieldGetDescription(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):137 -> b
     22:22:com.android.tools.r8.graph.DexMethod lambda$ensureInvokeRetargetingResult$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):171:171 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Nk:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/w2;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Pk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterL8Synthesizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uk;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):31:33 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):45:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
     3:3:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedVirtualRetarget():147:147 -> a
     3:3:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150410,12 +150397,12 @@
     4:4:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):46 -> a
     5:6:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):48:49 -> a
     1:1:java.lang.String uniqueIdentifier():38:38 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Qk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterPostProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uk;"}
     java.util.Map emulatedDispatchMethods -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():33:33 -> <clinit>
@@ -150428,22 +150415,22 @@
     7:7:void <init>(com.android.tools.r8.graph.AppView):43 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):51 -> a
     4:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):51:52 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;)V"}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;)V"}
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
     9:9:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
@@ -150451,9 +150438,9 @@
     10:10:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):60 -> a
     11:27:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):61:77 -> a
     28:29:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/in;)V"}
     30:30:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Rk;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Tk;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     31:32:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Map):93:94 -> a
     31:32:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
     33:49:void ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):118:134 -> a
@@ -150525,23 +150512,23 @@
     98:98:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):175:175 -> a
     98:98:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Map):99 -> a
     98:98:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Rk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterSynthesizerEventConsumer.java"}
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     void acceptCovariantRetargetMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer -> com.android.tools.r8.internal.Qk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer -> com.android.tools.r8.internal.Sk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterSynthesizerEventConsumer.java"}
     void acceptDesugaredLibraryRetargeterDispatchProgramClass(com.android.tools.r8.graph.DexProgramClass) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer -> com.android.tools.r8.internal.Tk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterSynthesizerEventConsumer.java"}
     void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;)V"}
     void acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Uk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryRetargeterSyntheticHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -150550,7 +150537,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):33:34 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.DexMethod ensureCovariantRetargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/w2;"}
     2:2:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     2:2:com.android.tools.r8.graph.DexMethod ensureCovariantRetargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150572,7 +150559,7 @@
     17:17:com.android.tools.r8.graph.Code lambda$ensureCovariantRetargetMethod$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58 -> a
     18:18:com.android.tools.r8.graph.Code lambda$ensureCovariantRetargetMethod$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):59:59 -> a
     19:19:com.android.tools.r8.graph.DexMethod ensureRetargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Pk;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Rk;)Lcom/android/tools/r8/graph/w2;"}
     20:20:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     20:20:com.android.tools.r8.graph.DexMethod ensureRetargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):68 -> a
     21:25:com.android.tools.r8.graph.DexMethod ensureRetargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):71:75 -> a
@@ -150603,7 +150590,7 @@
     42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassBuilder.getType():79:79 -> a
     42:42:void lambda$buildHolderDispatchMethod$20(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Pk;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Rk;Lcom/android/tools/r8/synthesis/M;)V"}
     43:43:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getEmulatedDispatchMethod():61:61 -> a
     43:43:void lambda$buildHolderDispatchMethod$20(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150622,7 +150609,7 @@
     55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassBuilder.getType():79:79 -> a
     55:55:void lambda$buildInterfaceDispatchMethod$18(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):236 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/synthesis/M;)V"}
     56:56:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getInterfaceMethod():57:57 -> a
     56:56:void lambda$buildInterfaceDispatchMethod$18(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticMethodBuilder):236 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150661,12 +150648,12 @@
     81:82:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setInterface():106 -> a
     81:82:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/internal/in;)V"}
     83:84:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setInterface():107:108 -> a
     83:84:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):231 -> a
     85:86:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):231:232 -> a
     87:87:com.android.tools.r8.graph.DexMethod forwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;)Lcom/android/tools/r8/graph/w2;"}
     88:88:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getForwardingMethod():65:65 -> a
     88:88:com.android.tools.r8.graph.DexMethod forwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):95 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150678,7 +150665,7 @@
     91:91:com.android.tools.r8.graph.DexMethod forwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     92:92:com.android.tools.r8.graph.DexMethod emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/wi;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/yi;)Lcom/android/tools/r8/graph/w2;"}
     93:93:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):106:106 -> a
     93:93:com.android.tools.r8.graph.DexMethod emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):112 -> a
     94:94:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
@@ -150713,7 +150700,7 @@
     108:108:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$emulatedHolderDispatchMethod$6(com.android.tools.r8.synthesis.SyntheticNaming):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     109:109:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/graph/w2;"}
     110:110:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getEmulatedDispatchMethod():61:61 -> a
     110:110:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150724,11 +150711,11 @@
     113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getHolderContext():49:49 -> a
     113:113:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):136 -> a
     114:116:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):136:138 -> a
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     117:117:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     118:118:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     118:118:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):138 -> a
     119:119:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):139:139 -> a
@@ -150751,13 +150738,13 @@
     148:148:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):155 -> a
     149:151:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):163:165 -> a
     152:152:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedHolderDispatchMethod$8(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticNaming):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     153:153:void lambda$ensureEmulatedHolderDispatchMethod$10(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/Pk;Lcom/android/tools/r8/synthesis/o;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/Rk;Lcom/android/tools/r8/synthesis/o;)V"}
     154:154:void lambda$ensureProgramEmulatedHolderDispatchMethod$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/synthesis/V;)V"}
     155:155:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/Pk;)Lcom/android/tools/r8/graph/E0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/Rk;)Lcom/android/tools/r8/graph/E0;"}
     156:156:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getInterfaceMethod():57:57 -> a
     156:156:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):192 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -150768,11 +150755,11 @@
     159:159:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getHolderContext():49:49 -> a
     159:159:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):193 -> a
     160:161:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):193:194 -> a
-    162:162:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    162:162:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     162:162:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     163:163:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     163:163:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):194 -> a
     164:164:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):195:195 -> a
@@ -150794,14 +150781,14 @@
     186:186:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):975:975 -> a
     186:186:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):203 -> a
     187:187:void lambda$ensureEmulatedInterfaceDispatchMethod$15(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/synthesis/o;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/synthesis/o;)V"}
     188:188:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/Q8;)Lcom/android/tools/r8/graph/D2;"}
-    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/S8;)Lcom/android/tools/r8/graph/D2;"}
+    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     189:189:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     190:190:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    190:190:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    190:190:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     190:190:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):214 -> a
     191:192:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):214:215 -> a
@@ -150823,16 +150810,16 @@
     201:207:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):219:225 -> a
     208:208:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):220:220 -> a
     209:209:void lambda$ensureEmulatedInterfaceDispatchMethod$17(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/synthesis/V;)V"}
     210:210:void buildHolderDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):255:255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/Pk;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/l;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/Rk;)V"}
     211:211:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):268:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Pk;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
-    212:212:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Rk;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
+    212:212:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     212:212:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     213:213:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    213:213:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    213:213:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     213:213:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):268 -> a
     214:214:com.android.tools.r8.graph.DexMethod ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):102:102 -> a
@@ -150855,7 +150842,7 @@
     220:223:com.android.tools.r8.graph.CfCode generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):282:285 -> a
     220:223:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):269 -> a
     1:1:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):118:118 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/wi;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/yi;)Lcom/android/tools/r8/graph/w2;"}
     2:2:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):106:106 -> b
     2:2:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):118 -> b
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
@@ -150888,12 +150875,12 @@
     15:15:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$emulatedInterfaceDispatchMethod$7(com.android.tools.r8.synthesis.SyntheticNaming):118:118 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     16:17:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):172:173 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/Q8;)V"}
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/S8;)V"}
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> b
     18:18:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):173 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):173 -> b
     20:20:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):173:173 -> b
@@ -150915,25 +150902,25 @@
     30:36:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):179:185 -> b
     37:37:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):180:180 -> b
     38:38:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceDispatchMethod$13(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticNaming):197:197 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureCovariantRetargetMethod$0(com.android.tools.r8.synthesis.SyntheticNaming):46:46 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceDispatchMethod$16(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticNaming):221:221 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedHolderDispatchMethod$9(com.android.tools.r8.synthesis.SyntheticNaming):156:156 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureProgramEmulatedHolderDispatchMethod$11(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticNaming):181:181 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceDispatchMethod$14(com.android.tools.r8.synthesis.SyntheticNaming):204:204 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureRetargetMethod$3(com.android.tools.r8.synthesis.SyntheticNaming):81:81 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.DesugaredLibraryConverter -> com.android.tools.r8.internal.Fk:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.DesugaredLibraryConverter -> com.android.tools.r8.internal.Hk:
 # {"id":"sourceFile","fileName":"DesugaredLibraryConverter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertMultiLevelAnythingToMachineSpecification(java.nio.file.Path,java.util.Set,java.util.Set,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Ljava/util/Set;Ljava/util/Set;Ljava/nio/file/Path;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/dP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Ljava/util/Set;Ljava/util/Set;Ljava/nio/file/Path;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/hP;"}
     2:4:com.android.tools.r8.com.google.gson.JsonObject parseJsonConfig(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.StringResource$FileResource):100:102 -> a
     2:4:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertMultiLevelAnythingToMachineSpecification(java.nio.file.Path,java.util.Set,java.util.Set,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):63 -> a
     5:5:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertMultiLevelAnythingToMachineSpecification(java.nio.file.Path,java.util.Set,java.util.Set,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):65:65 -> a
@@ -150999,11 +150986,11 @@
     50:50:com.android.tools.r8.com.google.gson.JsonObject parseJsonConfig(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.StringResource$FileResource):104 -> a
     50:50:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertMultiLevelAnythingToMachineSpecification(java.nio.file.Path,java.util.Set,java.util.Set,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):63 -> a
     51:57:java.lang.String convertToMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification):87:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/dP;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/hP;)Ljava/lang/String;"}
     58:60:java.lang.String convertToMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification):92:94 -> a
     61:61:void lambda$convertToMachineSpecification$0(com.android.tools.r8.utils.Box,java.lang.String,com.android.tools.r8.DiagnosticsHandler):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Ljava/lang/String;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.gt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Ljava/lang/String;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.jt:
 # {"id":"sourceFile","fileName":"HumanToMachineEmulatedInterfaceConverter.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
@@ -151016,7 +151003,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):35:39 -> <init>
     1:21:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):48:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/aM;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/eM;Ljava/util/function/BiConsumer;)V"}
     22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor.getRewrittenType():125:125 -> a
     22:22:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151028,10 +151015,10 @@
     25:25:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):68 -> a
     26:26:void convertEmulatedInterfaces(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):72:72 -> a
     27:29:boolean lambda$convertEmulatedInterfaces$0(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexEncodedMethod):60:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/et;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/j1;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gt;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/j1;)Z"}
     30:30:boolean lambda$convertEmulatedInterfaces$0(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexEncodedMethod):61:61 -> a
     31:33:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClassAndMethod):65:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/H0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/H0;)V"}
     34:42:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):77:85 -> a
     34:42:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClassAndMethod):66 -> a
     43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor.getRewrittenType():125:125 -> a
@@ -151100,28 +151087,28 @@
     114:114:boolean com.android.tools.r8.utils.WorkList.isEmpty():141:141 -> a
     114:114:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.graph.DexType,java.util.Set):185 -> a
     115:121:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.graph.DexType,java.util.Set):186:192 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.kt:
 # {"id":"sourceFile","fileName":"HumanToMachinePrefixConverter.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eM;"}
     java.lang.String synthesizedPrefix -> c
     boolean libraryCompilation -> d
     java.util.Map descriptorPrefix -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set descriptorMaintainPrefix -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set descriptorDontRewritePrefix -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map descriptorDifferentPrefix -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set usedPrefix -> i
     boolean jdk11Legacy -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,boolean,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):43:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/aM;Ljava/lang/String;ZLjava/lang/String;Lcom/android/tools/r8/internal/dt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/eM;Ljava/lang/String;ZLjava/lang/String;Lcom/android/tools/r8/internal/ft;)V"}
     2:16:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,boolean,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):34:48 -> <init>
     17:19:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):246:248 -> <init>
     17:19:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,boolean,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):48 -> <init>
@@ -151175,12 +151162,12 @@
     33:33:com.android.tools.r8.graph.DexType convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):102:102 -> a
     34:34:com.android.tools.r8.graph.DexType convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):101:101 -> a
     35:35:void rewriteApiConversions(java.util.Map):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;)V"}
     36:38:void lambda$rewriteApiConversions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):116:118 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;[Lcom/android/tools/r8/graph/w2;)V"}
     39:39:void rewriteEmulatedInterface(java.util.Map):126:126 -> a
     40:40:void lambda$rewriteEmulatedInterface$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/et;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/gt;)V"}
     41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor.getRewrittenType():125:125 -> a
     41:41:void lambda$rewriteEmulatedInterface$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$HumanEmulatedInterfaceDescriptor):127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151233,7 +151220,7 @@
     8:11:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):221:224 -> d
     8:11:void registerType(com.android.tools.r8.graph.DexType):157 -> d
     12:15:void registerType(com.android.tools.r8.graph.DexType):159:162 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.lt:
 # {"id":"sourceFile","fileName":"HumanToMachineRetargetConverter.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
@@ -151245,7 +151232,7 @@
     2:5:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):33:36 -> <init>
     1:4:void convertRetargetField(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):71:74 -> a
     1:4:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     5:5:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putStaticFieldRetarget(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):397:397 -> a
     5:5:void convertRetargetField(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151254,17 +151241,17 @@
     6:6:void convertRetargetField(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):77 -> a
     6:6:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):45 -> a
     7:37:void convertCovariantRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):82:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     38:58:void convertRetargetMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer,java.util.function.Consumer):119:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     59:59:void convertRetargetMethodToMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     60:83:void convertRetargetMethodEmulatedDispatch(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):160:183 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;)V"}
     84:84:void convertRetargetMethodEmulatedDispatchToType(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     85:85:void convertRetargetMethodEmulatedDispatchToMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     86:86:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):208:208 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j1;)Z"}
     87:87:boolean com.android.tools.r8.graph.DexClass.isFinal():617:617 -> a
@@ -151274,7 +151261,7 @@
     88:88:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):209 -> a
     89:89:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):209:209 -> a
     90:93:void convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):217:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
     94:94:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putEmulatedVirtualRetargetThroughEmulatedInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421:421 -> a
     94:94:void convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151289,7 +151276,7 @@
     106:106:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.getRetargetStaticField():241:241 -> a
     106:106:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/internal/aM;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/internal/eM;Ljava/util/function/BiConsumer;)V"}
     107:108:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):44:45 -> a
     109:109:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.getCovariantRetarget():245:245 -> a
     109:109:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):47 -> a
@@ -151305,26 +151292,26 @@
     122:127:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):61:66 -> a
     128:128:void convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):241:241 -> a
     128:128:void lambda$convertRetargetMethodEmulatedDispatchToType$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
     129:129:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):3141:3141 -> a
     129:129:void convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):241 -> a
     129:129:void lambda$convertRetargetMethodEmulatedDispatchToType$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):193 -> a
     130:132:void convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):242:244 -> a
     130:132:void lambda$convertRetargetMethodEmulatedDispatchToType$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):193 -> a
     133:144:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):253:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/dt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/ft;)Z"}
     145:145:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     145:145:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):271 -> a
     146:148:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$12(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):268:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     149:149:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> a
     149:149:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$12(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):267 -> a
     150:150:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
     151:153:void convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiConsumer):279:281 -> a
     151:153:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):286 -> a
     154:154:void lambda$convertNonEmulatedVirtualRetarget$13(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     155:155:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
     155:155:void lambda$convertNonEmulatedVirtualRetarget$13(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151340,51 +151327,51 @@
     160:160:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):405:405 -> a
     160:160:void lambda$convertRetargetMethodToMethod$8(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):154 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
     161:161:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):405:405 -> a
     161:161:void lambda$convertRetargetMethodToMethod$8(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):154 -> a
     1:1:void lambda$convertRetargetFlags$3(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     2:2:void lambda$convertRetargetFlags$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):59:59 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     3:3:void lambda$convertRetargetFlags$5(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     4:4:void convertRetargetMethodToType(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):144:144 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     5:5:void lambda$convertRetargetMethodEmulatedDispatchToMethod$11(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):204:204 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/internal/dt;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/internal/ft;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
     6:6:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):299:299 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
     7:9:void convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiConsumer):279:281 -> b
     7:9:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):299 -> b
     10:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putNonEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):409:409 -> b
     10:10:void lambda$convertRetargetMethodToMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):155 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
     11:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.putNonEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):409:409 -> b
     11:11:void lambda$convertRetargetMethodToMethod$9(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):155 -> b
     1:1:void lambda$convertRetargetFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):48:48 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     2:2:void lambda$convertRetargetMethodToType$6(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
     1:1:void lambda$convertRetargetFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):51:51 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/I2;)V"}
     2:2:void lambda$convertRetargetMethodToType$7(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.kt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/j1;)V"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.mt:
 # {"id":"sourceFile","fileName":"HumanToMachineSpecificationConverter.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     java.util.Set missingCustomConversions -> c
     com.android.tools.r8.utils.Timing timing -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     1:1:void <init>(com.android.tools.r8.utils.Timing):47:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:6:void <init>(com.android.tools.r8.utils.Timing):44:48 -> <init>
     1:5:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):53:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dP;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/kP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hP;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/oP;"}
     6:7:com.android.tools.r8.graph.AppInfoWithClassHierarchy com.android.tools.r8.graph.AppInfoWithClassHierarchy.createForDesugaring(com.android.tools.r8.graph.AppInfo):88:89 -> a
     6:7:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):56 -> a
     8:11:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MultiAPILevelMachineDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):56:59 -> a
@@ -151422,22 +151409,22 @@
     44:55:void checkEmulatedInterfaceMap(java.util.Map):98:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     56:57:void lambda$checkEmulatedInterfaceMap$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):102:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/bM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/fM;)V"}
     58:59:void lambda$checkEmulatedInterfaceMap$0(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):105:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)V"}
     60:60:boolean lambda$checkEmulatedInterfaceMap$2(java.util.Map,com.android.tools.r8.graph.DexType):108:108 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/I2;)Z"}
     61:64:void lambda$checkEmulatedInterfaceMap$3(com.android.tools.r8.graph.DexType,java.util.List):111:114 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     65:65:void lambda$emulatedInterfaceTypes$4(java.util.Set,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/bM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/fM;)V"}
     66:67:java.util.Map convertRewritingFlagMap(java.util.Map,java.lang.String,boolean,java.lang.String):133:134 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/String;ZLjava/lang/String;)Ljava/util/HashMap;"}
     68:68:void lambda$convertRewritingFlagMap$5(java.util.Map,java.lang.String,boolean,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/String;ZLjava/lang/String;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/dt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/String;ZLjava/lang/String;Lcom/android/tools/r8/internal/O2;Lcom/android/tools/r8/internal/ft;)V"}
     69:69:void lambda$convertRewritingFlagMap$5(java.util.Map,java.lang.String,boolean,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):136:136 -> a
     70:74:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):145:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ys;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/at;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/aM;"}
     75:76:com.android.tools.r8.graph.AppInfoWithClassHierarchy com.android.tools.r8.graph.AppInfoWithClassHierarchy.createForDesugaring(com.android.tools.r8.graph.AppInfo):88:89 -> a
     75:76:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):148 -> a
     77:77:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):148:148 -> a
@@ -151474,7 +151461,7 @@
     97:97:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):163 -> a
     98:98:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):163:163 -> a
     99:100:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.lang.String,boolean,java.lang.String):181:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Ljava/lang/String;ZLjava/lang/String;)Lcom/android/tools/r8/internal/bM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Ljava/lang/String;ZLjava/lang/String;)Lcom/android/tools/r8/internal/fM;"}
     101:101:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags.builder():29:29 -> a
     101:101:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.lang.String,boolean,java.lang.String):182 -> a
     102:106:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.lang.String,boolean,java.lang.String):184:188 -> a
@@ -151577,7 +151564,7 @@
     173:175:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.lang.String,boolean,java.lang.String):201 -> a
     176:185:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.lang.String,boolean,java.lang.String):203:212 -> a
     186:186:void lambda$convertRewritingFlags$6(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):206:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     187:187:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.getRewrittenType(com.android.tools.r8.graph.DexType):457:457 -> a
     187:187:void convertCustomConversion(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):221 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151596,10 +151583,10 @@
     1:2:java.util.Set emulatedInterfaceTypes(java.util.Map):123:124 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)Ljava/util/Set;"}
     3:5:void warnMissingReferences(java.lang.String,java.util.Set):240:242 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.mt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.ot:
 # {"id":"sourceFile","fileName":"HumanToMachineWrapperConverter.java"}
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
     java.util.Set missingClasses -> c
@@ -151610,7 +151597,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):33:39 -> <init>
     1:2:void fillDescriptors(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.Map):125:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft;Ljava/util/IdentityHashMap;)V"}
     3:10:void lambda$fillDescriptors$0(java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):128:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
     11:17:java.util.LinkedHashMap orderDescriptors(java.util.Map):143:149 -> a
@@ -151620,9 +151607,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:22:java.util.LinkedHashMap orderDescriptors(java.util.Map):151:154 -> a
     23:23:void finalizeWrapperDescriptors(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/aM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/eM;)V"}
     24:24:void lambda$finalizeWrapperDescriptors$1(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/aM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/eM;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/nt;)V"}
     25:25:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder.getSubwrappers():88:88 -> a
     25:25:void lambda$finalizeWrapperDescriptors$1(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151639,9 +151626,9 @@
     37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder.addWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor):429:429 -> a
     37:37:void lambda$finalizeWrapperDescriptors$1(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder):174 -> a
     38:77:void fillDescriptors(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder,java.util.Map):185:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/Set;Lcom/android/tools/r8/internal/lt;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/Set;Lcom/android/tools/r8/internal/nt;Ljava/util/Map;)V"}
     78:99:void fillDescriptors(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder,java.util.Map):219:240 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter$WrapperDescriptorBuilder -> com.android.tools.r8.internal.nt:
 # {"id":"sourceFile","fileName":"HumanToMachineWrapperConverter.java"}
     java.util.List methods -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -151656,11 +151643,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:void setNonPublicAccess():96:96 -> b
     1:4:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.WrapperDescriptor toWrapperDescriptor():100:103 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ym0;"}
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.qJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cm0;"}
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.uJ:
 # {"id":"sourceFile","fileName":"LegacyToHumanSpecificationConverter.java"}
     com.android.tools.r8.utils.Timing timing -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     java.util.Set missingClasses -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     java.util.Set missingMethods -> c
@@ -151670,11 +151657,11 @@
     boolean $assertionsDisabled -> e
     1:4:void <clinit>():45:48 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.Timing):53:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     2:6:void <init>(com.android.tools.r8.utils.Timing):50:54 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags.builder():54:54 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):342 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sJ;)Lcom/android/tools/r8/internal/ot;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wJ;)Lcom/android/tools/r8/internal/qt;"}
     2:2:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.getIdentifier():79:79 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):343 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151702,7 +151689,7 @@
     13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):348 -> a
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):350:350 -> a
     15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iP;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/dP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mP;Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/hP;"}
     16:16:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification.getOrigin():32:32 -> a
     16:16:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151759,12 +151746,12 @@
     84:84:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags.getDontRewriteInvocation():111:111 -> a
     84:84:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/pJ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/tJ;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     85:85:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> a
     86:95:void reportWarnings(com.android.tools.r8.utils.Reporter):113:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     96:105:void legacyLibraryFlagHacks(java.lang.String,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):153:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/y2;Lcom/android/tools/r8/internal/dt$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/y2;Lcom/android/tools/r8/internal/ft$a;)V"}
     106:108:void legacyLibraryFlagHacks(java.lang.String,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):161:163 -> a
     109:109:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder.retargetMethodToType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):491:491 -> a
     109:109:void legacyLibraryFlagHacks(java.lang.String,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):164 -> a
@@ -151780,14 +151767,14 @@
     124:124:void legacyLibraryFlagHacks(java.lang.String,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):181 -> a
     125:126:void legacyLibraryFlagHacks(java.lang.String,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):185:186 -> a
     127:128:java.util.Map convertRewritingFlagMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):193:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jx;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;)Ljava/util/HashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lx;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;)Ljava/util/HashMap;"}
     129:129:void lambda$convertRewritingFlagMap$0(java.util.Map,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):195:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;Ljava/lang/Integer;Lcom/android/tools/r8/internal/pJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;Ljava/lang/Integer;Lcom/android/tools/r8/internal/tJ;)V"}
     130:130:void com.android.tools.r8.ir.desugar.desugaredlibrary.ApiLevelRange.<init>(int):16:16 -> a
     130:130:void lambda$convertRewritingFlagMap$0(java.util.Map,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):195 -> a
     131:131:void lambda$convertRewritingFlagMap$0(java.util.Map,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):195:195 -> a
     132:133:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):201:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pJ;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/dt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tJ;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/internal/ft;"}
     134:134:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags.getRewritePrefix():91:91 -> a
     134:134:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151811,34 +151798,34 @@
     148:148:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):217 -> a
     149:152:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):217:220 -> a
     153:153:void lambda$convertRewritingFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):205:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;)V"}
     154:155:void convertEmulatedInterface(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):230:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xu;)V"}
     156:163:java.util.Set convertDontRewriteInvocation(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,java.util.List):266:273 -> a
     156:163:void convertEmulatedInterface(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):232 -> a
     164:167:void convertEmulatedInterface(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):233:236 -> a
     168:168:boolean lambda$convertEmulatedInterface$4(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):234:234 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/j1;)Z"}
     169:169:void convertRetargetCoreLibMember(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):285:285 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Ljava/util/Map;)V"}
     170:173:void lambda$convertRetargetCoreLibMember$7(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):287:290 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     174:188:void lambda$convertRetargetCoreLibMember$7(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):289:303 -> a
     189:189:void lambda$convertRetargetCoreLibMember$7(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
     190:190:void lambda$convertRetargetCoreLibMember$7(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):300:300 -> a
     191:212:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):315:336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/x0;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/x0;)Ljava/util/List;"}
     213:213:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):335:335 -> a
     214:214:boolean lambda$findMethodsWithName$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j1;)Z"}
     1:1:void lambda$convertRewritingFlags$3(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):218:218 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/graph/H2;Ljava/util/Map;)V"}
     2:2:void lambda$convertEmulatedInterface$5(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):235:235 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/j1;)V"}
     3:4:void lambda$rewritePrefix$6(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):254:255 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;)V"}
     1:8:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):243:250 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dt$a;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ft$a;Ljava/lang/String;Ljava/lang/String;)V"}
     9:9:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMap.entryOf(java.lang.Object,java.lang.Object):341:341 -> c
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):139 -> c
     9:9:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):251 -> c
@@ -151852,7 +151839,7 @@
     12:23:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):139 -> c
     12:23:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):251 -> c
     24:31:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):252:259 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.IJ:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.MJ:
 # {"id":"sourceFile","fileName":"LibraryValidator.java"}
     1:16:void validate(com.android.tools.r8.graph.DexApplication,boolean,com.android.tools.r8.utils.AndroidApiLevel):25:40 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;ZLcom/android/tools/r8/internal/y2;)V"}
@@ -151866,7 +151853,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):37:38 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):43:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     6:6:boolean shouldRewriteInvokeToThrow(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):57:57 -> a
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):48 -> a
     7:7:boolean com.android.tools.r8.graph.MethodResolutionResult.isArrayCloneMethodResult():0:0 -> a
@@ -151878,25 +151865,25 @@
     21:21:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):71:71 -> a
     21:21:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.AlwaysThrowingInstructionDesugaring.computeInvokeAsThrowRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/U4;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/U4;)Lcom/android/tools/r8/internal/wk;"}
     22:22:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.AlwaysThrowingInstructionDesugaring.computeInvokeAsThrowRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):0:0 -> a
     23:23:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     23:23:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):89 -> a
     23:23:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.AlwaysThrowingInstructionDesugaring.computeInvokeAsThrowRewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult):0 -> a
     24:24:java.util.Collection lambda$computeInvokeAsThrowRewrite$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     25:25:java.util.Collection lambda$computeInvokeAsThrowRewrite$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
     26:26:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowNSMERewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/wk;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/yk;)Lcom/android/tools/r8/internal/wk;"}
     27:27:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     27:27:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowNSMERewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):97 -> a
     28:28:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowNSMERewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):115:115 -> a
     29:29:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     29:29:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowNSMERewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):116 -> a
     30:30:java.util.Collection lambda$computeInvokeAsThrowNSMERewrite$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     31:46:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):127:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/ir/optimize/G0;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/ir/optimize/G0;)Ljava/util/ArrayList;"}
     47:47:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations.uncheckedGetMethod():248:248 -> a
     47:47:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -151907,10 +151894,10 @@
     79:80:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):169:170 -> a
     81:88:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):167:174 -> a
     89:99:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer getMethodSynthesizerForThrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):185:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/G0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/ir/optimize/G0;"}
     100:104:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer getMethodSynthesizerForThrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):194:198 -> a
     105:109:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer getMethodSynthesizerForThrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):197:201 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.TB:
 # {"id":"sourceFile","fileName":"InvokeSpecialBridgeInfo.java"}
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -151932,14 +151919,14 @@
     4:4:int compareTo(java.lang.Object):10 -> compareTo
     5:5:int compareTo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):37:37 -> compareTo
     5:5:int compareTo(java.lang.Object):10 -> compareTo
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.VB:
 # {"id":"sourceFile","fileName":"InvokeSpecialToSelfDesugaring.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):29:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):36:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     7:7:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):166:166 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):41 -> a
     8:28:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):45:65 -> a
@@ -151948,26 +151935,26 @@
     31:31:com.android.tools.r8.ir.desugar.DesugarDescription desugarToInvokeVirtual(com.android.tools.r8.cf.code.CfInvoke):69:69 -> a
     31:31:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarToInvokeVirtual(com.android.tools.r8.internal.CfInvoke):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;)Lcom/android/tools/r8/internal/wk;"}
     32:32:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarToInvokeVirtual(com.android.tools.r8.internal.CfInvoke):0:0 -> a
     33:33:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     33:33:com.android.tools.r8.ir.desugar.DesugarDescription desugarToInvokeVirtual(com.android.tools.r8.cf.code.CfInvoke):82 -> a
     33:33:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarToInvokeVirtual(com.android.tools.r8.internal.CfInvoke):0 -> a
     34:35:java.util.Collection lambda$desugarToInvokeVirtual$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     36:36:java.util.Collection lambda$desugarToInvokeVirtual$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
     37:37:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     37:37:java.util.Collection lambda$desugarToInvokeVirtual$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
     38:38:com.android.tools.r8.ir.desugar.DesugarDescription desugarWithBridge(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     38:38:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarWithBridge(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/wk;"}
     39:39:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarWithBridge(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription desugarWithBridge(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):102 -> a
     40:40:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InvokeSpecialToSelfDesugaring.desugarWithBridge(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> a
     41:41:java.util.Collection lambda$desugarWithBridge$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     42:51:com.android.tools.r8.graph.DexMethod ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):107:116 -> a
     42:51:java.util.Collection lambda$desugarWithBridge$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):100 -> a
     52:52:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
@@ -151993,20 +151980,20 @@
     72:74:com.android.tools.r8.graph.DexMethod getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):134:136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/w2;"}
     75:75:com.android.tools.r8.graph.DexMethod getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):135:135 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer -> com.android.tools.r8.internal.WB:
 # {"id":"sourceFile","fileName":"InvokeSpecialToSelfDesugaringEventConsumer.java"}
     void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.bd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.dd:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BA;"}
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
     boolean needsLibraryInfo -> e
     java.util.function.Predicate isLiveMethod -> f
     java.util.Map classInfo -> g
@@ -152028,7 +152015,7 @@
     2:35:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):433:466 -> <init>
     1:1:boolean ignoreLibraryInfo():481:481 -> a
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):1115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Zc;"}
     2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):1116:1116 -> a
     3:6:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1043:1046 -> a
     3:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):1118 -> a
@@ -152037,14 +152024,14 @@
     7:7:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):1118 -> a
     8:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexType):1119:1119 -> a
     9:10:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):486:487 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/D2;)V"}
     11:11:void lambda$process$0(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):492:492 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;)V"}
     12:35:void finalizeProcessing(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):502:525 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     36:61:void finalizeProcessing(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):502:527 -> a
     62:63:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.Map):505:506 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/D2;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/D2;Ljava/util/Map;)V"}
     64:64:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticMethodInfo.getMethod():88:88 -> a
     64:64:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.Map):507 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152067,10 +152054,10 @@
     82:82:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.Map):521 -> a
     83:83:void lambda$finalizeProcessing$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.Map):518:518 -> a
     84:87:void lambda$finalizeProcessing$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):529:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/D2;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/D2;Ljava/util/List;)V"}
     88:91:void lambda$finalizeProcessing$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):531:534 -> a
     92:94:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):559:561 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Xc;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Zc;)Lcom/android/tools/r8/internal/Zc;"}
     95:95:boolean needsLibraryInfo():477:477 -> a
     95:95:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):562 -> a
     96:108:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeEmulatedInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):562:574 -> a
@@ -152079,14 +152066,14 @@
     114:117:boolean lambda$computeEmulatedInterfaceInfo$4(com.android.tools.r8.graph.DexMethod):567:570 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     118:123:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethodsMatching(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):579:584 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Vc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/Xc;"}
     124:124:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     124:124:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethodsMatching(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):584 -> a
     125:128:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethodsMatching(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):584:587 -> a
     129:129:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.create(java.util.Set):160:160 -> a
     129:129:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures getDefaultMethodsMatching(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):587 -> a
     130:133:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):631:634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Tc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Vc;)V"}
     134:134:java.util.Set com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.getEmulatedInterfaces():319:319 -> a
     134:134:void duplicateEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):634 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152126,7 +152113,7 @@
     282:282:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$8(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):750 -> a
     283:288:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$8(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):747:752 -> a
     289:302:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):837:850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Rc;Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Tc;Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/w2;)V"}
     303:307:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):849:853 -> a
     308:316:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):852:860 -> a
     317:317:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):951:951 -> a
@@ -152163,7 +152150,7 @@
     436:437:void addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1022:1023 -> a
     436:437:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):926 -> a
     438:438:void lambda$resolveForwardForSignature$10(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):850:850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/j1;)V"}
     439:439:void com.android.tools.r8.utils.BooleanBox.and(boolean):52:52 -> a
     439:439:void lambda$resolveForwardForSignature$10(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):850 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152204,7 +152191,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/graph/E0;Ljava/util/function/Function;)Ljava/lang/Object;"}
     508:509:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):1100:1101 -> a
     508:509:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$13(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexClass):1091 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wc;Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yc;Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Tc;"}
     510:515:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1043:1048 -> a
     510:515:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):1078 -> a
     510:515:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):1101 -> a
@@ -152371,10 +152358,10 @@
     596:598:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):1110 -> a
     596:598:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo lambda$visitClassInfo$13(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexClass):1091 -> a
     599:602:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):1123:1126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Zc;"}
     603:605:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):1125:1127 -> a
     606:608:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):1131:1133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/q2;)Lcom/android/tools/r8/internal/Zc;"}
     609:612:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1043:1046 -> a
     609:612:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1140 -> a
     609:612:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):1134 -> a
@@ -152387,7 +152374,7 @@
     617:622:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):1134 -> a
     623:625:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1153:1155 -> a
     623:625:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$14(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):1149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wc;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yc;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Zc;"}
     626:631:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1043:1048 -> a
     626:631:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1140 -> a
     626:631:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1156 -> a
@@ -152405,7 +152392,7 @@
     642:644:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1158:1160 -> a
     642:644:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$14(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):1149 -> a
     1:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):542:549 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Xc;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Zc;)Lcom/android/tools/r8/internal/Zc;"}
     9:9:boolean needsLibraryInfo():477:477 -> b
     9:9:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):549 -> b
     10:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):549:551 -> b
@@ -152426,46 +152413,46 @@
     27:27:java.util.Map lambda$addSyntheticThrowingMethod$12(com.android.tools.r8.graph.DexProgramClass):942:942 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/util/Map;"}
     28:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):1086:1090 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wc;Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yc;Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Tc;"}
     33:33:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1145:1145 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wc;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Xc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yc;Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Zc;"}
     34:34:boolean ignoreLibraryInfo():481:481 -> b
     34:34:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1145 -> b
     35:37:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):1146:1148 -> b
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.Tc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uc;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo EMPTY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc;"}
     1:2:void <clinit>():197:198 -> <clinit>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     3:3:void <clinit>():198 -> <clinit>
     4:4:void <clinit>():198:198 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):213:216 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/Sc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tc;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/Uc;)V"}
     1:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):234:238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Z"}
     6:6:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):237:237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.Uc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xc;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces emulatedInterfaces -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uc;"}
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():336:338 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):345:347 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vc;Lcom/android/tools/r8/internal/Tc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc;Lcom/android/tools/r8/internal/Vc;)V"}
     1:8:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):351:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sc;)Lcom/android/tools/r8/internal/Sc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uc;)Lcom/android/tools/r8/internal/Uc;"}
     9:9:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):323:323 -> a
     9:9:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):358 -> a
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
@@ -152502,12 +152489,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:26:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():311:311 -> a
     26:26:boolean isEmpty():363 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.Vc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     java.util.Set emulatedInterfaces -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc;"}
     1:1:void <clinit>():298:298 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <clinit>
     2:2:void <clinit>():298 -> <clinit>
@@ -152518,36 +152505,36 @@
     3:3:void <init>(com.android.tools.r8.graph.DexType):303 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType):303:303 -> <init>
     5:6:void <init>(java.util.Set):306:307 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;)V"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Uc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;)V"}
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Wc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wc;"}
     1:1:void <clinit>():408:408 -> <clinit>
     1:1:void <init>():411:411 -> <init>
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):416:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Wc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Yc;"}
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):421:421 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
     3:3:void reportMissingType(com.android.tools.r8.graph.DexType):427:427 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Xc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     java.util.Set signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xc;"}
     1:1:void <clinit>():157:157 -> <clinit>
     1:2:void <init>(java.util.Set):165:166 -> <init>
     1:1:boolean isEmpty():182:182 -> a
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vc;)Lcom/android/tools/r8/internal/Vc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc;)Lcom/android/tools/r8/internal/Xc;"}
     2:2:boolean isEmpty():182:182 -> a
     2:2:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean isEmpty():182:182 -> a
     3:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):173 -> a
     4:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):176:178 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Wc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Yc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.graph.DexClass directSubClass -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E0;"}
@@ -152557,24 +152544,24 @@
     1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.BiConsumer):381:384 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/D2;Ljava/util/function/BiConsumer;)V"}
     1:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):388:392 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Wc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Yc;"}
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):397:397 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
     7:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppInfo.definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):180:185 -> a
     7:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):397 -> a
     13:13:void reportMissingType(com.android.tools.r8.graph.DexType):401:401 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Zc:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vc;"}
-    com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sc;"}
-    com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo EMPTY -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xc;"}
+    com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uc;"}
+    com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo EMPTY -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zc;"}
     1:1:void <clinit>():246:246 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):253:255 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vc;Lcom/android/tools/r8/internal/Sc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc;Lcom/android/tools/r8/internal/Uc;)V"}
     1:1:boolean isEmpty():275:275 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():182:182 -> a
     2:2:boolean isEmpty():275 -> a
@@ -152582,25 +152569,25 @@
     3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():182:182 -> a
     3:3:boolean isEmpty():275 -> a
     4:4:boolean isEmpty():275:275 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticForwardingMethodInfo -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticForwardingMethodInfo -> com.android.tools.r8.internal.ad:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.graph.DexClassAndMethod baseMethod -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H0;"}
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):109:110 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticForwardingMethodInfo asForwardingMethodInfo():124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yc;"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticMethodInfo -> com.android.tools.r8.internal.Zc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ad;"}
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticMethodInfo -> com.android.tools.r8.internal.bd:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):83:84 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticForwardingMethodInfo asForwardingMethodInfo():96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yc;"}
-    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticThrowingMethodInfo asThrowingMethodInfo():100:100 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ad;"}
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticThrowingMethodInfo -> com.android.tools.r8.internal.ad:
+    1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticThrowingMethodInfo asThrowingMethodInfo():100:100 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cd;"}
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticThrowingMethodInfo -> com.android.tools.r8.internal.cd:
 # {"id":"sourceFile","fileName":"ClassProcessor.java"}
     com.android.tools.r8.graph.DexType errorType -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -152609,29 +152596,29 @@
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):135:137 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/U4$a;)V"}
     1:1:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SyntheticThrowingMethodInfo asThrowingMethodInfo():150:150 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ad;"}
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.ei:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cd;"}
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.gi:
 # {"id":"sourceFile","fileName":"DefaultMethodsHelper.java"}
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection):61:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/di;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fi;)V"}
     3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):66:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     10:13:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection wrapInCollection():82:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/di;"}
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.di:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fi;"}
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.fi:
 # {"id":"sourceFile","fileName":"DefaultMethodsHelper.java"}
     java.util.List live -> a
     java.util.List hidden -> b
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi;"}
     1:2:void <clinit>():29:30 -> <clinit>
     1:3:void <init>(java.util.List,java.util.List):37:39 -> <init>
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.jn:
 # {"id":"sourceFile","fileName":"EmulatedInterfaceApplicationRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -152648,7 +152635,7 @@
     7:7:void <init>(com.android.tools.r8.graph.AppView):36 -> <init>
     8:9:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)V"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getRewrittenType():30:30 -> a
     2:2:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152663,28 +152650,28 @@
     23:23:com.android.tools.r8.graph.DexEncodedMethod[] computeNewVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):141:141 -> a
     24:27:boolean lambda$computeNewVirtualMethods$1(com.android.tools.r8.graph.DexEncodedMethod):129:132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer -> com.android.tools.r8.internal.ln:
 # {"id":"sourceFile","fileName":"EmulatedInterfaceSynthesizerEventConsumer.java"}
     void acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer -> com.android.tools.r8.internal.mn:
 # {"id":"sourceFile","fileName":"EmulatedInterfaceSynthesizerEventConsumer.java"}
     void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass) -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.AA:
 # {"id":"sourceFile","fileName":"InterfaceDesugaringForTesting.java"}
     1:1:java.lang.String getCompanionClassNameSuffix():16:16 -> a
     2:2:java.lang.String getCompanionClassDescriptor(java.lang.String):28:28 -> a
     1:1:java.lang.String getDefaultMethodPrefix():20:20 -> b
     1:1:java.lang.String getEmulateLibraryClassNameSuffix():12:12 -> c
     1:1:java.lang.String getPrivateMethodPrefix():24:24 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.BA:
 # {"id":"sourceFile","fileName":"InterfaceDesugaringSyntheticHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.function.Predicate shouldIgnoreFromReportsPredicate -> b
     com.android.tools.r8.cf.CfVersion MAX_INTERFACE_DESUGARED_CF_VERSION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean $assertionsDisabled -> d
     1:5:void <clinit>():53:57 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):71:73 -> <init>
@@ -152698,7 +152685,7 @@
     169:169:java.lang.String getCompanionClassDescriptor(java.lang.String):167:167 -> a
     170:170:java.lang.String getCompanionClassDescriptor(java.lang.String):167:167 -> a
     171:174:com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode getInterfaceMethodDesugaringMode(com.android.tools.r8.utils.InternalOptions):84:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)I"}
     175:175:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedInterfaces():163:163 -> a
     175:175:com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode getInterfaceMethodDesugaringMode(com.android.tools.r8.utils.InternalOptions):87 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152716,11 +152703,11 @@
     181:181:void lambda$ensureEmulatedInterfaceDispatchMethod$10(com.android.tools.r8.synthesis.SyntheticMethodBuilder):360 -> a
     182:182:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):115:115 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
-    183:183:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    183:183:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     183:183:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     184:184:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    184:184:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    184:184:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     184:184:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):115 -> a
     185:196:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):115:126 -> a
@@ -152728,7 +152715,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     212:212:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):137:137 -> a
     213:213:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/synthesis/H;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/synthesis/H;)V"}
     214:214:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     214:214:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152742,7 +152729,7 @@
     219:219:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):151 -> a
     220:220:boolean verifyKind(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):151:151 -> a
     221:222:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.graph.DexType):156:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/wi;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/yi;)Lcom/android/tools/r8/graph/w2;"}
     223:223:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getMethod():53:53 -> a
     223:223:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.graph.DexType):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152781,7 +152768,7 @@
     245:245:void lambda$ensureEmulatedInterfaceMarkerInterface$2(com.android.tools.r8.graph.DexClasspathClass):207:207 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     246:248:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod computeEmulatedInterfaceForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):264:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/wi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/yi;"}
     249:249:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedVirtualRetargetThroughEmulatedInterface():151:151 -> a
     249:249:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod computeEmulatedInterfaceForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152791,10 +152778,10 @@
     257:257:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getForwardingMethod():65:65 -> a
     257:257:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod computeEmulatedInterfaceForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):275 -> a
     258:258:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;)Lcom/android/tools/r8/graph/w2;"}
     259:259:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):288:288 -> a
     260:260:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):307:307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/FA;)Lcom/android/tools/r8/graph/w2;"}
     261:261:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getMethod():53:53 -> a
     261:261:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):308 -> a
     262:265:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):310:313 -> a
@@ -152802,7 +152789,7 @@
     266:266:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):314 -> a
     267:269:com.android.tools.r8.graph.DexMethod ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):314:316 -> a
     270:273:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):322:325 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/graph/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/graph/H0;"}
     274:274:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.getMethod():53:53 -> a
     274:274:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -152810,11 +152797,11 @@
     279:279:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     279:279:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):329 -> a
     280:280:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):330:330 -> a
-    281:281:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    281:281:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     281:281:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):330 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     282:282:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    282:282:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    282:282:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     282:282:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):330 -> a
     283:284:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):330:331 -> a
@@ -152846,7 +152833,7 @@
     324:324:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     324:324:void lambda$ensureCompanionClassInitializesInterface$26(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):572 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     325:325:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     325:325:void lambda$ensureCompanionClassInitializesInterface$26(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):572 -> a
     326:326:void lambda$ensureCompanionClassInitializesInterface$26(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):571:571 -> a
@@ -152856,7 +152843,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/graph/H0;"}
     329:329:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer):373:373 -> a
     330:330:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):379:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/FA;)Lcom/android/tools/r8/graph/H0;"}
     331:331:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     331:331:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):379 -> a
     332:332:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):381:381 -> a
@@ -152865,7 +152852,7 @@
     339:339:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):385 -> a
     340:340:com.android.tools.r8.graph.DexClassAndMethod ensureDefaultAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):386:386 -> a
     341:343:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):403:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BA;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/C5;"}
     344:344:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):486:486 -> a
     344:344:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):405 -> a
     345:347:com.android.tools.r8.graph.ProgramMethod ensureDefaultAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):407:409 -> a
@@ -152924,7 +152911,7 @@
     407:407:com.android.tools.r8.graph.Code lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$11(com.android.tools.r8.graph.DexMethod):425:425 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     408:408:void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$13(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):427:427 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     409:409:void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):441:441 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/synthesis/M;)V"}
     410:410:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.copy():78:78 -> a
@@ -152959,7 +152946,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/lang/String;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/w2;"}
     436:436:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):477:477 -> a
     437:441:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):563:567 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/BA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/DA;)V"}
     442:442:void ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):564:564 -> a
     443:443:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     443:443:com.android.tools.r8.graph.DexClassAndMethod ensureMethodOfClasspathCompanionClassStub(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView):502 -> a
@@ -153069,7 +153056,7 @@
     530:536:java.util.function.Predicate getShouldIgnoreFromReportsPredicate(com.android.tools.r8.graph.AppView):658:664 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Ljava/util/function/Predicate;"}
     537:539:boolean lambda$getShouldIgnoreFromReportsPredicate$31(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):665:667 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/I2;)Z"}
     540:540:boolean com.android.tools.r8.graph.DexString.endsWith(com.android.tools.r8.graph.DexString):570:570 -> a
     540:540:boolean lambda$getShouldIgnoreFromReportsPredicate$31(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):667 -> a
     541:542:boolean isRewrittenEmulatedInterface(com.android.tools.r8.graph.DexType):102:103 -> a
@@ -153094,18 +153081,18 @@
     550:550:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):682 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;)V"}
     551:551:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685:685 -> a
-    552:552:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1375:1375 -> a
+    552:552:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1381:1381 -> a
     552:552:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    553:554:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1375:1376 -> a
+    553:554:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1381:1382 -> a
     553:554:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685 -> a
     555:555:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    555:555:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1378 -> a
+    555:555:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1384 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     555:555:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685 -> a
-    556:562:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1378:1384 -> a
+    556:562:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1384:1390 -> a
     556:562:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685 -> a
-    563:563:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1376:1376 -> a
+    563:563:void com.android.tools.r8.utils.InternalOptions.warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1382:1382 -> a
     563:563:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):685 -> a
     1:1:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():91:91 -> b
     1:1:void lambda$ensureMethodOfClasspathCompanionClassStub$21(com.android.tools.r8.synthesis.SyntheticMethodBuilder):513 -> b
@@ -153143,7 +153130,7 @@
     211:211:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):193:193 -> b
     212:212:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):193:193 -> b
     213:213:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor getEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):226:226 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/gn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/in;"}
     214:214:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> b
     214:214:boolean requiresEmulatedDispatch(com.android.tools.r8.graph.DexClassAndMethod):243 -> b
     214:214:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor getEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod):227 -> b
@@ -153167,7 +153154,7 @@
     235:235:com.android.tools.r8.graph.Code lambda$ensureEmulatedInterfaceDispatchMethod$9(com.android.tools.r8.graph.DexMethod):360:360 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     236:236:void lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$16(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):455:455 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     237:237:void lambda$ensureMethodOfClasspathCompanionClassStub$18(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):509:509 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/o;)V"}
     238:238:void lambda$ensureMethodOfClasspathCompanionClassStub$19(com.android.tools.r8.graph.DexClasspathClass):510:510 -> b
@@ -153200,7 +153187,7 @@
     253:253:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> b
     253:253:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):540 -> b
     254:265:com.android.tools.r8.graph.ProgramMethod ensureMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):547:558 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BA;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/C5;"}
     266:266:void lambda$ensureCompanionClassInitializesInterface$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):569:569 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/M;)V"}
     267:267:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$27(com.android.tools.r8.graph.DexEncodedMethod):590:590 -> b
@@ -153218,7 +153205,7 @@
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.synthesis.SyntheticNaming):328:328 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     3:3:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):433:433 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BA;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/C5;"}
     4:4:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):492:492 -> c
     4:4:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):433 -> c
     5:9:com.android.tools.r8.graph.ProgramMethod ensurePrivateAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):434:438 -> c
@@ -153226,7 +153213,7 @@
     11:11:com.android.tools.r8.graph.Code lambda$ensureMethodOfClasspathCompanionClassStub$20(com.android.tools.r8.graph.DexMethod):514:514 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     12:12:void lambda$ensureStaticAsMethodOfProgramCompanionClassStub$24(com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):542:542 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DA;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     13:16:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):587:590 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     1:2:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):94:95 -> d
@@ -153242,7 +153229,7 @@
     7:7:com.android.tools.r8.graph.Code lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.graph.DexMethod):453:453 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     8:10:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):519:521 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BA;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DA;)Lcom/android/tools/r8/graph/C5;"}
     11:11:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexClassAndMethod):460:460 -> d
     11:11:com.android.tools.r8.graph.ProgramMethod ensureStaticAsMethodOfProgramCompanionClassStub(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):523 -> d
     12:13:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):464:465 -> d
@@ -153262,7 +153249,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureMethodOfClasspathCompanionClassStub$17(com.android.tools.r8.synthesis.SyntheticNaming):506:506 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.DA:
 # {"id":"sourceFile","fileName":"InterfaceMethodDesugaringBaseEventConsumer.java"}
     void acceptStaticAsCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
@@ -153272,16 +153259,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptPrivateAsCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer -> com.android.tools.r8.internal.FA:
 # {"id":"sourceFile","fileName":"InterfaceMethodDesugaringEventConsumer.java"}
     void acceptInvokeObjectCloneOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer$EmptyInterfaceMethodDesugaringEventConsumer -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer$EmptyInterfaceMethodDesugaringEventConsumer -> com.android.tools.r8.internal.EA:
 # {"id":"sourceFile","fileName":"InterfaceMethodDesugaringEventConsumer.java"}
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer$EmptyInterfaceMethodDesugaringEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EA;"}
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():26:26 -> <init>
     1:1:void acceptStaticAsCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):60:60 -> i
@@ -153292,18 +153279,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void acceptPrivateAsCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):55:55 -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.GA:
 # {"id":"sourceFile","fileName":"InterfaceMethodProcessorFacade.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MA;"}
     com.android.tools.r8.ir.desugar.itf.ClassProcessor classProcessor -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dd;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,java.util.function.Predicate,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):33:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/KA;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/MA;I)V"}
     1:1:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):42:42 -> a
     1:1:boolean lambda$processClassesConcurrently$0(com.android.tools.r8.graph.DexProgramClass):54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
@@ -153315,11 +153302,11 @@
     3:3:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor):45 -> a
     3:3:boolean lambda$processClassesConcurrently$0(com.android.tools.r8.graph.DexProgramClass):54 -> a
     4:4:void lambda$processClassesConcurrently$1(com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GA;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IA;Lcom/android/tools/r8/graph/D2;)V"}
     5:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     1:4:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):53:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     5:11:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):53:59 -> b
     12:12:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.finalizeProcessing():351:351 -> b
     12:12:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):59 -> b
@@ -153359,38 +153346,38 @@
     32:32:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.run():32 -> b
     32:32:void com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.finalizeProcessing():353 -> b
     32:32:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):59 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.HA:
 # {"id":"sourceFile","fileName":"InterfaceMethodRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory factory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode desugaringMode -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BA;"}
     java.util.Set emulatedMethods -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet synthesizedMethods -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     java.util.Map cache -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Set precedingDesugaringsForInvoke -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set precedingDesugaringsForInvokeDynamic -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():85:85 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):135:135 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;I)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):95:98 -> <init>
     6:6:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):98 -> <init>
     7:53:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):98:144 -> <init>
     54:57:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):143:146 -> <init>
     1:1:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/iB;)V"}
     2:2:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedInterfaces():163:163 -> a
     2:2:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):153 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -153398,13 +153385,13 @@
     3:3:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):153 -> a
     4:12:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):153:161 -> a
     13:13:void lambda$checkForAssumedLibraryTypes$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):156:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)V"}
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getRewrittenType():30:30 -> a
     14:14:void lambda$checkForAssumedLibraryTypes$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void lambda$checkForAssumedLibraryTypes$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):157:157 -> a
     16:16:void lambda$checkForAssumedLibraryTypes$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/jh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lh;)V"}
     17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor.getTo():23:23 -> a
     17:17:void lambda$checkForAssumedLibraryTypes$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -153428,16 +153415,16 @@
     33:33:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:34:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Z"}
     35:35:boolean lambda$isAlreadyDesugared$3(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;)Z"}
     36:36:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod):212:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/graph/C5;)Z"}
     37:37:boolean lambda$isAlreadyDesugared$4(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A9;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C9;)Z"}
     38:38:boolean hasPreciseNeedsDesugaring():219:219 -> a
     39:42:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):228:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     43:43:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):668:668 -> a
     43:43:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):232 -> a
     44:46:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):235:237 -> a
@@ -153456,7 +153443,7 @@
     55:55:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):239 -> a
     56:56:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):241:241 -> a
     57:70:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):247:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     71:71:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):166:166 -> a
     71:71:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):260 -> a
     72:74:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):261:263 -> a
@@ -153502,7 +153489,7 @@
     209:224:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeVirtualDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):503:518 -> a
     209:224:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):292 -> a
     225:225:java.util.Collection lambda$computeInvokeStatic$11(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):443:443 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     226:226:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     226:226:java.util.Collection lambda$computeInvokeStatic$11(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):445 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -153516,7 +153503,7 @@
     250:250:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$computeInvokeStatic$8(com.android.tools.r8.synthesis.SyntheticNaming):447:447 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     251:251:void lambda$computeInvokeStatic$10(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):452:452 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/synthesis/M;)V"}
     252:252:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     252:252:void lambda$computeInvokeStatic$10(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):452 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -153528,7 +153515,7 @@
     256:256:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     256:256:void lambda$computeInvokeStatic$10(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.synthesis.SyntheticMethodBuilder):454 -> a
     257:257:com.android.tools.r8.graph.Code lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):456:456 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     258:258:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.builder(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
     258:258:com.android.tools.r8.graph.Code lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):456 -> a
     259:259:com.android.tools.r8.graph.Code lambda$computeInvokeStatic$9(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):457:457 -> a
@@ -153538,7 +153525,7 @@
     263:263:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     263:263:java.util.Collection lambda$rewriteInvokeSuper$17(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):756 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     264:264:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     264:264:java.util.Collection lambda$rewriteInvokeSuper$17(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):756 -> a
     265:265:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
@@ -153554,7 +153541,7 @@
     277:277:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     277:277:java.util.Collection lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):781 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     278:278:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     278:278:java.util.Collection lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):781 -> a
     279:279:java.util.Collection lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):786:786 -> a
@@ -153571,7 +153558,7 @@
     290:295:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):522:527 -> a
     290:295:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.internal.CfInvoke):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;)Lcom/android/tools/r8/internal/wk;"}
     296:296:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.computeEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.MethodResolutionResult):255:255 -> a
     296:296:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):527 -> a
     296:296:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.internal.CfInvoke):0 -> a
@@ -153589,12 +153576,12 @@
     301:301:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.cf.code.CfInvoke):547 -> a
     301:301:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceVirtualDispatchOrNull(com.android.tools.r8.internal.CfInvoke):0 -> a
     302:371:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):553:622 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/zk;"}
     372:398:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):621:647 -> a
     399:399:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):644:644 -> a
     400:404:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):559:563 -> a
     405:406:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeAsThrowRewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):652:653 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/wk;"}
     407:407:java.util.Collection getInvokeStaticInstructions(com.android.tools.r8.graph.DexMethod):658:658 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Ljava/util/List;"}
     408:408:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):692:692 -> a
@@ -153643,7 +153630,7 @@
     424:428:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):824:828 -> a
     424:428:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/zk;"}
     429:429:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy):702:702 -> a
     429:429:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):828 -> a
     429:429:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
@@ -153651,7 +153638,7 @@
     430:437:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
     438:438:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     438:438:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     439:439:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     439:439:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):852 -> a
     439:439:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
@@ -153659,7 +153646,7 @@
     440:445:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
     446:446:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     446:446:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":451,"2":452,"3":453},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":451,"2":452,"3":453},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     447:447:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     447:447:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):879 -> a
     447:447:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0 -> a
@@ -153676,16 +153663,16 @@
     453:453:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     453:453:com.android.tools.r8.ir.desugar.DesugarDescription computeEmulatedInterfaceInvokeSpecial(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):866 -> a
     454:457:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$21(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):847:850 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     458:459:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$22(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):876:877 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     460:460:java.util.Collection lambda$computeEmulatedInterfaceInvokeSpecial$22(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):876:876 -> a
     461:470:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodHandle):893:902 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y2;Lcom/android/tools/r8/graph/C5;)V"}
     471:471:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):920:920 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KA;)Lcom/android/tools/r8/internal/EA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MA;)Lcom/android/tools/r8/internal/GA;"}
     472:478:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):954:960 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/di;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/fi;"}
     479:479:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):889:889 -> a
     479:479:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):969 -> a
     480:506:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):974:1000 -> a
@@ -153695,12 +153682,12 @@
     516:517:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):124:125 -> a
     516:517:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1009 -> a
     518:520:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1010:1012 -> a
-    521:521:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1362:1362 -> a
+    521:521:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1368:1368 -> a
     521:521:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1012 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    522:528:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1362:1368 -> a
+    522:528:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1368:1374 -> a
     522:528:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1012 -> a
-    529:529:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1363:1363 -> a
+    529:529:void com.android.tools.r8.utils.InternalOptions.warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):1369:1369 -> a
     529:529:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1012 -> a
     1:1:void initializeEmulatedInterfaceVariables():192:192 -> b
     2:2:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedInterfaces():163:163 -> b
@@ -153710,14 +153697,14 @@
     3:3:void initializeEmulatedInterfaceVariables():193 -> b
     4:10:void initializeEmulatedInterfaceVariables():193:199 -> b
     11:11:void lambda$compute$5(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):283:283 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)V"}
     12:12:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):668:668 -> b
     12:12:void lambda$compute$5(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):284 -> b
     13:13:void lambda$compute$5(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):286:286 -> b
     14:15:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):395:396 -> b
     14:15:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/zk;"}
     16:16:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):103:103 -> b
     16:16:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):397 -> b
     16:16:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
@@ -153757,7 +153744,7 @@
     27:27:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
     28:28:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):415:415 -> b
     28:28:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.canLeaveStaticInterfaceMethodInvokes():2665:2665 -> b
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.canLeaveStaticInterfaceMethodInvokes():2671:2671 -> b
     29:29:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):415 -> b
     29:29:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
     30:30:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):417:417 -> b
@@ -153783,7 +153770,7 @@
     37:39:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> b
     40:40:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":59,"2":60,"3":61},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":59,"2":60,"3":61},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     41:41:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     41:41:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):468 -> b
     41:41:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
@@ -153805,7 +153792,7 @@
     56:56:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
     57:57:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> b
     57:57:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":62,"2":63,"3":64},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":62,"2":63,"3":64},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     58:58:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     58:58:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):498 -> b
     58:58:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> b
@@ -153822,10 +153809,10 @@
     64:64:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> b
     64:64:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeStatic(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):484 -> b
     65:69:java.util.Collection lambda$computeEmulatedInterfaceVirtualDispatchOrNull$13(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):542:546 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wi;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yi;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     70:70:java.util.Collection lambda$computeEmulatedInterfaceVirtualDispatchOrNull$13(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):542:542 -> b
     71:71:java.util.Collection lambda$computeInvokeDirect$14(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):597:597 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     72:72:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():529:529 -> b
     72:72:java.util.Collection lambda$computeInvokeDirect$14(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):597 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -153858,16 +153845,16 @@
     100:100:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> b
     100:100:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):938 -> b
     101:106:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):943:948 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/di;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/fi;"}
     1:4:java.util.Collection lambda$computeInvokeDirect$15(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):635:638 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     5:5:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):668:668 -> c
     5:5:void lambda$computeInvokeStatic$7(com.android.tools.r8.graph.ProgramMethod):418 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     6:7:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):708:709 -> c
     6:7:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/zk;"}
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):47:47 -> c
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):709 -> c
     8:8:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
@@ -153908,7 +153895,7 @@
     39:45:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
     46:46:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> c
     46:46:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":71,"2":72,"3":73},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":71,"2":72,"3":73},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     47:47:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> c
     47:47:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):768 -> c
     47:47:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
@@ -153916,7 +153903,7 @@
     48:48:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
     49:49:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0:0 -> c
     49:49:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     50:50:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> c
     50:50:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):792 -> c
     50:50:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.InterfaceMethodRewriter.rewriteInvokeSuper(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.ProgramMethod):0 -> c
@@ -153943,7 +153930,7 @@
     76:76:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> c
     76:76:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):771 -> c
     1:2:java.util.Collection lambda$computeInvokeStatic$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):494:495 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     3:3:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.ensureStaticAsMethodOfCompanionClassStub(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):391:391 -> d
     3:3:java.util.Collection lambda$computeInvokeStatic$12(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):495 -> d
     4:4:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> d
@@ -153981,7 +153968,7 @@
     7:10:void upgradeCfVersionToSupportInterfaceMethodInvoke(com.android.tools.r8.graph.ProgramMethod):684:687 -> g
 com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> R8$$REMOVED$$CLASS$$102:
 # {"id":"sourceFile","fileName":"InterfaceMethodRewriterFixup.java"}
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.IA:
 # {"id":"sourceFile","fileName":"InterfaceProcessingDesugaringEventConsumer.java"}
     void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I0;)V"}
@@ -153990,13 +153977,13 @@
     void acceptThrowingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/U4$a;)V"}
     void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zA;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.KA:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BA;)V"}
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.MA:
 # {"id":"sourceFile","fileName":"InterfaceProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BA;"}
     java.util.Map postProcessingInterfaceInfos -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode desugaringMode -> d
@@ -154007,15 +153994,15 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;I)V"}
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper$InterfaceMethodDesugaringMode):61:77 -> <init>
     1:5:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):86:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     6:6:void processEmulatedInterfaceOnly(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):107:107 -> a
     6:6:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):91 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     7:7:void processEmulatedInterfaceOnly(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):91 -> a
     8:8:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void processEmulatedInterfaceOnly(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):107 -> a
     8:8:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer):91 -> a
@@ -154092,7 +154079,7 @@
     151:155:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):287:291 -> a
     151:155:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.ProgramMethod):280 -> a
     156:156:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():297:297 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KA;"}
     157:157:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():464:464 -> a
     157:157:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():297 -> a
     158:184:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():298:324 -> a
@@ -154117,7 +154104,7 @@
     191:191:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder.build(com.android.tools.r8.graph.AppView):481:481 -> a
     191:191:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():324 -> a
     192:194:void lambda$postProcessInterfaces$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):307:309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HA;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JA;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1;)V"}
     195:195:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():196:196 -> a
     195:195:void lambda$postProcessInterfaces$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154137,14 +154124,14 @@
     201:201:void lambda$postProcessInterfaces$2(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):311 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     202:202:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo getPostProcessingInterfaceInfo(com.android.tools.r8.graph.DexProgramClass):358:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/JA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/LA;"}
     203:203:void forEachMethodToMove(java.util.function.BiConsumer):363:363 -> a
     204:205:void lambda$forEachMethodToMove$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):365:366 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/JA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/LA;)V"}
     206:206:boolean com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo.hasNonClinitDirectMethods():409:409 -> a
     206:206:void lambda$postProcessInterfaces$3(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):300 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/JA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JA;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/LA;)V"}
     207:207:void lambda$postProcessInterfaces$3(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):300:300 -> a
     208:209:void clearDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:222 -> a
     208:209:void lambda$postProcessInterfaces$3(com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo):301 -> a
@@ -154174,17 +154161,17 @@
     222:222:com.android.tools.r8.graph.ProgramMethod ensureCompanionMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):133 -> a
     223:224:com.android.tools.r8.graph.ProgramMethod ensureCompanionMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):133:134 -> a
     1:1:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo lambda$getPostProcessingInterfaceInfo$4(com.android.tools.r8.graph.DexProgramClass):359:359 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/JA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/LA;"}
     1:14:void removeBridges(com.android.tools.r8.graph.DexProgramClass):328:341 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.KA:
 # {"id":"sourceFile","fileName":"InterfaceProcessor.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraNewMethodSignatures -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f6;"}
     int $r8$clinit -> o
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):437:437 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/PP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/a6;Lcom/android/tools/r8/internal/TP;)V"}
     2:2:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):437 -> <init>
     3:3:java.util.Map com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.getForwardMap():82:82 -> <init>
@@ -154199,12 +154186,12 @@
     1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):453:454 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):453:453 -> e
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.JA:
 # {"id":"sourceFile","fileName":"InterfaceProcessor.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     1:3:void <init>():467:469 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.LA:
 # {"id":"sourceFile","fileName":"InterfaceProcessor.java"}
     java.util.Map defaultMethodsToImplementation -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -154218,16 +154205,16 @@
     5:8:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):394:397 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     9:9:void setHasNonClinitDirectMethods():413:413 -> a
-com.android.tools.r8.ir.desugar.itf.L8InnerOuterAttributeEraser -> com.android.tools.r8.internal.BI:
+com.android.tools.r8.ir.desugar.itf.L8InnerOuterAttributeEraser -> com.android.tools.r8.internal.FI:
 # {"id":"sourceFile","fileName":"L8InnerOuterAttributeEraser.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.pY:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.tY:
 # {"id":"sourceFile","fileName":"ProgramEmulatedInterfaceSynthesizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BA;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):38:40 -> <init>
@@ -154235,19 +154222,19 @@
     1:1:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getEmulatedMethods():34:34 -> a
     1:1:boolean lambda$synthesizeEmulateInterfaceMethods$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.graph.DexEncodedMethod):65 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/graph/j1;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/graph/j1;)Z"}
     2:2:boolean lambda$synthesizeEmulateInterfaceMethods$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.graph.DexEncodedMethod):65:65 -> a
     3:3:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getEmulatedMethods():34:34 -> a
     3:3:void lambda$synthesizeEmulateInterfaceMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/internal/mn;Lcom/android/tools/r8/synthesis/M;)V"}
     4:4:void lambda$synthesizeEmulateInterfaceMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):71:71 -> a
     5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassBuilder.getType():79:79 -> a
     5:5:void lambda$synthesizeEmulateInterfaceMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):72 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void lambda$synthesizeEmulateInterfaceMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):69:69 -> a
     7:7:void synthesizeProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/internal/S8;)V"}
     8:8:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     8:8:void synthesizeProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154258,11 +154245,11 @@
     20:20:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$synthesizeProgramEmulatedInterface$0(com.android.tools.r8.synthesis.SyntheticNaming):50:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     21:21:void lambda$synthesizeProgramEmulatedInterface$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/internal/mn;Lcom/android/tools/r8/synthesis/V;)V"}
     22:22:void lambda$synthesizeEmulateInterfaceMethods$4(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/V;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/internal/mn;Lcom/android/tools/r8/graph/C5;)V"}
     23:24:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):83:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/kn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/synthesis/M;Lcom/android/tools/r8/internal/mn;)V"}
     25:25:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getEmulatedDispatchMethod():61:61 -> a
     25:25:void synthesizeEmulatedInterfaceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154302,13 +154289,13 @@
     48:54:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.LinkedHashMap,com.android.tools.r8.graph.DexMethod):99:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     55:55:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gn;Lcom/android/tools/r8/internal/kn;)Ljava/util/LinkedHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/mn;)Ljava/util/LinkedHashMap;"}
     56:56:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor.getDispatchCases():69:69 -> a
     56:56:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:58:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):113:114 -> a
     59:59:void lambda$resolveDispatchCases$6(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/wi;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/internal/mn;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/yi;)V"}
     60:60:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):302:302 -> a
     60:60:void lambda$resolveDispatchCases$6(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):118 -> a
     61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.ensureEmulatedInterfaceForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):301:301 -> a
@@ -154316,12 +154303,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:void lambda$resolveDispatchCases$6(java.util.LinkedHashMap,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):116:116 -> a
     63:63:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> a
     64:64:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> a
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> a
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131 -> a
     66:68:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131:133 -> a
@@ -154332,7 +154319,7 @@
     70:70:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):135 -> a
     71:72:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):135:136 -> a
     73:80:void lambda$synthesizeClasses$7(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):138:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/in;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kn;)V"}
     81:81:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor.getEmulatedMethods():34:34 -> a
     81:81:void lambda$synthesizeClasses$7(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154341,29 +154328,29 @@
     85:90:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):154:159 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$L8ProgramEmulatedInterfaceSynthesizerEventConsumer):64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/in;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/kn;Lcom/android/tools/r8/internal/mn;Lcom/android/tools/r8/synthesis/V;)V"}
     2:2:java.lang.String uniqueIdentifier():124:124 -> b
 com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring -> R8$$REMOVED$$CLASS$$103:
 # {"id":"sourceFile","fileName":"D8LambdaDesugaring.java"}
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Kq:
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Mq:
 # {"id":"sourceFile","fileName":"ForcefullyMovedLambdaMethodConsumer.java"}
     1:1:com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer emptyForcefullyMovedLambdaMethodConsumer():14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Mq;"}
     2:2:void lambda$emptyForcefullyMovedLambdaMethodConsumer$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.SI:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.WI:
 # {"id":"sourceFile","fileName":"LambdaDeserializationMethodRemover.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:6:void run(com.android.tools.r8.graph.AppView,java.util.Collection):25:30 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Collection;)V"}
-com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer -> com.android.tools.r8.internal.TI:
+com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer -> com.android.tools.r8.internal.XI:
 # {"id":"sourceFile","fileName":"LambdaDesugaringEventConsumer.java"}
     void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.VI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.ZI:
 # {"id":"sourceFile","fileName":"LambdaInstructionDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -154372,12 +154359,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:10:void <init>(com.android.tools.r8.graph.AppView):46:54 -> <init>
     1:5:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):59:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     6:6:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
     6:6:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):63 -> a
     7:7:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):64:64 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     9:9:boolean isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):207:207 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):72 -> a
     10:10:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
@@ -154398,18 +154385,18 @@
     17:17:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInstruction):79:79 -> a
     17:17:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.LambdaInstructionDesugaring.desugarInstruction(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     18:18:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.LambdaInstructionDesugaring.desugarInstruction(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     19:19:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     19:19:com.android.tools.r8.ir.desugar.DesugarDescription desugarInstruction(com.android.tools.r8.cf.code.CfInstruction):108 -> a
     19:19:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.LambdaInstructionDesugaring.desugarInstruction(com.android.tools.r8.internal.CfInstruction):0 -> a
     20:20:java.util.Collection lambda$desugarInstruction$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     21:21:java.util.Collection lambda$desugarInstruction$1(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):90:90 -> a
     22:22:java.util.Collection lambda$desugarInstruction$0(com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     23:23:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/UI;)Ljava/util/AbstractCollection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/YI;)Ljava/util/AbstractCollection;"}
     24:24:boolean com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection$1CfDesugaringInfoImpl.canIncreaseBytecodeSize():256:256 -> a
     24:24:java.util.Collection desugarInvokeDynamicInstruction(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154435,7 +154422,7 @@
     65:65:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.cf.code.CfInvokeDynamic.getCallSite():151:151 -> a
     65:65:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):176 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/UI;Z)Lcom/android/tools/r8/internal/PI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/YI;Z)Lcom/android/tools/r8/internal/TI;"}
     66:66:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):176:176 -> a
     67:74:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):175:182 -> a
     75:75:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
@@ -154448,15 +154435,15 @@
     98:101:void com.android.tools.r8.ir.desugar.LambdaClass.setClass(com.android.tools.r8.graph.DexProgramClass):123:126 -> a
     98:101:com.android.tools.r8.ir.desugar.LambdaClass createLambdaClass(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean):201 -> a
     102:105:void lambda$desugarInvokeDynamicInstruction$2(com.android.tools.r8.ir.desugar.FreshLocalProvider,java.util.Deque,com.android.tools.r8.graph.DexType):152:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tq;Ljava/util/Deque;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vq;Ljava/util/Deque;Lcom/android/tools/r8/graph/I2;)V"}
     106:106:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createLambdaClass$3(com.android.tools.r8.synthesis.SyntheticNaming):186:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     107:107:void lambda$createLambdaClass$4(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke,boolean,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/internal/UI;ZLcom/android/tools/r8/synthesis/V;)V"}
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.UI:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/internal/YI;ZLcom/android/tools/r8/synthesis/V;)V"}
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.YI:
 # {"id":"sourceFile","fileName":"LambdaInstructionDesugaring.java"}
     java.util.Collection desugarInvoke(com.android.tools.r8.ir.code.Position,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
 com.android.tools.r8.ir.desugar.nest.AccessBridgeFactory -> com.android.tools.r8.internal.L1:
 # {"id":"sourceFile","fileName":"AccessBridgeFactory.java"}
     boolean $assertionsDisabled -> a
@@ -154502,7 +154489,7 @@
     37:37:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():109 -> a
     37:37:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     38:38:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     39:39:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):42:42 -> a
@@ -154510,7 +154497,7 @@
     40:40:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedField.getApiLevel():109 -> a
     40:40:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):42 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):42 -> a
     42:42:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramField,boolean):43:43 -> a
     43:49:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):49:55 -> a
@@ -154543,18 +154530,18 @@
     73:73:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
     73:73:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):64 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    74:74:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    74:74:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     74:74:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):64 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     75:75:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):65:65 -> a
     76:76:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     76:76:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):65 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    77:77:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     77:77:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):65 -> a
     78:78:com.android.tools.r8.graph.ProgramMethod createInitializerAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):66:66 -> a
     79:79:void lambda$createMethodAccessorBridge$0(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/internal/Mq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/internal/Oq;)V"}
     1:7:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):72:78 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/C5;"}
     8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
@@ -154585,24 +154572,24 @@
     37:37:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> b
     37:37:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):95 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    38:38:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     38:38:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):95 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     39:39:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):96:96 -> b
     40:40:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> b
     40:40:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):96 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     41:41:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):96 -> b
     42:42:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):97:97 -> b
     43:43:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):92:92 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/internal/Mq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/internal/Oq;)V"}
     44:44:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setDirectTarget(com.android.tools.r8.graph.DexMethod,boolean):149:149 -> b
     44:44:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):92 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:46:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.setDirectTarget(com.android.tools.r8.graph.DexMethod,boolean):150:151 -> b
     45:46:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):92 -> b
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.Ah:
 # {"id":"sourceFile","fileName":"D8NestBasedAccessDesugaring.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -154611,7 +154598,7 @@
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.nest.Nest.getHostClass():65:65 -> a
     2:2:void lambda$clearNestAttributes$4(com.android.tools.r8.ir.desugar.nest.Nest):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;)V"}
     3:3:void com.android.tools.r8.graph.DexClass.clearNestMembers():1114:1114 -> a
     3:3:void lambda$clearNestAttributes$4(com.android.tools.r8.ir.desugar.nest.Nest):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154623,59 +154610,59 @@
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.nest.Nest.getHostClass():65:65 -> a
     7:7:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/aQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/eQ;)V"}
     8:8:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     8:8:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):97 -> a
     9:11:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):98:100 -> a
     12:12:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/E0;)V"}
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296:1296 -> a
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302:1302 -> a
     13:13:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296:1296 -> a
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302:1302 -> a
     14:14:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
     15:15:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1298 -> a
+    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1304 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
-    16:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1298:1298 -> a
+    16:16:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1304:1304 -> a
     16:16:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
     17:17:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> a
-    17:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296 -> a
+    17:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
     18:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296 -> a
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302 -> a
     18:18:void lambda$checkAndFailOnIncompleteNests$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):75 -> a
     19:19:boolean com.android.tools.r8.ir.desugar.nest.Nest.hasMissingMembers():81:81 -> a
     19:19:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):67 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/eQ;)V"}
     20:20:boolean com.android.tools.r8.ir.desugar.nest.Nest.hasMissingMembers():81:81 -> a
     20:20:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):67 -> a
     21:22:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):70:71 -> a
-    23:23:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1315:1315 -> a
+    23:23:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1321:1321 -> a
     23:23:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1315:1315 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1321:1321 -> a
     24:24:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):71 -> a
     25:25:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):68:68 -> a
-    26:26:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> a
+    26:26:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> a
     26:26:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> a
+    27:27:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> a
     27:27:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):68 -> a
     28:28:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> a
-    28:28:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> a
+    28:28:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:28:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):68 -> a
     29:29:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
-    29:29:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> a
+    29:29:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> a
     29:29:void lambda$checkAndFailOnIncompleteNests$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.nest.Nest):68 -> a
     30:30:void lambda$clearNestAttributes$5(com.android.tools.r8.graph.DexClass):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)V"}
     31:32:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):94:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;Ljava/util/concurrent/ExecutorService;)V"}
     33:33:void com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.forEachNest(java.util.function.Consumer):82:82 -> a
     33:33:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):95 -> a
     34:34:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions com.android.tools.r8.ir.conversion.D8MethodProcessor.getProfileCollectionAdditions():61:61 -> a
@@ -154692,9 +154679,9 @@
     40:43:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):135:138 -> a
     44:44:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):135:135 -> a
     45:45:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$7(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.DexClasspathClass):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;Lcom/android/tools/r8/graph/I0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/graph/I0;)V"}
     46:46:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$8(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;Lcom/android/tools/r8/graph/e0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/graph/e0;)V"}
     47:47:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:17 -> a
     47:47:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$8(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -154702,36 +154689,36 @@
     48:50:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$8(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):146 -> a
     1:1:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60:60 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)V"}
-    2:2:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296:1296 -> b
+    2:2:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302:1302 -> b
     2:2:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296:1296 -> b
+    3:3:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302:1302 -> b
     3:3:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
     4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> b
-    4:4:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1298 -> b
+    4:4:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1304 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
-    5:5:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1298:1298 -> b
+    5:5:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1304:1304 -> b
     5:5:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
     6:6:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> b
-    6:6:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296 -> b
+    6:6:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
     7:7:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> b
-    7:7:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1296 -> b
+    7:7:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1302 -> b
     7:7:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):60 -> b
     8:8:void clearNestAttributes():81:81 -> b
     9:9:boolean com.android.tools.r8.ir.desugar.nest.Nest.hasMissingMembers():81:81 -> b
     9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):41 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;)V"}
     10:10:boolean com.android.tools.r8.ir.desugar.nest.Nest.hasMissingMembers():81:81 -> b
     10:10:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):41 -> b
     11:12:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):44:45 -> b
-    13:13:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1315:1315 -> b
+    13:13:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1321:1321 -> b
     13:13:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):45 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1315:1315 -> b
+    14:14:void com.android.tools.r8.utils.InternalOptions.errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1321:1321 -> b
     14:14:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):45 -> b
     15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.nest.Nest.getHostClass():65:65 -> b
     15:15:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):47 -> b
@@ -154740,29 +154727,29 @@
     17:17:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):51 -> b
     18:22:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):51:55 -> b
     23:23:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:42 -> b
-    24:24:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> b
+    24:24:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> b
     24:24:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:25:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> b
+    25:25:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> b
     25:25:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42 -> b
     26:26:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> b
-    26:26:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> b
+    26:26:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:26:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42 -> b
     27:27:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> b
-    27:27:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> b
+    27:27:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> b
     27:27:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42 -> b
     28:28:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):144:144 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;Lcom/android/tools/r8/graph/I0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/graph/I0;)V"}
     29:29:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):79:79 -> b
     29:29:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):144 -> b
     1:1:void reportDesugarDependencies():39:39 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.yh:
 # {"id":"sourceFile","fileName":"D8NestBasedAccessDesugaring.java"}
     com.android.tools.r8.ir.conversion.D8MethodProcessor val$methodProcessor -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xh;"}
     1:1:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.ir.conversion.D8MethodProcessor):106:106 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xh;)V"}
     1:1:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):114:114 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/H0;)V"}
     2:2:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):126:126 -> a
@@ -154771,16 +154758,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):120:120 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.xh:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.zh:
 # {"id":"sourceFile","fileName":"D8NestBasedAccessDesugaring.java"}
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iQ;"}
     com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ah;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():150:150 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):155:157 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yh;Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/eQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ah;Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/iQ;)V"}
     1:2:void registerFieldAccessFromClasspath(com.android.tools.r8.graph.DexField,boolean):161:162 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Z)V"}
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):128:128 -> a
@@ -154842,23 +154829,23 @@
     33:34:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):409:410 -> a
     33:34:void ensureFieldAccessBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):178 -> a
     33:34:void registerFieldAccessFromClasspath(com.android.tools.r8.graph.DexField,boolean):164 -> a
-    35:35:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> a
+    35:35:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> a
     35:35:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> a
     35:35:void ensureFieldAccessBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):178 -> a
     35:35:void registerFieldAccessFromClasspath(com.android.tools.r8.graph.DexField,boolean):164 -> a
     36:36:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> a
-    36:36:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> a
+    36:36:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     36:36:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> a
     36:36:void ensureFieldAccessBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):178 -> a
     36:36:void registerFieldAccessFromClasspath(com.android.tools.r8.graph.DexField,boolean):164 -> a
     37:37:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
-    37:37:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> a
+    37:37:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> a
     37:37:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> a
     37:37:void ensureFieldAccessBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndField,boolean,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):178 -> a
     37:37:void registerFieldAccessFromClasspath(com.android.tools.r8.graph.DexField,boolean):164 -> a
     38:45:void ensureMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):249:256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/eQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/iQ;)V"}
     46:46:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     46:46:void ensureMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):257 -> a
     47:49:void ensureMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):257:259 -> a
@@ -154991,22 +154978,22 @@
     61:62:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):409:410 -> i
     61:62:void ensureConstructorOrMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225 -> i
     61:62:void registerInvokeFromClasspath(com.android.tools.r8.graph.DexMethod):206 -> i
-    63:63:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311:1311 -> i
+    63:63:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317:1317 -> i
     63:63:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> i
     63:63:void ensureConstructorOrMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225 -> i
     63:63:void registerInvokeFromClasspath(com.android.tools.r8.graph.DexMethod):206 -> i
     64:64:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> i
-    64:64:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> i
+    64:64:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:64:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> i
     64:64:void ensureConstructorOrMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225 -> i
     64:64:void registerInvokeFromClasspath(com.android.tools.r8.graph.DexMethod):206 -> i
     65:65:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> i
-    65:65:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1311 -> i
+    65:65:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.fatalErrorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1317 -> i
     65:65:java.lang.RuntimeException com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.reportIncompleteNest(com.android.tools.r8.graph.LibraryMember):410 -> i
     65:65:void ensureConstructorOrMethodBridgeFromClasspathAccess(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):225 -> i
     65:65:void registerInvokeFromClasspath(com.android.tools.r8.graph.DexMethod):206 -> i
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.aQ:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.eQ:
 # {"id":"sourceFile","fileName":"Nest.java"}
     com.android.tools.r8.graph.DexClass hostClass -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E0;"}
@@ -155019,11 +155006,11 @@
     1:4:void <init>(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):22:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"}
     1:23:com.android.tools.r8.ir.desugar.nest.Nest create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer):34:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/E0;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/aQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/E0;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/eQ;"}
     24:28:void lambda$create$0(com.android.tools.r8.graph.AppView,java.util.List,java.util.List,com.android.tools.r8.graph.DexType):49:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/graph/I2;)V"}
     29:29:java.lang.Iterable getClasspathMembers():60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jC;"}
     30:30:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):903:903 -> a
     30:30:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):576 -> a
     30:30:java.lang.Iterable getClasspathMembers():61 -> a
@@ -155036,7 +155023,7 @@
     34:34:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.transform(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):739:739 -> a
     34:34:java.lang.Iterable getClasspathMembers():60 -> a
     1:1:boolean hasHostOrLibraryMember():77:77 -> b
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.cQ:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.gQ:
 # {"id":"sourceFile","fileName":"NestBasedAccessDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -155055,12 +155042,12 @@
     19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget.getBridge():126:126 -> a
     19:19:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarFieldInstruction$1(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget,com.android.tools.r8.graph.ProgramField,boolean):206 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bQ;Lcom/android/tools/r8/graph/A5;Z)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fQ;Lcom/android/tools/r8/graph/A5;Z)Lcom/android/tools/r8/graph/C5;"}
     20:20:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarFieldInstruction$1(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget,com.android.tools.r8.graph.ProgramField,boolean):205:205 -> a
     21:25:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):144:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     26:31:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.cf.code.CfInstruction):150:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/internal/z9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/internal/B9;)V"}
     32:42:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.cf.code.CfInstruction):153:163 -> a
     43:43:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
     43:43:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.cf.code.CfInstruction):166 -> a
@@ -155072,7 +155059,7 @@
     49:59:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.cf.code.CfInstruction):171:181 -> a
     60:60:void lambda$prepare$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.cf.code.CfInstruction):180:180 -> a
     61:62:void prepareDesugarMethodInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):219:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;)V"}
     63:63:boolean com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget.shouldAddBridge():134:134 -> a
     63:63:void prepareDesugarMethodInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):221 -> a
     64:64:com.android.tools.r8.graph.DexClassAndMember com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget.getTarget():130:130 -> a
@@ -155086,7 +155073,7 @@
     77:77:void prepareDesugarMethodInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):235 -> a
     78:81:void prepareDesugarMethodInstruction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):235:238 -> a
     82:82:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarMethodInstruction$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget):229:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bQ;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fQ;)Lcom/android/tools/r8/graph/C5;"}
     83:83:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget.getBridge():126:126 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarMethodInstruction$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155098,7 +155085,7 @@
     87:87:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarMethodInstruction$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget):233:233 -> a
     88:88:com.android.tools.r8.graph.ProgramMethod lambda$prepareDesugarMethodInstruction$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget):232:232 -> a
     89:95:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):246:252 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/bQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/fQ;"}
     96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):79:79 -> a
     96:96:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):252 -> a
     97:103:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):253:259 -> a
@@ -155131,7 +155118,7 @@
     119:121:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Function):262:264 -> a
     122:122:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
     122:122:void prepareDesugarFieldInstruction(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;)V"}
     123:123:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):79:79 -> a
     123:123:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):272 -> a
     123:123:void prepareDesugarFieldInstruction(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):195 -> a
@@ -155163,17 +155150,17 @@
     151:154:boolean needsDesugaring(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClassAndMethod):310:313 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/graph/H0;)Z"}
     155:169:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):318:332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     170:170:com.android.tools.r8.ir.desugar.DesugarDescription desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction):336:336 -> a
     170:170:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.internal.CfFieldInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/wk;"}
     171:171:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.internal.CfFieldInstruction):0:0 -> a
     172:172:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     172:172:com.android.tools.r8.ir.desugar.DesugarDescription desugarFieldInstruction(com.android.tools.r8.cf.code.CfFieldInstruction):364 -> a
     172:172:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarFieldInstruction(com.android.tools.r8.internal.CfFieldInstruction):0 -> a
     173:173:java.util.Collection lambda$desugarFieldInstruction$4(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):349:349 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     174:174:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
     174:174:java.util.Collection lambda$desugarFieldInstruction$4(com.android.tools.r8.cf.code.CfFieldInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):348 -> a
     175:175:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramMethod):79:79 -> a
@@ -155214,13 +155201,13 @@
     202:202:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke):368:368 -> a
     202:202:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.internal.CfInvoke):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;)Lcom/android/tools/r8/internal/wk;"}
     203:203:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.internal.CfInvoke):0:0 -> a
     204:204:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     204:204:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke):404 -> a
     204:204:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.NestBasedAccessDesugaring.desugarInvokeInstruction(com.android.tools.r8.internal.CfInvoke):0 -> a
     205:209:java.util.Collection lambda$desugarInvokeInstruction$5(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):379:383 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     210:210:com.android.tools.r8.graph.DexClassAndMember com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget.getTarget():130:130 -> a
     210:210:java.util.Collection lambda$desugarInvokeInstruction$5(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):385 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155321,7 +155308,7 @@
     6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):3141:3141 -> d
     6:6:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):487 -> d
     7:7:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):488:488 -> d
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.bQ:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.fQ:
 # {"id":"sourceFile","fileName":"NestBasedAccessDesugaring.java"}
     com.android.tools.r8.graph.DexMethod bridge -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -155331,7 +155318,7 @@
     1:1:void <clinit>():114:114 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMember):119:122 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/G0;)V"}
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.eQ:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.iQ:
 # {"id":"sourceFile","fileName":"NestBasedAccessDesugaringEventConsumer.java"}
     void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/H0;)V"}
@@ -155341,10 +155328,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer$EmptyNestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.dQ:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer$EmptyNestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.hQ:
 # {"id":"sourceFile","fileName":"NestBasedAccessDesugaringEventConsumer.java"}
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer$EmptyNestBasedAccessDesugaringEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hQ;"}
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):52:52 -> a
@@ -155355,7 +155342,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):58:58 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
-com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.O10:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.S10:
 # {"id":"sourceFile","fileName":"RecordCfMethods.java"}
     1:16:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):51:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/G;"}
@@ -155394,7 +155381,7 @@
     291:291:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> b
     291:291:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):309 -> b
     292:292:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):310:310 -> b
-com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.S10:
+com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.W10:
 # {"id":"sourceFile","fileName":"RecordDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -155422,7 +155409,7 @@
     6:6:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.disableAndroidApiLevelCheck():130:130 -> a
     6:6:void lambda$synthesizeRecordHelper$6(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):359 -> a
     7:9:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):102:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
     10:10:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
     10:10:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):104 -> a
     11:13:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):104:106 -> a
@@ -155440,7 +155427,7 @@
     27:27:void prepareInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):121:121 -> a
     27:27:void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions):105 -> a
     28:29:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):134:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     30:30:void scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
     30:30:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):136 -> a
     31:31:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
@@ -155489,7 +155476,7 @@
     56:58:void scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):166 -> a
     56:58:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):136 -> a
     59:59:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     60:60:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
     60:60:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):176 -> a
     61:61:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):177:177 -> a
@@ -155510,7 +155497,7 @@
     82:82:com.android.tools.r8.graph.DexField[] com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic.getFields():187:187 -> a
     82:82:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/d20;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/h20;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/C5;"}
     83:83:com.android.tools.r8.graph.ProgramMethod synthesizeGetFieldsAsObjectsMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexMethod):274:274 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod lambda$ensureGetFieldsAsObjects$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.graph.DexMethod):326 -> a
     84:87:com.android.tools.r8.graph.ProgramMethod synthesizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider,com.android.tools.r8.graph.DexMethod):283:286 -> a
@@ -155543,13 +155530,13 @@
     124:124:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvokeDynamic(com.android.tools.r8.cf.code.CfInstruction):198:198 -> a
     124:124:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvokeDynamic(com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/wk;"}
     125:125:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvokeDynamic(com.android.tools.r8.internal.CfInstruction):0:0 -> a
     126:126:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     126:126:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvokeDynamic(com.android.tools.r8.cf.code.CfInstruction):215 -> a
     126:126:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvokeDynamic(com.android.tools.r8.internal.CfInstruction):0 -> a
     127:127:java.util.Collection lambda$desugarInvokeDynamic$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     128:128:java.util.List desugarInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):242:242 -> a
     128:128:java.util.Collection lambda$desugarInvokeDynamic$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):209 -> a
     129:129:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordRewriterHelper.parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:127 -> a
@@ -155613,13 +155600,13 @@
     164:164:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):219:219 -> a
     164:164:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvoke(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/wk;"}
     165:165:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvoke(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0:0 -> a
     166:166:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     166:166:com.android.tools.r8.ir.desugar.DesugarDescription desugarInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod):232 -> a
     166:166:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.RecordDesugaring.desugarInvoke(com.android.tools.r8.internal.CfInvoke,com.android.tools.r8.graph.DexMethod):0 -> a
     167:168:java.util.Collection lambda$desugarInvoke$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):230:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     169:169:java.util.Collection lambda$desugarInvoke$1(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):230:230 -> a
     170:170:com.android.tools.r8.graph.ProgramMethod synthesizeEqualsRecordMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):268:268 -> a
     170:170:com.android.tools.r8.graph.ProgramMethod lambda$ensureEqualsRecord$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):309 -> a
@@ -155686,7 +155673,7 @@
     238:238:com.android.tools.r8.graph.ProgramMethod synthesizeEqualsRecordMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):268 -> a
     238:238:com.android.tools.r8.graph.ProgramMethod lambda$ensureEqualsRecord$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):309 -> a
     239:239:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):303:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d20;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h20;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     240:240:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic.getRecordClass():199:199 -> a
     240:240:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):304 -> a
     241:241:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):305:305 -> a
@@ -155696,7 +155683,7 @@
     245:245:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):305 -> a
     246:250:com.android.tools.r8.graph.DexMethod ensureEqualsRecord(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):306:310 -> a
     251:251:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):348:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/C5;"}
     252:252:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     252:252:com.android.tools.r8.graph.ProgramMethod synthesizeRecordHelper(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):349 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155707,7 +155694,7 @@
     259:259:com.android.tools.r8.graph.Code lambda$synthesizeRecordHelper$5(java.util.function.BiFunction,com.android.tools.r8.graph.DexMethod):358:358 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     260:260:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):368:368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d20;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h20;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Ljava/util/ArrayList;"}
     261:261:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic.getRecordType():191:191 -> a
     261:261:java.util.List desugarInvokeRecordHashCode(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):369 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155724,7 +155711,7 @@
     281:281:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureRecordClassHelper$8(com.android.tools.r8.synthesis.SyntheticNaming):467:467 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     282:284:void lambda$ensureRecordClassHelper$10(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):478:480 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/T10;Ljava/util/Collection;Lcom/android/tools/r8/internal/U10;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X10;Ljava/util/Collection;Lcom/android/tools/r8/internal/Y10;Lcom/android/tools/r8/graph/D2;)V"}
     285:292:void lambda$ensureRecordClassHelper$10(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):479:486 -> a
     293:293:void lambda$ensureRecordClassHelper$10(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):485:485 -> a
     294:300:void checkRecordTagNotPresent(com.android.tools.r8.graph.DexItemFactory):493:499 -> a
@@ -155744,7 +155731,7 @@
     330:330:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     330:330:com.android.tools.r8.graph.DexProgramClass ensureRecordClassHelper(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):464 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/AbstractCollection;Lcom/android/tools/r8/internal/V10;Lcom/android/tools/r8/internal/Q8;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/AbstractCollection;Lcom/android/tools/r8/internal/Z10;Lcom/android/tools/r8/internal/S8;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/graph/D2;"}
     331:331:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     331:331:com.android.tools.r8.graph.DexProgramClass ensureRecordClassHelper(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):464 -> a
     332:343:com.android.tools.r8.graph.DexProgramClass ensureRecordClassHelper(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):464:475 -> a
@@ -155786,7 +155773,7 @@
     372:372:void lambda$ensureRecordClassHelper$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):473 -> a
     373:373:void lambda$ensureRecordClassHelper$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):473:473 -> a
     374:374:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):593:593 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
     375:375:com.android.tools.r8.graph.DexApplicationReadFlags com.android.tools.r8.graph.DexApplication.getFlags():149:149 -> a
     375:375:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):593 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155806,7 +155793,7 @@
     387:389:void ensureRecordClass(com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer,java.util.Collection):431 -> a
     387:389:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):602 -> a
     390:393:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):612:615 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/pa;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ra;Ljava/util/concurrent/ExecutorService;)V"}
     394:394:void com.android.tools.r8.graph.ClassAccessFlags.unsetRecord():200:200 -> a
     394:394:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):615 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155824,7 +155811,7 @@
     9:9:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic.getRecordClass():199:199 -> b
     9:9:com.android.tools.r8.graph.DexMethod ensureGetFieldsAsObjects(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):319 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d20;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h20;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)Lcom/android/tools/r8/graph/w2;"}
     10:10:com.android.tools.r8.graph.DexMethod ensureGetFieldsAsObjects(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):320:320 -> b
     11:12:com.android.tools.r8.graph.DexMethod getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):333:334 -> b
     11:12:com.android.tools.r8.graph.DexMethod ensureGetFieldsAsObjects(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer):320 -> b
@@ -155834,7 +155821,7 @@
     21:21:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$synthesizeRecordHelper$4(com.android.tools.r8.synthesis.SyntheticNaming):351:351 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     22:22:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):398:398 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d20;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h20;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)Ljava/util/ArrayList;"}
     23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic.getRecordType():191:191 -> b
     23:23:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):399 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -155868,16 +155855,16 @@
     51:59:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):411:419 -> b
     60:60:java.lang.String uniqueIdentifier():586:586 -> b
     1:1:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$ensureRecordClassHelper$7():466:466 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DO;"}
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.V10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HO;"}
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.Z10:
 # {"id":"sourceFile","fileName":"RecordDesugaringEventConsumer.java"}
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.T10:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.X10:
 # {"id":"sourceFile","fileName":"RecordDesugaringEventConsumer.java"}
     void acceptRecordClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.U10:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.Y10:
 # {"id":"sourceFile","fileName":"RecordDesugaringEventConsumer.java"}
     void acceptRecordClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
@@ -155889,18 +155876,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptRecordGetFieldsAsObjectsHelperMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.b20:
+com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.f20:
 # {"id":"sourceFile","fileName":"RecordFieldValuesRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter irConverter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):45:47 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter create(com.android.tools.r8.graph.AppView):39:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/b20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/f20;"}
     3:9:void rewriteRecordFieldValues():53:59 -> a
     10:15:void rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):67:72 -> a
     10:15:void rewriteRecordFieldValues():60 -> a
@@ -155984,11 +155971,11 @@
     84:84:void rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):88:88 -> a
     84:84:void rewriteRecordFieldValues():60 -> a
     85:102:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):135:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/K5;)V"}
-com.android.tools.r8.ir.desugar.records.RecordRewriter -> com.android.tools.r8.internal.c20:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/M5;)V"}
+com.android.tools.r8.ir.desugar.records.RecordRewriter -> com.android.tools.r8.internal.g20:
 # {"id":"sourceFile","fileName":"RecordRewriter.java"}
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.e20:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.i20:
 # {"id":"sourceFile","fileName":"RecordRewriterHelper.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
@@ -156006,8 +155993,8 @@
     57:75:boolean isInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:119 -> a
     76:76:boolean isInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
     77:91:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):139:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/d20;"}
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.d20:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/h20;"}
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.h20:
 # {"id":"sourceFile","fileName":"RecordRewriterHelper.java"}
     com.android.tools.r8.graph.DexString methodName -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -156023,7 +156010,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:7:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):172:178 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/graph/H2;[Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.bf0:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.ff0:
 # {"id":"sourceFile","fileName":"StringConcatInstructionDesugaring.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -156035,7 +156022,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:17:void <init>(com.android.tools.r8.graph.AppView):52:67 -> <init>
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):73 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
@@ -156046,13 +156033,13 @@
     16:16:com.android.tools.r8.ir.desugar.DesugarDescription desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic):92:92 -> a
     16:16:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.internal.CfInvokeDynamic):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;)Lcom/android/tools/r8/internal/wk;"}
     17:17:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.internal.CfInvokeDynamic):0:0 -> a
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     18:18:com.android.tools.r8.ir.desugar.DesugarDescription desugarMakeConcat(com.android.tools.r8.cf.code.CfInvokeDynamic):104 -> a
     18:18:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcat(com.android.tools.r8.internal.CfInvokeDynamic):0 -> a
     19:55:java.util.Collection desugarMakeConcatWithConstantsInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):150:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/graph/C5;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/graph/C5;)Ljava/util/Collection;"}
     56:68:java.util.Collection desugarMakeConcatWithConstantsInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):185:197 -> a
     69:69:java.util.Collection desugarMakeConcatWithConstantsInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):194:194 -> a
     70:84:java.util.Collection desugarMakeConcatWithConstantsInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.graph.ProgramMethod):190:204 -> a
@@ -156068,7 +156055,7 @@
     136:136:java.util.Collection desugarMakeConcatInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     136:136:java.util.Collection lambda$desugarMakeConcat$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     137:147:java.util.Collection desugarMakeConcatInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):111:121 -> a
     137:147:java.util.Collection lambda$desugarMakeConcat$0(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):103 -> a
     148:155:java.util.Collection desugarMakeConcatInstructions(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):118:125 -> a
@@ -156077,25 +156064,25 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Lcom/android/tools/r8/graph/C5;)Ljava/lang/String;"}
     162:162:java.lang.String convertToString(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.ProgramMethod):246:246 -> a
     163:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):418:420 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;)Lcom/android/tools/r8/internal/Le;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/lang/String;)Lcom/android/tools/r8/internal/Ne;"}
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic):129:129 -> b
     1:1:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.internal.CfInvokeDynamic):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;)Lcom/android/tools/r8/internal/wk;"}
     2:2:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.internal.CfInvokeDynamic):0:0 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription desugarMakeConcatWithConstants(com.android.tools.r8.cf.code.CfInvokeDynamic):142 -> b
     3:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.StringConcatInstructionDesugaring.desugarMakeConcatWithConstants(com.android.tools.r8.internal.CfInvokeDynamic):0 -> b
     4:4:java.util.Collection lambda$desugarMakeConcatWithConstants$1(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):140:140 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H9;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.Xe0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J9;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.bf0:
 # {"id":"sourceFile","fileName":"StringConcatInstructionDesugaring.java"}
     int variableIndex -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):374:375 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)V"}
     1:1:com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk():389:389 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xe0;"}
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.Ye0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bf0;"}
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.cf0:
 # {"id":"sourceFile","fileName":"StringConcatInstructionDesugaring.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -156104,33 +156091,33 @@
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):343:344 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk():357:357 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xe0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bf0;"}
     1:1:com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk():365:365 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/af0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ef0;"}
     1:2:com.android.tools.r8.ir.code.ValueType getValueType():348:349 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kl0;"}
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.Ze0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ol0;"}
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.df0:
 # {"id":"sourceFile","fileName":"StringConcatInstructionDesugaring.java"}
     java.util.List chunks -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk biggestArgumentChunk -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xe0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bf0;"}
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk firstConstantChunk -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/af0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ef0;"}
     int argumentChunksStackSize -> d
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ff0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):259:259 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ff0;)V"}
     2:6:void <init>(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):253:257 -> <init>
     1:6:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk):262:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xe0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bf0;)V"}
     7:9:void addChunk(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk):272:274 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/af0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ef0;)V"}
     10:12:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):296:298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uL;)Ljava/util/Collection;"}
     13:13:boolean com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk.isArgumentChunk():0:0 -> a
     13:13:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):298 -> a
     14:16:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):299:301 -> a
@@ -156153,19 +156140,19 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:58:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):315:330 -> a
     59:63:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):328:332 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.af0:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.ef0:
 # {"id":"sourceFile","fileName":"StringConcatInstructionDesugaring.java"}
     com.android.tools.r8.graph.DexString stringConstant -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):398:399 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk():413:413 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/af0;"}
-com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer -> com.android.tools.r8.internal.Zh0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ef0;"}
+com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer -> com.android.tools.r8.internal.di0:
 # {"id":"sourceFile","fileName":"TwrCloseResourceDesugaringEventConsumer.java"}
     void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.ai0:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.ei0:
 # {"id":"sourceFile","fileName":"TwrInstructionDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -156180,14 +156167,14 @@
     1:8:void <init>(com.android.tools.r8.graph.AppView):36:43 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):48:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     3:4:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):196:197 -> a
     3:4:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):51 -> a
     5:5:boolean isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod):202:202 -> a
     5:5:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):197 -> a
     5:5:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):51 -> a
     6:8:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):52:54 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseSuppressedExceptions():2764:2764 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseSuppressedExceptions():2770:2770 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):54 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):55:55 -> a
     11:12:boolean isTwrSuppressedInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.DexMethod):166:167 -> a
@@ -156203,7 +156190,7 @@
     21:23:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):58 -> a
     24:27:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):59:62 -> a
     28:33:java.util.Collection lambda$rewriteTwrAddSuppressedInvoke$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     34:34:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getMethodContext():236:236 -> a
     34:34:java.util.Collection lambda$rewriteTwrAddSuppressedInvoke$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156211,7 +156198,7 @@
     36:36:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$rewriteTwrAddSuppressedInvoke$0(com.android.tools.r8.synthesis.SyntheticNaming):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     37:42:java.util.Collection lambda$rewriteTwrCloseResourceInvoke$5(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):129:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     43:43:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getMethodContext():236:236 -> a
     43:43:java.util.Collection lambda$rewriteTwrCloseResourceInvoke$5(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156230,7 +156217,7 @@
     50:50:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     50:50:void lambda$createAndCallSyntheticMethod$7(com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159 -> a
     51:51:com.android.tools.r8.com.google.common.collect.ImmutableList createAndCallSyntheticMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/graph/E2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Ge;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/graph/E2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Ie;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/jc0;"}
     52:52:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     52:52:com.android.tools.r8.com.google.common.collect.ImmutableList createAndCallSyntheticMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexProto,java.util.function.BiFunction,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramMethod):148 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156248,13 +156235,13 @@
     1:4:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrAddSuppressedInvoke():66:69 -> b
     1:4:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrAddSuppressedInvoke():0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wk;"}
     5:5:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrAddSuppressedInvoke():0:0 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrAddSuppressedInvoke():87 -> b
     6:6:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrAddSuppressedInvoke():0 -> b
     7:12:java.util.Collection lambda$rewriteTwrGetSuppressedInvoke$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):106:111 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     13:13:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getMethodContext():236:236 -> b
     13:13:java.util.Collection lambda$rewriteTwrGetSuppressedInvoke$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):112 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156266,7 +156253,7 @@
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrCloseResourceInvoke():118:118 -> c
     2:2:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrCloseResourceInvoke():0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wk;"}
     3:3:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrCloseResourceInvoke():0:0 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrCloseResourceInvoke():136 -> c
@@ -156274,14 +156261,14 @@
     1:4:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrGetSuppressedInvoke():91:94 -> d
     1:4:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrGetSuppressedInvoke():0 -> d
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wk;"}
     5:7:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrGetSuppressedInvoke():93:95 -> d
     5:7:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrGetSuppressedInvoke():0 -> d
     8:8:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrGetSuppressedInvoke():0:0 -> d
     9:9:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> d
     9:9:com.android.tools.r8.ir.desugar.DesugarDescription rewriteTwrGetSuppressedInvoke():113 -> d
     9:9:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.TwrInstructionDesugaring.rewriteTwrGetSuppressedInvoke():0 -> d
-com.android.tools.r8.ir.desugar.typeswitch.SwitchHelperGenerator -> com.android.tools.r8.internal.dg0:
+com.android.tools.r8.ir.desugar.typeswitch.SwitchHelperGenerator -> com.android.tools.r8.internal.hg0:
 # {"id":"sourceFile","fileName":"SwitchHelperGenerator.java"}
     1:2:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):44:45 -> <init>
     1:2:void com.android.tools.r8.internal.SwitchHelperGenerator.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0 -> <init>
@@ -156340,7 +156327,7 @@
     32:40:void com.android.tools.r8.internal.SwitchHelperGenerator.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0 -> <init>
     41:41:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0:0 -> <init>
     41:41:void com.android.tools.r8.internal.SwitchHelperGenerator.<init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52,"2":53,"3":54},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52,"2":53,"3":54},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     42:42:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():91:91 -> <init>
     42:42:void synthesizeStaticMethod(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,java.util.function.Consumer):101 -> <init>
     42:42:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):55 -> <init>
@@ -156374,7 +156361,7 @@
     53:53:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):55 -> <init>
     54:54:void synthesizeStaticMethod(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,java.util.function.Consumer):100:100 -> <init>
     54:54:void <init>(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.AppView,java.util.function.Consumer):55 -> <init>
-com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaring -> com.android.tools.r8.internal.hj0:
+com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaring -> com.android.tools.r8.internal.lj0:
 # {"id":"sourceFile","fileName":"TypeSwitchDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -156399,7 +156386,7 @@
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):75:75 -> a
     1:1:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isInvokeDynamic():0:0 -> a
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):75 -> a
     2:2:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -156410,7 +156397,7 @@
     4:5:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     6:6:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     7:7:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):91 -> a
     7:7:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -156418,7 +156405,7 @@
     8:10:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     11:11:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32,"2":33,"3":34},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":32,"2":33,"3":34},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     12:12:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):114 -> a
     12:12:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -156432,7 +156419,7 @@
     17:18:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     19:19:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     19:19:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35,"2":36,"3":37},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35,"2":36,"3":37},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     20:20:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     20:20:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):138 -> a
     20:20:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -156449,7 +156436,7 @@
     25:25:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
     26:26:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     26:26:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40},"outline":"Lcom/android/tools/r8/internal/g5;a(Lcom/android/tools/r8/internal/sk;)Lcom/android/tools/r8/internal/vk;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40},"outline":"Lcom/android/tools/r8/internal/i5;a(Lcom/android/tools/r8/internal/uk;)Lcom/android/tools/r8/internal/xk;"}
     27:27:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     27:27:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):161 -> a
     27:27:com.android.tools.r8.internal.DesugarDescription com.android.tools.r8.internal.TypeSwitchDesugaring.compute(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.CfInstruction):0 -> a
@@ -156480,7 +156467,7 @@
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription$Builder com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder.setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):108:108 -> a
     40:40:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):143 -> a
     41:41:java.util.Collection lambda$compute$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     42:42:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     42:42:java.util.Collection lambda$compute$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):90 -> a
     43:43:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.disableAndroidApiLevelCheck():130:130 -> a
@@ -156498,11 +156485,11 @@
     49:49:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     49:49:void lambda$generateInvokeToDesugaredMethod$10(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):208 -> a
     50:50:java.util.Collection lambda$compute$3(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     51:51:java.util.Collection lambda$compute$5(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     52:53:java.util.List genSwitchMethod(com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.function.Consumer):172:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Ljava/util/function/Consumer;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Ljava/util/function/Consumer;)Ljava/util/ArrayList;"}
     54:54:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     54:54:java.util.List genSwitchMethod(com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,java.util.function.Consumer):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156515,7 +156502,7 @@
     72:72:void lambda$genSwitchMethod$7(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):180:180 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/synthesis/V;)V"}
     73:73:void generateInvokeToDesugaredMethod(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):196:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     74:74:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     74:74:void generateInvokeToDesugaredMethod(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):198 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156568,7 +156555,7 @@
     280:287:void generateSwitchLoadArguments(java.util.List,com.android.tools.r8.graph.DexCallSite,java.util.function.Consumer):285:292 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/D0;Ljava/util/function/Consumer;)V"}
     1:1:java.util.Collection lambda$compute$1(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):106:106 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2905:2905 -> b
     2:2:java.util.Collection lambda$compute$1(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):109 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -156583,13 +156570,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     8:8:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$generateInvokeToDesugaredMethod$8(com.android.tools.r8.synthesis.SyntheticNaming):200:200 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaringEventConsumer -> com.android.tools.r8.internal.ij0:
+com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaringEventConsumer -> com.android.tools.r8.internal.mj0:
 # {"id":"sourceFile","fileName":"TypeSwitchDesugaringEventConsumer.java"}
     void acceptTypeSwitchClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptTypeSwitchMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaringHelper -> com.android.tools.r8.internal.jj0:
+com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchDesugaringHelper -> com.android.tools.r8.internal.nj0:
 # {"id":"sourceFile","fileName":"TypeSwitchDesugaringHelper.java"}
     1:2:com.android.tools.r8.errors.CompilationError throwEnumFieldConstantDynamic(java.lang.String,com.android.tools.r8.graph.DexClassAndMethod):28:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/H0;)V"}
@@ -156645,7 +156632,7 @@
     5:5:boolean isTypeSwitchCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):35 -> b
 com.android.tools.r8.ir.desugar.typeswitch.TypeSwitchMethods -> R8$$REMOVED$$CLASS$$104:
 # {"id":"sourceFile","fileName":"TypeSwitchMethods.java"}
-com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaring -> com.android.tools.r8.internal.pl0:
+com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaring -> com.android.tools.r8.internal.tl0:
 # {"id":"sourceFile","fileName":"VarHandleDesugaring.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -156658,7 +156645,7 @@
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():43:43 -> a
     1:1:void ensureVarHandleClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):249 -> a
     1:1:java.util.Collection lambda$computeDesugarSignaturePolymorphicMethod$12(com.android.tools.r8.cf.code.CfInvoke,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;ILcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;ILcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     2:3:void ensureVarHandleClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):249:250 -> a
     2:3:java.util.Collection lambda$computeDesugarSignaturePolymorphicMethod$12(com.android.tools.r8.cf.code.CfInvoke,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):421 -> a
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
@@ -156740,7 +156727,7 @@
     171:180:java.util.Collection desugarSignaturePolymorphicMethod(com.android.tools.r8.cf.code.CfInvoke,int,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator):586:595 -> a
     171:180:java.util.Collection lambda$computeDesugarSignaturePolymorphicMethod$12(com.android.tools.r8.cf.code.CfInvoke,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):422 -> a
     181:186:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):74:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/G9;)V"}
     187:187:int scanInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,int):90:90 -> a
     187:187:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):81 -> a
     188:188:boolean com.android.tools.r8.cf.code.CfInstruction.isInitClass():0:0 -> a
@@ -156792,7 +156779,7 @@
     219:220:boolean refersToMethodHandlesLookup(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):179 -> a
     219:220:boolean refersToMethodHandlesLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):172 -> a
     221:222:void ensureMethodHandlesLookupClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):194:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ql0;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ul0;Ljava/util/Collection;)V"}
     223:223:void ensureMethodHandlesLookupClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):194:194 -> a
     224:224:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     224:224:void ensureMethodHandlesLookupClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):198 -> a
@@ -156868,7 +156855,7 @@
     275:283:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
     284:284:void lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> a
     284:284:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":373,"2":374,"3":375},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":373,"2":374,"3":375},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     285:285:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarMethodHandlesLookupClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):977:977 -> a
     285:285:void lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):207 -> a
     285:285:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
@@ -156943,7 +156930,7 @@
     352:354:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
     355:355:void lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> a
     355:355:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":378},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":378},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     356:356:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarMethodHandlesLookupClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):995:995 -> a
     356:356:void lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):207 -> a
     356:356:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> a
@@ -156980,40 +156967,40 @@
     378:378:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarMethodHandlesLookupClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):993:993 -> a
     378:378:void lambda$ensureMethodHandlesLookupClass$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):207 -> a
     379:380:void lambda$ensureVarHandleClass$8(java.util.Collection,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):240:241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ql0;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/ul0;Lcom/android/tools/r8/graph/D2;)V"}
     381:441:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):257:317 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/z9;)Lcom/android/tools/r8/internal/xk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B9;)Lcom/android/tools/r8/internal/zk;"}
     442:443:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):313:314 -> a
     444:445:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):308:309 -> a
     446:462:com.android.tools.r8.ir.desugar.DesugarDescription compute(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):305:321 -> a
     463:463:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesArrayElementVarHandle(com.android.tools.r8.graph.DexItemFactory):381:381 -> a
     463:463:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesArrayElementVarHandle(com.android.tools.r8.graph.DexItemFactory):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/wk;"}
     464:464:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesArrayElementVarHandle(com.android.tools.r8.graph.DexItemFactory):0:0 -> a
     465:465:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     465:465:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesArrayElementVarHandle(com.android.tools.r8.graph.DexItemFactory):405 -> a
     465:465:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesArrayElementVarHandle(com.android.tools.r8.graph.DexItemFactory):0 -> a
     466:475:java.util.Collection lambda$computeMethodHandlesArrayElementVarHandle$11(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):392:401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     476:476:java.util.Collection lambda$computeMethodHandlesArrayElementVarHandle$11(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):399:399 -> a
     477:477:java.util.Collection lambda$computeMethodHandlesArrayElementVarHandle$11(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):393:393 -> a
     478:478:com.android.tools.r8.ir.desugar.DesugarDescription computeDesugarSignaturePolymorphicMethod(com.android.tools.r8.cf.code.CfInvoke,int):410:410 -> a
     478:478:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeDesugarSignaturePolymorphicMethod(com.android.tools.r8.internal.CfInvoke,int):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;I)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;I)Lcom/android/tools/r8/internal/wk;"}
     479:479:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeDesugarSignaturePolymorphicMethod(com.android.tools.r8.internal.CfInvoke,int):0:0 -> a
     480:480:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> a
     480:480:com.android.tools.r8.ir.desugar.DesugarDescription computeDesugarSignaturePolymorphicMethod(com.android.tools.r8.cf.code.CfInvoke,int):425 -> a
     480:480:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeDesugarSignaturePolymorphicMethod(com.android.tools.r8.internal.CfInvoke,int):0 -> a
     481:481:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):610:610 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De;Lcom/android/tools/r8/internal/Q8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fe;Lcom/android/tools/r8/internal/S8;)V"}
     482:482:com.android.tools.r8.graph.DexApplicationReadFlags com.android.tools.r8.graph.DexApplication.getFlags():149:149 -> a
     482:482:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):610 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     483:488:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):611:616 -> a
     489:489:void lambda$synthesizeClasses$13(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.List):615:615 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Ljava/util/List;)V"}
     490:498:void synthesizeClassIfReferenced(com.android.tools.r8.graph.DexApplicationReadFlags,java.util.function.Predicate,java.util.function.Function,java.util.function.Consumer):628:636 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/z0;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Consumer;)V"}
     1:6:boolean refersToVarHandle(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):109:114 -> b
@@ -157027,7 +157014,7 @@
     15:16:boolean refersToVarHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):130 -> b
     17:17:void ensureMethodHandlesLookupClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):217:217 -> b
     17:17:java.util.Collection lambda$computeMethodHandlesLookup$9(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):336 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> b
     18:18:void ensureMethodHandlesLookupClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):217 -> b
     18:18:java.util.Collection lambda$computeMethodHandlesLookup$9(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):336 -> b
@@ -157037,7 +157024,7 @@
     29:29:java.util.Collection lambda$computeMethodHandlesLookup$9(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):343:343 -> b
     30:30:java.util.Collection lambda$computeMethodHandlesLookup$9(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):338:338 -> b
     31:32:void ensureVarHandleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):225:226 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ql0;Ljava/util/Collection;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ul0;Ljava/util/Collection;)V"}
     33:33:void ensureVarHandleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):225:225 -> b
     34:34:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     34:34:void ensureVarHandleClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,java.util.Collection):228 -> b
@@ -157834,7 +157821,7 @@
     543:550:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     551:551:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     551:551:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     552:552:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):500:500 -> b
     552:552:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     552:552:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157843,7 +157830,7 @@
     553:558:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     559:559:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     559:559:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1328,"2":1329,"3":1330},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1328,"2":1329,"3":1330},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     560:560:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):508:508 -> b
     560:560:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     560:560:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157858,7 +157845,7 @@
     568:568:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     569:569:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     569:569:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1331,"2":1332,"3":1333},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1331,"2":1332,"3":1333},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     570:570:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):518:518 -> b
     570:570:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     570:570:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157887,7 +157874,7 @@
     585:589:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     590:590:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     590:590:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1334,"2":1335,"3":1336},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1334,"2":1335,"3":1336},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     591:591:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):528:528 -> b
     591:591:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     591:591:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157966,7 +157953,7 @@
     802:804:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     805:805:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     805:805:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1337,"2":1338,"3":1339},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1337,"2":1338,"3":1339},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     806:806:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):536:536 -> b
     806:806:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     806:806:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157975,7 +157962,7 @@
     807:812:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     813:813:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     813:813:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1340,"2":1341,"3":1342},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1340,"2":1341,"3":1342},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     814:814:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):544:544 -> b
     814:814:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     814:814:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157984,7 +157971,7 @@
     815:820:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     821:821:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     821:821:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1343,"2":1344,"3":1345},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1343,"2":1344,"3":1345},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     822:822:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):552:552 -> b
     822:822:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     822:822:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -157993,7 +157980,7 @@
     823:828:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     829:829:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     829:829:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1346,"2":1347,"3":1348},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1346,"2":1347,"3":1348},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     830:830:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):560:560 -> b
     830:830:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     830:830:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158002,7 +157989,7 @@
     831:836:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     837:837:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     837:837:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1349,"2":1350,"3":1351},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1349,"2":1350,"3":1351},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     838:838:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):568:568 -> b
     838:838:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     838:838:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158011,7 +157998,7 @@
     839:844:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     845:845:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     845:845:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1352,"2":1353,"3":1354},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1352,"2":1353,"3":1354},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     846:846:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):576:576 -> b
     846:846:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     846:846:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158020,7 +158007,7 @@
     847:852:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     853:853:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     853:853:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1355,"2":1356,"3":1357},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1355,"2":1356,"3":1357},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     854:854:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):584:584 -> b
     854:854:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     854:854:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158029,7 +158016,7 @@
     855:860:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     861:861:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     861:861:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1358,"2":1359,"3":1360},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1358,"2":1359,"3":1360},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     862:862:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):592:592 -> b
     862:862:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     862:862:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158062,7 +158049,7 @@
     885:889:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     890:890:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     890:890:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1361,"2":1362,"3":1363},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1361,"2":1362,"3":1363},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     891:891:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):602:602 -> b
     891:891:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     891:891:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158071,7 +158058,7 @@
     892:897:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
     898:898:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0:0 -> b
     898:898:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1364,"2":1365,"3":1366},"outline":"Lcom/android/tools/r8/internal/Ac;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1364,"2":1365,"3":1366},"outline":"Lcom/android/tools/r8/internal/Cc;a(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/graph/j1$a;"}
     899:899:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.generateDesugarVarHandleClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.graph.DexItemFactory):610:610 -> b
     899:899:void lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> b
     899:899:void com.android.tools.r8.internal.VarHandleDesugaring.lambda$ensureVarHandleClass$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):0 -> b
@@ -158328,19 +158315,19 @@
     1367:1367:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesLookup(com.android.tools.r8.graph.DexItemFactory):325:325 -> b
     1367:1367:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesLookup(com.android.tools.r8.graph.DexItemFactory):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/wk;"}
     1368:1368:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesLookup(com.android.tools.r8.graph.DexItemFactory):0:0 -> b
     1369:1369:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> b
     1369:1369:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesLookup(com.android.tools.r8.graph.DexItemFactory):349 -> b
     1369:1369:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesLookup(com.android.tools.r8.graph.DexItemFactory):0 -> b
     1370:1370:java.lang.String uniqueIdentifier():600:600 -> b
     1371:1371:void lambda$synthesizeClasses$14(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.List):620:620 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q8;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S8;Ljava/util/List;)V"}
     1:1:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$ensureMethodHandlesLookupClass$1():201:201 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HO;"}
     2:2:void ensureMethodHandlesLookupClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):217:217 -> c
     2:2:java.util.Collection lambda$computeMethodHandlesPrivateLookupIn$10(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):364 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Tq;Lcom/android/tools/r8/internal/qL;Lcom/android/tools/r8/internal/f9;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Vq;Lcom/android/tools/r8/internal/uL;Lcom/android/tools/r8/internal/h9;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/D9;Lcom/android/tools/r8/graph/B1;)Ljava/util/Collection;"}
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> c
     3:3:void ensureMethodHandlesLookupClass(com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer,com.android.tools.r8.graph.ProgramDefinition):217 -> c
     3:3:java.util.Collection lambda$computeMethodHandlesPrivateLookupIn$10(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfDesugaringInfo,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):364 -> c
@@ -158352,7 +158339,7 @@
     15:15:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesPrivateLookupIn(com.android.tools.r8.graph.DexItemFactory):353:353 -> c
     15:15:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesPrivateLookupIn(com.android.tools.r8.graph.DexItemFactory):0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/uk;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/wk;"}
     16:16:com.android.tools.r8.internal.DesugarDescription$NonEmptyBuilder$1 com.android.tools.r8.internal.VarHandleDesugaring.computeMethodHandlesPrivateLookupIn(com.android.tools.r8.graph.DexItemFactory):0:0 -> c
     17:17:com.android.tools.r8.ir.desugar.DesugarDescription com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder.build():134:134 -> c
     17:17:com.android.tools.r8.ir.desugar.DesugarDescription computeMethodHandlesPrivateLookupIn(com.android.tools.r8.graph.DexItemFactory):377 -> c
@@ -158366,8 +158353,8 @@
     4:19:void com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):62:77 -> d
     4:19:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):62 -> d
     20:20:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$ensureVarHandleClass$5():230:230 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DO;"}
-com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer -> com.android.tools.r8.internal.ql0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HO;"}
+com.android.tools.r8.ir.desugar.varhandle.VarHandleDesugaringEventConsumer -> com.android.tools.r8.internal.ul0:
 # {"id":"sourceFile","fileName":"VarHandleDesugaringEventConsumer.java"}
     void acceptVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y5;)V"}
@@ -159584,13 +159571,13 @@
     2:3:void <init>(java.util.Set):32:33 -> <init>
     2:3:void <init>():29 -> <init>
     4:5:void <init>(java.util.Set):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F40;)V"}
     1:1:void narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:2:boolean add(com.android.tools.r8.ir.code.Value):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     3:3:void addLiveAffectedValuesOf(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:java.util.Iterator iterator():114:114 -> a
     4:4:void addLiveAffectedValuesOf(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):81 -> a
     5:6:void addLiveAffectedValuesOf(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):81:82 -> a
@@ -159599,7 +159586,7 @@
     8:8:boolean isEmpty():109:109 -> a
     8:8:boolean hasNext():104 -> a
     8:8:void narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/function/Consumer;)V"}
     9:9:void narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):47:47 -> a
     10:10:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:50 -> a
     10:10:void narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):47 -> a
@@ -159615,7 +159602,7 @@
     1:1:boolean isEmpty():109:109 -> b
     1:1:boolean hasNext():104 -> b
     1:1:void propagateWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/function/Consumer;)V"}
     2:2:void propagateWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):57:57 -> b
     3:3:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:50 -> b
     3:3:void propagateWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):57 -> b
@@ -159649,17 +159636,17 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():32:32 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):38:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)V"}
     2:2:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48 -> a
     3:4:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48:49 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseAssertionErrorTwoArgumentConstructor():2768:2768 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canUseAssertionErrorTwoArgumentConstructor():2774:2774 -> a
     5:5:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):49 -> a
     6:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):52:64 -> a
     19:19:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
@@ -159704,7 +159691,7 @@
     57:57:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):88 -> a
     58:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):89:89 -> a
     59:62:com.android.tools.r8.graph.ProgramMethod createSynthetic(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):94:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/C5;"}
     63:63:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     63:63:com.android.tools.r8.graph.ProgramMethod createSynthetic(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):99 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -159752,7 +159739,7 @@
     112:112:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):361:361 -> a
     112:112:void lambda$rewrite$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.NewInstance):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/nQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/rQ;)V"}
     113:113:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):361:361 -> a
     113:113:void lambda$rewrite$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.NewInstance):86 -> a
 com.android.tools.r8.ir.optimize.AssertionErrorTwoArgsConstructorRewriterEventConsumer -> com.android.tools.r8.ir.optimize.c:
@@ -159778,12 +159765,12 @@
     1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/AssertionsConfiguration;)Lcom/android/tools/r8/ir/optimize/e;"}
     2:2:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
     3:8:boolean com.android.tools.r8.utils.AssertionConfigurationWithDefault.isPassthroughAll():30:35 -> a
     3:8:boolean isEnabled(com.android.tools.r8.utils.InternalOptions):145 -> a
     9:9:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):149:149 -> a
     9:9:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dt;)Z"}
     10:10:boolean com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString.isPassthrough():99:99 -> a
     10:10:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):361 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -159952,13 +159939,13 @@
     255:255:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):164 -> a
     256:256:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):180:180 -> a
     257:265:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.utils.Timing):346:354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/F;Lcom/android/tools/r8/internal/ph0;)V"}
     266:266:com.android.tools.r8.ir.code.DominatorTree lambda$runInternal$1(com.android.tools.r8.ir.code.IRCode):384:384 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/nm;"}
     267:267:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
     267:267:com.android.tools.r8.ir.code.DominatorTree lambda$runInternal$1(com.android.tools.r8.ir.code.IRCode):384 -> a
     268:271:void lambda$runInternal$3(java.util.Set,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.ir.code.BasicBlock):388:391 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/ZI;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/dJ;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/I5;)V"}
     272:272:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     272:272:void lambda$runInternal$3(java.util.Set,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.ir.code.BasicBlock):398 -> a
     273:273:void lambda$runInternal$3(java.util.Set,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.ir.code.BasicBlock):398:398 -> a
@@ -159980,16 +159967,16 @@
     291:292:void lambda$runInternal$3(java.util.Set,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.ir.code.BasicBlock):408 -> a
     293:310:void lambda$runInternal$3(java.util.Set,com.android.tools.r8.utils.LazyBox,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.ir.code.BasicBlock):407:424 -> a
     311:311:void lambda$runInternal$2(java.util.Map,com.android.tools.r8.ir.code.BasicBlock):413:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/I5;)V"}
     312:312:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     312:312:void lambda$runInternal$2(java.util.Map,com.android.tools.r8.ir.code.BasicBlock):419 -> a
     313:314:void lambda$runInternal$2(java.util.Map,com.android.tools.r8.ir.code.BasicBlock):420:421 -> a
     315:315:void lambda$runInternal$2(java.util.Map,com.android.tools.r8.ir.code.BasicBlock):417:417 -> a
     316:316:void lambda$runInternal$2(java.util.Map,com.android.tools.r8.ir.code.BasicBlock):415:415 -> a
     317:318:boolean isUsingJavaAssertionsDisabledField(com.android.tools.r8.ir.code.FieldInstruction):556:557 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;)Z"}
     319:323:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):566:570 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/Zt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/bu;"}
     324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.If.lhs():69:69 -> a
     324:324:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):571 -> a
     325:325:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):571:571 -> a
@@ -160039,9 +160026,9 @@
     4:6:void <init>(com.android.tools.r8.graph.AppView,boolean):71:73 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;I)V"}
     1:3:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):77:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     4:4:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/ph0;)V"}
     5:5:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):97:97 -> a
     5:5:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):88 -> a
     6:6:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues computeAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate):130:130 -> a
@@ -160091,7 +160078,7 @@
     28:30:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):88 -> a
     31:31:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):89:89 -> a
     32:51:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):150:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/j;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/j;)V"}
     52:52:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     52:52:boolean computeAssumedValuesForInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):224 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160262,7 +160249,7 @@
     228:228:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):212 -> a
     229:232:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):213:216 -> a
     233:247:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):371:385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/ir/optimize/j;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/ir/optimize/j;)Z"}
     248:248:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.getNullability():133:133 -> a
     248:248:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):389 -> a
     249:251:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):389:391 -> a
@@ -160272,7 +160259,7 @@
     257:257:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):401:401 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/k;)V"}
     258:270:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):404:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/k;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/ir/optimize/i;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/k;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/ir/optimize/i;)Z"}
     271:271:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):863:863 -> a
     271:271:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):422 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160284,11 +160271,11 @@
     276:276:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):433:433 -> a
     277:277:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):430:430 -> a
     278:281:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):443:446 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/k;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/k;)Ljava/util/IdentityHashMap;"}
     282:284:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):449:451 -> a
     282:284:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.internal.LazyDominatorTree,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/aJ;Ljava/util/Map;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/ir/optimize/i;)Lcom/android/tools/r8/ir/optimize/h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/eJ;Ljava/util/Map;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/ir/optimize/i;)Lcom/android/tools/r8/ir/optimize/h;"}
     285:285:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):797:797 -> a
     285:285:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):453 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160333,7 +160320,7 @@
     330:334:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.internal.LazyDominatorTree,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
     335:335:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
     335:335:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.internal.LazyDominatorTree,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":895,"2":896,"3":897},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":895,"2":896,"3":897},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     837:839:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):502:504 -> a
     837:839:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.internal.LazyDominatorTree,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
     840:849:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):502:511 -> a
@@ -160387,27 +160374,27 @@
     897:897:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):697:697 -> a
     897:897:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):500 -> a
     898:898:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):479:479 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     899:899:boolean lambda$computeDominanceForAssumedValues$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):503:503 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     900:900:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):512:512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lm;Lcom/android/tools/r8/internal/G5;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nm;Lcom/android/tools/r8/internal/I5;)Ljava/util/Set;"}
     901:901:boolean lambda$computeDominanceForAssumedValues$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):518:518 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     902:902:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):529:529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/util/Map;"}
     903:903:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):583:583 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/i;)Z"}
     904:904:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
     904:904:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):583 -> a
     905:911:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):592:598 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Ljava/util/Map;)V"}
     912:912:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):615:615 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/k;Ljava/util/Set;Ljava/util/IdentityHashMap;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/k;Ljava/util/Set;Ljava/util/IdentityHashMap;Ljava/util/function/Predicate;)V"}
     913:917:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):617:621 -> a
     913:917:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.internal.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/ir/optimize/i;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/ir/optimize/i;)Z"}
     918:920:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):687:689 -> a
     918:920:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):622 -> a
     918:920:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.internal.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
@@ -160421,7 +160408,7 @@
     923:927:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.internal.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
     928:928:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
     928:928:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.internal.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.internal.Instruction,com.android.tools.r8.internal.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":991,"2":992,"3":993},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":991,"2":992,"3":993},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     929:929:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():753:753 -> a
     929:929:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):624 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160508,7 +160495,7 @@
     993:993:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):697:697 -> a
     993:993:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):622 -> a
     994:996:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):644:646 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/internal/aA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/internal/cA;)V"}
     997:997:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Phi.getOperand(int):196:196 -> a
     997:997:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):646 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160516,11 +160503,11 @@
     998:998:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):646 -> a
     999:1000:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):648:649 -> a
     1001:1001:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):678:678 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/util/Map;"}
     1002:1002:boolean hasOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):740:740 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)Z"}
     1:52:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):552:603 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/k;)V"}
     53:53:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:50 -> b
     53:53:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):603 -> b
     54:54:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):603:603 -> b
@@ -160533,15 +160520,15 @@
     58:58:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
     58:58:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):589 -> b
     59:59:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):679:679 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/util/List;"}
     60:63:boolean isNullableReferenceType(com.android.tools.r8.ir.code.Value):728:731 -> b
     60:63:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):736 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)Z"}
     64:64:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):736:736 -> b
     65:65:boolean lambda$hasOtherNonDebugUsers$15(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):740:740 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean lambda$materializeSelectedAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):636:636 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
 com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.ir.optimize.h:
 # {"id":"sourceFile","fileName":"AssumeInserter.java"}
     1:1:void <init>():969:969 -> <init>
@@ -160550,21 +160537,21 @@
 com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.ir.optimize.g:
 # {"id":"sourceFile","fileName":"AssumeInserter.java"}
     com.android.tools.r8.ir.code.Value assumedValue -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.Set dominatedUsers -> b
     java.util.Map dominatedPhiUsers -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():1024:1024 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):1031:1031 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:6:void <init>(com.android.tools.r8.ir.code.Value):1028:1032 -> <init>
 com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.ir.optimize.i:
 # {"id":"sourceFile","fileName":"AssumeInserter.java"}
     com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance dominance -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/h;"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():743:743 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):748:748 -> <init>
@@ -160572,7 +160559,7 @@
     2:5:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):746:749 -> <init>
     1:1:boolean hasDynamicTypeInfoIgnoringNullability():761:761 -> a
     2:5:void setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):769:772 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;)V"}
     6:9:void setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):770:773 -> a
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():777:777 -> b
     1:1:boolean isNonNull():785 -> b
@@ -160587,7 +160574,7 @@
     1:2:void <init>(java.util.Map):820:821 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;)V"}
     1:14:void computeDominance(com.android.tools.r8.utils.TriFunction):830:843 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;)V"}
     15:15:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
     15:15:void computeDominance(com.android.tools.r8.utils.TriFunction):843 -> a
     16:20:void computeDominance(com.android.tools.r8.utils.TriFunction):844:848 -> a
@@ -160604,13 +160591,13 @@
     29:29:void computeDominance(com.android.tools.r8.utils.TriFunction):853 -> a
     30:31:void computeDominance(com.android.tools.r8.utils.TriFunction):856:857 -> a
     32:32:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):845:845 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;)Z"}
     33:33:void removeAll(java.util.Map):872:872 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)V"}
     34:38:void lambda$removeAll$1(com.android.tools.r8.ir.code.Instruction,java.util.Map):874:878 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Ljava/util/Map;)V"}
     39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):885:902 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ph0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Th0;)V"}
 com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.ir.optimize.j:
 # {"id":"sourceFile","fileName":"AssumeInserter.java"}
     java.util.Map assumedValues -> a
@@ -160618,33 +160605,33 @@
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
     1:7:void <init>():907:913 -> <init>
     1:5:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):920:924 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/ir/optimize/h;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/ir/optimize/h;Ljava/util/function/Consumer;)V"}
     6:6:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
     6:6:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):925 -> a
     7:8:void updateAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,java.util.function.Consumer):925:926 -> a
     9:9:java.util.Map lambda$updateAssumedValueInfo$0(com.android.tools.r8.ir.code.Instruction):922:922 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/util/Map;"}
     10:10:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo lambda$updateAssumedValueInfo$1(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,com.android.tools.r8.ir.code.Value):923:923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/h;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/ir/optimize/i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/h;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/ir/optimize/i;"}
     11:11:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):935:935 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Fm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Hm;)V"}
     12:12:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):932:932 -> a
     13:13:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):936:936 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/ir/optimize/i;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/ir/optimize/i;)V"}
     14:14:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):950:950 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     15:15:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):949:949 -> a
     16:17:boolean isMaybeNullAndNotNullType(com.android.tools.r8.ir.code.Value):959:960 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     18:18:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     18:18:boolean isMaybeNullAndNotNullType(com.android.tools.r8.ir.code.Value):960 -> a
     1:1:void addAssumedValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):944:944 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Fm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Hm;)V"}
     2:2:void addAssumedValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):941:941 -> b
     3:3:void lambda$addAssumedValueWithUnknownDominance$3(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):945:945 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/ir/optimize/i;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/ir/optimize/i;)V"}
     4:4:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):955:955 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     5:5:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):954:954 -> b
 com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.ir.optimize.l:
 # {"id":"sourceFile","fileName":"AssumeInserter.java"}
@@ -160684,28 +160671,28 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Set affectedAssumeInstructions -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):37:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:39 -> <init>
     1:1:void addAffectedAssumeInstruction(com.android.tools.r8.ir.code.Assume):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y4;)V"}
     2:16:void removeRedundantAssumeInstruction(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,java.util.function.Consumer):92:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y4;Lcom/android/tools/r8/internal/J5;Ljava/util/Set;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y4;Lcom/android/tools/r8/internal/L5;Ljava/util/Set;Ljava/util/function/Consumer;)V"}
 com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.ir.optimize.s:
 # {"id":"sourceFile","fileName":"BasicBlockInstructionsEquivalence.java"}
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/f;"}
     com.android.tools.r8.ir.conversion.MethodConversionOptions conversionOptions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN$a;"}
     int[] hashes -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):24:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
     3:3:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):26 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -160728,7 +160715,7 @@
     33:39:int doHash(com.android.tools.r8.ir.code.BasicBlock):82:88 -> a
     33:39:int doHash(java.lang.Object):17 -> a
     40:46:int computeHash(com.android.tools.r8.ir.code.BasicBlock):93:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
     47:47:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     47:47:int computeHash(com.android.tools.r8.ir.code.BasicBlock):99 -> a
     48:48:int computeHash(com.android.tools.r8.ir.code.BasicBlock):99:99 -> a
@@ -160743,7 +160730,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     3:3:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:36 -> a
     3:3:void runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
     4:4:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
@@ -160767,7 +160754,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
@@ -160775,128 +160762,134 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():67:67 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):141:141 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):139:144 -> <init>
-    1:106:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):149:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;)Lcom/android/tools/r8/ir/optimize/u;"}
-    107:110:void com.android.tools.r8.utils.IteratorUtils.removeIf(java.util.Iterator,java.util.function.Predicate):155:158 -> a
-    107:110:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):173 -> a
-    107:110:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254 -> a
-    111:111:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):260:260 -> a
-    112:112:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
-    112:112:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):260 -> a
+    1:5:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):149:153 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;)Lcom/android/tools/r8/ir/optimize/u;"}
+    6:6:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    6:6:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):154 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:149:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:297 -> a
-    150:150:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
-    150:150:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
+    7:7:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    7:7:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):154 -> a
+    8:107:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):155:254 -> a
+    108:111:void com.android.tools.r8.utils.IteratorUtils.removeIf(java.util.Iterator,java.util.function.Predicate):155:158 -> a
+    108:111:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):173 -> a
+    108:111:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254 -> a
+    112:112:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):260:260 -> a
+    113:113:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
+    113:113:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):260 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    114:150:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:297 -> a
     151:151:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
     151:151:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
-    152:152:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
-    152:152:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):331 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    152:152:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
     152:152:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
-    153:153:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):334:334 -> a
+    153:153:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
+    153:153:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):331 -> a
     153:153:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
-    154:154:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):332:332 -> a
+    154:154:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):334:334 -> a
     154:154:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
-    155:155:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):329:329 -> a
+    155:155:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):332:332 -> a
     155:155:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
-    156:169:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303:316 -> a
-    170:174:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Vd0;)V"}
-    175:189:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):320:334 -> a
-    175:189:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    190:190:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
-    190:190:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):334 -> a
+    156:156:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):329:329 -> a
+    156:156:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):297 -> a
+    157:170:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303:316 -> a
+    171:175:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):181:185 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Zd0;)V"}
+    176:190:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):320:334 -> a
+    176:190:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    191:191:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
+    191:191:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):334 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    190:190:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    191:192:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):334:335 -> a
-    191:192:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    193:193:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():60:60 -> a
-    193:193:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):335 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    193:193:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    194:194:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
+    191:191:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    192:193:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):334:335 -> a
+    192:193:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    194:194:com.android.tools.r8.graph.DexReference com.android.tools.r8.ir.code.DexItemBasedConstString.getItem():60:60 -> a
     194:194:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):335 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     194:194:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    195:204:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):335:344 -> a
-    195:204:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    205:205:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):349:349 -> a
-    205:205:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
-    205:205:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    206:206:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.top():41:41 -> a
-    206:206:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):350 -> a
+    195:195:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
+    195:195:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):335 -> a
+    195:195:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    196:205:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):335:344 -> a
+    196:205:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    206:206:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):349:349 -> a
     206:206:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
     206:206:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    207:240:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):350:383 -> a
-    207:240:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
-    207:240:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    241:241:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):44:44 -> a
-    241:241:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):383 -> a
-    241:241:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
-    241:241:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    242:244:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):383:385 -> a
-    242:244:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
-    242:244:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    245:245:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185:185 -> a
-    246:246:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):385:385 -> a
-    246:246:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
-    246:246:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
-    247:275:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):186:214 -> a
-    276:279:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):187:190 -> a
-    280:280:com.android.tools.r8.graph.DexField lambda$optimize$1(com.android.tools.r8.graph.DexClassAndField):273:273 -> a
+    207:207:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.top():41:41 -> a
+    207:207:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):350 -> a
+    207:207:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
+    207:207:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    208:241:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):350:383 -> a
+    208:241:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
+    208:241:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    242:242:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):44:44 -> a
+    242:242:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):383 -> a
+    242:242:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
+    242:242:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    243:245:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):383:385 -> a
+    243:245:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
+    243:245:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    246:246:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185:185 -> a
+    247:247:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):385:385 -> a
+    247:247:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):344 -> a
+    247:247:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):185 -> a
+    248:276:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):186:214 -> a
+    277:280:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):187:190 -> a
+    281:281:com.android.tools.r8.graph.DexField lambda$optimize$1(com.android.tools.r8.graph.DexClassAndField):273:273 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;)Lcom/android/tools/r8/graph/l1;"}
-    281:281:void lambda$optimize$2(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):291:291 -> a
+    282:282:void lambda$optimize$2(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):291:291 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/shaking/j;)V"}
-    282:283:void lambda$optimize$3():299:300 -> a
-    284:284:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():468:468 -> a
-    284:284:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):392 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;)Ljava/util/Map;"}
+    283:284:void lambda$optimize$3():299:300 -> a
     285:285:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():468:468 -> a
-    285:285:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):393 -> a
-    286:403:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):394:511 -> a
-    404:404:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    404:404:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):408 -> a
-    405:507:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):409:511 -> a
-    508:602:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):417:511 -> a
-    603:608:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):424:429 -> a
-    609:611:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():891:893 -> a
-    609:611:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):434 -> a
-    612:612:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
-    612:612:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():894 -> a
+    285:285:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):392 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;)Ljava/util/Map;"}
+    286:286:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():468:468 -> a
+    286:286:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):393 -> a
+    287:404:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):394:511 -> a
+    405:405:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    405:405:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):408 -> a
+    406:508:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):409:511 -> a
+    509:603:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):417:511 -> a
+    604:609:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):424:429 -> a
+    610:612:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():891:893 -> a
+    610:612:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):434 -> a
+    613:613:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo com.android.tools.r8.ir.code.DexItemBasedConstString.getNameComputationInfo():64:64 -> a
+    613:613:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():894 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    612:612:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):434 -> a
-    613:613:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():895:895 -> a
     613:613:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):434 -> a
-    614:639:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):437:462 -> a
-    640:647:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):546:553 -> a
-    640:647:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):462 -> a
-    648:695:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):464:511 -> a
-    696:721:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):486:511 -> a
-    722:741:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:511 -> a
-    742:749:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):506:513 -> a
-    750:751:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):511:512 -> a
-    752:752:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):480:480 -> a
+    614:614:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():895:895 -> a
+    614:614:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):434 -> a
+    615:640:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):437:462 -> a
+    641:648:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):546:553 -> a
+    641:648:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):462 -> a
+    649:696:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):464:511 -> a
+    697:722:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):486:511 -> a
+    723:742:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):492:511 -> a
+    743:750:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):506:513 -> a
+    751:752:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):511:512 -> a
+    753:753:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):480:480 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Ljava/util/Set;"}
-    753:753:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):538:538 -> a
+    754:754:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):538:538 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;)Ljava/util/Map;"}
-    754:756:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):558:560 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Iw;)Z"}
-    757:757:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
-    757:757:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):560 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    755:757:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):558:560 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Kw;)Z"}
     758:758:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
     758:758:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):560 -> a
-    759:759:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    759:759:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):563 -> a
-    760:762:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):563:565 -> a
-    763:763:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    763:763:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):565 -> a
-    764:765:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):565:566 -> a
-    766:766:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
-    766:766:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):566 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    767:767:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):566:566 -> a
+    759:759:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
+    759:759:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):560 -> a
+    760:760:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    760:760:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):563 -> a
+    761:763:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):563:565 -> a
+    764:764:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    764:764:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):565 -> a
+    765:766:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):565:566 -> a
+    767:767:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
+    767:767:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):566 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    768:768:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):566:566 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.ir.optimize.u:
 # {"id":"sourceFile","fileName":"ClassInitializerDefaultsOptimization.java"}
     java.util.Map fieldsWithStaticValues -> a
@@ -160931,7 +160924,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):38:39 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:17:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):52:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     18:18:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68 -> a
     19:23:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:73 -> a
@@ -160954,7 +160947,7 @@
     32:32:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93 -> a
     33:36:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:98 -> a
     37:42:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):153:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     43:43:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> a
     43:43:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):158 -> a
     44:44:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):159:159 -> a
@@ -161006,7 +160999,7 @@
     90:96:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):166 -> a
     97:97:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):184:184 -> a
     98:104:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):300:306 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;Lcom/android/tools/r8/internal/nz;)V"}
     105:105:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> a
     105:105:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):306 -> a
     106:106:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> a
@@ -161020,24 +161013,24 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.passes.BranchSimplifier branchSimplifier -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u7;"}
     com.android.tools.r8.graph.ProgramMethod context -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.code.IRCode code -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.utils.OptionalBool isAccessingVolatileField -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     java.util.Set ineligibleInstanceGetInstructions -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():66:66 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):79:79 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;)V"}
     2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):76 -> <init>
     3:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):76:84 -> <init>
     1:4:boolean getOrComputeIsAccessingVolatileField():94:97 -> a
     1:4:boolean isReadOfEffectivelyFinalFieldOutsideInitializer(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.NewInstance):511 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hp;Lcom/android/tools/r8/internal/nQ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/rQ;)Z"}
     5:11:boolean isReadOfEffectivelyFinalFieldOutsideInitializer(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.NewInstance):517:523 -> a
     12:12:boolean com.android.tools.r8.graph.FieldResolutionResult.isSingleProgramFieldResolutionResult():0:0 -> a
     12:12:boolean isReadOfEffectivelyFinalFieldOutsideInitializer(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.NewInstance):528 -> a
@@ -161052,7 +161045,7 @@
     38:38:boolean isReadOfEffectivelyFinalFieldOutsideInitializer(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.NewInstance):566 -> a
     39:39:boolean isReadOfEffectivelyFinalFieldOutsideInitializer(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.NewInstance):566:566 -> a
     40:40:void lambda$computeDirectAndIndirectCatchHandlerBlocks$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.ir.code.BasicBlock):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/I5;)V"}
     41:41:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getAllTargets():81:81 -> a
     41:41:void lambda$computeDirectAndIndirectCatchHandlerBlocks$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.ir.code.BasicBlock):148 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161182,14 +161175,14 @@
     279:280:com.android.tools.r8.ir.optimize.ConstantCanonicalizer clear():88:89 -> a
     279:280:com.android.tools.r8.ir.optimize.ConstantCanonicalizer canonicalize():302 -> a
     281:281:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):221:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rT;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;)Z"}
     282:282:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rT;Lcom/android/tools/r8/internal/rT;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;Lcom/android/tools/r8/internal/vT;)I"}
     283:285:void addPendingInsertion(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction,java.util.Map):309:311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mw;Lcom/android/tools/r8/internal/Iw;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ow;Lcom/android/tools/r8/internal/Kw;Ljava/util/IdentityHashMap;)V"}
     286:289:java.util.List removePendingInsertions(com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):347:350 -> a
     286:289:com.android.tools.r8.ir.code.InstructionListIterator insertPendingInsertions(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Mw;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Ow;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/internal/Nw;"}
     290:290:com.android.tools.r8.ir.code.InstructionListIterator insertPendingInsertions(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):321:321 -> a
     291:292:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Iterable):55:56 -> a
     291:292:com.android.tools.r8.ir.code.InstructionListIterator insertPendingInsertions(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):325 -> a
@@ -161198,7 +161191,7 @@
     295:298:com.android.tools.r8.ir.code.InstructionListIterator insertPendingInsertions(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):329 -> a
     299:307:com.android.tools.r8.ir.code.InstructionListIterator insertPendingInsertions(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,java.util.Map):330:338 -> a
     308:366:boolean isConstant(com.android.tools.r8.ir.code.Instruction):437:495 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     367:372:boolean isConstant(com.android.tools.r8.ir.code.Instruction):480:485 -> a
     373:388:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121:136 -> a
     373:388:boolean isConstant(com.android.tools.r8.ir.code.Instruction):484 -> a
@@ -161241,7 +161234,7 @@
     440:440:boolean isConstant(com.android.tools.r8.ir.code.Instruction):471:471 -> a
     441:499:boolean isConstant(com.android.tools.r8.ir.code.Instruction) -> a
     500:503:com.android.tools.r8.ir.code.InstructionListIterator insertCanonicalizedConstantAtInsertionPoint(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction):616:619 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Mw;Lcom/android/tools/r8/internal/Iw;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Ow;Lcom/android/tools/r8/internal/Kw;)Lcom/android/tools/r8/internal/Nw;"}
     504:507:com.android.tools.r8.ir.code.Position getPositionForCanonicalizationConstantAtInsertionPoint(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction):657:660 -> a
     504:507:com.android.tools.r8.ir.code.InstructionListIterator insertCanonicalizedConstantAtInsertionPoint(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction):621 -> a
     508:508:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():133:133 -> a
@@ -161250,7 +161243,7 @@
     509:517:com.android.tools.r8.ir.code.InstructionListIterator insertCanonicalizedConstantAtInsertionPoint(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction):620:628 -> a
     518:540:com.android.tools.r8.ir.code.InstructionListIterator insertCanonicalizedConstantAtInsertionPoint(com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Instruction):627:649 -> a
     541:541:com.android.tools.r8.ir.code.BasicBlock lambda$insertCanonicalizedConstantAtInsertionPoint$3(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.BasicBlock):628:628 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mw;Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ow;Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     1:1:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> b
     1:1:java.util.Set computeDirectAndIndirectCatchHandlerBlocks():145 -> b
     2:2:java.util.Set computeDirectAndIndirectCatchHandlerBlocks():146:146 -> b
@@ -161332,9 +161325,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/A;"}
     1:1:void <clinit>():17:17 -> <clinit>
     java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/zR;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/DR;)Ljava/util/Set;"}
     1:1:java.util.Set lambda$static$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):18:18 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/zR;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/DR;)Ljava/util/Set;"}
 com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.F:
 # {"id":"sourceFile","fileName":"DeadCodeRemover.java"}
     com.android.tools.r8.graph.AppView appView -> a
@@ -161344,7 +161337,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):40:41 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:17:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):45:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     18:23:void removeDeadAndTrivialPhis(java.util.Queue,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.ValueIsDeadAnalysis):122:127 -> a
     18:23:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):62 -> a
     24:24:void com.android.tools.r8.ir.code.Value.removePhiUser(com.android.tools.r8.ir.code.Phi):551:551 -> a
@@ -161369,13 +161362,13 @@
     36:36:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):68 -> a
     37:43:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):69:75 -> a
     44:45:void updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):100:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Queue;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Queue;Lcom/android/tools/r8/internal/bl0;)V"}
     46:46:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> a
     46:46:void updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:51:void updateWorklist(java.util.Queue,com.android.tools.r8.ir.code.Value):102:106 -> a
     52:59:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.ValueIsDeadAnalysis):145:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Queue;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/fl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Queue;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/jl0;)V"}
     60:60:boolean com.android.tools.r8.ir.code.CheckCast.isRefiningStaticType(com.android.tools.r8.utils.InternalOptions):59:59 -> a
     60:60:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.ValueIsDeadAnalysis):152 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161429,7 +161422,7 @@
     137:141:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.ValueIsDeadAnalysis):201 -> a
     142:144:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.ValueIsDeadAnalysis):205:207 -> a
     145:148:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):223:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
     149:152:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):255:258 -> a
     149:152:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):228 -> a
     153:153:java.util.List com.android.tools.r8.ir.code.CatchHandlers.getGuards():73:73 -> a
@@ -161521,7 +161514,7 @@
     223:223:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph(com.android.tools.r8.graph.AppView):684:684 -> a
     223:223:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):249 -> a
     1:10:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):79:88 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     11:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):86:90 -> b
     16:16:boolean com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult.isDeadIfOutValueIsDead():0:0 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):90 -> b
@@ -161545,40 +161538,40 @@
 com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.ir.optimize.D:
 # {"id":"sourceFile","fileName":"DeadCodeRemover.java"}
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:1:void <init>(com.android.tools.r8.ir.code.Value):325:325 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:java.lang.Iterable getValuesRequiredToBeDead():333:333 -> a
 com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.H:
 # {"id":"sourceFile","fileName":"DefaultInliningOracle.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$i;"}
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y1;"}
     com.android.tools.r8.graph.ProgramMethod method -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pO;"}
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy reasonStrategy -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yv;"}
     int instructionAllowance -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():67:67 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.ir.code.IRCode):89:90 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Wv;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Yv;Lcom/android/tools/r8/internal/Dt;)V"}
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.ir.code.IRCode):84:84 -> <init>
     4:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,int):98:106 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Wv;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Yv;I)V"}
     1:1:boolean isForcedInliningOracle():0:0 -> a
     2:19:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):128:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fm0;)Z"}
     20:22:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):129:131 -> a
     23:23:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fm0;)Z"}
     24:30:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):44:50 -> a
     24:30:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):160 -> a
     31:31:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
@@ -161602,7 +161595,7 @@
     43:47:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):164:168 -> a
     48:48:boolean canHaveIssuesWithMonitors(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):213:213 -> a
     48:48:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172 -> a
-    49:49:boolean com.android.tools.r8.utils.InternalOptions.canHaveIssueWithInlinedMonitors():3229:3229 -> a
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.canHaveIssueWithInlinedMonitors():3235:3235 -> a
     49:49:boolean canHaveIssuesWithMonitors(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):213 -> a
     49:49:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172 -> a
     50:50:boolean hasMonitorsOrIsSynchronized(com.android.tools.r8.ir.code.IRCode):219:219 -> a
@@ -161714,7 +161707,7 @@
     117:117:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     117:117:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):842 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/fm0;)Z"}
     118:118:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveMonitorInstruction():256:256 -> a
     118:118:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):842 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161740,7 +161733,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     137:148:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):863:874 -> a
     149:149:int getEstimatedMaxInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):357:357 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)I"}
     150:150:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     150:150:int getEstimatedMaxInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):358 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161754,14 +161747,14 @@
     165:170:int getEstimatedMaxInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):373 -> a
     171:172:int getEstimatedMaxInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):374:375 -> a
     173:173:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):401:401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/graph/C5;"}
     174:174:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
     174:174:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):401 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     175:175:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
     175:175:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):401 -> a
     176:176:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):414:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/S;"}
     177:183:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):525:531 -> a
     177:183:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):418 -> a
     184:184:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
@@ -161856,7 +161849,7 @@
     284:292:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:493 -> a
     293:293:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):660:660 -> a
     293:293:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):491 -> a
-    294:294:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.isConstructorInliningEnabled():1812:1812 -> a
+    294:294:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.isConstructorInliningEnabled():1818:1818 -> a
     294:294:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):660 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     294:294:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):491 -> a
@@ -161905,15 +161898,15 @@
     432:440:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):502:510 -> a
     441:449:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):509:517 -> a
     450:464:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):598:612 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ec;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gc;)Z"}
     465:480:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):611:626 -> a
     481:481:boolean com.android.tools.r8.ir.optimize.Inliner$InlineAction.mustBeInlined():598:598 -> a
     481:481:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):791 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/fm0;)Z"}
     482:484:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):794:796 -> a
     485:485:boolean com.android.tools.r8.ir.optimize.Inliner$InlineAction.mustBeInlined():598:598 -> a
     485:485:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):809 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/fm0;)Z"}
     486:488:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):820:822 -> a
     486:488:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):812 -> a
     489:489:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):813:813 -> a
@@ -161932,20 +161925,20 @@
     499:501:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):919:921 -> a
     499:501:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):814 -> a
     502:502:java.lang.Boolean lambda$isTargetClassInitialized$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):605:605 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Iv;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Kv;)Ljava/lang/Boolean;"}
     503:503:void markInlined(com.android.tools.r8.ir.code.IRCode):931:931 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     504:504:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):937:937 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/rd;"}
     505:505:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip.getUnboxIfPrimitiveElseBox():960:960 -> a
     505:505:boolean lambda$getEstimatedMaxInliningInstructionLimitIncrementForPrelude$1(com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip,com.android.tools.r8.ir.code.Instruction):376 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C1;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C1;Lcom/android/tools/r8/internal/Kw;)Z"}
     506:506:boolean lambda$getEstimatedMaxInliningInstructionLimitIncrementForPrelude$1(com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip,com.android.tools.r8.ir.code.Instruction):376:376 -> a
     1:1:com.android.tools.r8.graph.AppView appView():111:111 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y;"}
     2:2:int getInliningInstructionLimitIncrementForNonNullParamOrThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):286:286 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)I"}
     3:3:int com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgumentIndex():85:85 -> b
     3:3:int getInliningInstructionLimitIncrementForNonNullParamOrThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):291 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161955,7 +161948,7 @@
     5:5:int getInliningInstructionLimitIncrementForNonNullParamOrThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):292 -> b
     6:9:int getInliningInstructionLimitIncrementForNonNullParamOrThrow(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):292:295 -> b
     10:10:int getInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):310:310 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)I"}
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> b
     11:11:int getInliningInstructionLimitIncrementForPrelude(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):311 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -161981,11 +161974,11 @@
     50:50:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip.getUnboxIfPrimitiveElseBox():960:960 -> b
     50:50:boolean lambda$getInliningInstructionLimitIncrementForPrelude$0(com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip,com.android.tools.r8.ir.code.Instruction):341 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C1;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C1;Lcom/android/tools/r8/internal/Kw;)Z"}
     51:51:boolean lambda$getInliningInstructionLimitIncrementForPrelude$0(com.android.tools.r8.graph.DexItemFactory$BoxUnboxPrimitiveMethodRoundtrip,com.android.tools.r8.ir.code.Instruction):341:341 -> b
     1:5:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):231:235 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)Z"}
-    6:6:int com.android.tools.r8.utils.InternalOptions$InlinerOptions.getSimpleInliningInstructionLimit():1801:1801 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)Z"}
+    6:6:int com.android.tools.r8.utils.InternalOptions$InlinerOptions.getSimpleInliningInstructionLimit():1807:1807 -> c
     6:6:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):235 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:int getEstimatedMaxInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):275:275 -> c
@@ -162035,13 +162028,13 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():49:49 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):54:56 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):61:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     5:5:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
     5:5:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):64 -> a
     6:9:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):65:68 -> a
@@ -162211,16 +162204,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;)V"}
     1:1:boolean isForcedInliningOracle():0:0 -> a
     2:2:boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fm0;)Z"}
     3:7:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):56:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/graph/C5;"}
     8:8:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
     8:8:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
     9:9:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):60 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/S;"}
     11:11:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.Inliner$InlineAction.builder():577:577 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):78 -> a
     12:12:com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder.setInvoke(com.android.tools.r8.ir.code.InvokeMethod):842:842 -> a
@@ -162230,13 +162223,13 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):78 -> a
     15:18:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):79:82 -> a
     19:19:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/fm0;)Z"}
     20:20:boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/fm0;)Z"}
     21:21:void markInlined(com.android.tools.r8.ir.code.IRCode):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     22:26:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):118:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/rd;"}
     1:1:com.android.tools.r8.graph.AppView appView():37:37 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y;"}
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.M:
@@ -162250,7 +162243,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView):53:55 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:32:void canonicalize(com.android.tools.r8.ir.code.IRCode):59:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     33:34:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):228:229 -> a
     33:34:void canonicalize(com.android.tools.r8.ir.code.IRCode):94 -> a
     35:35:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection com.android.tools.r8.graph.AppView.getLibraryMethodSideEffectModelCollection():583:583 -> a
@@ -162290,13 +162283,13 @@
     158:158:void canonicalize(com.android.tools.r8.ir.code.IRCode):222 -> a
     159:160:void canonicalize(com.android.tools.r8.ir.code.IRCode):223:224 -> a
     161:161:java.util.List lambda$canonicalize$0(com.android.tools.r8.ir.code.InvokeMethod):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Ljava/util/List;"}
     162:162:boolean lambda$canonicalize$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rT;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;)Z"}
     163:163:int lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rT;Lcom/android/tools/r8/internal/rT;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;Lcom/android/tools/r8/internal/vT;)I"}
     164:170:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):176:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Map;Lcom/android/tools/r8/internal/rT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Map;Lcom/android/tools/r8/internal/vT;)V"}
     171:171:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     171:171:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):185 -> a
     172:172:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):39:39 -> a
@@ -162309,7 +162302,7 @@
     178:188:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):196 -> a
     189:190:void lambda$canonicalize$3(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):198:199 -> a
     191:197:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):237:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/DB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/FB;)V"}
     198:198:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     198:198:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):244 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -162319,7 +162312,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     202:211:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):250:259 -> a
     212:212:boolean lambda$insertCanonicalizedInvokeWithInValues$4(com.android.tools.r8.ir.code.Instruction):254:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.L:
 # {"id":"sourceFile","fileName":"IdempotentFunctionCallCanonicalizer.java"}
     boolean $assertionsDisabled -> a
@@ -162347,28 +162340,28 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AJ;"}
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder singleInlineCallers -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TL;"}
     com.android.tools.r8.ir.optimize.MultiCallerInliner multiCallerInliner -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/b0;"}
     java.util.Map singleCallerInlinedMethodsInWave -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Set singleCallerInlinedPrunedMethodsForTesting -> g
     com.android.tools.r8.androidapi.AvailableApiExceptions availableApiExceptions -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g5;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):122:122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/wJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/AJ;)V"}
     2:29:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):104:131 -> <init>
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3122:3122 -> <init>
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3128:3128 -> <init>
     30:30:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):131 -> <init>
     31:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):132:133 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createWhyAreYouNotInliningReporter(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/bm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/fm0;"}
     2:2:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.createFor(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):24:24 -> a
     2:2:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createWhyAreYouNotInliningReporter(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):138 -> a
     3:3:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isWhyAreYouNotInliningMethod(com.android.tools.r8.graph.DexMethod):626:626 -> a
@@ -162380,306 +162373,309 @@
     4:4:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createWhyAreYouNotInliningReporter(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):138 -> a
     5:7:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.createFor(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):25:27 -> a
     5:7:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createWhyAreYouNotInliningReporter(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):138 -> a
-    8:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):157:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/O;"}
-    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):115:115 -> a
+    8:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):157:163 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/O;"}
+    15:15:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):163 -> a
+    16:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):166:167 -> a
+    18:18:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117:117 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):167 -> a
+    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():121:121 -> a
+    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):167 -> a
-    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():119:119 -> a
-    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):115 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):167 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168:168 -> a
-    22:23:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1196:1197 -> a
-    22:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3122:3122 -> a
-    24:24:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1197 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    25:29:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1197:1201 -> a
-    25:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    30:30:boolean com.android.tools.r8.ir.code.CatchHandlers$1.hasNext():158:158 -> a
-    30:30:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1201 -> a
-    30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    31:32:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():163:164 -> a
-    31:32:java.lang.Object com.android.tools.r8.ir.code.CatchHandlers$1.next():152 -> a
-    31:32:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1201 -> a
-    31:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    33:34:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1202:1203 -> a
-    33:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):168:168 -> a
+    21:22:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1196:1197 -> a
+    21:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3128:3128 -> a
+    23:23:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1197 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    24:28:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1197:1201 -> a
+    24:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    29:29:boolean com.android.tools.r8.ir.code.CatchHandlers$1.hasNext():158:158 -> a
+    29:29:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1201 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    30:31:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():163:164 -> a
+    30:31:java.lang.Object com.android.tools.r8.ir.code.CatchHandlers$1.next():152 -> a
+    30:31:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1201 -> a
+    30:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    32:33:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1202:1203 -> a
+    32:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
+    34:34:boolean com.android.tools.r8.androidapi.AvailableApiExceptions.canCauseVerificationError(com.android.tools.r8.graph.DexType) -> a
+    34:34:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1204 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
     35:35:boolean com.android.tools.r8.androidapi.AvailableApiExceptions.canCauseVerificationError(com.android.tools.r8.graph.DexType):34:34 -> a
     35:35:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1204 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    36:36:boolean com.android.tools.r8.androidapi.AvailableApiExceptions.canCauseVerificationError(com.android.tools.r8.graph.DexType):34:34 -> a
-    36:36:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1204 -> a
-    36:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):171 -> a
-    37:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):172:176 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():3144:3144 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):176 -> a
-    43:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):177:183 -> a
-    50:50:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
+    36:40:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):172:176 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():3150:3150 -> a
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):176 -> a
+    42:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):177:183 -> a
+    49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
+    49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
+    50:50:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
+    50:50:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149 -> a
     50:50:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     51:51:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
     51:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149 -> a
     51:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    52:52:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
+    52:52:boolean com.android.tools.r8.ir.optimize.Inliner$Constraint.isNever():268:268 -> a
+    52:52:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319 -> a
     52:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149 -> a
     52:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
-    53:53:boolean com.android.tools.r8.ir.optimize.Inliner$Constraint.isNever():268:268 -> a
-    53:53:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319 -> a
-    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
-    54:55:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149:150 -> a
-    54:55:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
+    53:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):149:150 -> a
+    53:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):185 -> a
+    55:55:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):186 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:56:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
     56:56:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):186 -> a
+    57:57:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):191:191 -> a
+    58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):164:164 -> a
+    59:65:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):197:203 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;)Z"}
+    66:66:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    66:66:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203 -> a
+    67:67:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203:203 -> a
+    68:68:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():975:975 -> a
+    68:68:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:57:boolean com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget.isNever():319:319 -> a
-    57:57:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):186 -> a
-    58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):191:191 -> a
-    59:59:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):164:164 -> a
-    60:66:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):197:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;)Z"}
-    67:67:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    67:67:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203 -> a
-    68:68:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203:203 -> a
-    69:69:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():975:975 -> a
-    69:69:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):203 -> a
+    69:69:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):957:957 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;)V"}
+    70:70:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):951:951 -> a
+    71:74:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):968:971 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/Yv;)V"}
+    75:75:boolean com.android.tools.r8.ir.optimize.inliner.InliningIRProvider.verifyIRCacheIsEmpty():113:113 -> a
+    75:75:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):971 -> a
+    76:76:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):972:972 -> a
+    77:79:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):978:980 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pO;)Lcom/android/tools/r8/internal/Yv;"}
+    80:80:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):981:981 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ci;Lcom/android/tools/r8/internal/Jr;)Lcom/android/tools/r8/internal/Yv;"}
+    81:81:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):990:990 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Yv;)Lcom/android/tools/r8/ir/optimize/H;"}
+    82:88:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1002:1008 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;)V"}
+    89:89:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    89:89:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1009 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    70:70:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):957:957 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;)V"}
-    71:71:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):951:951 -> a
-    72:75:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):968:971 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/Wv;)V"}
-    76:76:boolean com.android.tools.r8.ir.optimize.inliner.InliningIRProvider.verifyIRCacheIsEmpty():113:113 -> a
-    76:76:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):971 -> a
-    77:77:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):972:972 -> a
-    78:80:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):978:980 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lO;)Lcom/android/tools/r8/internal/Wv;"}
-    81:81:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):981:981 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/Hr;)Lcom/android/tools/r8/internal/Wv;"}
-    82:82:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):990:990 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Wv;)Lcom/android/tools/r8/ir/optimize/H;"}
-    83:89:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1002:1008 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;)V"}
     90:90:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     90:90:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1009 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    91:91:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1009 -> a
-    92:92:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
-    92:92:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1010 -> a
-    93:112:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1011:1030 -> a
-    113:113:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
-    113:113:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1035 -> a
-    114:120:boolean tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):1178:1184 -> a
-    114:120:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1034 -> a
-    121:121:boolean com.android.tools.r8.ir.code.InstructionListIterator.removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):195:195 -> a
+    91:91:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
+    91:91:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1010 -> a
+    92:111:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1011:1030 -> a
+    112:112:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
+    112:112:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1035 -> a
+    113:119:boolean tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):1178:1184 -> a
+    113:119:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1034 -> a
+    120:120:boolean com.android.tools.r8.ir.code.InstructionListIterator.removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):195:195 -> a
+    120:120:boolean tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):1183 -> a
+    120:120:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1034 -> a
+    121:121:boolean com.android.tools.r8.ir.code.InstructionListIterator.removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):194:194 -> a
     121:121:boolean tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):1183 -> a
     121:121:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1034 -> a
-    122:122:boolean com.android.tools.r8.ir.code.InstructionListIterator.removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):194:194 -> a
-    122:122:boolean tryInlineMethodWithoutSideEffects(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):1183 -> a
-    122:122:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1034 -> a
-    123:125:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1040:1042 -> a
-    126:126:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    122:124:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1040:1042 -> a
+    125:125:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    125:125:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
+    126:126:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.hasNoWhyAreYouNotInliningMethods():630:630 -> a
+    126:126:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):35 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     126:126:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
     127:127:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.hasNoWhyAreYouNotInliningMethods():630:630 -> a
     127:127:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):35 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     127:127:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
-    128:128:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.hasNoWhyAreYouNotInliningMethods():630:630 -> a
-    128:128:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):35 -> a
+    128:128:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):39:39 -> a
     128:128:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
-    129:129:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):39:39 -> a
+    129:129:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    129:129:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47 -> a
     129:129:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
-    130:130:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    130:130:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47 -> a
-    130:130:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
-    131:132:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47:48 -> a
-    131:132:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
-    133:135:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1167:1169 -> a
-    133:135:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047 -> a
-    136:136:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):83:83 -> a
-    136:136:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):130 -> a
-    136:136:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1170 -> a
+    130:131:void com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter.handleInvokeWithUnknownTarget(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47:48 -> a
+    130:131:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1042 -> a
+    132:134:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1167:1169 -> a
+    132:134:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047 -> a
+    135:135:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):83:83 -> a
+    135:135:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):130 -> a
+    135:135:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1170 -> a
+    135:135:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047 -> a
+    136:136:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1170:1170 -> a
     136:136:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047 -> a
-    137:137:com.android.tools.r8.ir.optimize.InliningOracle getSingleTargetOracle(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.InliningOracle):1170:1170 -> a
-    137:137:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1047 -> a
-    138:154:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1048:1064 -> a
-    155:155:boolean com.android.tools.r8.ir.optimize.Inliner$InlineResult.isRetryAction():0:0 -> a
-    155:155:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1068 -> a
-    156:156:void enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1284:1284 -> a
-    156:156:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1069 -> a
-    157:176:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1073:1092 -> a
-    177:177:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
-    177:177:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1094 -> a
-    178:188:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1094:1104 -> a
-    189:189:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.Inliner$InlineAction.getDowncastClass():586:586 -> a
-    189:189:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1105 -> a
-    190:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1104:1114 -> a
-    201:201:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
-    201:201:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1114 -> a
+    137:153:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1048:1064 -> a
+    154:154:boolean com.android.tools.r8.ir.optimize.Inliner$InlineResult.isRetryAction():0:0 -> a
+    154:154:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1068 -> a
+    155:155:void enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1284:1284 -> a
+    155:155:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1069 -> a
+    156:175:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1073:1092 -> a
+    176:176:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
+    176:176:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1094 -> a
+    177:187:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1094:1104 -> a
+    188:188:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.Inliner$InlineAction.getDowncastClass():586:586 -> a
+    188:188:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1105 -> a
+    189:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1104:1114 -> a
+    200:200:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
+    200:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1114 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    202:204:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1114:1116 -> a
+    201:203:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1114:1116 -> a
+    204:204:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
+    204:204:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     205:205:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
     205:205:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    206:206:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):328:328 -> a
+    206:206:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
+    206:206:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):331 -> a
     206:206:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-    207:207:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
-    207:207:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):331 -> a
+    207:207:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):334:334 -> a
     207:207:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-    208:208:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):334:334 -> a
+    208:208:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):332:332 -> a
     208:208:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-    209:209:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):332:332 -> a
+    209:209:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):329:329 -> a
     209:209:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-    210:210:void com.android.tools.r8.ir.conversion.IRConverter.addWaveDoneAction(com.android.tools.r8.utils.Action):329:329 -> a
-    210:210:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1116 -> a
-    211:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1118:1120 -> a
-    214:214:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1119:1119 -> a
-    215:215:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
-    215:215:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1121 -> a
+    210:212:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1118:1120 -> a
+    213:213:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1119:1119 -> a
+    214:214:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
+    214:214:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    216:216:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
-    216:216:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1121 -> a
-    217:217:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1125:1125 -> a
-    218:218:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.notifyCodeHasChanged():217:217 -> a
-    218:218:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1127 -> a
-    219:221:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> a
-    219:221:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.notifyCodeHasChanged():218 -> a
-    219:221:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1127 -> a
-    222:227:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1128:1133 -> a
+    215:215:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
+    215:215:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1121 -> a
+    216:216:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1125:1125 -> a
+    217:217:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.notifyCodeHasChanged() -> a
+    217:217:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1127 -> a
+    218:220:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> a
+    218:220:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.notifyCodeHasChanged():218 -> a
+    218:220:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1127 -> a
+    221:226:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1128:1133 -> a
+    227:227:void com.android.tools.r8.graph.AccessFlags.demote(int):311:311 -> a
+    227:227:void com.android.tools.r8.graph.MethodAccessFlags.demoteFromBridge():164 -> a
+    227:227:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1133 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     228:228:void com.android.tools.r8.graph.AccessFlags.demote(int):311:311 -> a
     228:228:void com.android.tools.r8.graph.MethodAccessFlags.demoteFromBridge():164 -> a
     228:228:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1133 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    229:229:void com.android.tools.r8.graph.AccessFlags.demote(int):311:311 -> a
-    229:229:void com.android.tools.r8.graph.MethodAccessFlags.demoteFromBridge():164 -> a
-    229:229:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1133 -> a
-    230:239:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1135:1144 -> a
-    240:240:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1821:1821 -> a
-    240:240:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
+    229:238:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1135:1144 -> a
+    239:239:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1827:1827 -> a
+    239:239:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    241:243:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1822:1824 -> a
-    241:243:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    244:244:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2150:2150 -> a
-    244:244:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
+    240:242:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1828:1830 -> a
+    240:242:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
+    243:243:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2156:2156 -> a
+    243:243:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    243:243:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
+    244:244:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> a
+    244:244:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2157 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    244:244:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
     244:244:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    245:245:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> a
-    245:245:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2151 -> a
+    245:245:com.android.tools.r8.ir.analysis.proto.ProtoReferences com.android.tools.r8.ir.analysis.proto.ProtoShrinker.getProtoReferences():82:82 -> a
+    245:245:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    245:245:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
+    245:245:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
     245:245:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    246:246:com.android.tools.r8.ir.analysis.proto.ProtoReferences com.android.tools.r8.ir.analysis.proto.ProtoShrinker.getProtoReferences():82:82 -> a
-    246:246:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2151 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    246:246:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
+    246:246:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2157:2157 -> a
+    246:246:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
     246:246:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    247:247:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2151:2151 -> a
-    247:247:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
+    247:247:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.ProgramMethod):196:196 -> a
+    247:247:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2157 -> a
+    247:247:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
     247:247:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    248:248:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.ProgramMethod):196:196 -> a
-    248:248:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2151 -> a
-    248:248:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
+    248:248:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> a
+    248:248:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2161 -> a
+    248:248:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
     248:248:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    249:249:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.graph.AppView.protoShrinker():587:587 -> a
-    249:249:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2155 -> a
-    249:249:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
-    249:249:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    250:250:com.android.tools.r8.ir.analysis.proto.ProtoReferences com.android.tools.r8.ir.analysis.proto.ProtoShrinker.getProtoReferences():82:82 -> a
-    250:250:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2155 -> a
+    249:249:com.android.tools.r8.ir.analysis.proto.ProtoReferences com.android.tools.r8.ir.analysis.proto.ProtoShrinker.getProtoReferences():82:82 -> a
+    249:249:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    250:250:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
-    250:250:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    251:254:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2156:2159 -> a
-    251:254:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1824 -> a
-    251:254:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
-    255:258:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1146:1149 -> a
-    259:259:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
-    259:259:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1150 -> a
-    260:261:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1156:1157 -> a
-    262:264:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> a
-    262:264:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.finish():223 -> a
-    262:264:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1158 -> a
-    265:265:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.optimize.AffectedValues):1349:1349 -> a
-    265:265:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1159 -> a
-    266:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1160:1160 -> a
-    267:267:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
-    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1160 -> a
-    268:269:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1161:1162 -> a
-    270:270:void lambda$performInliningImpl$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1111:1111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/d3;)V"}
-    271:279:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.notifyMethodSingleCallerInlined(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):146:154 -> a
-    271:279:void lambda$performInliningImpl$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1111 -> a
-    280:280:boolean lambda$performInliningImpl$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1149:1149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
-    281:294:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1220:1233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/lh0;)V"}
-    295:295:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1265:1265 -> a
-    295:295:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1236 -> a
-    296:296:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1237:1237 -> a
-    297:297:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1265:1265 -> a
-    297:297:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1240 -> a
-    298:299:void lambda$postProcessInlineeBlocks$3(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1229:1230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/G5;)V"}
-    300:302:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1249:1251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Ljava/util/Set;Lcom/android/tools/r8/internal/lh0;)V"}
-    303:303:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    303:303:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1251 -> a
-    304:304:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1251:1251 -> a
-    305:307:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1259:1261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)V"}
-    308:308:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    308:308:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1261 -> a
-    309:309:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1261:1261 -> a
-    310:317:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1273:1280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/G5;Ljava/util/function/Consumer;)V"}
-    318:349:void onWaveDone():1297:1328 -> a
-    350:350:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1300:1300 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/tY;)V"}
-    351:351:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.isEmpty():131:131 -> a
-    351:351:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1314 -> a
-    352:355:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1317:1320 -> a
-    356:359:void com.android.tools.r8.graph.MethodCollection.removeMethods(java.util.Set):338:341 -> a
-    356:359:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1320 -> a
-    360:360:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
-    360:360:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
-    360:360:void com.android.tools.r8.graph.MethodCollection.removeMethods(java.util.Set):342 -> a
-    360:360:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1320 -> a
-    361:361:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1321:1321 -> a
-    362:362:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
-    362:362:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352 -> a
+    249:249:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
+    249:249:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
+    250:253:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):2162:2165 -> a
+    250:253:boolean com.android.tools.r8.utils.InternalOptions$InlinerOptions.shouldApplyInliningToInlinee(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):1830 -> a
+    250:253:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1144 -> a
+    254:257:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1146:1149 -> a
+    258:258:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
+    258:258:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1150 -> a
+    259:260:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1156:1157 -> a
+    261:263:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> a
+    261:263:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.finish():223 -> a
+    261:263:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1158 -> a
+    264:264:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.optimize.AffectedValues):1349:1349 -> a
+    264:264:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1159 -> a
+    265:265:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1160:1160 -> a
+    266:266:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
+    266:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1160 -> a
+    267:268:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1161:1162 -> a
+    269:269:void lambda$performInliningImpl$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1111:1111 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/d3;)V"}
+    270:278:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.notifyMethodSingleCallerInlined(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):146:154 -> a
+    270:278:void lambda$performInliningImpl$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1111 -> a
+    279:279:boolean lambda$performInliningImpl$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):1149:1149 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
+    280:293:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1220:1233 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/ph0;)V"}
+    294:294:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1265:1265 -> a
+    294:294:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1236 -> a
+    295:295:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1237:1237 -> a
+    296:296:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1265:1265 -> a
+    296:296:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.utils.Timing):1240 -> a
+    297:298:void lambda$postProcessInlineeBlocks$3(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1229:1230 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/I5;)V"}
+    299:301:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1249:1251 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Ljava/util/Set;Lcom/android/tools/r8/internal/ph0;)V"}
+    302:302:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    302:302:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1251 -> a
+    303:303:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1251:1251 -> a
+    304:306:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1259:1261 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)V"}
+    307:307:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    307:307:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1261 -> a
+    308:308:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):1261:1261 -> a
+    309:316:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1273:1280 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/I5;Ljava/util/function/Consumer;)V"}
+    317:348:void onWaveDone():1297:1328 -> a
+    349:349:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1300:1300 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xY;)V"}
+    350:350:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.isEmpty():131:131 -> a
+    350:350:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1314 -> a
+    351:354:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1317:1320 -> a
+    355:358:void com.android.tools.r8.graph.MethodCollection.removeMethods(java.util.Set):338:341 -> a
+    355:358:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1320 -> a
+    359:359:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
+    359:359:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
+    359:359:void com.android.tools.r8.graph.MethodCollection.removeMethods(java.util.Set):342 -> a
+    359:359:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1320 -> a
+    360:360:void lambda$onWaveDone$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):1321:1321 -> a
+    361:361:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
+    361:361:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-    363:363:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> a
-    363:363:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352 -> a
-    364:364:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352:1352 -> a
-    365:369:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1336:1340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
-    370:370:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):143:143 -> a
-    370:370:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1340 -> a
-    371:372:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1340:1341 -> a
-    373:373:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):127:127 -> a
-    373:373:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1338 -> a
-    374:374:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1344:1344 -> a
+    362:362:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> a
+    362:362:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352 -> a
+    363:363:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$8(com.android.tools.r8.graph.DexEncodedMethod):1352:1352 -> a
+    364:368:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1336:1340 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
+    369:369:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):143:143 -> a
+    369:369:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1340 -> a
+    370:371:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1340:1341 -> a
+    372:372:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):127:127 -> a
+    372:372:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1338 -> a
+    373:373:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1344:1344 -> a
+    374:374:void com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.clear():80:80 -> a
+    374:374:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1344 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     375:375:void com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.clear():80:80 -> a
     375:375:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1344 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    376:376:void com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.clear():80:80 -> a
-    376:376:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1344 -> a
-    377:377:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1345:1345 -> a
-    378:378:boolean lambda$onLastWaveDone$7(com.android.tools.r8.graph.ProgramMethod):1343:1343 -> a
+    376:376:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1345:1345 -> a
+    377:377:boolean lambda$onLastWaveDone$7(com.android.tools.r8.graph.ProgramMethod):1343:1343 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-    379:380:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1354:1355 -> a
+    378:379:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1354:1355 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
-    381:381:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1354:1354 -> a
-    382:384:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1367:1369 -> a
+    380:380:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1354:1354 -> a
+    381:383:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1367:1369 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    385:386:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> a
-    385:386:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1369 -> a
-    387:387:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1369:1369 -> a
+    384:385:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1325 -> a
+    384:385:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1369 -> a
+    386:386:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1369:1369 -> a
     1:6:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):884:889 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)I"}
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     7:7:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):895 -> b
     8:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):901:908 -> b
@@ -162819,7 +162815,7 @@
     com.android.tools.r8.graph.ProgramMethod target -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.code.Invoke invoke -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FB;"}
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/U;"}
     boolean shouldEnsureStaticInitialization -> d
@@ -162828,13 +162824,13 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():560:560 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):570:573 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/DB;Lcom/android/tools/r8/ir/optimize/U;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/FB;Lcom/android/tools/r8/ir/optimize/U;)V"}
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/Q;"}
     2:2:java.util.List com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult.getTopmostNotSatisfiedBlocks():192:192 -> a
     2:2:void handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):766 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/C0;Lcom/android/tools/r8/internal/G5;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/C0;Lcom/android/tools/r8/internal/I5;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     3:3:boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult.isNotSatisfied():200:200 -> a
     3:3:void handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):767 -> a
     4:4:boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult.isPartial():208:208 -> a
@@ -162847,17 +162843,17 @@
     9:9:void handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):774 -> a
     10:10:void handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):775:775 -> a
     11:24:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):606:619 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Vv;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xv;)Lcom/android/tools/r8/internal/Dt;"}
     25:41:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):615:631 -> a
     42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a
     42:42:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):631 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:43:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a
     43:43:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):631 -> a
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     44:44:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):631 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     45:45:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):631 -> a
     46:49:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):632:635 -> a
     50:50:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():504:504 -> a
@@ -162929,10 +162925,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     182:190:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):749:757 -> a
     191:191:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$2(com.android.tools.r8.ir.code.BasicBlock):690:690 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/bl0;"}
     192:192:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):782:782 -> a
     192:192:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):620 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/I5;)V"}
     193:193:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():695:695 -> a
     193:193:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):785 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -162956,7 +162952,7 @@
     204:204:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):620 -> a
     205:208:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):796:799 -> a
     205:208:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):641 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/I5;)V"}
     209:209:boolean com.android.tools.r8.ir.code.Value.isThis():1016:1016 -> a
     209:209:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):799 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -162984,7 +162980,7 @@
     222:224:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):809:811 -> a
     222:224:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):641 -> a
     225:232:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):816:823 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     233:233:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setRemoveInnerFramesIfThrowingNpe(boolean):295:295 -> a
     233:233:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):823 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -162997,7 +162993,7 @@
     com.android.tools.r8.graph.DexProgramClass downcastClass -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.ir.code.InvokeMethod invoke -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NB;"}
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/U;"}
     boolean shouldEnsureStaticInitialization -> d
@@ -163070,23 +163066,23 @@
 com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.Y:
 # {"id":"sourceFile","fileName":"InliningOracle.java"}
     com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/S;"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/pd;)Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/rd;)Lcom/android/tools/r8/internal/rd;"}
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/graph/C5;"}
     void markInlined(com.android.tools.r8.ir.code.IRCode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/fm0;)Z"}
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/fm0;)Z"}
     boolean willExceedBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/bm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/Q;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/fm0;)Z"}
     1:14:com.android.tools.r8.graph.DexProgramClass getDowncastTypeIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):50:63 -> a
     1:14:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/P;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/P;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
     15:15:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
     15:15:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):93 -> a
     16:16:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction$Builder,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
@@ -163100,9 +163096,9 @@
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/f;"}
     com.android.tools.r8.ir.conversion.MethodConversionOptions conversionOptions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN$a;"}
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.IRCode):17:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
     3:3:com.android.tools.r8.ir.conversion.MethodConversionOptions com.android.tools.r8.ir.code.IRCode.getConversionOptions():189:189 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.IRCode):19 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163138,7 +163134,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/b;)V"}
     2:6:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:18 -> <init>
     1:4:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     5:5:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     5:5:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):25 -> a
     6:7:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):25:26 -> a
@@ -163155,7 +163151,7 @@
     41:41:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):52 -> a
     42:60:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):52:70 -> a
     61:62:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;ILcom/android/tools/r8/internal/XO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;ILcom/android/tools/r8/internal/bP;)Z"}
     63:63:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     63:63:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):56 -> a
     64:65:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):56:57 -> a
@@ -163178,7 +163174,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap multiInlineCallEdges -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     int[] multiCallerInliningInstructionLimits -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():41:41 -> <clinit>
@@ -163194,13 +163190,13 @@
     3:3:java.util.Optional lambda$recordCallEdgeForMultiCallerInlining$2():130 -> a
     4:4:java.util.Optional lambda$recordCallEdgeForMultiCallerInlining$2():130:130 -> a
     5:9:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):60:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;)V"}
     10:10:void lambda$recordCallEdgesForMultiCallerInlining$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     11:11:com.android.tools.r8.ir.optimize.DefaultInliningOracle lambda$recordCallEdgesForMultiCallerInlining$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;)Lcom/android/tools/r8/ir/optimize/H;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;)Lcom/android/tools/r8/ir/optimize/H;"}
     12:14:void recordCallEdgeForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):128:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;)V"}
     15:15:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
     15:15:void recordCallEdgeForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163224,7 +163220,7 @@
     33:33:void recordCallEdgeForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):144 -> a
     34:35:void recordCallEdgeForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):144:145 -> a
     36:52:void stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMultiset):155:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/uY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/yY;)V"}
     53:53:void stopTrackingCallSitesForMethod(com.android.tools.r8.graph.ProgramMethod):177:177 -> a
     53:53:void stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMultiset):172 -> a
     54:54:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
@@ -163235,26 +163231,26 @@
     55:55:void stopTrackingCallSitesForMethod(com.android.tools.r8.graph.ProgramMethod):177 -> a
     55:55:void stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMultiset):172 -> a
     56:57:void lambda$stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining$4(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.ProgramMethod,int):165:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/graph/C5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/graph/C5;I)V"}
     58:66:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):189:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     67:67:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):127:127 -> a
     67:67:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     68:68:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:199 -> a
     69:69:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph lambda$onLastWaveDone$5(java.util.concurrent.ExecutorService):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/nP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/rP;"}
     70:70:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph.builder(com.android.tools.r8.graph.AppView):20:20 -> a
     70:70:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph lambda$onLastWaveDone$5(java.util.concurrent.ExecutorService):193 -> a
     71:71:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph lambda$onLastWaveDone$5(java.util.concurrent.ExecutorService):193:193 -> a
     72:128:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder computeMultiInlineCallerMethods(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):207:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nP;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;)Lcom/android/tools/r8/internal/TL;"}
     129:129:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
     129:129:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder computeMultiInlineCallerMethods(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):263 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     130:130:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
     130:130:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder computeMultiInlineCallerMethods(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):263 -> a
     131:139:void lambda$computeMultiInlineCallerMethods$9(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):212:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nP;Lcom/android/tools/r8/internal/PL;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;Lcom/android/tools/r8/internal/TL;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/C5;Ljava/util/Optional;)V"}
     140:140:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():542:542 -> a
     140:140:void lambda$computeMultiInlineCallerMethods$9(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph,com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod,java.util.Optional):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163293,9 +163289,9 @@
     179:179:boolean lambda$computeMultiInlineCallerMethods$7(com.android.tools.r8.graph.ProgramMethod):227:227 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     180:181:void lambda$computeMultiInlineCallerMethods$8(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod,int):257:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PL;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/C5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TL;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/C5;I)V"}
     1:30:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):71:100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     31:31:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethod.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):178:178 -> b
     31:31:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):100 -> b
     32:32:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):102:102 -> b
@@ -163321,7 +163317,7 @@
     50:50:boolean lambda$stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining$3(com.android.tools.r8.graph.ProgramMethod):155:155 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     51:51:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$onLastWaveDone$6(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):195:195 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nP;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rP;)Lcom/android/tools/r8/internal/TL;"}
 com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.ir.optimize.c0:
 # {"id":"sourceFile","fileName":"NestReducer.java"}
     com.android.tools.r8.graph.AppView appView -> a
@@ -163329,8 +163325,8 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():685:685 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():684:684 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):42 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:6:void removeNests():52:54 -> a
@@ -163344,7 +163340,7 @@
     9:12:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):45:48 -> a
     13:26:void reduceNests(java.util.concurrent.ExecutorService):64:77 -> a
     27:32:boolean lambda$processNestHost$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.NestMemberClassAttribute):88:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/k5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/k5;)Z"}
     33:33:boolean lambda$processNestHost$0(com.android.tools.r8.graph.DexProgramClass):94:94 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     34:34:java.lang.Iterable com.android.tools.r8.graph.DexClass.members(java.util.function.Predicate):236:236 -> a
@@ -163390,7 +163386,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/b;)V"}
     2:14:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):489:501 -> a
     2:14:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):43 -> a
     15:15:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
@@ -163441,7 +163437,7 @@
     59:59:boolean com.android.tools.r8.ir.code.IRCode.isConsistentGraph(com.android.tools.r8.graph.AppView):684:684 -> a
     59:59:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):46 -> a
     60:76:void shareIdenticalBlockPrefixFromNormalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Set,com.android.tools.r8.ir.optimize.InstructionEquivalence):65:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/regalloc/b;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/Z;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/regalloc/b;Ljava/util/Set;Lcom/android/tools/r8/ir/optimize/Z;)V"}
     77:77:boolean com.android.tools.r8.ir.code.BasicBlock.isEmpty():784:784 -> a
     77:77:void shareIdenticalBlockPrefixFromNormalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Set,com.android.tools.r8.ir.optimize.InstructionEquivalence):82 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163484,7 +163480,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     198:198:void shareIdenticalBlockPrefixFromNormalSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Set,com.android.tools.r8.ir.optimize.InstructionEquivalence):201:201 -> a
     199:199:boolean lambda$shareIdenticalBlockPrefixFromNormalSuccessors$0(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.ir.code.Value):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;ILcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/f;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;ILcom/android/tools/r8/internal/bl0;)Z"}
     200:200:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     200:200:boolean lambda$shareIdenticalBlockPrefixFromNormalSuccessors$0(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.ir.code.Value):136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163500,13 +163496,13 @@
     206:206:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> a
     206:206:boolean lambda$shareIdenticalBlockPrefixFromNormalSuccessors$0(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.ir.code.Value):138 -> a
     207:223:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):209:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     224:224:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap com.android.tools.r8.ir.code.BasicBlock.getLocalsAtEntry():121:121 -> a
     224:224:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     225:225:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):226:226 -> a
     226:252:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):237:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/f;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/f;I)V"}
     253:253:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     253:253:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):265 -> a
     254:254:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):265:265 -> a
@@ -163642,9 +163638,9 @@
     372:372:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):299 -> a
     373:385:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):305:317 -> a
     386:386:java.util.List lambda$shareIdenticalBlockSuffix$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):265:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Ljava/util/List;"}
     387:399:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):433:445 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/f;)V"}
     400:400:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     400:400:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):448 -> a
     401:406:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):449:454 -> a
@@ -163659,14 +163655,14 @@
     415:415:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):460 -> a
     416:425:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):462:471 -> a
     1:1:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):273:273 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Ljava/util/List;"}
 com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.f0:
 # {"id":"sourceFile","fileName":"PhiOptimizations.java"}
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> a
     1:6:boolean optimize(com.android.tools.r8.ir.code.IRCode):24 -> a
     1:6:boolean optimize(com.android.tools.r8.internal.IRCode):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
     7:8:boolean predecessorsHaveNormalFlow(com.android.tools.r8.ir.code.BasicBlock):28:29 -> a
     7:8:boolean tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):138 -> a
     7:8:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -163812,7 +163808,7 @@
     1:1:com.android.tools.r8.graph.AppView access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/q0;)Lcom/android/tools/r8/graph/y;"}
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     3:3:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):90 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -163831,25 +163827,25 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/q0;)Lcom/android/tools/r8/graph/y;"}
     2:2:java.lang.String getRewriterId():84:84 -> b
     3:3:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):97:97 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     1:1:com.android.tools.r8.graph.AppView access$900(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/q0;)Lcom/android/tools/r8/graph/y;"}
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot -> com.android.tools.r8.ir.optimize.g0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     com.android.tools.r8.ir.code.Value array -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.MemberType memberType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sN;"}
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):116:118 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/sN;)V"}
     boolean maybeHasIndex(int) -> a
     1:5:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot create(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):122:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/ir/optimize/g0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/ir/optimize/g0;"}
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithConstantIndex -> com.android.tools.r8.ir.optimize.h0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     int index -> c
     1:2:void <init>(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.MemberType):145:146 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;ILcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;ILcom/android/tools/r8/internal/sN;)V"}
     1:1:boolean maybeHasIndex(int):151:151 -> a
     1:5:boolean equals(java.lang.Object):165:169 -> equals
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):136:136 -> equals
@@ -163858,9 +163854,9 @@
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithValueIndex -> com.android.tools.r8.ir.optimize.i0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     com.android.tools.r8.ir.code.Value index -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):178:179 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     boolean maybeHasIndex(int) -> a
     1:5:boolean equals(java.lang.Object):198:202 -> equals
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):136:136 -> equals
@@ -163875,7 +163871,7 @@
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> e
     java.util.LinkedHashMap nonFinalStaticFieldValues -> f
     com.android.tools.r8.ir.code.InitClass mostRecentInitClass -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gv;"}
     java.util.LinkedHashMap mostRecentInstanceFieldWrites -> h
     java.util.LinkedHashMap mostRecentStaticFieldWrites -> i
     int maxCapacity -> j
@@ -163889,11 +163885,11 @@
     1:1:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.getMemberType():130:130 -> a
     1:1:boolean lambda$removeArraySlotValues$2(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):1298 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/ir/optimize/g0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/ir/optimize/g0;)Z"}
     2:2:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.getMemberType():130:130 -> a
     2:2:boolean lambda$removeArraySlotValues$3(com.android.tools.r8.ir.code.MemberType,int,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):1308 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;ILcom/android/tools/r8/ir/optimize/g0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;ILcom/android/tools/r8/ir/optimize/g0;)Z"}
     3:3:boolean lambda$removeArraySlotValues$3(com.android.tools.r8.ir.code.MemberType,int,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):1308:1308 -> a
     4:5:void clearMostRecentInstanceFieldWrite(com.android.tools.r8.graph.DexField):1116:1117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
@@ -163919,9 +163915,9 @@
     29:32:int reduceSize(int,java.util.Set):1283:1286 -> a
     29:32:int reduceSize(int,java.util.Map):1293 -> a
     33:34:void removeArraySlotValues(com.android.tools.r8.ir.code.MemberType):1297:1298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;)V"}
     35:38:void removeArraySlotValues(com.android.tools.r8.ir.code.MemberType,int):1303:1306 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;I)V"}
     39:43:void putArraySlotValue(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue):1368:1372 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/g0;Lcom/android/tools/r8/ir/optimize/n0;)V"}
     44:48:void putFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue):1384:1388 -> a
@@ -163953,7 +163949,7 @@
     1:1:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():695:695 -> a
     1:1:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):921 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)Lcom/android/tools/r8/ir/optimize/j0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)Lcom/android/tools/r8/ir/optimize/j0;"}
     2:2:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():695:695 -> a
     2:2:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):921 -> a
     3:14:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):922:933 -> a
@@ -164004,7 +164000,7 @@
     75:75:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):1253:1253 -> a
     75:75:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock,int):946 -> a
     76:77:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):985:986 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/a30;)V"}
     78:82:void removeState(com.android.tools.r8.ir.code.BasicBlock):1018:1022 -> a
     78:82:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):987 -> a
     83:84:boolean com.android.tools.r8.ir.code.BasicBlock.hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):332:333 -> a
@@ -164014,7 +164010,7 @@
     88:92:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):993 -> a
     93:93:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):995:995 -> a
     94:94:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):1003:1003 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/ir/optimize/j0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/ir/optimize/j0;)V"}
     95:95:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.isEmpty():1220:1220 -> a
     95:95:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):1004 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -164051,11 +164047,11 @@
     com.android.tools.r8.graph.DexField field -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.ir.code.Value object -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():206:206 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value):211:214 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/bl0;)V"}
     1:5:boolean equals(java.lang.Object):225:229 -> equals
     1:1:int hashCode():219:219 -> hashCode
     2:2:int com.android.tools.r8.ir.code.Value.hashCode():784:784 -> hashCode
@@ -164064,15 +164060,15 @@
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.ir.optimize.m0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/Kw;)V"}
     com.android.tools.r8.ir.analysis.type.TypeElement getType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode -> com.android.tools.r8.ir.optimize.p0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     int maxCapacityPerBlock -> c
     com.android.tools.r8.ir.optimize.AffectedValues affectedValues -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/a;"}
@@ -164088,24 +164084,24 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():233:233 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.IRCode):254:254 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/q0;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/q0;Lcom/android/tools/r8/internal/Dt;)V"}
     2:20:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.IRCode):241:259 -> <init>
     21:21:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> <init>
     21:21:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.IRCode):259 -> <init>
     22:22:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.IRCode):259:259 -> <init>
     1:2:void lambda$run$0(java.util.List,com.android.tools.r8.ir.code.Value):477:478 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/bl0;)V"}
     3:3:void lambda$run$1(com.android.tools.r8.ir.code.Phi):481:481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;)V"}
     4:4:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):286:286 -> a
     4:4:void lambda$run$1(com.android.tools.r8.ir.code.Phi):481 -> a
     5:6:void lambda$processInstructionsToRemove$3(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):492:493 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Ljava/util/Set;)V"}
     7:17:void lambda$processInstructionsToRemove$3(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):492:502 -> a
     18:18:boolean lambda$processInstructionsToRemove$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):493:493 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Kw;)Z"}
     19:19:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):511:511 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)V"}
     20:20:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$1000(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     20:20:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):511 -> a
     21:21:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
@@ -164132,7 +164128,7 @@
     53:53:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):532:532 -> a
     54:54:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):520:520 -> a
     55:55:void lambda$handleInvokeDirect$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):535:535 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GB;Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/IB;Lcom/android/tools/r8/graph/F0;Lcom/android/tools/r8/internal/fw;)V"}
     56:56:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
     56:56:void lambda$handleInvokeDirect$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):535 -> a
     57:58:void lambda$handleInvokeDirect$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):536:537 -> a
@@ -164163,7 +164159,7 @@
     102:105:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.markClassAsInitialized(com.android.tools.r8.graph.DexType):1259:1262 -> a
     102:105:boolean markClassAsInitialized(com.android.tools.r8.graph.DexType):614 -> a
     106:110:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):738:742 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;Lcom/android/tools/r8/graph/F0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cw;Lcom/android/tools/r8/graph/F0;)V"}
     111:111:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$2600(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     111:111:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):742 -> a
     112:120:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):742:750 -> a
@@ -164195,7 +164191,7 @@
     155:155:com.android.tools.r8.ir.code.InitClass com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.clearMostRecentInitClass():1436:1436 -> a
     155:155:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):769 -> a
     156:163:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):822:829 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vd0;Lcom/android/tools/r8/graph/F0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zd0;Lcom/android/tools/r8/graph/F0;)V"}
     164:164:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$3100(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     164:164:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):829 -> a
     165:170:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):829:834 -> a
@@ -164226,12 +164222,12 @@
     205:205:java.lang.Boolean lambda$handleStaticPut$5(com.android.tools.r8.graph.DexClassAndField):836 -> a
     206:206:java.lang.Boolean lambda$handleStaticPut$5(com.android.tools.r8.graph.DexClassAndField):836:836 -> a
     207:207:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):858:858 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/uU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/yU;)V"}
     208:208:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$3400(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     208:208:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):858 -> a
     209:210:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):858:859 -> a
     211:215:void lambda$applyObjectState$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):861:865 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
     216:216:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.ProgramField.asProgramFieldOrNull(com.android.tools.r8.graph.DexClassAndField):21:21 -> a
     216:216:void lambda$applyObjectState$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):865 -> a
     217:217:void lambda$applyObjectState$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):866:866 -> a
@@ -164260,7 +164256,7 @@
     239:239:com.android.tools.r8.ir.code.InitClass com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.clearMostRecentInitClass():1436:1436 -> a
     239:239:void killAllNonFinalActiveFields():886 -> a
     240:242:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):890:892 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     243:243:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$3500(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     243:243:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):892 -> a
     244:247:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):892:895 -> a
@@ -164297,7 +164293,7 @@
     4:4:void markMostRecentInitClassForRemoval(com.android.tools.r8.graph.DexType):620 -> b
     5:7:void markMostRecentInitClassForRemoval(com.android.tools.r8.graph.DexType):621:623 -> b
     1:23:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run():362:384 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kd;"}
     24:24:void handleArrayGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):628:628 -> c
     24:24:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult run():384 -> c
     25:25:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$1700(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> c
@@ -164596,31 +164592,31 @@
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode$ExistingValue -> com.android.tools.r8.ir.optimize.n0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     com.android.tools.r8.ir.code.Value value -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode this$1 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/p0;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode,com.android.tools.r8.ir.code.Value):266:267 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/p0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/p0;Lcom/android/tools/r8/internal/bl0;)V"}
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):277:279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/Kw;)V"}
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement getType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):284:284 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     1:1:java.lang.String toString():293:293 -> toString
 com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode$MaterializableValue -> com.android.tools.r8.ir.optimize.o0:
 # {"id":"sourceFile","fileName":"RedundantFieldLoadAndStoreElimination.java"}
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode this$1 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/p0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():297:297 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode,com.android.tools.r8.ir.analysis.value.SingleValue):301:302 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/p0;Lcom/android/tools/r8/internal/cc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/p0;Lcom/android/tools/r8/internal/gc0;)V"}
     3:3:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode,com.android.tools.r8.ir.analysis.value.SingleValue):302 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$RedundantFieldLoadAndStoreEliminationOnCode,com.android.tools.r8.ir.analysis.value.SingleValue):302:303 -> <init>
     1:2:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):308:309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/Kw;)V"}
     3:3:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):73:73 -> a
     3:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):309 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):309:309 -> a
@@ -164631,7 +164627,7 @@
     8:8:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):311 -> a
     9:10:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):312:313 -> a
     11:12:com.android.tools.r8.ir.analysis.type.TypeElement getType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):318:319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/aj0;"}
     13:13:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
     13:13:com.android.tools.r8.ir.analysis.type.TypeElement getType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):319 -> a
     14:15:com.android.tools.r8.ir.analysis.type.TypeElement getType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):323:324 -> a
@@ -164662,12 +164658,12 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     2:2:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):538 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     3:3:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):538 -> a
     3:3:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
     4:5:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):541:542 -> a
@@ -164685,26 +164681,26 @@
     11:15:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
     16:18:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):542:544 -> a
     16:18:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2563:2563 -> a
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2569:2569 -> a
     19:19:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     19:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2563 -> a
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2569 -> a
     20:20:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     20:20:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2563:2563 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2569:2569 -> a
     21:21:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     21:21:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    22:22:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2564 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    22:22:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2570 -> a
     22:22:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     22:22:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    23:24:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568:2569 -> a
-    23:24:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2564 -> a
+    23:24:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574:2575 -> a
+    23:24:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2570 -> a
     23:24:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     23:24:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2564:2564 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):2570:2570 -> a
     25:25:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):544 -> a
     25:25:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38 -> a
     26:28:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:43 -> a
@@ -164817,11 +164813,11 @@
     179:179:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71 -> a
     180:181:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:73 -> a
     182:182:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     183:183:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/ir/optimize/a;)Ljava/util/function/BiConsumer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/ir/optimize/a;)Ljava/util/function/BiConsumer;"}
     184:191:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):85:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     192:192:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     192:192:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):92 -> a
     193:208:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):91:106 -> a
@@ -164848,25 +164844,25 @@
     218:218:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):110 -> a
     219:231:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):115:127 -> a
     232:246:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):126:140 -> a
-    247:247:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    247:247:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     247:247:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    248:248:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    248:248:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     248:248:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):140 -> a
     249:251:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):141:143 -> a
-    252:252:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568:2568 -> a
+    252:252:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574:2574 -> a
     252:252:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143 -> a
-    253:253:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    253:253:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568 -> a
+    253:253:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    253:253:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574 -> a
     253:253:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    254:254:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    254:254:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574 -> a
     254:254:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143 -> a
-    255:255:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2568:2568 -> a
+    255:255:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2574:2574 -> a
     255:255:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143 -> a
     256:256:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143:143 -> a
-    257:257:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2569:2569 -> a
+    257:257:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.requiredCfVersionForConstClassInstructions():2575:2575 -> a
     257:257:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):143 -> a
     258:258:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):142:142 -> a
     259:261:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):117:119 -> a
@@ -164890,7 +164886,7 @@
     5:5:void <init>(com.android.tools.r8.graph.AppView):86 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView):86:86 -> <init>
     1:1:void run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy getAppInfoWithClassHierarchy():90:90 -> a
     2:2:void run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):95 -> a
     3:3:void run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):97:97 -> a
@@ -164949,14 +164945,14 @@
     38:38:void run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):98 -> a
     39:39:void run(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):99:99 -> a
     40:42:java.util.Set getReturnsPotentiallyNeedingCheckCast(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):105:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;)Ljava/util/Set;"}
     43:67:java.util.Set getReturnsPotentiallyNeedingCheckCast(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):106:130 -> a
     68:68:java.util.Set getReturnsPotentiallyNeedingCheckCast(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):120:120 -> a
     69:69:java.util.Set getReturnsPotentiallyNeedingCheckCast(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):108:108 -> a
     70:70:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getReturnsPotentiallyNeedingCheckCast$0(com.android.tools.r8.synthesis.SyntheticNaming):105:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     71:72:void lambda$getReturnsPotentiallyNeedingCheckCast$2(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):132:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/I5;)V"}
     73:74:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object,java.util.Set):49:50 -> a
     73:74:boolean shouldInsertCheckCastForValue(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.Set):143 -> a
     73:74:void lambda$getReturnsPotentiallyNeedingCheckCast$2(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):134 -> a
@@ -164991,7 +164987,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:boolean workaroundInstanceOfTypeWeakeningInVerifier(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Z"}
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     2:2:boolean workaroundInstanceOfTypeWeakeningInVerifier(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165020,13 +165016,13 @@
     25:25:boolean workaroundInstanceOfTypeWeakeningInVerifier(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):113 -> a
     26:26:boolean workaroundInstanceOfTypeWeakeningInVerifier(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):119:119 -> a
     27:27:boolean lambda$workaroundInstanceOfTypeWeakeningInVerifier$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/pd;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/rd;)Z"}
     28:28:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
     28:28:boolean lambda$workaroundInstanceOfTypeWeakeningInVerifier$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:void workaroundDex2OatLinkedListBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;)V"}
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():2940:2940 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;)V"}
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():2946:2946 -> a
     30:30:void workaroundDex2OatLinkedListBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):190 -> a
     31:43:void workaroundDex2OatLinkedListBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):193:205 -> a
     44:44:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
@@ -165063,9 +165059,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/w2;"}
     84:84:com.android.tools.r8.graph.DexMethod lambda$workaroundDex2OatLinkedListBug$2(com.android.tools.r8.graph.DexItemFactory):197:197 -> a
     85:85:boolean lambda$workaroundDex2OatLinkedListBug$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):221:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     86:89:boolean lambda$workaroundForwardingInitializerBug$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.Instruction):286:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Kw;)Z"}
     90:90:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     90:90:boolean lambda$workaroundForwardingInitializerBug$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.Instruction):289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165075,13 +165071,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     94:94:boolean lambda$workaroundForwardingInitializerBug$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.Instruction):290:290 -> a
     95:95:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):391:391 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     96:96:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration com.android.tools.r8.graph.AppView.getDontWarnConfiguration():487:487 -> a
     96:96:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):461 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/y;)V"}
     97:97:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):462:462 -> a
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeToInterfaceMethodBug():3188:3188 -> a
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeToInterfaceMethodBug():3194:3194 -> a
     98:98:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):462 -> a
     99:99:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):463:463 -> a
     100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():43:43 -> a
@@ -165105,13 +165101,13 @@
     117:117:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):476:476 -> a
     118:118:void reportInvokeSuperToInterfaceOnDalvik(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):472:472 -> a
     1:1:boolean lambda$workaroundInstanceOfTypeWeakeningInVerifier$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):110:110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/pd;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/rd;)Z"}
     2:2:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> b
     2:2:boolean lambda$workaroundInstanceOfTypeWeakeningInVerifier$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):110 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):264:264 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;)V"}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():2977:2977 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;)V"}
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():2983:2983 -> b
     4:4:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):264 -> b
     5:21:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):268:284 -> b
     22:25:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):359:362 -> b
@@ -165156,7 +165152,7 @@
     8:16:void report(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.lang.String):257:265 -> a
     17:17:void report(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.lang.String):259:259 -> a
     18:18:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     19:19:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
     19:19:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165203,16 +165199,16 @@
     42:42:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     42:42:void lambda$createSynthesizedMethod$4(com.android.tools.r8.graph.DexProto,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):292 -> a
     43:45:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):237:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/j1;"}
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/j1;"}
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     46:46:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    47:47:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     47:47:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):239 -> a
     48:48:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):241:241 -> a
     49:49:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):240:240 -> a
     50:51:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):276:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/List;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/List;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/j1;"}
     52:52:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     52:52:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165291,7 +165287,7 @@
     149:149:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$3(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):294 -> a
     1:1:java.lang.String getRewriterId():79:79 -> b
     2:31:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):103:132 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     32:75:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):130:173 -> b
     76:91:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):171:186 -> b
     92:118:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):182:208 -> b
@@ -165304,15 +165300,15 @@
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.u0:
 # {"id":"sourceFile","fileName":"ServiceLoaderRewriter.java"}
     com.android.tools.r8.ir.code.IRCode code -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YB;"}
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nw;"}
     1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):333:336 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/WB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/YB;)V"}
     1:7:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):342:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;Lcom/android/tools/r8/graph/w2;)V"}
     8:11:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):367:370 -> a
     8:11:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):349 -> a
     12:12:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull():1284:1284 -> a
@@ -165328,14 +165324,14 @@
     29:29:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):362 -> a
     30:31:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):362:363 -> a
     32:32:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):347:347 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/internal/Kw;)V"}
     33:33:void com.android.tools.r8.utils.BooleanBox.and(boolean):52:52 -> a
     33:33:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):347 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:34:boolean lambda$perform$1(com.android.tools.r8.ir.code.Instruction):350:350 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     35:35:boolean lambda$perform$2(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction):360:360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;Lcom/android/tools/r8/internal/Kw;)Z"}
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriterDiagnostic -> com.android.tools.r8.ir.optimize.ServiceLoaderRewriterDiagnostic:
 # {"id":"sourceFile","fileName":"ServiceLoaderRewriterDiagnostic.java"}
     com.android.tools.r8.origin.Origin origin -> b
@@ -165359,7 +165355,7 @@
     220:220:void <clinit>():248:248 -> <clinit>
     1:1:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult.builder():196:196 -> a
     1:1:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/y0;)Lcom/android/tools/r8/ir/optimize/C0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/y0;)Lcom/android/tools/r8/ir/optimize/C0;"}
     2:58:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):252:308 -> a
     59:59:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.fail():219:219 -> a
     59:59:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):309 -> a
@@ -165372,9 +165368,9 @@
     65:67:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.build():239:241 -> a
     65:67:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis):317 -> a
     68:74:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult canInlineWithoutSynthesizingNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):322:328 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/C0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/C0;"}
     75:79:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$canInlineWithoutSynthesizingNullCheckForReceiver$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):331:335 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Iw;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Kw;)I"}
     80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Monitor.object():42:42 -> a
     80:80:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$canInlineWithoutSynthesizingNullCheckForReceiver$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165382,14 +165378,14 @@
     81:81:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$canInlineWithoutSynthesizingNullCheckForReceiver$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):335 -> a
     82:84:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$canInlineWithoutSynthesizingNullCheckForReceiver$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):337:339 -> a
     85:86:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult triggersClassInitializationBeforeAnyStaticRead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):347:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/C0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/C0;"}
     87:87:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):352:352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Iw;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Kw;)I"}
     88:106:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):351:369 -> a
 com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.ir.optimize.x0:
 # {"id":"sourceFile","fileName":"SimpleDominatingEffectAnalysis.java"}
     com.android.tools.r8.utils.IntBox val$visitedInstructions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sz;"}
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis val$analysis -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/y0;"}
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder val$builder -> h
@@ -165397,11 +165393,11 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():254:254 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.IntBox,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis,com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder):254:254 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/ir/optimize/y0;Lcom/android/tools/r8/ir/optimize/D0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/ir/optimize/y0;Lcom/android/tools/r8/ir/optimize/D0;)V"}
     1:1:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     2:9:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):262:269 -> a
     10:10:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.addSatisfyingInstruction(com.android.tools.r8.ir.code.Instruction):223:223 -> a
     10:10:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):269 -> a
@@ -165428,7 +165424,7 @@
     36:36:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl.getState():92:92 -> a
     36:36:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):296 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/List;)Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/List;)Lcom/android/tools/r8/internal/Nh0;"}
     37:38:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):296:297 -> a
     39:42:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks.joinChildren(java.util.List):122:125 -> a
     39:42:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):298 -> a
@@ -165467,10 +165463,10 @@
 com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.ir.optimize.y0:
 # {"id":"sourceFile","fileName":"SimpleDominatingEffectAnalysis.java"}
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect analyze(com.android.tools.r8.ir.code.Instruction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)I"}
     1:1:int maxNumberOfInstructions():0:0 -> a
     2:2:java.util.List getSuccessors(com.android.tools.r8.ir.code.BasicBlock):161:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Ljava/util/List;"}
 com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect -> R8$$REMOVED$$CLASS$$105:
 # {"id":"sourceFile","fileName":"SimpleDominatingEffectAnalysis.java"}
 com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.ir.optimize.z0:
@@ -165556,7 +165552,7 @@
     19:19:void processClasses(com.android.tools.r8.graph.DexProgramClass):100 -> a
     20:22:void processClasses(com.android.tools.r8.graph.DexProgramClass):100:102 -> a
     23:45:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):108:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/g1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/g1;)V"}
     46:46:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     46:46:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):130 -> a
     47:55:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):130:138 -> a
@@ -165573,7 +165569,7 @@
     69:69:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):150 -> a
     70:83:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):153:166 -> a
     84:84:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Kw;)Z"}
     85:85:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     85:85:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):127 -> a
     86:86:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):127:127 -> a
@@ -165586,7 +165582,7 @@
     92:92:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):174 -> a
     93:93:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):174:174 -> a
     1:1:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):102:102 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/g1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/g1;)V"}
 com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.ir.optimize.I0:
 # {"id":"sourceFile","fileName":"UtilityMethodsForCodeOptimizations.java"}
     1:21:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):42:62 -> a
@@ -165607,7 +165603,7 @@
     35:35:com.android.tools.r8.graph.CfCode getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):93 -> a
     35:35:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$4(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):83 -> a
     36:37:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):66:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     38:38:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     38:38:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):68 -> a
     39:41:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):69:71 -> a
@@ -165638,7 +165634,7 @@
     56:56:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     56:56:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):84 -> a
     57:58:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):101:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     59:59:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     59:59:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):103 -> a
     60:63:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):104:107 -> a
@@ -165647,7 +165643,7 @@
     65:65:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):119 -> a
     66:68:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):118:120 -> a
     69:71:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowRuntimeExceptionWithMessageMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):202:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     72:72:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     72:72:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowRuntimeExceptionWithMessageMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):205 -> a
     73:76:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowRuntimeExceptionWithMessageMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):206:209 -> a
@@ -165656,7 +165652,7 @@
     78:78:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowRuntimeExceptionWithMessageMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):222 -> a
     79:81:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowRuntimeExceptionWithMessageMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):221:223 -> a
     1:2:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeToStringIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):35:36 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     3:3:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeToStringIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):37 -> b
     4:7:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeToStringIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):38:41 -> b
@@ -165705,7 +165701,7 @@
     42:42:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$synthesizeThrowIllegalAccessErrorMethod$6(com.android.tools.r8.synthesis.SyntheticNaming):106:106 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     43:44:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIncompatibleClassChangeErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):134:135 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     45:45:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     45:45:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIncompatibleClassChangeErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):136 -> b
     46:49:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowIncompatibleClassChangeErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):137:140 -> b
@@ -165754,7 +165750,7 @@
     30:30:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$9(com.android.tools.r8.synthesis.SyntheticNaming):139:139 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     31:32:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowNoSuchMethodErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):169:170 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
     33:33:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> c
     33:33:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowNoSuchMethodErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):171 -> c
     34:37:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowNoSuchMethodErrorMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):172:175 -> c
@@ -165898,7 +165894,7 @@
 com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.ir.optimize.G0:
 # {"id":"sourceFile","fileName":"UtilityMethodsForCodeOptimizations.java"}
     com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizationsEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/ir/optimize/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/J0;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/ir/optimize/H0;"}
 com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.ir.optimize.H0:
 # {"id":"sourceFile","fileName":"UtilityMethodsForCodeOptimizations.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
@@ -165922,7 +165918,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptUtilityThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.api.InstanceInitializerOutliner -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.ir.optimize.api.InstanceInitializerOutliner -> com.android.tools.r8.internal.xw:
 # {"id":"sourceFile","fileName":"InstanceInitializerOutliner.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -165950,20 +165946,20 @@
     9:9:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     9:9:void lambda$createSynthesizedNewInstance$4(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):231 -> a
     10:27:boolean canSkipClInit(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.ir.code.Value):174:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/nQ;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/rQ;Lcom/android/tools/r8/internal/bl0;)Z"}
     28:28:boolean isChangeInPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):195:195 -> a
     28:28:boolean canSkipClInit(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.ir.code.Value):191 -> a
     29:29:boolean lambda$canSkipClInit$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Instruction):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/Kw;)Z"}
     30:30:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> a
     30:30:boolean lambda$canSkipClInit$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Instruction):181 -> a
     31:31:boolean lambda$canSkipClInit$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Instruction):184:184 -> a
     32:32:boolean isChangeInPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):195:195 -> a
     32:32:boolean lambda$canSkipClInit$0(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Instruction):184 -> a
     33:33:boolean lambda$canSkipClInit$1(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.ir.code.Instruction):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nQ;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rQ;Lcom/android/tools/r8/internal/Kw;)Z"}
     34:35:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):217:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/j1;"}
     36:36:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     36:36:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -165990,7 +165986,7 @@
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.NewInstanceSourceCode.generateCfCode():36 -> a
     69:69:com.android.tools.r8.graph.Code lambda$createSynthesizedNewInstance$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):234 -> a
     70:74:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedInstanceInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):247:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/androidapi/f;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/graph/j1;"}
     75:75:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     75:75:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedInstanceInitializer(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -166045,12 +166041,12 @@
     141:142:com.android.tools.r8.graph.Code lambda$createSynthesizedInstanceInitializer$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):274 -> a
     143:143:com.android.tools.r8.graph.Code lambda$createSynthesizedInstanceInitializer$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):275:275 -> a
     144:150:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):290:296 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     151:151:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isD8MethodProcessor():0:0 -> a
     151:151:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):296 -> a
     152:156:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):296:300 -> a
     1:1:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     2:2:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPostMethodProcessor():0:0 -> b
     2:2:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):64 -> b
     3:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):64:66 -> b
@@ -166214,11 +166210,11 @@
     143:143:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createSynthesizedNewInstance$2(com.android.tools.r8.synthesis.SyntheticNaming):222:222 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     144:144:java.lang.String getRewriterId():308:308 -> b
-com.android.tools.r8.ir.optimize.api.InstanceInitializerOutlinerEventConsumer -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.ir.optimize.api.InstanceInitializerOutlinerEventConsumer -> com.android.tools.r8.internal.yw:
 # {"id":"sourceFile","fileName":"InstanceInitializerOutlinerEventConsumer.java"}
     void acceptInstanceInitializerOutline(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.oc:
 # {"id":"sourceFile","fileName":"ClassInliner.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -166231,7 +166227,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/ir/optimize/W;)V"}
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner):47:52 -> <init>
     1:27:void processMethodCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):138:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)V"}
     28:47:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isInstanceEligible():155:174 -> a
     28:47:void processMethodCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):168 -> a
     48:48:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
@@ -166357,13 +166353,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     207:207:void processMethodCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):260:260 -> a
     208:212:com.android.tools.r8.ir.optimize.InliningOracle lambda$processMethodCode$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.code.IRCode):141:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/ir/optimize/Y;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/ir/optimize/Y;"}
     213:213:boolean lambda$processMethodCode$1(com.android.tools.r8.ir.code.Instruction):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     214:214:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     214:214:boolean lambda$processMethodCode$1(com.android.tools.r8.ir.code.Instruction):150 -> a
     215:215:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):244:244 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;Lcom/android/tools/r8/internal/Ir;)V"}
     216:216:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner):386:386 -> a
     216:216:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):244 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -166371,31 +166367,31 @@
     218:221:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):244 -> a
     222:228:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.Inliner):390:396 -> a
     222:228:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):244 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.nc:
 # {"id":"sourceFile","fileName":"ClassInliner.java"}
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nc;"}
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nc;"}
     1:2:void <clinit>():40:41 -> <clinit>
     1:1:void <init>(java.lang.String,int):39:39 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.pc:
 # {"id":"sourceFile","fileName":"ClassInlinerCostAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xv;"}
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sc;"}
     int estimatedCost -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet):41:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/qc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/sc;)V"}
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet):36:44 -> <init>
     1:11:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):52:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/D2;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/D2;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;)Z"}
     12:12:int com.android.tools.r8.graph.Code.estimatedSizeForInlining():148:148 -> a
     12:12:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):62 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -166408,11 +166404,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:62:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):111:140 -> a
     33:62:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     63:63:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     63:63:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     64:64:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
     64:64:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     65:65:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -166468,30 +166464,30 @@
     83:83:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     84:85:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):129:130 -> a
     84:85:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     86:86:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     86:86:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     87:87:int estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
     87:87:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     88:98:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:92 -> a
     99:101:boolean exceedsInstructionBudgetAfterIncrement(int):98:100 -> a
-    102:102:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1734:1734 -> a
+    102:102:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1740:1740 -> a
     102:102:boolean exceedsInstructionBudgetAfterIncrement(int):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:105:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1737:1737 -> a
+    105:105:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1743:1743 -> a
     105:105:boolean exceedsInstructionBudgetAfterIncrement(int):100 -> a
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    106:106:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1737 -> a
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    106:106:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1743 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     106:106:boolean exceedsInstructionBudgetAfterIncrement(int):100 -> a
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    107:107:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1737 -> a
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    107:107:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1743 -> a
     107:107:boolean exceedsInstructionBudgetAfterIncrement(int):100 -> a
-    108:108:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1740:1740 -> a
+    108:108:int com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions.getClassInliningInstructionAllowance():1746:1746 -> a
     108:108:boolean exceedsInstructionBudgetAfterIncrement(int):100 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.sc:
 # {"id":"sourceFile","fileName":"ClassInlinerReceiverSet.java"}
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -166500,35 +166496,35 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:5:void <init>(com.android.tools.r8.ir.code.Value):24:27 -> <init>
     6:7:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):54:55 -> <init>
     6:7:void <init>(com.android.tools.r8.ir.code.Value):31 -> <init>
     8:8:void <init>(com.android.tools.r8.ir.code.Value):31:31 -> <init>
     1:1:void addDeferredAliasValidityCheck(com.android.tools.r8.ir.code.Value,java.util.function.BooleanSupplier):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/function/BooleanSupplier;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/function/BooleanSupplier;)V"}
     2:2:boolean isDefiniteReceiverAlias(com.android.tools.r8.ir.code.Value):78:78 -> a
     2:2:boolean isReceiverAlias(com.android.tools.r8.ir.code.Value):74 -> a
     2:2:void addDeferredAliasValidityCheck(com.android.tools.r8.ir.code.Value,java.util.function.BooleanSupplier):61 -> a
     3:11:void addDeferredAliasValidityCheck(com.android.tools.r8.ir.code.Value,java.util.function.BooleanSupplier):61:69 -> a
     12:18:boolean isIllegalReceiverAlias(com.android.tools.r8.ir.code.Value):82:88 -> a
     12:18:boolean addReceiverAlias(com.android.tools.r8.ir.code.Value):36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     19:24:boolean addReceiverAlias(com.android.tools.r8.ir.code.Value):40:45 -> a
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):68:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Ljava/util/List;"}
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Hp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Ljava/util/List;"}
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Kp:
 # {"id":"sourceFile","fileName":"FieldValueHelper.java"}
     com.android.tools.r8.graph.DexField field -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.code.Instruction root -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.graph.AppView appView -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.Value defaultValue -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.Map ins -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map outs -> g
@@ -166536,10 +166532,10 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):39:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/y;)V"}
     2:13:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):35:46 -> <init>
     1:8:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):86:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/bl0;"}
     9:21:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> a
     9:21:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):93 -> a
     22:35:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):94:107 -> a
@@ -166547,7 +166543,7 @@
     36:48:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108 -> a
     49:63:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108:122 -> a
     64:64:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/mw;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/ow;)Lcom/android/tools/r8/internal/bl0;"}
     65:65:com.android.tools.r8.ir.code.BasicBlockInstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1795:1795 -> a
     65:65:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):129 -> a
     66:66:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):129:129 -> a
@@ -166564,47 +166560,47 @@
     101:101:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstructionListIterator.insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
     101:101:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):163 -> a
     102:105:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):163:166 -> a
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Uv:
 # {"id":"sourceFile","fileName":"InlineCandidateProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.Inliner inliner -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/W;"}
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pO;"}
     com.android.tools.r8.graph.ProgramMethod method -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.code.Instruction root -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.code.Value eligibleInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.graph.DexProgramClass eligibleClass -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState objectState -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yU;"}
     java.util.Map directMethodCalls -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet indirectMethodCallsOnInstance -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     java.util.Map directInlinees -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.List indirectInlinees -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sc;"}
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):125:125 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/W;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/W;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Kw;)V"}
     2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):108:133 -> <init>
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     1:1:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1230 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Ljava/util/Set;)Z"}
     2:4:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1230:1232 -> a
     5:5:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet.isDefiniteReceiverAlias(com.android.tools.r8.ir.code.Value):78:78 -> a
     5:5:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet.isReceiverAlias(com.android.tools.r8.ir.code.Value):74 -> a
@@ -166617,10 +166613,10 @@
     14:14:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     14:14:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1351 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     15:16:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1351:1352 -> a
     17:18:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):215:216 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZI;)Lcom/android/tools/r8/internal/Mw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dJ;)Lcom/android/tools/r8/internal/Ow;"}
     19:19:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.Value.firstPhiUser():401:401 -> a
     19:19:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):216 -> a
     20:20:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.Value.firstPhiUser():401:401 -> a
@@ -166774,7 +166770,7 @@
     221:221:void markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1313 -> a
     221:221:boolean isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,java.util.Set):1210 -> a
     221:221:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):335 -> a
-    222:222:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():61:61 -> a
+    222:222:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():59:59 -> a
     222:222:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1299 -> a
     222:222:void markSizeOfDirectTargetForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1313 -> a
     222:222:boolean isEligibleDirectMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,java.util.Set):1210 -> a
@@ -166807,7 +166803,7 @@
     244:245:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):239 -> a
     246:249:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):241:244 -> a
     250:250:boolean processInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):378:378 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/Vv;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/internal/Xv;)Z"}
     251:262:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):396:407 -> a
     251:262:boolean processInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):381 -> a
     263:263:void com.android.tools.r8.ir.optimize.Inliner.performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):940:940 -> a
@@ -166936,7 +166932,7 @@
     488:488:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:522 -> a
     488:488:void lambda$removeInstruction$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1351 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     489:490:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
     489:490:void lambda$removeInstruction$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1351 -> a
     491:491:void rebindIndirectEligibleInstanceUsersFromPhis():576:576 -> a
@@ -166961,9 +166957,9 @@
     540:540:void rebindIndirectEligibleInstanceUsersFromPhis():620 -> a
     541:547:void rebindIndirectEligibleInstanceUsersFromPhis():620:626 -> a
     548:577:void removeFieldReadsFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):733:762 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;)V"}
     578:583:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):771:776 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/mw;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ow;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/IdentityHashMap;)V"}
     584:586:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):775:777 -> a
     587:588:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper.getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):64:65 -> a
     587:588:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):777 -> a
@@ -166991,12 +166987,12 @@
     618:618:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):802 -> a
     619:622:void removeFieldReadFromNewInstance(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):805:808 -> a
     623:623:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$removeFieldReadFromNewInstance$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):776:776 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/Hp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/Kp;"}
     624:630:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):917:923 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ow;)V"}
     631:631:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):919:919 -> a
     632:632:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1254:1254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;ILjava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;ILjava/util/Set;)Z"}
     633:633:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
     633:633:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -167113,7 +167109,7 @@
     775:775:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1299:1299 -> a
     775:775:void markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1304 -> a
     775:775:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1290 -> a
-    776:776:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():61:61 -> a
+    776:776:boolean com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.isLambda():59:59 -> a
     776:776:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1299 -> a
     776:776:void markSizeOfIndirectTargetForInlining(com.android.tools.r8.graph.ProgramMethod):1304 -> a
     776:776:boolean isEligibleParameterUsage(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1290 -> a
@@ -167126,11 +167122,11 @@
     785:785:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):56:56 -> a
     785:785:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1325 -> a
     786:789:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1326:1329 -> a
-    790:790:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):115:115 -> a
+    790:790:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117:117 -> a
     790:790:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1329 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    791:791:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():119:119 -> a
-    791:791:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):115 -> a
+    791:791:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():121:121 -> a
+    791:791:boolean com.android.tools.r8.shaking.KeepMethodInfo.isClassInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117 -> a
     791:791:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1329 -> a
     792:803:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1333:1344 -> a
     804:811:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isInliningBlockedDueToArrayClone(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):635:642 -> a
@@ -167147,7 +167143,7 @@
     814:814:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isInliningBlockedDueToArrayClone(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):641:641 -> a
     814:814:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1344 -> a
     1:26:void removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):813:838 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;)V"}
     27:28:void replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):889:890 -> b
     27:28:void removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):835 -> b
     29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):47:47 -> b
@@ -167177,36 +167173,36 @@
     118:120:void removeFieldWrites():945:947 -> b
     121:123:void removeFieldWrites():929:931 -> b
     124:124:boolean lambda$isEligibleParameterUsages$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,java.util.Set):1242:1242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;ILjava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;ILjava/util/Set;)Z"}
     1:7:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):633:639 -> c
     1:7:void com.android.tools.r8.internal.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.internal.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;)V"}
     8:62:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):638:692 -> c
     8:62:void com.android.tools.r8.internal.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.internal.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):0 -> c
     63:63:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):0:0 -> c
     63:63:void com.android.tools.r8.internal.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.internal.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":782,"2":783,"3":784},"outline":"Lcom/android/tools/r8/internal/B5;a(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":782,"2":783,"3":784},"outline":"Lcom/android/tools/r8/internal/D5;a(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/I5;"}
     756:781:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):693:718 -> c
     756:781:void com.android.tools.r8.internal.InlineCandidateProcessor.removeMiscUsages(com.android.tools.r8.internal.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):0 -> c
     782:782:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):693:693 -> c
     783:783:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):693:693 -> c
     784:784:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AffectedValues):693:693 -> c
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Tv:
 # {"id":"sourceFile","fileName":"InlineCandidateProcessor.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():1355:1355 -> <clinit>
     1:2:void <init>():1357:1358 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.c7:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.e7:
 # {"id":"sourceFile","fileName":"BottomParameterUsage.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage BOTTOM -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e7;"}
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     2:2:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> a
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
@@ -167226,7 +167222,7 @@
     10:10:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> a
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/RV;"}
     11:11:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     11:11:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> a
     11:11:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
@@ -167246,7 +167242,7 @@
     19:19:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> a
     19:19:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
     19:19:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Lcom/android/tools/r8/internal/RV;"}
     20:20:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     20:20:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> a
     20:20:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> a
@@ -167264,12 +167260,12 @@
     24:27:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.build():321:324 -> a
     24:27:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):35 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():40:40 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:boolean isParameterReturned():55:55 -> d
     1:1:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> e
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> e
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterMutated():65 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> e
     2:2:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> e
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> e
@@ -167287,7 +167283,7 @@
     1:1:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> f
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> f
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():70 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> f
     2:2:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> f
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> f
@@ -167305,7 +167301,7 @@
     1:1:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240:240 -> g
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> g
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():75 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> g
     2:2:void com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.<init>():240 -> g
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.builder():57 -> g
@@ -167320,41 +167316,41 @@
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():75 -> g
     5:8:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder.build():321:324 -> g
     5:8:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():75 -> g
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.d7:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.f7:
 # {"id":"sourceFile","fileName":"BottomParameterUsagePerContext.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f7;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/SV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():22:22 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27:27 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.e7:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.g7:
 # {"id":"sourceFile","fileName":"BottomParameterUsages.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g7;"}
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/TV;"}
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.<init>():99:99 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):37 -> a
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):38:38 -> a
     5:5:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages.create(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):78:78 -> a
     5:5:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):39 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():22:22 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TV;"}
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():55:55 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.pc:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.rc:
 # {"id":"sourceFile","fileName":"ClassInlinerMethodConstraintAnalysis.java"}
     1:2:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):21:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/qc;"}
     3:3:int com.android.tools.r8.graph.DexEncodedMethod.getNumberOfArguments():206:206 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -167369,7 +167365,7 @@
     20:22:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):42:44 -> a
     23:23:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     24:24:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult lambda$analyze$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vB;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Eh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xB;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Gh;"}
     25:26:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     25:26:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisBase.run(java.lang.Object,com.android.tools.r8.utils.Timing):71 -> a
     25:26:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult lambda$analyze$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):33 -> a
@@ -167379,35 +167375,35 @@
     29:29:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult.join(com.android.tools.r8.graph.AppView):49:49 -> a
     29:29:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult,com.android.tools.r8.graph.AppView):37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eh;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gh;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/TV;"}
     30:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult.join(com.android.tools.r8.graph.AppView):49:50 -> a
     30:31:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult,com.android.tools.r8.graph.AppView):37 -> a
     32:32:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult,com.android.tools.r8.graph.AppView):37:37 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.ai:
 # {"id":"sourceFile","fileName":"DefaultAnalysisContext.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ai;"}
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext.<init>():14:14 -> <init>
     1:1:void <init>():11 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.gB:
 # {"id":"sourceFile","fileName":"InternalNonEmptyParameterUsage.java"}
     java.util.Set castsWithParameter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set fieldsReadFromParameter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set methodCallsWithParameterAsReceiver -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     boolean isParameterMutated -> d
     boolean isParameterReturned -> e
     boolean isParameterUsedAsLock -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():25:25 -> <clinit>
     1:4:void <init>(java.util.Set,java.util.Set,java.util.Set,boolean,boolean,boolean):41:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;ZZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;ZZZ)V"}
     5:16:void <init>(java.util.Set,java.util.Set,java.util.Set,boolean,boolean,boolean):42:53 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):66 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):67:67 -> a
@@ -167416,7 +167412,7 @@
     5:7:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):68:70 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):80:80 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/RV;"}
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     9:9:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):80 -> a
     9:9:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):25 -> a
@@ -167429,7 +167425,7 @@
     12:15:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):25 -> a
     16:16:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):96:96 -> a
     16:16:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Lcom/android/tools/r8/internal/RV;"}
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     17:17:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):96 -> a
     17:17:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):25 -> a
@@ -167441,9 +167437,9 @@
     20:24:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):98:102 -> a
     20:24:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):25 -> a
     25:25:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage asInternalNonEmpty():110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
     26:26:void lambda$externalize$0(com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pu;Lcom/android/tools/r8/internal/MB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ru;Lcom/android/tools/r8/internal/OB;)V"}
     27:27:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder.add(java.lang.Object):502:502 -> a
     27:27:void lambda$externalize$0(com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -167455,7 +167451,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:void lambda$externalize$0(com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):118 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():116:116 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultiset.builder():455:455 -> c
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():116 -> c
     3:5:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():117:119 -> c
@@ -167498,57 +167494,57 @@
     1:1:boolean isParameterReturned():135:135 -> d
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage setParameterMutated():156:159 -> e
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterMutated():25 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:10:boolean equals(java.lang.Object):202:211 -> equals
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage setParameterReturned():170:173 -> f
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():25 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage setParameterUsedAsLock():184:187 -> g
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():25 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:5:int hashCode():217:221 -> hashCode
     6:11:int hashCode():220:225 -> hashCode
 com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> R8$$REMOVED$$CLASS$$107:
 # {"id":"sourceFile","fileName":"InternalNonEmptyParameterUsage.java"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.uR:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.yR:
 # {"id":"sourceFile","fileName":"NonEmptyParameterUsage.java"}
     java.util.Set castsWithParameter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set fieldsReadFromParameter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.com.google.common.collect.Multiset methodCallsWithParameterAsReceiver -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
     boolean isParameterMutated -> d
     boolean isParameterReturned -> e
     boolean isParameterUsedAsLock -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():17:17 -> <clinit>
     1:4:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.Multiset,boolean,boolean,boolean):33:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/Su;ZZZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/Uu;ZZZ)V"}
     5:16:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.Multiset,boolean,boolean,boolean):34:45 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/RV;"}
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage asNonEmpty():65:65 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yR;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():70:70 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:boolean isParameterReturned():96:96 -> d
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterMutated():106:106 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:10:boolean equals(java.lang.Object):125:134 -> equals
     11:11:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultiset.equals(java.lang.Object):341:341 -> equals
     11:11:boolean equals(java.lang.Object):134 -> equals
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():111:111 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():116:116 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:5:int hashCode():140:144 -> hashCode
     6:11:int hashCode():143:148 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.zR:
 # {"id":"sourceFile","fileName":"NonEmptyParameterUsagePerContext.java"}
     java.util.Map backing -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
@@ -167557,7 +167553,7 @@
     1:3:void <init>(java.util.Map):18:20 -> <init>
     1:1:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isBottom():0:0 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext):46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vR;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/internal/SV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext):49:49 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isBottom():0:0 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext):49 -> a
@@ -167568,7 +167564,7 @@
     7:7:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext):58 -> a
     8:9:boolean allMatch(java.util.function.BiPredicate):33:34 -> a
     10:10:void lambda$join$0(java.util.Map,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)V"}
     11:11:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isBottom():0:0 -> a
     11:11:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.join(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):68 -> a
     11:11:void lambda$join$0(java.util.Map,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):57 -> a
@@ -167681,18 +167677,18 @@
     42:42:void lambda$join$0(java.util.Map,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):57 -> a
     43:43:void lambda$join$0(java.util.Map,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):55:55 -> a
     44:44:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext asKnown():63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zR;"}
     45:45:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$externalize$1(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     46:46:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> a
     46:46:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$externalize$1(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):87 -> a
     47:47:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$externalize$1(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):87:87 -> a
     48:70:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction):106:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/SV;"}
     71:71:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext create(java.util.Map):24:24 -> a
     71:71:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction):128 -> a
     1:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():70:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SV;"}
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isBottom():0:0 -> b
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():71 -> b
     4:4:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> b
@@ -167705,20 +167701,20 @@
     17:17:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():89 -> b
     18:18:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():89:89 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):95:95 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:6:boolean equals(java.lang.Object):134:139 -> equals
     1:1:int hashCode():144:144 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.wR:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.AR:
 # {"id":"sourceFile","fileName":"NonEmptyParameterUsages.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():65:65 -> <clinit>
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):72:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):212:212 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):212 -> a
@@ -167746,33 +167742,33 @@
     11:12:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):216 -> a
     13:13:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages join(com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):223:223 -> a
     14:16:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):120:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/TV;"}
     17:17:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages create(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):78:78 -> a
     17:17:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):123 -> a
     18:18:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SV;"}
     19:19:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(com.android.tools.r8.ir.code.Value):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/AR;"}
     20:20:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$abandonClassInliningInCurrentContexts$1(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     21:27:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.util.Collection):140:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/AR;"}
     28:28:int com.android.tools.r8.ir.code.Argument.getIndex():53:53 -> a
     28:28:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.util.Collection):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:31:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.util.Collection):146:148 -> a
     32:32:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$abandonClassInliningInCurrentContexts$3(int[],int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([IILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([IILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/SV;"}
     33:33:boolean com.android.tools.r8.utils.ArrayUtils.containsInt(int[],int):36:36 -> a
     33:33:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$abandonClassInliningInCurrentContexts$3(int[],int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):150 -> a
     34:34:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$abandonClassInliningInCurrentContexts$3(int[],int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):151:151 -> a
     35:37:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):157:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/AR;"}
     38:38:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     38:38:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):159 -> a
     39:43:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):160:164 -> a
     44:44:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/AR;"}
     45:45:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     45:45:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169 -> a
     46:47:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):170:171 -> a
@@ -167781,9 +167777,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     49:49:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):172:172 -> a
     50:50:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$rebuildParameter$4(int,java.util.function.BiFunction,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/BiFunction;ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/BiFunction;ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/SV;"}
     51:51:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iA;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kA;)Lcom/android/tools/r8/internal/AR;"}
     52:52:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet.iterator():501:501 -> a
     52:52:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):183 -> a
     53:53:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet.iterator():501:501 -> a
@@ -167804,7 +167800,7 @@
     67:67:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):192 -> a
     68:81:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):192:205 -> a
     82:82:void lambda$join$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mx;ILcom/android/tools/r8/internal/OV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ox;ILcom/android/tools/r8/internal/SV;)V"}
     83:83:java.lang.Object com.android.tools.r8.utils.Int2ObjectMapUtils.getOrDefault(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,java.lang.Object):18:18 -> a
     83:83:void lambda$join$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):221 -> a
     84:84:void lambda$join$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):221:221 -> a
@@ -167818,13 +167814,13 @@
     88:88:void lambda$join$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):220 -> a
     89:89:void lambda$join$5(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):218:218 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$externalize$0(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):98:98 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/SV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$abandonClassInliningInCurrentContexts$2(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):151:151 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty():92:92 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AR;"}
     1:5:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():97:101 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TV;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1.iterator():637:637 -> e
     6:6:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():101 -> e
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1.iterator():637:637 -> e
@@ -167843,46 +167839,46 @@
     15:18:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():110:113 -> e
     1:5:boolean equals(java.lang.Object):229:233 -> equals
     1:1:int hashCode():238:238 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.NV:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.RV:
 # {"id":"sourceFile","fileName":"ParameterUsage.java"}
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/RV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/RV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage asInternalNonEmpty():24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage asNonEmpty():20:20 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yR;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     boolean isParameterReturned() -> d
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterMutated() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.OV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.SV:
 # {"id":"sourceFile","fileName":"ParameterUsagePerContext.java"}
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/SV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext asKnown():12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zR;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.PV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.TV:
 # {"id":"sourceFile","fileName":"ParameterUsages.java"}
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SV;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/TV;"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):11:11 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/z1;"}
     2:2:boolean isBottom():0:0 -> b
@@ -167903,10 +167899,10 @@
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():11:11 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z1;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty():19:19 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AR;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.yh0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.Ch0:
 # {"id":"sourceFile","fileName":"TransferFunction.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -167917,24 +167913,24 @@
     com.android.tools.r8.ir.code.Argument lastArgument -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c3;"}
     com.android.tools.r8.ir.code.InvokeDirect constructorInvoke -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IB;"}
     java.util.Set argumentsOfInterest -> f
     java.util.Set instructionsOfInterest -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():55:55 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):80:80 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;)V"}
     2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):73:84 -> <init>
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Monitor.object():42:42 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):360 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TO;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XO;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Monitor.object():42:42 -> a
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):360 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):360:360 -> a
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeMonitor(com.android.tools.r8.ir.code.Monitor,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):359:359 -> a
     5:5:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
     6:6:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):55:55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/z1;"}
     7:7:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeExceptionalBlockEntryState(java.lang.Object,com.android.tools.r8.graph.DexType,java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):55:55 -> a
@@ -167942,7 +167938,7 @@
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     8:8:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     9:9:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38:38 -> a
     9:9:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):248 -> a
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):248:248 -> a
@@ -167970,7 +167966,7 @@
     47:47:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     47:47:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38 -> a
     47:47:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JB;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     48:48:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38:38 -> a
     48:48:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):293 -> a
     49:49:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):293:293 -> a
@@ -167981,7 +167977,7 @@
     69:69:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     69:69:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38 -> a
     69:69:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     70:70:java.lang.Iterable com.android.tools.r8.ir.code.InvokeMethodWithReceiver.getNonReceiverArguments():38:38 -> a
     70:70:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):336 -> a
     71:71:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):336:336 -> a
@@ -167990,7 +167986,7 @@
     76:76:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):338 -> a
     77:90:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):339:352 -> a
     91:92:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/PV;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/TV;)Lcom/android/tools/r8/internal/Dh0;"}
     93:94:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeArgument(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):167:168 -> a
     93:94:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):93 -> a
     95:105:boolean isMaybeEligibleForClassInlining(com.android.tools.r8.ir.analysis.type.TypeElement):383:393 -> a
@@ -168113,28 +168109,28 @@
     219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> a
     219:219:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeCheckCast$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cb;Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eb;Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     220:220:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeCheckCast$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):190:190 -> a
     221:221:boolean lambda$apply$0(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Z"}
     222:222:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> a
     222:222:boolean lambda$apply$0(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):97 -> a
     223:223:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     223:223:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     224:224:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):374:374 -> a
     225:225:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):373:373 -> a
     226:230:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):186:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cb;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eb;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     231:231:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):189:189 -> a
     232:237:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):208:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mw;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ow;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     238:243:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):212:217 -> a
     244:244:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInstanceGet$2(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mw;Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ow;Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     245:245:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cw;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     246:246:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     246:246:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):225 -> a
     247:251:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):226:230 -> a
@@ -168142,21 +168138,21 @@
     252:252:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):230 -> a
     253:261:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):231:239 -> a
     262:262:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInstancePut$3(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):237:237 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     263:263:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeInterface$4(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):310:310 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JB;Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     264:264:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeVirtual$5(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):353:353 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     265:265:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):365:365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O90;Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/wR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S90;Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/AR;"}
     266:266:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):364:364 -> a
     267:267:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):378:378 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     268:268:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     268:268:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):378 -> a
     269:270:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):378:379 -> a
     271:271:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):423:423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wR;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AR;)Lcom/android/tools/r8/internal/Dh0;"}
     272:272:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages.rebuildParameters(com.android.tools.r8.utils.IntObjToObjFunction):65:65 -> a
     272:272:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):424 -> a
     273:273:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
@@ -168181,7 +168177,7 @@
     282:282:com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult fail():369:369 -> a
     282:282:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult widen(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):440 -> a
     283:283:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$9(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):426:426 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/SV;"}
     284:284:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isBottom():0:0 -> a
     284:284:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$9(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):426 -> a
     285:285:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> a
@@ -168194,62 +168190,62 @@
     288:288:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$9(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):430 -> a
     289:292:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$widen$9(int,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):430:433 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeMonitor$6(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):360:360 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     2:2:boolean lambda$widen$10(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):439:439 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Z"}
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext.isTop():0:0 -> b
     3:3:boolean lambda$widen$10(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):439 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeReturn$7(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):365:365 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Lcom/android/tools/r8/internal/RV;"}
     1:1:boolean lambda$widen$8(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):432:432 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yh;Lcom/android/tools/r8/internal/NV;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ai;Lcom/android/tools/r8/internal/RV;)Z"}
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> d
     2:2:boolean lambda$widen$8(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):432 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.dk0:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.hk0:
 # {"id":"sourceFile","fileName":"UnknownParameterUsage.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage TOP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk0;"}
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField):11:11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/RV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addMethodCallWithParameterAsReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):11:11 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Lcom/android/tools/r8/internal/RV;"}
     3:3:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage externalize():38:38 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:boolean isParameterReturned():48:48 -> d
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterMutated():11:11 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():11:11 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():11:11 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.ek0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.ik0:
 # {"id":"sourceFile","fileName":"UnknownParameterUsagePerContext.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ik0;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/SV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize():22:22 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27:27 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NV;"}
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.fk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RV;"}
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.jk0:
 # {"id":"sourceFile","fileName":"UnknownParameterUsages.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jk0;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/OV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/SV;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/OV;)Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/SV;)Lcom/android/tools/r8/internal/TV;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():21:21 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TV;"}
     1:1:boolean equals(java.lang.Object):47:47 -> equals
     1:1:int hashCode():52:52 -> hashCode
 com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint -> com.android.tools.r8.internal.c2:
@@ -168259,13 +168255,13 @@
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/qc;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/RV;"}
     3:3:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Z"}
     4:4:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/uU;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/yU;Lcom/android/tools/r8/graph/C5;)Z"}
 com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint -> com.android.tools.r8.internal.k2:
 # {"id":"sourceFile","fileName":"AlwaysTrueClassInlinerMethodConstraint.java"}
     com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint INSTANCE -> a
@@ -168273,36 +168269,36 @@
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/qc;"}
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/RV;"}
     3:3:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Z"}
     4:4:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/uU;Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.oc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/yU;Lcom/android/tools/r8/graph/C5;)Z"}
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.qc:
 # {"id":"sourceFile","fileName":"ClassInlinerMethodConstraint.java"}
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/qc;"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/RV;"}
     boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Z"}
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/uU;Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Bf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/yU;Lcom/android/tools/r8/graph/C5;)Z"}
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Df:
 # {"id":"sourceFile","fileName":"ConditionalClassInlinerMethodConstraint.java"}
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TV;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):33:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TV;)V"}
     3:3:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isTop():0:0 -> <init>
     3:3:void <init>(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):34 -> <init>
     4:5:void <init>(com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):34:35 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/qc;"}
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.isBottom():0:0 -> a
     2:2:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):41 -> a
     3:3:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):44:44 -> a
@@ -168335,12 +168331,12 @@
     15:15:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):63 -> a
     16:16:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):63:63 -> a
     17:18:void lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):49:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/Mx;ILcom/android/tools/r8/internal/OV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/internal/Ox;ILcom/android/tools/r8/internal/SV;)V"}
     19:19:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
     19:19:void lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):55 -> a
     20:25:void lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):56:61 -> a
     26:26:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/NV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/RV;"}
     27:28:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int):79:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Z"}
     29:29:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isBottom():0:0 -> a
@@ -168355,7 +168351,7 @@
     33:38:boolean hasUnsafeCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage):145:150 -> a
     33:38:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int):87 -> a
     39:40:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):101:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/uU;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;ILcom/android/tools/r8/internal/yU;Lcom/android/tools/r8/graph/C5;)Z"}
     41:41:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isBottom():0:0 -> a
     41:41:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):102 -> a
     42:42:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> a
@@ -168378,14 +168374,14 @@
     61:61:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
     61:61:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):129 -> a
     62:66:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):130:134 -> a
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.bg0:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.fg0:
 # {"id":"sourceFile","fileName":"SwitchCaseAnalyzer.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     1:1:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):27 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ag0;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eg0;I)Z"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     2:2:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):27 -> a
     3:7:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):28:32 -> a
@@ -168404,7 +168400,7 @@
     21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     21:21:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ag0;Lcom/android/tools/r8/internal/B1;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eg0;Lcom/android/tools/r8/internal/B1;I)Z"}
     22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Switch.value():24:24 -> a
     22:22:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):46 -> a
     23:24:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):47:48 -> a
@@ -168420,44 +168416,44 @@
     40:40:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):91:91 -> a
     40:40:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):60 -> a
     41:42:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):61:62 -> a
-com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.Tm:
 # {"id":"sourceFile","fileName":"EmptyEnumUnboxer.java"}
     com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tm;"}
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:1:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():34:34 -> a
     2:2:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/ph0;)V"}
     3:3:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):71:71 -> a
     4:4:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     5:5:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     6:6:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Wd0;)V"}
     7:7:void rewriteWithLens():60:60 -> a
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):44:44 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void updateEnumUnboxingCandidatesInfo():77:77 -> b
-com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.yn:
 # {"id":"sourceFile","fileName":"EnumDataMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap subEnumToSuperEnumMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):38:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;)V"}
     1:6:boolean isAssignableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):66:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     7:8:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData get(com.android.tools.r8.graph.DexType):104:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xn;"}
     9:9:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData get(com.android.tools.r8.graph.DexProgramClass):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/xn;"}
     10:12:java.util.Set computeAllUnboxedEnums():118:120 -> a
     13:14:int getUnboxedValue(com.android.tools.r8.graph.DexField):137:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)I"}
@@ -168494,97 +168490,97 @@
     2:2:com.android.tools.r8.graph.DexType representativeType(com.android.tools.r8.graph.DexType):75 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.DexType representativeType(com.android.tools.r8.graph.DexType):75:75 -> c
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.xn:
 # {"id":"sourceFile","fileName":"EnumDataMap.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap instanceFieldMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap valuesTypes -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet valuesFields -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     int valuesSize -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():162:162 -> <clinit>
     1:6:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet,int):181:186 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;I)V"}
     1:1:boolean lambda$subEnumTypeSingleValue$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):239:239 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     2:6:com.android.tools.r8.ir.analysis.value.SingleNumberValue subEnumTypeSingleValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory,com.android.tools.r8.graph.DexType):239:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C1;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Zb0;"}
     7:7:com.android.tools.r8.ir.analysis.value.SingleNumberValue subEnumTypeSingleValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory,com.android.tools.r8.graph.DexType):242:242 -> a
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.Fn:
 # {"id":"sourceFile","fileName":"EnumInstanceFieldData.java"}
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData():33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bn;"}
     boolean isUnknown() -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.yn:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.Bn:
 # {"id":"sourceFile","fileName":"EnumInstanceFieldData.java"}
     1:1:void <init>():52:52 -> <init>
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData():65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bn;"}
     1:1:boolean isUnknown():56:56 -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData():69:69 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cn;"}
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.zn:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.Cn:
 # {"id":"sourceFile","fileName":"EnumInstanceFieldData.java"}
     com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap mapping -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
     1:2:void <init>(com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap):88:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;)V"}
     1:1:void forEach(java.util.function.BiConsumer):116:116 -> a
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData():104:104 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cn;"}
     1:1:boolean isMapping():99:99 -> d
     1:1:boolean isOrdinal():94:94 -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.An:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.Dn:
 # {"id":"sourceFile","fileName":"EnumInstanceFieldData.java"}
     1:1:void <init>():73:73 -> <init>
     1:1:boolean isMapping():81:81 -> d
     1:1:boolean isOrdinal():76:76 -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.Bn:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.En:
 # {"id":"sourceFile","fileName":"EnumInstanceFieldData.java"}
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/En;"}
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     1:1:boolean isUnknown():48:48 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.In:
 # {"id":"sourceFile","fileName":"EnumUnboxer.java"}
     1:1:void <init>():22:22 -> <init>
     void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Wd0;)V"}
     void rewriteWithLens() -> a
     void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/ph0;)V"}
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void updateEnumUnboxingCandidatesInfo() -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.Kn:
 # {"id":"sourceFile","fileName":"EnumUnboxerImpl.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/On;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rn;"}
     java.util.Set candidatesToRemoveInWave -> d
     java.util.Map staticFieldValuesMap -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsDependingOnLibraryModelisation -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TL;"}
     com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder checkNotNullMethodsBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SL;"}
     com.android.tools.r8.graph.DexClassAndField ordinalField -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F0;"}
     boolean debugLogEnabled -> i
@@ -168597,7 +168593,7 @@
     2:30:void <init>(com.android.tools.r8.graph.AppView):155:183 -> <init>
     1:1:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues.isEnumStaticFieldValues():0:0 -> a
     1:1:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):1144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Sd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Wd0;)V"}
     2:5:void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues):1147:1150 -> a
     6:6:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
     6:6:void lambda$analyzeInvokeCustom$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):365 -> a
@@ -168615,7 +168611,7 @@
     14:14:void lambda$updateKeepInfo$8(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):856:856 -> a
     15:15:void com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions.disablePeepholeOptimizations(com.android.tools.r8.ir.conversion.MethodProcessor):96:96 -> a
     15:15:void lambda$analyzeEnums$0(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/QN$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/UN$a;)V"}
     16:16:void lambda$analyzeEnums$0(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):329:329 -> a
     17:17:void com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions.disablePeepholeOptimizations(com.android.tools.r8.ir.conversion.MethodProcessor):96:96 -> a
     17:17:void lambda$analyzeEnums$0(com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):329 -> a
@@ -168625,7 +168621,7 @@
     19:19:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():114:114 -> a
     19:19:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EB;Ljava/util/Set;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;Ljava/util/Set;Lcom/android/tools/r8/graph/C5;)V"}
     20:20:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexCallSite.getMethodProto():118:118 -> a
     20:20:void analyzeInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom,java.util.Set,com.android.tools.r8.graph.ProgramMethod):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -168636,7 +168632,7 @@
     35:35:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():114:114 -> a
     35:35:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EB;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;Ljava/util/function/Consumer;)V"}
     36:36:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():110:110 -> a
     36:36:void analyzeInvokeCustomParameters(com.android.tools.r8.ir.code.InvokeCustom,java.util.function.Consumer):375 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -168644,7 +168640,7 @@
     39:39:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo.getEnumClass():192:192 -> a
     39:39:void lambda$analyzeEnumInstances$9(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):880 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/internal/Nn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/internal/Qn;)V"}
     40:40:java.util.Set com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo.getRequiredInstanceFieldData():204:204 -> a
     40:40:void lambda$analyzeEnumInstances$9(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):881 -> a
     41:44:void lambda$analyzeEnumInstances$9(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):881:884 -> a
@@ -168654,14 +168650,14 @@
     52:52:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo.getEnumClass():192:192 -> a
     52:52:void lambda$analyzeInitializers$11(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):1157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qn;)V"}
     53:59:void lambda$analyzeInitializers$11(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):1158:1164 -> a
     60:61:java.util.Set com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo.getSubclasses():187:188 -> a
     60:61:void lambda$analyzeInitializers$11(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):1168 -> a
     62:69:void lambda$analyzeInitializers$11(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):1168:1175 -> a
     70:70:com.android.tools.r8.graph.DexClassAndField getOrdinalField():195:195 -> a
     70:70:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):1135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uU;)Ljava/util/OptionalInt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yU;)Ljava/util/OptionalInt;"}
     71:71:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):1135:1135 -> a
     72:72:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):51:51 -> a
     72:72:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):1135 -> a
@@ -168674,16 +168670,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     77:79:java.util.OptionalInt getOrdinal(com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):1137:1139 -> a
     80:80:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K10;Lcom/android/tools/r8/graph/D2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O10;Lcom/android/tools/r8/graph/D2;)Z"}
     81:81:boolean reportFailure(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1751:1751 -> a
     81:81:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):214 -> a
     82:82:boolean markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.eligibility.Reason,com.android.tools.r8.graph.DexProgramClass):216:216 -> a
     83:90:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):227:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/graph/D2;"}
     91:98:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):241:248 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/D2;"}
     99:112:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):253:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)V"}
     113:113:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     113:113:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):266 -> a
     114:133:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):267:286 -> a
@@ -168818,7 +168814,7 @@
     274:274:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.addMethodDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):130 -> a
     274:274:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):322 -> a
     275:275:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):326:326 -> a
-    276:276:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2182:2182 -> a
+    276:276:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.canUseLir(com.android.tools.r8.graph.AppView):2188:2188 -> a
     276:276:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):326 -> a
     277:277:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):327:327 -> a
     278:278:boolean com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
@@ -168875,14 +168871,14 @@
     311:311:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.addRequiredEnumInstanceFieldData(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):141 -> a
     311:311:void addRequiredNameData(com.android.tools.r8.graph.DexProgramClass):583 -> a
     312:331:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):595:614 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     332:332:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.NewArrayFilled.getArrayType():61:61 -> a
     332:332:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):614 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     333:333:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):614:614 -> a
     334:348:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.Set):613:627 -> a
     349:350:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):634:635 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/K10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/O10;"}
     351:384:com.android.tools.r8.ir.optimize.enums.eligibility.Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1195:1228 -> a
     351:384:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):636 -> a
     385:385:com.android.tools.r8.ir.optimize.enums.eligibility.Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1220:1220 -> a
@@ -168984,7 +168980,7 @@
     469:469:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):648 -> a
     470:473:com.android.tools.r8.ir.optimize.enums.eligibility.Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):649:652 -> a
     474:474:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):662:662 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     475:477:void initializeCheckNotNullMethods(com.android.tools.r8.graph.lens.GraphLens):668:670 -> a
     475:477:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):663 -> a
     478:479:void initializeEnumUnboxingCandidates(com.android.tools.r8.graph.lens.GraphLens):675:676 -> a
@@ -169135,7 +169131,7 @@
     550:552:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):664 -> a
     553:554:void rewriteWithLens():687:688 -> a
     555:567:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):701:713 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/ir/optimize/info/z;Lcom/android/tools/r8/internal/ph0;)V"}
     568:568:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.isEmpty():75:75 -> a
     568:568:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):713 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -169294,21 +169290,21 @@
     685:685:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):785 -> a
     686:686:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):786:786 -> a
     687:687:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder lambda$unboxEnums$5(com.android.tools.r8.utils.collections.LongLivedClassSetBuilder,com.android.tools.r8.graph.lens.GraphLens):738:738 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ML;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/ML;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QL;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/QL;"}
     688:688:java.util.Set lambda$unboxEnums$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.LongLivedClassSetBuilder):739:739 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ML;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QL;)Ljava/util/Set;"}
     689:691:boolean lambda$unboxEnums$7(com.android.tools.r8.graph.ProgramMethod,java.util.Set):743:745 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/Set;)Z"}
     692:692:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
     692:692:boolean lambda$unboxEnums$7(com.android.tools.r8.graph.ProgramMethod,java.util.Set):745 -> a
     693:693:void updateKeepInfo(java.util.Set):853:853 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;)V"}
     694:694:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
     694:694:void updateKeepInfo(java.util.Set):853 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     695:695:void updateKeepInfo(java.util.Set):854:854 -> a
     696:698:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):903:905 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)Lcom/android/tools/r8/internal/vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)Lcom/android/tools/r8/internal/xn;"}
     699:699:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> a
     699:699:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):905 -> a
     700:711:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):905:916 -> a
@@ -169475,7 +169471,7 @@
     824:824:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1062 -> a
     825:825:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData buildData(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1062:1062 -> a
     826:826:com.android.tools.r8.utils.TraversalContinuation lambda$buildData$10(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,boolean,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState):938:938 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Rd0;Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/internal/az;ZLcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/Wu;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/io;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Vd0;Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/internal/cz;ZLcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/Yu;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/lo;)Lcom/android/tools/r8/internal/Oh0;"}
     827:827:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     827:827:com.android.tools.r8.utils.TraversalContinuation lambda$buildData$10(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,boolean,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState):939 -> a
     828:828:com.android.tools.r8.utils.TraversalContinuation lambda$buildData$10(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,boolean,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState):943:943 -> a
@@ -169542,20 +169538,20 @@
     906:906:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     906:906:com.android.tools.r8.utils.TraversalContinuation lambda$buildData$10(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,boolean,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState):1010 -> a
     907:908:boolean isAssignableToArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1247:1248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/bl0;)Z"}
     909:909:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     909:909:boolean isAssignableToArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1248 -> a
     910:913:boolean isAssignableToArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1252:1255 -> a
     914:914:boolean isAssignableToArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1254:1254 -> a
     915:921:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeNewArrayFilledUser(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexProgramClass):1278:1284 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/K10;"}
     922:925:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeNewArrayFilledUser(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexProgramClass):1283:1286 -> a
     926:926:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     926:926:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeNewArrayFilledUser(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexProgramClass):1288 -> a
     927:927:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeNewArrayFilledUser(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexProgramClass):1288:1288 -> a
     928:937:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeNewArrayFilledUser(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexProgramClass):1287:1296 -> a
     938:944:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1314:1320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kp;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/np;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/K10;"}
     945:945:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):64:64 -> a
     945:945:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1320 -> a
     946:946:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
@@ -169564,12 +169560,12 @@
     947:958:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1322:1333 -> a
     959:963:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeFieldPutUser(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1332:1336 -> a
     964:972:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexProgramClass):1342:1350 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zt;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/K10;"}
     973:977:boolean isEqualEnumCandidateType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexProgramClass):1359:1363 -> a
     973:977:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexProgramClass):1351 -> a
     978:980:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeIfUser(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexProgramClass):1352:1354 -> a
     981:994:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1380:1393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/K10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/O10;"}
     995:995:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     995:995:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1394 -> a
     996:996:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1394:1394 -> a
@@ -169693,7 +169689,7 @@
     1305:1305:void markMethodDependsOnLibraryModelisation(com.android.tools.r8.graph.ProgramMethod):223:223 -> a
     1305:1305:com.android.tools.r8.ir.optimize.enums.eligibility.Reason analyzeInvokeUser(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):1500 -> a
     1306:1306:com.android.tools.r8.ir.optimize.enums.eligibility.Reason comparableAsUnboxedValues(com.android.tools.r8.ir.code.InvokeMethod):1507:1507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/K10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/O10;"}
     1307:1307:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     1307:1307:com.android.tools.r8.ir.optimize.enums.eligibility.Reason comparableAsUnboxedValues(com.android.tools.r8.ir.code.InvokeMethod):1507 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -169718,17 +169714,17 @@
     1325:1325:void lambda$reportEnumsAnalysis$17(java.lang.StringBuilder,com.android.tools.r8.graph.DexType,java.util.List):1710 -> a
     1326:1335:void lambda$reportEnumsAnalysis$17(java.lang.StringBuilder,com.android.tools.r8.graph.DexType,java.util.List):1710:1719 -> a
     1336:1341:void lambda$reportEnumsAnalysis$16(java.lang.StringBuilder,com.android.tools.r8.ir.optimize.enums.eligibility.Reason,int):1713:1718 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/K10;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/O10;I)V"}
     1342:1342:void lambda$reportEnumsAnalysis$19(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.graph.DexType,java.util.List):1728:1728 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     1343:1343:void lambda$reportEnumsAnalysis$18(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1730:1730 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/K10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Lcom/android/tools/r8/internal/O10;)V"}
     1344:1347:int lambda$reportEnumsAnalysis$20(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object,java.lang.Object):1734:1737 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U0;Ljava/lang/Object;Ljava/lang/Object;)I"}
     1348:1352:void lambda$reportEnumsAnalysis$21(java.lang.StringBuilder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1741:1745 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/U0;Ljava/lang/Object;)V"}
     1353:1356:boolean reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.eligibility.Reason):1756:1759 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/K10;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/O10;)Z"}
     1357:1357:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1772:1772 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1358:1358:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection.addPrunedMethod(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
@@ -169750,13 +169746,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     12:12:boolean instanceInitializersAllowUnboxing(com.android.tools.r8.graph.DexProgramClass):1184:1184 -> b
     13:13:boolean lambda$analyzeNewArrayFilledUser$13(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value):1288:1288 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/bl0;)Z"}
     14:14:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder lambda$analyzeInvokeUser$14(com.android.tools.r8.graph.lens.GraphLens):1450:1450 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/ML;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/QL;"}
     15:15:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1767:1767 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:24:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():876:899 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yn;"}
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> c
     25:25:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():899 -> c
     26:26:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():899:899 -> c
@@ -169768,7 +169764,7 @@
     2:2:java.util.List lambda$reportFailure$22(com.android.tools.r8.graph.DexType):1758:1758 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/List;"}
     1:9:com.android.tools.r8.ir.optimize.enums.EnumDataMap finishAnalysis():861:869 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yn;"}
     10:10:java.util.Set com.android.tools.r8.ir.optimize.enums.EnumDataMap.getUnboxedSuperEnums():114:114 -> e
     10:10:com.android.tools.r8.ir.optimize.enums.EnumDataMap finishAnalysis():869 -> e
     11:11:com.android.tools.r8.ir.optimize.enums.EnumDataMap finishAnalysis():869:869 -> e
@@ -169781,18 +169777,18 @@
     15:15:com.android.tools.r8.ir.optimize.enums.EnumDataMap finishAnalysis():869:869 -> e
     1:6:void reportEnumsAnalysis():1666:1671 -> f
     7:85:void reportEnumsAnalysis():1669:1747 -> f
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.Gn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.Jn:
 # {"id":"sourceFile","fileName":"EnumUnboxerImpl.java"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens val$graphLens -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens val$codeLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result val$treeFixerResult -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ao;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kn;"}
     1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result):805:805 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hn;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Xn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kn;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ao;)V"}
     1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):303:303 -> a
     1:1:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):820 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -169842,19 +169838,19 @@
     37:37:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):811:811 -> a
     38:38:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):810:810 -> a
     39:39:void lambda$fixup$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):813:813 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/ir/optimize/info/v;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/ir/optimize/info/v;)V"}
     40:40:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):58:58 -> a
     40:40:void lambda$fixup$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):813 -> a
     41:41:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):63:63 -> a
     41:41:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):58 -> a
     41:41:void lambda$fixup$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):813 -> a
     42:42:void lambda$fixup$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):839:839 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/ir/optimize/info/w;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/ir/optimize/info/w;)V"}
     43:43:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):202:202 -> a
     43:43:void lambda$fixup$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):839 -> a
 com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1$1 -> R8$$REMOVED$$CLASS$$108:
 # {"id":"sourceFile","fileName":"EnumUnboxerImpl.java"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer -> com.android.tools.r8.internal.Nn:
 # {"id":"sourceFile","fileName":"EnumUnboxerMethodProcessorEventConsumer.java"}
     void acceptEnumUnboxerCheckNotZeroContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
@@ -169862,24 +169858,24 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     void acceptEnumUnboxerLocalUtilityClassMethodContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerUtils -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerUtils -> com.android.tools.r8.internal.On:
 # {"id":"sourceFile","fileName":"EnumUnboxerUtils.java"}
     1:11:boolean isArrayUsedOnlyForHashCode(com.android.tools.r8.ir.code.NewArrayFilled,com.android.tools.r8.graph.DexItemFactory):16:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kQ;Lcom/android/tools/r8/graph/B1;)Z"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Mn:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oQ;Lcom/android/tools/r8/graph/B1;)Z"}
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Pn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCandidateAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl enumUnboxer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kn;"}
     com.android.tools.r8.graph.DexItemFactory factory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/On;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rn;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl):38:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Kn;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl):35:41 -> <init>
     1:1:void removePinnedCandidates():153:153 -> a
     2:2:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
@@ -169899,7 +169895,7 @@
     17:19:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):162 -> a
     20:22:void removePinnedCandidate(com.android.tools.r8.graph.DexType):177:179 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.On:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Rn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCandidateInfoCollection.java"}
     java.util.Map enumTypeToInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -169910,7 +169906,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:5:void <init>():28:32 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     2:7:boolean isAssignableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):93:98 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
     8:13:com.android.tools.r8.graph.DexProgramClass getCandidateClassOrNull(com.android.tools.r8.graph.DexType):102:107 -> a
@@ -169934,21 +169930,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:void removeCandidate(com.android.tools.r8.graph.DexType):67:67 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Qn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCandidateInfoCollection.java"}
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodDependencies -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TL;"}
     java.util.Set requiredInstanceFieldData -> c
     java.util.Set subclasses -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():164:164 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.lens.GraphLens):176:176 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/internal/ns;)V"}
     2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.lens.GraphLens):168:182 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Wn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCfMethods.java"}
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
@@ -169977,34 +169973,34 @@
     50:50:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> b
     50:50:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):182 -> b
     51:51:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):183:183 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Yn:
 # {"id":"sourceFile","fileName":"EnumUnboxingLens.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C1;"}
     java.util.Map prototypeChangesPerMethod -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     java.util.Set dispatchMethods -> s
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():47:47 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map,java.util.Set):62:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/internal/b6;Lcom/android/tools/r8/internal/Y5;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Bu;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/internal/d6;Lcom/android/tools/r8/internal/a6;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Du;Ljava/util/Set;)V"}
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map,java.util.Set):64 -> <init>
     4:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map,java.util.Set):64:67 -> <init>
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens asEnumUnboxerLens():77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yn;"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> a
     2:2:void com.android.tools.r8.graph.lens.MethodLookupResult$Builder.<init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):66 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult$Builder com.android.tools.r8.graph.lens.MethodLookupResult.builder(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     3:4:com.android.tools.r8.graph.lens.MethodLookupResult com.android.tools.r8.graph.lens.MethodLookupResult$Builder.build():85:86 -> a
     3:4:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):156 -> a
     5:7:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):157:159 -> a
     8:8:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     9:9:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.hasAnyEnumsWithSubtypes():44:44 -> a
     9:9:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -170014,7 +170010,7 @@
     11:11:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):90 -> a
     12:12:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):90:90 -> a
     13:13:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     14:14:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     14:14:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -170109,9 +170105,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:89:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):229:230 -> a
     90:93:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):248:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)Lcom/android/tools/r8/internal/cC;"}
     1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):99:99 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Z"}
     2:2:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> f
     2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):99 -> f
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):242:242 -> f
@@ -170126,28 +170122,28 @@
     8:8:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):103 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:10:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):103:104 -> f
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Xn:
 # {"id":"sourceFile","fileName":"EnumUnboxingLens.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C1;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap typeMap -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap newMethodSignatures -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d6;"}
     java.util.Map methodMap -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map prototypeChangesPerMethod -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():261:261 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap):278:278 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yn;)V"}
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap):266:279 -> <init>
     16:16:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap):280 -> <init>
@@ -170196,8 +170192,8 @@
     46:46:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):365 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:47:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):367:367 -> a
-    48:48:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):281:281 -> a
-    48:48:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():277 -> a
+    48:48:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):279:279 -> a
+    48:48:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():275 -> a
     48:48:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):367 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     49:61:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):369:381 -> a
@@ -170205,26 +170201,26 @@
     75:75:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForRewrittenTypes(com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):78:78 -> a
     75:75:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):391 -> a
     76:76:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChanges(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,boolean,java.util.List):392:392 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Zn:
 # {"id":"sourceFile","fileName":"EnumUnboxingRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map checkNotNullToCheckNotZeroMapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S5;"}
     com.android.tools.r8.graph.DexItemFactory factory -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses utilityClasses -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fo;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():66:66 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumDataMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):79:85 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/wn;Lcom/android/tools/r8/internal/bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/yn;Lcom/android/tools/r8/internal/fo;)V"}
     1:4:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):159:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/zR;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/DR;)Ljava/util/Set;"}
     5:5:boolean com.android.tools.r8.graph.lens.GraphLens.isEnumUnboxerLens():0:0 -> a
     5:5:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):162 -> a
     6:10:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):162:166 -> a
@@ -170234,11 +170230,11 @@
     16:16:java.util.Map createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):168 -> a
-    17:17:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    17:17:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     17:17:java.util.Map createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):168 -> a
-    18:18:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    18:18:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     18:18:java.util.Map createInitialConvertedEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):103 -> a
     18:18:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):168 -> a
     19:19:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
@@ -171136,7 +171132,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     537:540:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):239:242 -> a
     541:541:void fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/nO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/rO;)V"}
     542:542:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     542:542:void fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):251 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171150,7 +171146,7 @@
     553:578:void fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):261:286 -> a
     579:579:void fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):285:285 -> a
     580:580:com.android.tools.r8.ir.code.InvokeStatic lambda$fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Kn;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/WB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nn;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/YB;"}
     581:581:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():47:47 -> a
     581:581:com.android.tools.r8.ir.code.InvokeStatic lambda$fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value):270 -> a
     582:583:com.android.tools.r8.ir.code.InvokeStatic lambda$fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value):270:271 -> a
@@ -171178,7 +171174,7 @@
     596:596:com.android.tools.r8.ir.code.InvokeStatic lambda$fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value):277 -> a
     597:597:com.android.tools.r8.ir.code.InvokeStatic lambda$fixupPrimitiveElementsOfNonPrimitiveNewArrayFilled$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Value):278:278 -> a
     598:607:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):604:613 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WB;Lcom/android/tools/r8/internal/Bt;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/J5;Ljava/util/Set;Lcom/android/tools/r8/internal/nO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YB;Lcom/android/tools/r8/internal/Dt;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/L5;Ljava/util/Set;Lcom/android/tools/r8/internal/rO;)V"}
     608:608:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     608:608:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):614 -> a
     609:609:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):614:614 -> a
@@ -171334,7 +171330,7 @@
     762:762:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):742 -> a
     763:770:void rewriteInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):743:750 -> a
     771:771:void rewriteStringValueOf(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):761:761 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WB;Lcom/android/tools/r8/graph/C5;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/nO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YB;Lcom/android/tools/r8/graph/C5;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/rO;)V"}
     772:772:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     772:772:void rewriteStringValueOf(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):761 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171358,7 +171354,7 @@
     785:785:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     785:785:void rewriteStringValueOf(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.enums.EnumUnboxerMethodProcessorEventConsumer):767 -> a
     786:788:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.List):867:869 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Ljava/util/ArrayList;)V"}
     789:789:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     789:789:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.List):870 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171367,7 +171363,7 @@
     795:795:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     795:795:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.List):874 -> a
     796:797:com.android.tools.r8.graph.DexType getEnumClassTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):890:891 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/graph/I2;"}
     798:798:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     798:798:com.android.tools.r8.graph.DexType getEnumClassTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):891 -> a
     799:799:com.android.tools.r8.graph.DexType getEnumClassTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):892:892 -> a
@@ -171377,35 +171373,35 @@
     804:804:com.android.tools.r8.graph.DexType getEnumClassTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):901 -> a
     804:804:com.android.tools.r8.graph.DexType getEnumClassTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):894 -> a
     1:1:boolean lambda$rewriteInvokeStatic$1(java.util.Map,com.android.tools.r8.ir.code.Value):666:666 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Xk0;)Z"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Yn:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/bl0;)Z"}
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.bo:
 # {"id":"sourceFile","fileName":"EnumUnboxingTreeFixer.java"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder lensBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Un;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xn;"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap checkNotNullMethods -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     com.android.tools.r8.graph.DexItemFactory factory -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     java.util.Map unboxedEnumHierarchy -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses utilityClasses -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fo;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap dispatchMethods -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     com.android.tools.r8.graph.PrunedItems$Builder prunedItemsBuilder -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I5;"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions profileCollectionAdditions -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cY;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):122:122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/internal/wn;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/internal/yn;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/fo;)V"}
     2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):112:113 -> <init>
     4:4:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Map,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):113 -> <init>
@@ -171426,10 +171422,10 @@
     6:6:void com.android.tools.r8.graph.CfCodeWithLens.setCodeLens(com.android.tools.r8.graph.lens.GraphLens):42:42 -> a
     6:6:void lambda$fixupTypeReferences$2(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.CfCodeWithLens):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vn;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/J;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yn;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/J;)V"}
     7:7:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():91:91 -> a
     7:7:void lambda$duplicateCheckNotNullMethods$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Nb;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Pb;Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/synthesis/M;)V"}
     8:8:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):99:99 -> a
     8:8:void lambda$duplicateCheckNotNullMethods$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):267 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171471,7 +171467,7 @@
     29:30:void lambda$computeUnboxedEnumClasses$0(java.util.Set,com.android.tools.r8.graph.DexProgramClass,java.util.Set):140:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)V"}
     31:40:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):153:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/ao;"}
     41:41:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.build(com.android.tools.r8.graph.AppView,java.util.Set):410:410 -> a
     41:41:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):162 -> a
     42:42:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.build(com.android.tools.r8.graph.AppView,java.util.Set):410:410 -> a
@@ -171506,7 +171502,7 @@
     73:73:void lambda$fixupTypeReferences$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.CfCodeWithLens):161:161 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/J;)V"}
     74:74:void fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.fixup.MethodNamingUtility):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ZN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/dO;)V"}
     75:75:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isSuperUnboxedEnum(com.android.tools.r8.graph.DexType):83:83 -> a
     75:75:void fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.fixup.MethodNamingUtility):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171563,7 +171559,7 @@
     107:107:void com.android.tools.r8.graph.FieldCollection.replaceFields(java.util.function.Function):201:201 -> a
     107:107:void fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.fixup.MethodNamingUtility):219 -> a
     108:109:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):225:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/Is;"}
     110:110:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.builder(com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):42:42 -> a
     110:110:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):229 -> a
     111:120:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):231:240 -> a
@@ -171575,7 +171571,7 @@
     123:131:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):291:299 -> a
     132:132:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):291:291 -> a
     133:140:void lambda$duplicateCheckNotNullMethods$8(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):244:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/FU;Lcom/android/tools/r8/graph/C5;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/JU;Lcom/android/tools/r8/graph/C5;Ljava/util/Set;)V"}
     141:141:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():64:64 -> a
     141:141:void lambda$duplicateCheckNotNullMethods$8(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):251 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171640,10 +171636,10 @@
     218:218:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):274:274 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     219:222:void lambda$duplicateCheckNotNullMethods$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):295:298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     223:223:void lambda$duplicateCheckNotNullMethods$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):293:293 -> a
     224:225:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):319:320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/D2;)V"}
     226:226:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     226:226:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):324 -> a
     227:227:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):325:325 -> a
@@ -171734,10 +171730,10 @@
     394:394:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
     394:394:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):407 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    395:395:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    395:395:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     395:395:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):408 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    396:396:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    396:396:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     396:396:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):408 -> a
     397:397:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):409:409 -> a
     398:398:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.lens.MethodLookupResult.getPrototypeChanges():43:43 -> a
@@ -171862,7 +171858,7 @@
     570:570:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):549:549 -> a
     571:571:void fixupSuperEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):548:548 -> a
     572:572:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):554:554 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/pL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/tL;)Ljava/util/Collection;"}
     573:573:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData com.android.tools.r8.ir.optimize.enums.EnumDataMap.get(com.android.tools.r8.graph.DexProgramClass):110:110 -> a
     573:573:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):554 -> a
     574:576:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):555:557 -> a
@@ -171874,7 +171870,7 @@
     581:581:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):559 -> a
     582:582:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):574:574 -> a
     583:584:void lambda$createLocalUtilityFields$12(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):561:562 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vn;Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/A5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xn;Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/A5;)V"}
     585:585:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.addRemovedField(com.android.tools.r8.graph.DexField):223:223 -> a
     585:585:void lambda$createLocalUtilityFields$12(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):562 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171884,7 +171880,7 @@
     594:594:boolean lambda$createLocalUtilityFields$11(java.util.Map,com.android.tools.r8.graph.DexField):570:570 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/l1;)Z"}
     595:595:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):582:582 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/pL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/g1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/tL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/g1;"}
     596:596:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass.getType():181:181 -> a
     596:596:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):584 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -171914,7 +171910,7 @@
     615:616:void lambda$createLocalUtilityField$13(com.android.tools.r8.graph.FieldAccessFlags):603:604 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g3;)V"}
     617:617:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):633:633 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/pL;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/tL;)Ljava/util/Collection;"}
     618:618:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass.getDefinition():177:177 -> a
     618:618:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass):635 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172017,9 +172013,9 @@
     700:700:void lambda$createLocalUtilityMethods$15(java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):639:639 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/j1;)V"}
     701:701:void lambda$createLocalUtilityMethods$16(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):645:645 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     702:702:void emulatedDispatchMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,boolean):748:748 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pL;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/yY;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tL;Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/internal/CY;Z)V"}
     703:703:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     703:703:void emulatedDispatchMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,boolean):748 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172046,7 +172042,7 @@
     763:763:void emulatedDispatchMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,boolean):783:783 -> a
     764:771:void emulatedDispatchMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,boolean):780:787 -> a
     772:775:com.android.tools.r8.graph.DexMethod directMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod,boolean):841:844 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Z)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Z)Lcom/android/tools/r8/graph/w2;"}
     776:776:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.moveAndMap(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):302:302 -> a
     776:776:com.android.tools.r8.graph.DexMethod directMoveAndMap(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod,boolean):844 -> a
     777:780:void recordEmulatedDispatch(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):851:854 -> a
@@ -172055,16 +172051,16 @@
     781:785:void recordEmulatedDispatch(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):854 -> a
     786:786:void recordEmulatedDispatch(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):856:856 -> a
     787:793:com.android.tools.r8.graph.DexEncodedMethod installDispatchMethod(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,java.util.List,com.android.tools.r8.graph.DexMethod,java.util.Map):865:871 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pL;Ljava/util/LinkedHashMap;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/w2;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tL;Ljava/util/LinkedHashMap;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/w2;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/graph/j1;"}
     794:836:com.android.tools.r8.graph.DexEncodedMethod installDispatchMethod(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,java.util.List,com.android.tools.r8.graph.DexMethod,java.util.Map):868:910 -> a
     837:837:boolean lambda$installDispatchMethod$18(java.util.Map,com.android.tools.r8.graph.DexMethod):872:872 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;)Z"}
     838:838:void lambda$installDispatchMethod$19(java.util.IdentityHashMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):877:877 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     839:840:void lambda$installDispatchMethod$20(java.util.IdentityHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Integer,com.android.tools.r8.graph.DexType):885:886 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Ez;Ljava/lang/Integer;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Gz;Ljava/lang/Integer;Lcom/android/tools/r8/graph/I2;)V"}
     841:843:com.android.tools.r8.graph.DexEncodedMethod createAbstractMethodErrorLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):953:955 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/j1;"}
     844:844:com.android.tools.r8.ir.code.Position com.android.tools.r8.graph.DexEncodedMethod.getAndClearPendingInlineFrameAsPosition():809:809 -> a
     844:844:com.android.tools.r8.graph.DexEncodedMethod createAbstractMethodErrorLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):955 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172108,15 +172104,15 @@
     893:893:com.android.tools.r8.graph.DexEncodedMethod createAbstractMethodErrorLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):975:975 -> a
     894:895:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):969:970 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/j1$a;)V"}
-    896:896:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    896:896:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     896:896:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):971 -> a
     897:897:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):971:971 -> a
     898:898:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.AppView.computedMinApiLevel():1384:1384 -> a
     898:898:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):972 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    899:899:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    899:899:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     899:899:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):972 -> a
-    900:900:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    900:900:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     900:900:void lambda$createAbstractMethodErrorLocalUtilityMethod$23(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):973 -> a
     901:904:void lambda$transformMethodForLocalUtility$24(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):985:988 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/G4;)V"}
@@ -172124,11 +172120,11 @@
     905:905:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():273 -> a
     905:905:void lambda$transformMethodForLocalUtility$24(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):989 -> a
     906:913:com.android.tools.r8.graph.DexMethod createFreshMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):1001:1008 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pL;Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tL;Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     914:918:com.android.tools.r8.graph.DexMethod createFreshMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):1005:1009 -> a
     919:919:com.android.tools.r8.graph.DexMethod createFreshMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):1003:1003 -> a
     920:921:boolean isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):1014:1015 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/vn;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/xn;)Z"}
     922:922:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):200:200 -> a
     922:922:boolean isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):1015 -> a
     923:923:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):204:204 -> a
@@ -172145,7 +172141,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     928:928:boolean isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):1016:1016 -> a
     929:932:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.fixup.MethodNamingUtility):1022:1025 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZN;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dO;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     933:933:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getSharedUtilityClass():58:58 -> a
     933:933:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.fixup.MethodNamingUtility):1027 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172192,20 +172188,20 @@
     992:1000:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1084:1092 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$3(com.android.tools.r8.graph.fixup.MethodNamingUtility,com.android.tools.r8.graph.DexEncodedMethod):218:218 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZN;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dO;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     2:7:void fixupSuperEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):307:312 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;)V"}
     8:8:void fixupSuperEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):309:309 -> b
     9:9:void lambda$fixupSuperEnumClassInitializers$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):311:311 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/D2;)V"}
     10:10:void lambda$createLocalUtilityMethods$17(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):654:654 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     11:20:com.android.tools.r8.graph.DexMethod installLocalUtilityMethod(com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod,boolean):919:928 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Z)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;Z)Lcom/android/tools/r8/graph/w2;"}
     21:21:boolean lambda$installLocalUtilityMethod$21(java.util.Map,com.android.tools.r8.graph.DexMethod):921:921 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;)Z"}
     22:25:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):935:938 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tL;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/j1;"}
     26:30:com.android.tools.r8.graph.DexEncodedMethod createLocalUtilityMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):937:941 -> b
     31:32:void lambda$createLocalUtilityMethod$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):945:946 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/j1$a;)V"}
@@ -172215,7 +172211,7 @@
     34:35:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1530:1531 -> b
     34:35:void lambda$createLocalUtilityMethod$22(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):946 -> b
     1:4:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map):614:617 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/pL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/tL;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     5:5:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.addRemovedMethod(com.android.tools.r8.graph.DexMethod):237:237 -> c
     5:5:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map):617 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172258,19 +172254,19 @@
     23:24:com.android.tools.r8.graph.DexEncodedMethod$Builder transformMethodForLocalUtility(com.android.tools.r8.graph.DexEncodedMethod$Builder,com.android.tools.r8.graph.ProgramMethod):982:983 -> c
     25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.unsetIsLibraryMethodOverride():1555:1555 -> c
     25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder transformMethodForLocalUtility(com.android.tools.r8.graph.DexEncodedMethod$Builder,com.android.tools.r8.graph.ProgramMethod):992 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.ao:
 # {"id":"sourceFile","fileName":"EnumUnboxingTreeFixer.java"}
     com.android.tools.r8.com.google.common.collect.BiMap checkNotNullToCheckNotZeroMapping -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens lens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yn;"}
     com.android.tools.r8.graph.PrunedItems prunedItems -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/J5;"}
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.PrunedItems):1114:1118 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gs;Lcom/android/tools/r8/internal/vY;Lcom/android/tools/r8/internal/Vn;Lcom/android/tools/r8/graph/J5;)V"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.Zn:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;Lcom/android/tools/r8/internal/zY;Lcom/android/tools/r8/internal/Yn;Lcom/android/tools/r8/graph/J5;)V"}
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.co:
 # {"id":"sourceFile","fileName":"EnumUnboxingUtilityClass.java"}
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
@@ -172282,30 +172278,30 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D2;"}
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizingContext():24:24 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D2;"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.bo:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.fo:
 # {"id":"sourceFile","fileName":"EnumUnboxingUtilityClasses.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fb0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass,com.android.tools.r8.com.google.common.collect.ImmutableMap):37:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb0;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb0;Lcom/android/tools/r8/internal/Du;)V"}
     1:1:void forEach(java.util.function.Consumer):43:43 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass getSharedUtilityClass():58:58 -> a
     2:2:void forEach(java.util.function.Consumer):44 -> a
     3:3:void forEach(java.util.function.Consumer):44:44 -> a
     4:5:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass getLocalUtilityClass(com.android.tools.r8.graph.DexType):52:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/pL;"}
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.ao:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/tL;"}
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.eo:
 # {"id":"sourceFile","fileName":"EnumUnboxingUtilityClasses.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fb0;"}
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/H0;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):74:74 -> <init>
@@ -172314,7 +172310,7 @@
     2:2:void <init>(com.android.tools.r8.graph.AppView):72 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.AppView):72:75 -> <init>
     1:5:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses build(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):93:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/bo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/fo;"}
     6:6:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder.build():108:108 -> a
     6:6:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses build(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):97 -> a
     7:7:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder.build():108:108 -> a
@@ -172334,22 +172330,22 @@
     19:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses build(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):109:117 -> a
     28:28:com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses build(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):109:109 -> a
     29:30:void lambda$build$0(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass):105:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FU;Lcom/android/tools/r8/internal/Zn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JU;Lcom/android/tools/r8/internal/co;)V"}
     31:34:void lambda$build$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     35:35:void lambda$build$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111:111 -> a
     36:36:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):139:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/I2;"}
     37:37:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):138:138 -> a
     38:38:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):137:137 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.ho:
 # {"id":"sourceFile","fileName":"EnumValueOptimizer.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):195:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
     2:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):195 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172361,12 +172357,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):197:197 -> a
     7:7:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/oA;Lcom/android/tools/r8/internal/uA;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/qA;Lcom/android/tools/r8/internal/wA;I)Z"}
     8:8:int com.android.tools.r8.ir.code.Switch.getFallthroughBlockIndex():58:58 -> a
     8:8:boolean lambda$removeSwitchMaps$0(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.code.IntSwitch,int):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):387:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/graph/l1;Z)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/graph/l1;Z)Lcom/android/tools/r8/internal/B1;"}
     10:10:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):387 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getEnumFieldValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexField,boolean):388:388 -> a
@@ -172382,12 +172378,12 @@
     25:25:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:522 -> a
     25:25:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):314 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     26:27:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
     26:27:void lambda$removeSwitchMaps$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):314 -> a
     1:1:java.lang.String getRewriterId():59:59 -> b
     2:12:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):65:75 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     13:13:com.android.tools.r8.graph.AppView com.android.tools.r8.ir.conversion.passes.CodeRewriterPass.appView():33:33 -> b
     13:13:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):76 -> b
     14:16:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):77:79 -> b
@@ -172444,7 +172440,7 @@
     107:107:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):179 -> b
     108:108:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):180:180 -> b
     1:1:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):221:221 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> c
     2:2:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):221 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -172520,7 +172516,7 @@
     69:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):239 -> c
     72:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):347:348 -> c
     72:73:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):239 -> c
-    74:74:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2132:2132 -> c
+    74:74:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():2138:2138 -> c
     74:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):348 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     74:74:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):239 -> c
@@ -172639,34 +172635,34 @@
     185:185:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> c
     185:185:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):327 -> c
     186:186:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):328:328 -> c
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.co:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.go:
 # {"id":"sourceFile","fileName":"EnumValueOptimizer.java"}
     com.android.tools.r8.graph.DexType enumClass -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.code.Instruction ordinalInvoke -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eC;"}
     com.android.tools.r8.ir.code.Instruction arrayGet -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H3;"}
     com.android.tools.r8.ir.code.Instruction staticGet -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ud0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yd0;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cz;"}
     1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):414:419 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/H3;Lcom/android/tools/r8/internal/Ud0;Lcom/android/tools/r8/internal/az;)V"}
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.pL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/eC;Lcom/android/tools/r8/internal/H3;Lcom/android/tools/r8/internal/Yd0;Lcom/android/tools/r8/internal/cz;)V"}
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.tL:
 # {"id":"sourceFile","fileName":"LocalEnumUnboxingUtilityClass.java"}
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xn;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():27:27 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.DexProgramClass):37:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vn;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xn;Lcom/android/tools/r8/graph/D2;)V"}
     1:9:void ensureMethods(com.android.tools.r8.graph.AppView):49:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     10:11:void lambda$ensureMethods$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData):51:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/Bn;)V"}
     12:15:com.android.tools.r8.graph.DexString computeGetInstanceFieldMethodName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):73:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/H2;"}
     16:20:com.android.tools.r8.graph.DexString computeGetInstanceFieldMethodName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):75:79 -> a
@@ -172757,7 +172753,7 @@
     6:6:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):138:138 -> c
     7:7:com.android.tools.r8.graph.DexType getType():181:181 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.oL:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.sL:
 # {"id":"sourceFile","fileName":"LocalEnumUnboxingUtilityClass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -172766,7 +172762,7 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():184:184 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):192:198 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xn;)V"}
     8:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):197:200 -> <init>
     1:1:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setUseSortedMethodBacking(boolean):163:163 -> a
     1:1:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
@@ -172782,7 +172778,7 @@
     5:11:com.android.tools.r8.graph.DexProgramClass createClass():211:217 -> a
     12:12:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticNaming):213:213 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.bb0:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.fb0:
 # {"id":"sourceFile","fileName":"SharedEnumUnboxingUtilityClass.java"}
     com.android.tools.r8.graph.DexProgramClass sharedUtilityClass -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
@@ -172901,14 +172897,14 @@
     1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):185:189 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/C5;"}
     6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):186:186 -> h
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.ab0:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.eb0:
 # {"id":"sourceFile","fileName":"SharedEnumUnboxingUtilityClass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yn;"}
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/H0;"}
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> e
@@ -172918,7 +172914,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():254:254 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):269:269 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wn;Lcom/android/tools/r8/internal/ev;Lcom/android/tools/r8/shaking/H0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yn;Lcom/android/tools/r8/internal/gv;Lcom/android/tools/r8/shaking/H0;)V"}
     2:5:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):414:417 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):270 -> <init>
     6:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):271:275 -> <init>
@@ -173033,7 +173029,7 @@
     54:54:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
     55:55:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):335:335 -> a
     55:55:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    56:56:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     56:56:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:56:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
@@ -173043,10 +173039,10 @@
     58:58:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):337 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     58:58:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
-    59:59:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    59:59:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     59:59:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):337 -> a
     59:59:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
-    60:60:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     60:60:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):338 -> a
     60:60:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):300 -> a
     61:61:com.android.tools.r8.graph.DexEncodedMethod createClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):339:339 -> a
@@ -173096,7 +173092,7 @@
     89:89:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
     90:90:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):375:375 -> a
     90:90:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
-    91:91:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    91:91:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     91:91:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):376 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     91:91:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
@@ -173106,10 +173102,10 @@
     93:93:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):377 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:93:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
-    94:94:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    94:94:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     94:94:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):377 -> a
     94:94:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
-    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    95:95:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     95:95:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):378 -> a
     95:95:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):301 -> a
     96:97:com.android.tools.r8.graph.DexEncodedMethod createValuesMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField):379:380 -> a
@@ -173134,25 +173130,25 @@
     109:125:com.android.tools.r8.graph.DexProgramClass createClass():289:305 -> a
     126:126:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticNaming):291:291 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
-com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Pb:
 # {"id":"sourceFile","fileName":"CheckNotNullEnumUnboxerMethodClassification.java"}
     int argumentIndex -> a
     1:2:void <init>(int):16:17 -> <init>
     1:17:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):37:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/Ln;"}
     18:18:com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification():64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nb;"}
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.In:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pb;"}
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.Ln:
 # {"id":"sourceFile","fileName":"EnumUnboxerMethodClassification.java"}
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/Ln;"}
     1:1:com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification():23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nb;"}
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.Jn:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pb;"}
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.Mn:
 # {"id":"sourceFile","fileName":"EnumUnboxerMethodClassificationAnalysis.java"}
     1:23:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):39:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Lcom/android/tools/r8/internal/Ln;"}
     24:24:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
     24:24:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):61 -> a
     25:25:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):62:62 -> a
@@ -173171,15 +173167,15 @@
     47:73:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):71 -> a
     74:78:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):72:76 -> a
     79:79:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):46:46 -> a
-com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Tj0:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.Xj0:
 # {"id":"sourceFile","fileName":"UnknownEnumUnboxerMethodClassification.java"}
     com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xj0;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/In;"}
-com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.Ob:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/Ln;"}
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.Qb:
 # {"id":"sourceFile","fileName":"CheckNotZeroCode.java"}
     com.android.tools.r8.graph.ProgramMethod checkNotNullMethod -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -173189,7 +173185,7 @@
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():127:127 -> M0
     1:1:boolean isEmptyVoidMethod():132:132 -> T0
     1:4:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):53:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     5:5:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> a
     5:5:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -173240,77 +173236,77 @@
     91:91:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):137:137 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     92:92:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     93:93:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):117:117 -> c
     1:1:java.lang.String toString():147:147 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.K10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.O10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_IF_TYPES -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason ASSIGNMENT_OUTSIDE_INIT -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason ELIGIBLE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason ANNOTATION -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason PINNED -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason DOWN_CAST -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INSTANCE_OF -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBENUM_SUBTYPES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBENUM_INVALID_HIERARCHY -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBENUM_INSTANCE_FIELDS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason MANY_INSTANCE_FIELDS -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason DEFAULT_METHOD_INVOKE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason UNRESOLVABLE_FIELD -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason CONST_CLASS -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_PHI -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_CLINIT -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_SUBTYPE_INIT -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason SUBTYPE_CLINIT -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CLASSPATH -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CUSTOM -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason IMPLICIT_UP_CAST_IN_RETURN -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_ARRAY_PUT -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_NEW_ARRAY -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason TYPE_MISMATCH_FIELD_PUT -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K10;"}
     1:36:void <clinit>():13:48 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getKind() -> a
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.A10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.E10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexMethod invokedMethod -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -173318,7 +173314,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:java.lang.Object getKind():85:85 -> a
     1:1:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingContentsForEnumValuesArrayReason -> com.android.tools.r8.internal.B10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingContentsForEnumValuesArrayReason -> com.android.tools.r8.internal.F10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexField valuesField -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -173326,12 +173322,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.Object getKind():117:117 -> a
     1:1:java.lang.String toString():122:122 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingEnumStaticFieldValuesReason -> com.android.tools.r8.internal.C10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingEnumStaticFieldValuesReason -> com.android.tools.r8.internal.G10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     1:1:void <init>():94:94 -> <init>
     1:1:java.lang.Object getKind():98:98 -> a
     1:1:java.lang.String toString():103:103 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingExactDynamicEnumTypeForEnumWithSubtypesReason -> com.android.tools.r8.internal.D10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingExactDynamicEnumTypeForEnumWithSubtypesReason -> com.android.tools.r8.internal.H10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexField enumField -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -173341,7 +173337,7 @@
     4:6:void <init>(int):136:138 -> <init>
     1:1:java.lang.Object getKind():143:143 -> a
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.E10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.I10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexField enumField -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -173358,7 +173354,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.Object getKind():181:181 -> a
     1:17:java.lang.String toString():186:202 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingObjectStateForEnumInstanceReason -> com.android.tools.r8.internal.F10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$MissingObjectStateForEnumInstanceReason -> com.android.tools.r8.internal.J10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexField enumField -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -173366,22 +173362,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.Object getKind():217:217 -> a
     1:1:java.lang.String toString():222:222 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.G10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.K10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     java.lang.String message -> E
     1:2:void <init>(java.lang.String):60:61 -> <init>
     1:1:java.lang.Object getKind():66:66 -> a
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnboxedValueNonComparable -> com.android.tools.r8.internal.H10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnboxedValueNonComparable -> com.android.tools.r8.internal.L10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexMethod invokedMethod -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.analysis.type.TypeElement type1 -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.analysis.type.TypeElement type2 -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):277:280 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/aj0;)V"}
     1:1:java.lang.Object getKind():285:285 -> a
     1:2:java.lang.String toString():297:298 -> toString
     3:6:java.lang.String typeInformation(com.android.tools.r8.ir.analysis.type.TypeElement):289:292 -> toString
@@ -173390,7 +173386,7 @@
     8:11:java.lang.String typeInformation(com.android.tools.r8.ir.analysis.type.TypeElement):289:292 -> toString
     8:11:java.lang.String toString():302 -> toString
     12:12:java.lang.String toString():302:302 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.I10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedInstanceFieldValueForEnumInstanceReason -> com.android.tools.r8.internal.M10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     int ordinal -> E
     com.android.tools.r8.graph.DexField instanceField -> F
@@ -173399,7 +173395,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.Object getKind():238:238 -> a
     1:4:java.lang.String toString():243:246 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.J10:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.N10:
 # {"id":"sourceFile","fileName":"Reason.java"}
     com.android.tools.r8.graph.DexMethod invokedMethod -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -173416,18 +173412,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/B1;"}
     1:1:boolean isConcreteCallSiteOptimizationInfo():0:0 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int):27:27 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Fm;"}
 com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.b:
 # {"id":"sourceFile","fileName":"ConcreteCallSiteOptimizationInfo.java"}
     int size -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicTypes -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cz;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():28:28 -> <clinit>
     1:7:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):43:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;)V"}
     1:1:com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/b;"}
     2:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):64:64 -> a
@@ -173438,50 +173434,50 @@
     7:7:int com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.numberOfExtraParameters():134:134 -> a
     7:7:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):72 -> a
     8:13:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):72:77 -> a
-    14:14:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
-    14:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():79 -> a
+    14:14:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
+    14:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():77 -> a
     14:14:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
-    15:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():81:83 -> a
+    15:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():79:81 -> a
     15:17:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
     18:18:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap.size():813:813 -> a
-    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():83 -> a
+    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():81 -> a
     18:18:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.graph.proto.ArgumentInfoCollection.getKeys():75:75 -> a
-    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():84 -> a
+    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.graph.proto.ArgumentInfoCollection.getKeys():73:73 -> a
+    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():82 -> a
     19:19:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
-    20:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():86:86 -> a
+    20:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():84:84 -> a
     20:20:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
-    21:21:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():107:107 -> a
-    21:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():87 -> a
+    21:21:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():105:105 -> a
+    21:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():85 -> a
     21:21:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
     22:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    22:22:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():107 -> a
-    22:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():87 -> a
+    22:22:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():105 -> a
+    22:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():85 -> a
     22:22:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
     23:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    23:23:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():107 -> a
-    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():87 -> a
+    23:23:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():105 -> a
+    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():85 -> a
     23:23:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     24:24:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.iterator():942:942 -> a
-    24:24:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():107 -> a
-    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():87 -> a
+    24:24:java.util.Iterator com.android.tools.r8.graph.proto.ArgumentInfoCollection.iterator():105 -> a
+    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():85 -> a
     24:24:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
-    25:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():88:88 -> a
+    25:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():86:86 -> a
     25:25:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
     26:26:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():920:920 -> a
     26:26:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.next():914 -> a
-    26:26:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():89 -> a
+    26:26:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():87 -> a
     26:26:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
-    27:28:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():90:91 -> a
+    27:28:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.getRemovedParameterIndices():88:89 -> a
     27:28:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77 -> a
     29:30:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77:78 -> a
     31:34:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):77:80 -> a
-    35:35:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    35:35:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     35:35:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):80 -> a
     36:44:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):82:90 -> a
-    45:45:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    45:45:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     45:45:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):92 -> a
     46:61:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):94:109 -> a
     62:62:int com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.numberOfExtraParameters():134:134 -> a
@@ -173497,7 +173493,7 @@
     69:70:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):128:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/B1;"}
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int):122:123 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Fm;"}
     1:5:boolean equals(java.lang.Object):202:206 -> equals
     1:1:int hashCode():211:211 -> hashCode
     1:2:java.lang.String toString():216:217 -> toString
@@ -173514,7 +173510,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue():28:28 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():38:38 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
@@ -173523,9 +173519,9 @@
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/d;"}
     java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F40;"}
     com.android.tools.r8.ir.analysis.value.AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kk0;"}
     1:4:void <clinit>():30:33 -> <clinit>
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <clinit>
     5:5:void <clinit>():33 -> <clinit>
@@ -173534,16 +173530,16 @@
     boolean isMultiCallerMethod() -> A
     1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():88:88 -> B
     1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():191 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     boolean mayHaveSideEffects() -> C
     boolean neverReturnsNormally() -> D
     boolean returnValueHasBeenPropagated() -> E
     boolean returnValueOnlyDependsOnArguments() -> F
     boolean returnsArgument() -> G
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)Lcom/android/tools/r8/internal/sw;"}
     2:2:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):206:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     3:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():221:221 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo():28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/g;"}
@@ -173557,22 +173553,22 @@
     1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():66:66 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/a;"}
     1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():136:136 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C7;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():71:71 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qc;"}
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():91:91 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():81:81 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():76:76 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ln;"}
     1:1:java.util.Set getInitializedClassesOnNormalExit():86:86 -> p
     int getMaxRemovedAndroidLogLevel() -> q
     java.util.BitSet getNonNullParamOnNormalExits() -> r
     java.util.BitSet getNonNullParamOrThrow() -> s
     int getReturnedArgument() -> t
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():156:156 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
     java.util.BitSet getUnusedArguments() -> v
     boolean hasBeenInlinedIntoSingleCallSite() -> w
     boolean isConvertCheckNotNull() -> y
@@ -173584,7 +173580,7 @@
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue() -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
@@ -173610,16 +173606,16 @@
     1:1:void <init>():23:23 -> <init>
     boolean isMultiCallerMethod() -> A
     com.android.tools.r8.utils.OptionalBool isReturnValueUsed() -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     boolean mayHaveSideEffects() -> C
     boolean neverReturnsNormally() -> D
     boolean returnValueHasBeenPropagated() -> E
     boolean returnValueOnlyDependsOnArguments() -> F
     boolean returnsArgument() -> G
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)Lcom/android/tools/r8/internal/sw;"}
     boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     boolean cannotBeKept() -> e
     boolean classInitializerMayBePostponed() -> f
     boolean forceInline() -> g
@@ -173630,22 +173626,22 @@
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos() -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/a;"}
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo() -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C7;"}
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint() -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qc;"}
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification() -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ln;"}
     java.util.Set getInitializedClassesOnNormalExit() -> p
     int getMaxRemovedAndroidLogLevel() -> q
     java.util.BitSet getNonNullParamOnNormalExits() -> r
     java.util.BitSet getNonNullParamOrThrow() -> s
     int getReturnedArgument() -> t
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint() -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
     java.util.BitSet getUnusedArguments() -> v
     boolean hasBeenInlinedIntoSingleCallSite() -> w
     1:2:boolean hasUnusedArguments():99:100 -> x
@@ -173656,34 +173652,34 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Db;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fb;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():120:120 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):129:132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;)V"}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelease():770:770 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;)V"}
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelease():769:769 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):132 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):133:136 -> <init>
     1:1:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):530:530 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Z"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     2:2:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):534 -> a
     3:3:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):617:617 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;)Z"}
     4:62:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):548:606 -> a
     4:62:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):617 -> a
     63:103:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):567:607 -> a
     63:103:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):617 -> a
     104:112:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):620:628 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Jw;)Lcom/android/tools/r8/ir/optimize/info/i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Lw;)Lcom/android/tools/r8/ir/optimize/info/i;"}
     113:113:boolean isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):696:696 -> a
     113:113:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):628 -> a
-    114:114:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1011:1011 -> a
+    114:114:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1017:1017 -> a
     114:114:boolean isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):696 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     114:114:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):628 -> a
@@ -173702,7 +173698,7 @@
     130:132:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):629:631 -> a
     133:133:boolean isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):717:717 -> a
     133:133:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):631 -> a
-    134:134:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1011:1011 -> a
+    134:134:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1017:1017 -> a
     134:134:boolean isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):717 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     134:134:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):631 -> a
@@ -173718,7 +173714,7 @@
     159:166:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):644 -> a
     167:188:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):645:666 -> a
     189:190:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):731:732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)Z"}
     191:191:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     191:191:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):733 -> a
     192:193:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):733:734 -> a
@@ -173731,7 +173727,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     197:197:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):734:734 -> a
     198:222:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):926:950 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/info/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dt;)V"}
     223:223:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):949:949 -> a
     224:224:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a
     224:224:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):959 -> a
@@ -173770,7 +173766,7 @@
     268:269:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):893:894 -> a
     268:269:boolean lambda$computeMayHaveSideEffects$1(com.android.tools.r8.graph.DexProgramClass):952 -> a
     270:270:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1104:1104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/lm;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/nm;Ljava/util/Set;)Z"}
     271:271:boolean com.android.tools.r8.ir.code.Value.isThis():1016:1016 -> a
     271:271:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -173787,7 +173783,7 @@
     319:364:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1162:1207 -> a
     319:364:boolean isNonNullOnNormalExit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1149 -> a
     365:365:boolean lambda$isNonNullOnNormalExit$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1120:1120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Kw;)Z"}
     366:366:boolean hasBitwiseOperation(com.android.tools.r8.ir.code.Argument):1237:1237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c3;)Z"}
     367:367:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
@@ -173813,7 +173809,7 @@
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicReturnType -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean mayHaveSideEffects -> d
     boolean neverReturnsNormally -> e
     java.util.BitSet nonNullParamOnNormalExits -> f
@@ -173823,10 +173819,10 @@
     int $r8$clinit -> j
       # {"id":"com.android.tools.r8.synthesized"}
     1:9:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,boolean,boolean,java.util.BitSet,java.util.BitSet,int,boolean):43:51 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Dm;ZZLjava/util/BitSet;Ljava/util/BitSet;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Fm;ZZLjava/util/BitSet;Ljava/util/BitSet;IZ)V"}
     1:1:boolean isMultiCallerMethod():230:230 -> A
     1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():235:235 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean mayHaveSideEffects():95:95 -> C
     1:1:boolean neverReturnsNormally():105:105 -> D
     1:1:boolean returnValueHasBeenPropagated():245:245 -> E
@@ -173876,12 +173872,12 @@
     24:24:void lambda$create$0(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfo$Builder):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     26:26:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():140:140 -> a
     26:26:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo():24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/g;"}
     27:27:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)Lcom/android/tools/r8/internal/sw;"}
     1:1:boolean cannotBeKept():145:145 -> e
     1:1:boolean classInitializerMayBePostponed():150:150 -> f
     1:1:boolean forceInline():240:240 -> g
@@ -173892,22 +173888,22 @@
     1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():155:155 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/a;"}
     1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():175:175 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C7;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():160:160 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qc;"}
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():185:185 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():90:90 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():165:165 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ln;"}
     1:1:java.util.Set getInitializedClassesOnNormalExit():180:180 -> p
     1:1:int getMaxRemovedAndroidLogLevel():170:170 -> q
     1:1:java.util.BitSet getNonNullParamOnNormalExits():110:110 -> r
     1:1:java.util.BitSet getNonNullParamOrThrow():115:115 -> s
     1:1:int getReturnedArgument():125:125 -> t
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():210:210 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
     1:1:java.util.BitSet getUnusedArguments():225:225 -> v
     1:1:boolean hasBeenInlinedIntoSingleCallSite():135:135 -> w
     1:1:boolean isConvertCheckNotNull():195:195 -> y
@@ -173917,7 +173913,7 @@
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicReturnType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean mayHaveSideEffects -> c
     boolean neverReturnsNormally -> d
     java.util.BitSet nonNullParamOnNormalExits -> e
@@ -173931,7 +173927,7 @@
 # {"id":"sourceFile","fileName":"MethodResolutionOptimizationInfoAnalysis.java"}
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.create(com.android.tools.r8.graph.AppView):38:38 -> a
     1:1:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/cX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/gX;)V"}
     2:6:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):49:53 -> a
     7:7:com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoCollection.builder():35:35 -> a
     7:7:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):53 -> a
@@ -173951,7 +173947,7 @@
 com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$DownwardsTraversalState -> com.android.tools.r8.ir.optimize.info.m:
 # {"id":"sourceFile","fileName":"MethodResolutionOptimizationInfoAnalysis.java"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet virtualMethodsInSuperClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$DownwardsTraversalState EMPTY -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/m;"}
     1:1:void <clinit>():254:254 -> <clinit>
@@ -173959,7 +173955,7 @@
     2:2:void <clinit>():255 -> <clinit>
     3:3:void <clinit>():255:255 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureSet):262:263 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;)V"}
     com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$DownwardsTraversalState asDownwardsTraversalState() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/m;"}
 com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$Traversal -> com.android.tools.r8.ir.optimize.info.n:
@@ -174144,7 +174140,7 @@
 com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$UpwardsTraversalState -> com.android.tools.r8.ir.optimize.info.p:
 # {"id":"sourceFile","fileName":"MethodResolutionOptimizationInfoAnalysis.java"}
     com.android.tools.r8.utils.collections.DexMethodSignatureMap infos -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rl;"}
     com.android.tools.r8.ir.optimize.info.MethodResolutionOptimizationInfoAnalysis$UpwardsTraversalState EMPTY -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/p;"}
     boolean $assertionsDisabled -> c
@@ -174153,7 +174149,7 @@
     4:4:void <clinit>():287 -> <clinit>
     5:5:void <clinit>():287:287 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureMap):291:292 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;)V"}
     1:1:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.isDefault():0:0 -> a
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo join(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):317 -> a
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo lambda$joinMethodOptimizationInfo$1(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):309 -> a
@@ -174273,16 +174269,16 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):32:33 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:22:void enqueueAffectedCallers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):47:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;)V"}
     23:43:void enqueueAffectedCallers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):50:70 -> a
     44:45:java.util.List lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProgramClass):53:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
     46:46:void lambda$enqueueAffectedCallers$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,java.util.List):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Ljava/util/List;)V"}
     47:47:boolean com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):122:122 -> a
     47:47:void lambda$enqueueAffectedCallers$0(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.ProgramMethod):57 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/gB;Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/iB;Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
     48:48:boolean com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):122:122 -> a
     48:48:void lambda$enqueueAffectedCallers$0(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.ProgramMethod):57 -> a
     49:49:boolean com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
@@ -174405,7 +174401,7 @@
     int flags -> b
     int readBits -> c
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():32:32 -> <clinit>
     1:11:void <init>():32:42 -> <init>
@@ -174426,7 +174422,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue():78:78 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():142:142 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:int getReadBits():124:124 -> h
     1:1:boolean isDead():155:155 -> i
     1:1:boolean valueHasBeenPropagated():164:164 -> j
@@ -174444,24 +174440,24 @@
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint classInlinerConstraint -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qc;"}
     boolean convertCheckNotNull -> h
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ln;"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.utils.OptionalBool isReturnValueUsed -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C7;"}
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection instanceInitializerInfoCollection -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tw;"}
     java.util.BitSet nonNullParamOrThrow -> n
     java.util.BitSet nonNullParamOnNormalExits -> o
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint nopInliningConstraint -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ob0;"}
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint simpleInliningConstraint -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ob0;"}
     int maxRemovedAndroidLogLevel -> r
     java.util.BitSet parametersWithBitwiseOperations -> s
     java.util.BitSet unusedArguments -> t
@@ -174484,7 +174480,7 @@
     110:211:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):57:158 -> <init>
     1:1:boolean isMultiCallerMethod():584:584 -> A
     1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():589:589 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean mayHaveSideEffects():603:603 -> C
     1:1:boolean neverReturnsNormally():472:472 -> D
     1:1:boolean returnValueHasBeenPropagated():822:822 -> E
@@ -174523,7 +174519,7 @@
     2:4:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):166:168 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     5:11:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):207:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/Set;)Lcom/android/tools/r8/ir/optimize/info/w;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/Set;)Lcom/android/tools/r8/ir/optimize/info/w;"}
     12:18:boolean verifyDynamicTypeIsUnboxedEnum(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):222:228 -> a
     12:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Set):213 -> a
     19:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo unsetDynamicType():793:793 -> a
@@ -174735,12 +174731,12 @@
     103:103:int com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer.fixupReturnedArgumentIndex(int):134 -> a
     103:103:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):696 -> a
     103:103:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):186 -> a
-    104:104:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    104:104:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     104:104:int com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer.fixupReturnedArgumentIndex(int):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     104:104:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):696 -> a
     104:104:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):186 -> a
-    105:105:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    105:105:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     105:105:int com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer.fixupReturnedArgumentIndex(int):134 -> a
     105:105:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):696 -> a
     105:105:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):186 -> a
@@ -174857,7 +174853,7 @@
     136:136:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupUnusedArguments(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):550 -> a
     136:136:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):190 -> a
     137:137:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):355:355 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/In;)Lcom/android/tools/r8/ir/optimize/info/w;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ln;)Lcom/android/tools/r8/ir/optimize/info/w;"}
     138:138:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
     138:138:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):355 -> a
     139:139:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):356:356 -> a
@@ -174865,7 +174861,7 @@
     140:140:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):356 -> a
     141:143:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):355:357 -> a
     144:144:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):389:389 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)Lcom/android/tools/r8/internal/sw;"}
     145:146:void setUnusedArguments(java.util.BitSet):561:562 -> a
     147:147:java.util.BitSet getUnusedArguments():546:546 -> a
     147:147:void setUnusedArguments(java.util.BitSet):563 -> a
@@ -174879,7 +174875,7 @@
     152:152:void setUnusedArguments(java.util.BitSet):565:565 -> a
     153:153:boolean mayHaveSideEffects():603:603 -> a
     153:153:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):608 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)Z"}
     154:154:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getNopInliningConstraint():507:507 -> a
     154:154:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):611 -> a
     155:155:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):611:611 -> a
@@ -174892,14 +174888,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;)V"}
     168:177:void setAbstractReturnValue(com.android.tools.r8.ir.analysis.value.AbstractValue):730:739 -> a
     178:178:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):751:751 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Fm;)V"}
     179:188:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.TypeElement):756:765 -> a
     179:188:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):751 -> a
     189:190:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):769:770 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/ir/optimize/info/w;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/ir/optimize/info/w;"}
     191:193:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):769:771 -> a
     194:199:boolean verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.TypeElement):777:782 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/aj0;)V"}
     1:1:void unsetSimpleInliningConstraint():643:643 -> a0
     1:3:void markReturnsArgument(int):685:687 -> b
     1:1:void unsetUnusedArguments():569:569 -> b0
@@ -174916,22 +174912,22 @@
     1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():298:298 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/ir/optimize/info/a;"}
     1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():477:477 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C7;"}
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():325:325 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qc;"}
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():384:384 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():374:374 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():349:349 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/In;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ln;"}
     1:1:java.util.Set getInitializedClassesOnNormalExit():379:379 -> p
     1:1:int getMaxRemovedAndroidLogLevel():401:401 -> q
     1:1:java.util.BitSet getNonNullParamOnNormalExits():430:430 -> r
     1:1:java.util.BitSet getNonNullParamOrThrow():412:412 -> s
     1:1:int getReturnedArgument():467:467 -> t
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():512:512 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ob0;"}
     1:1:java.util.BitSet getUnusedArguments():546:546 -> v
     1:1:boolean hasBeenInlinedIntoSingleCallSite():449:449 -> w
     1:1:boolean isConvertCheckNotNull():574:574 -> y
@@ -174987,21 +174983,21 @@
     9:9:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):52:52 -> a
     10:10:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> a
     10:10:void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C7;)V"}
     11:11:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):488:488 -> a
     11:11:void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):235 -> a
     12:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> a
     12:12:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qc;)V"}
     13:13:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):336:336 -> a
     13:13:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):242 -> a
     14:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> a
     14:14:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/In;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ln;)V"}
     15:15:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):249:249 -> a
     16:16:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> a
     16:16:void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     17:17:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setNopInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):623:623 -> a
     17:17:void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):277 -> a
     18:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> a
@@ -175019,7 +175015,7 @@
     24:24:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType):145:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Fm;)V"}
     26:26:void com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):146:146 -> a
     26:26:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType):145 -> a
     27:27:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):150:150 -> a
@@ -175113,11 +175109,11 @@
     67:67:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):193 -> a
     68:68:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):194:194 -> a
     69:69:void setAbstractFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):199:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Lk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Pk0;)V"}
     70:70:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setAbstractFunction(com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):747:747 -> a
     70:70:void setAbstractFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):199 -> a
     71:71:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):205:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Fm;)V"}
     72:72:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):215:215 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     73:73:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.clearFlag(int):266:266 -> a
@@ -175126,7 +175122,7 @@
     74:74:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):230:230 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/ir/optimize/O;)V"}
     75:75:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):256:256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/rw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/tw;)V"}
     76:76:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):656:656 -> a
     76:76:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):257 -> a
     77:77:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):267:267 -> a
@@ -175146,7 +175142,7 @@
     4:7:void setParametersWithBitwiseOperations(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):295 -> b
     8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.ProgramMethod):68:68 -> b
     8:8:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):283 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     9:9:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):639:639 -> b
     9:9:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):283 -> b
     10:10:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):101:101 -> b
@@ -175225,7 +175221,7 @@
     7:7:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     8:8:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Fm;)V"}
     9:9:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):54:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/B1;)V"}
     10:10:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):66:66 -> a
@@ -175233,19 +175229,19 @@
     11:11:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):73:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/B1;)V"}
     12:12:void setAbstractFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Lk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Pk0;)V"}
     13:13:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Fm;)V"}
     14:14:void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C7;)V"}
     15:15:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qc;)V"}
     16:16:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/In;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ln;)V"}
     17:17:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/rw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/tw;)V"}
     18:18:void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     2:2:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):0:0 -> b
@@ -175255,7 +175251,7 @@
     4:4:void setParametersWithBitwiseOperations(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/BitSet;)V"}
     5:5:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):129:129 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     2:2:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):0:0 -> c
@@ -175285,7 +175281,7 @@
     6:6:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):42 -> a
     7:7:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):43:43 -> a
     8:8:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/Fm;)V"}
     9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.graph.DexEncodedField.getMutableOptimizationInfo():113:114 -> a
     9:10:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType):57 -> a
     11:11:void com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.setDynamicType(com.android.tools.r8.ir.analysis.type.DynamicType):146:146 -> a
@@ -175312,9 +175308,9 @@
     26:26:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):109:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/B1;)V"}
     27:27:void setAbstractFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Lk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Pk0;)V"}
     28:28:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Fm;)V"}
     29:29:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):125:125 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     30:30:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.clearFlag(int):266:266 -> a
@@ -175327,21 +175323,21 @@
     32:32:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):145:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/ir/optimize/O;)V"}
     33:33:void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/A7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/C7;)V"}
     34:34:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):488:488 -> a
     34:34:void setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:35:void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):162:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qc;)V"}
     36:36:void setConvertCheckNotNull(com.android.tools.r8.graph.DexClassAndMethod):165:165 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)V"}
     37:37:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setConvertCheckNotNull():344:344 -> a
     37:37:void setConvertCheckNotNull(com.android.tools.r8.graph.DexClassAndMethod):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:40:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):172:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/In;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ln;)V"}
     41:41:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/rw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/tw;)V"}
     42:42:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):656:656 -> a
     42:42:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):183 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -175351,7 +175347,7 @@
     44:44:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):197 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     46:46:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setNopInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):623:623 -> a
     46:46:void setNopInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):207 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -175391,7 +175387,7 @@
     8:8:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):202 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):213:213 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ob0;)V"}
     10:10:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):639:639 -> b
     10:10:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):213 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -175574,12 +175570,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/E;"}
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.v7:
 # {"id":"sourceFile","fileName":"BridgeAnalyzer.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:12:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):42:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/A7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/C7;"}
     13:18:boolean analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):138:143 -> a
     13:18:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):132 -> a
     13:18:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):54 -> a
@@ -175675,31 +175671,31 @@
     112:123:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):114:125 -> a
     124:124:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):121:121 -> a
     125:125:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:119 -> a
-com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo -> com.android.tools.r8.internal.C7:
 # {"id":"sourceFile","fileName":"BridgeInfo.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo asVirtualBridgeInfo():33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nl0;"}
-com.android.tools.r8.ir.optimize.info.bridge.DirectBridgeInfo -> com.android.tools.r8.internal.bm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rl0;"}
+com.android.tools.r8.ir.optimize.info.bridge.DirectBridgeInfo -> com.android.tools.r8.internal.dm:
 # {"id":"sourceFile","fileName":"DirectBridgeInfo.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32:32 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.optimize.info.bridge.SuperBridgeInfo -> com.android.tools.r8.internal.Tf0:
+com.android.tools.r8.ir.optimize.info.bridge.SuperBridgeInfo -> com.android.tools.r8.internal.Xf0:
 # {"id":"sourceFile","fileName":"SuperBridgeInfo.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32:32 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.Nl0:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.Rl0:
 # {"id":"sourceFile","fileName":"VirtualBridgeInfo.java"}
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):32:33 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo asVirtualBridgeInfo():47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nl0;"}
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Um:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rl0;"}
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Wm:
 # {"id":"sourceFile","fileName":"EmptyInstanceFieldInitializationInfoCollection.java"}
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Um;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wm;"}
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():26:26 -> <init>
     1:1:void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):37:37 -> a
@@ -175707,87 +175703,87 @@
     2:2:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):44:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/BiConsumer;)V"}
     3:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/fw;"}
     4:4:boolean isEmpty():53:53 -> a
     5:5:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/hw;"}
     6:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/hw;"}
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.cw:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.ew:
 # {"id":"sourceFile","fileName":"InstanceFieldArgumentInitializationInfo.java"}
     int argumentIndex -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(int):24:25 -> <init>
     1:8:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):45:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     9:9:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):51:51 -> a
     10:10:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.graph.proto.RemovedArgumentInfo.getSingleValue():64:64 -> a
     10:10:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):55 -> a
     11:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):58:60 -> a
     14:14:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo():39:39 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ew;"}
     1:1:boolean isArgumentInitializationInfo():34:34 -> g
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.dw:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.fw:
 # {"id":"sourceFile","fileName":"InstanceFieldInitializationInfo.java"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     1:1:boolean isTypeInitializationInfo():32:32 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo():28:28 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ew;"}
     1:1:boolean isSingleValue():40:40 -> f
     1:1:boolean isArgumentInitializationInfo():24:24 -> g
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue():44:44 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gc0;"}
     1:1:boolean isUnknown():48:48 -> isUnknown
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.hw:
 # {"id":"sourceFile","fileName":"InstanceFieldInitializationInfoCollection.java"}
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/hw;"}
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/BiConsumer;)V"}
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/BiConsumer;)V"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/fw;"}
     boolean isEmpty() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fw;"}
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.ew:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/hw;"}
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.gw:
 # {"id":"sourceFile","fileName":"InstanceFieldInitializationInfoCollection.java"}
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
     1:3:void <init>():53:55 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):63:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/dw;)Lcom/android/tools/r8/internal/ew;"}
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.gw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/fw;)Lcom/android/tools/r8/internal/gw;"}
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.iw:
 # {"id":"sourceFile","fileName":"InstanceFieldInitializationInfoFactory.java"}
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/cw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ew;"}
     3:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.lw:
 # {"id":"sourceFile","fileName":"InstanceFieldTypeInitializationInfo.java"}
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rd;"}
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):28:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/aj0;)V"}
     1:1:boolean isTypeInitializationInfo():43:43 -> a
     2:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     3:16:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):60:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     17:17:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):96:96 -> a
     17:17:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):73 -> a
     18:20:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):73:75 -> a
@@ -175797,7 +175793,7 @@
     1:6:boolean equals(java.lang.Object):89:94 -> equals
     1:1:int hashCode():80:80 -> hashCode
     1:1:java.lang.String toString():99:99 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.AR:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ER:
 # {"id":"sourceFile","fileName":"NonTrivialInstanceFieldInitializationInfoCollection.java"}
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
@@ -175805,58 +175801,58 @@
     1:4:void <init>(java.util.TreeMap):29:32 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.builder():28:28 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/hw;"}
     2:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):73:73 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.build():71:74 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):77 -> a
     7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.builder():28:28 -> a
     7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/hw;"}
     8:8:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):84:84 -> a
     9:12:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.build():71:74 -> a
     9:12:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):89 -> a
     13:13:void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/BiConsumer;)V"}
     14:18:void lambda$forEach$0(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):41:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/fw;)V"}
     19:19:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):55:55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/BiConsumer;)V"}
     20:21:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/internal/fw;"}
     22:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):60:60 -> a
     23:23:boolean isEmpty():66:66 -> a
     24:24:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ew;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gw;Lcom/android/tools/r8/graph/proto/c;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/fw;)V"}
     25:25:void lambda$fixupAfterParametersChanged$1(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):75:75 -> a
     26:27:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):87:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ew;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gw;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/fw;)V"}
     28:28:void lambda$rewrittenWithLens$2(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):86:86 -> a
     29:29:void lambda$toString$3(java.util.List,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/dw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/fw;)V"}
     1:4:java.lang.String toString():94:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.ak0:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.ek0:
 # {"id":"sourceFile","fileName":"UnknownInstanceFieldInitializationInfo.java"}
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ak0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ek0;"}
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/fw;"}
     2:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/dw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/fw;"}
     1:1:boolean isUnknown():30:30 -> isUnknown
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Yg:
 # {"id":"sourceFile","fileName":"ContextInsensitiveInstanceInitializerInfoCollection.java"}
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GR;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GR;)V"}
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):30:30 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     2:2:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/tw;"}
     3:3:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):105:105 -> a
     3:3:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):42 -> a
     4:4:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):105:105 -> a
@@ -175867,7 +175863,7 @@
     9:10:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):43:44 -> a
     11:11:com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):55:55 -> a
     11:11:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/tw;"}
     12:12:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):118:118 -> a
     12:12:com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):56 -> a
     12:12:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):14 -> a
@@ -175882,16 +175878,16 @@
     19:20:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):14 -> a
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo getContextInsensitive():25:25 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     1:1:boolean isEmpty():35:35 -> c
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.di:
 # {"id":"sourceFile","fileName":"DefaultInstanceInitializerInfo.java"}
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/di;"}
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos():46:46 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
     1:1:com.android.tools.r8.graph.DexMethod getParent():41:41 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean instanceFieldInitializationMayDependOnEnvironment():56:56 -> d
@@ -175900,28 +175896,28 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q;"}
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():66:66 -> g
     1:1:java.lang.String toString():86:86 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Xm:
 # {"id":"sourceFile","fileName":"EmptyInstanceInitializerInfoCollection.java"}
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xm;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     2:2:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/tw;"}
     3:3:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/tw;"}
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14:14 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     1:1:boolean isEmpty():37:37 -> c
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.sw:
 # {"id":"sourceFile","fileName":"InstanceInitializerInfo.java"}
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo():27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GR;"}
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
     com.android.tools.r8.graph.DexMethod getParent() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     boolean instanceFieldInitializationMayDependOnEnvironment() -> d
@@ -175929,23 +175925,23 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q;"}
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.tw:
 # {"id":"sourceFile","fileName":"InstanceInitializerInfoCollection.java"}
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/proto/c;)Lcom/android/tools/r8/internal/tw;"}
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/tw;"}
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sw;"}
     boolean isEmpty() -> c
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.CR:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.GR:
 # {"id":"sourceFile","fileName":"NonTrivialInstanceInitializerInfo.java"}
     int data -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hw;"}
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q;"}
     com.android.tools.r8.graph.DexMethod parent -> d
@@ -175953,14 +175949,14 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet,com.android.tools.r8.graph.DexMethod):35:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fw;Lcom/android/tools/r8/internal/q;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/hw;Lcom/android/tools/r8/internal/q;Lcom/android/tools/r8/graph/w2;)V"}
     3:3:boolean verifyNoUnknownBits(int):58:58 -> <init>
     3:3:void <init>(int,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet,com.android.tools.r8.graph.DexMethod):36 -> <init>
     4:7:void <init>(int,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet,com.android.tools.r8.graph.DexMethod):37:40 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo():50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GR;"}
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos():79:79 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hw;"}
     1:1:com.android.tools.r8.graph.DexMethod getParent():74:74 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean instanceFieldInitializationMayDependOnEnvironment():89:89 -> d
@@ -175969,22 +175965,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q;"}
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():99:99 -> g
     1:1:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.BR:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.FR:
 # {"id":"sourceFile","fileName":"NonTrivialInstanceInitializerInfo.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():130:130 -> <clinit>
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.ci:
 # {"id":"sourceFile","fileName":"DefaultInliningReasonStrategy.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l8;"}
     com.android.tools.r8.utils.InternalOptions$InlinerOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$i;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation):27:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/j8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/l8;)V"}
     1:5:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):42:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/U;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/U;"}
     6:6:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):622:622 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -175999,20 +175995,20 @@
     20:20:boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):79:79 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):56 -> a
     21:30:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58:67 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Xp:
 # {"id":"sourceFile","fileName":"FixedInliningReasonStrategy.java"}
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/U;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):17:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/U;)V"}
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/U;"}
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Tv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/U;"}
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Vv:
 # {"id":"sourceFile","fileName":"InlinerUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;Ljava/util/Set;)V"}
     2:2:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     2:2:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176027,7 +176023,7 @@
     7:7:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
     8:9:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22:23 -> a
     10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;Ljava/util/Set;)V"}
     11:11:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():217:217 -> a
     11:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176040,18 +176036,18 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     18:18:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Vv:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Xv:
 # {"id":"sourceFile","fileName":"InliningIRProvider.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.ProgramMethod context -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AJ;"}
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pO;"}
     java.util.Map cache -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> g
@@ -176059,14 +176055,14 @@
     1:1:void <init>():29:29 -> <init>
     2:9:void <init>():27:34 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.conversion.MethodProcessor):42:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/wJ;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/AJ;Lcom/android/tools/r8/internal/pO;)V"}
     11:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.conversion.MethodProcessor):27:47 -> <init>
     1:2:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):98:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Dt;"}
     3:4:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):104:105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/Dt;)V"}
     1:10:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):80:89 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Dt;"}
     11:19:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):137:145 -> b
     11:19:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):89 -> b
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> b
@@ -176092,23 +176088,23 @@
     31:31:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.MethodProcessor):59:59 -> b
     31:31:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):85 -> b
     32:33:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):91:92 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.Uv:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.Wv:
 # {"id":"sourceFile","fileName":"InliningIRProvider.java"}
     1:1:void <init>():51:51 -> <init>
     1:1:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Dt;"}
     2:2:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):54:54 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Bt;"}
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Wv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Dt;"}
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Yv:
 # {"id":"sourceFile","fileName":"InliningReasonStrategy.java"}
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/U;"}
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.FR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/H;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/U;"}
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.JR:
 # {"id":"sourceFile","fileName":"NopWhyAreYouNotInliningReporter.java"}
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JR;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:void reportCallerHasUnknownApiLevel():38:38 -> a
@@ -176118,11 +176114,11 @@
     4:4:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     5:5:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cw;)V"}
     6:6:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)V"}
     7:7:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:void reportCallerNotSameClass():26:26 -> b
     2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):100:100 -> b
     1:1:void reportCallerNotSameNest():29:29 -> c
@@ -176157,7 +176153,7 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():25:25 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.bm0:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.fm0:
 # {"id":"sourceFile","fileName":"WhyAreYouNotInliningReporter.java"}
     1:1:void <init>():20:20 -> <init>
     void reportCallerHasUnknownApiLevel() -> a
@@ -176167,11 +176163,11 @@
     void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cw;)V"}
     void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)V"}
     void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     void reportCallerNotSameClass() -> b
     void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
     void reportCallerNotSameNest() -> c
@@ -176198,14 +176194,14 @@
     void reportUnsafeDueToArrayCloneCall() -> v
     boolean unsetReasonHasBeenReportedFlag() -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.cm0:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.gm0:
 # {"id":"sourceFile","fileName":"WhyAreYouNotInliningReporterImpl.java"}
     com.android.tools.r8.graph.ProgramMethod callee -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.graph.ProgramMethod context -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean reasonHasBeenReported -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -176239,13 +176235,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     34:34:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):172:172 -> a
     35:37:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):247:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cw;)V"}
     38:38:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):245:245 -> a
     39:39:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):257:257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)V"}
     40:40:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):255:255 -> a
     41:41:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):263:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:void reportCallerNotSameClass():56:56 -> b
     2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):210:210 -> b
     1:1:void reportCallerNotSameNest():61:61 -> c
@@ -176272,36 +176268,36 @@
     1:1:void reportUnsafeDueToArrayCloneCall():303:303 -> v
     1:2:boolean unsetReasonHasBeenReportedFlag():296:297 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.nP:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.rP:
 # {"id":"sourceFile","fileName":"MultiCallerInlinerCallGraph.java"}
     1:1:void <init>(java.util.Map):16:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;)V"}
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.oP:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.sP:
 # {"id":"sourceFile","fileName":"MultiCallerInlinerCallGraphBuilder.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode createNode(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/mR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qR;"}
     2:5:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph build(java.util.concurrent.ExecutorService):31:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/nP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/rP;"}
     6:11:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph build(java.util.concurrent.ExecutorService):31:36 -> a
     12:12:void processClass(com.android.tools.r8.graph.DexProgramClass):40:40 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     1:4:void processMethod(com.android.tools.r8.graph.ProgramMethod):44:47 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.pP:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.tP:
 # {"id":"sourceFile","fileName":"MultiCallerInlinerInvokeRegistry.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode,java.util.function.Function,java.util.Map):28:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/qP;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/uP;Ljava/util/function/Function;Ljava/util/concurrent/ConcurrentHashMap;)V"}
     1:1:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     2:2:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):40 -> a
     3:4:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
     1:1:com.android.tools.r8.graph.lens.GraphLens getCodeLens():33:33 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ls;"}
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.qP:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ns;"}
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.uP:
 # {"id":"sourceFile","fileName":"MultiCallerInlinerNode.java"}
     java.util.concurrent.atomic.AtomicInteger numberOfCallSites -> c
     boolean $assertionsDisabled -> d
@@ -176310,17 +176306,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void <init>(com.android.tools.r8.graph.ProgramMethod):14:14 -> <init>
     1:1:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;Z)V"}
     2:3:void addCallerConcurrently(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode,boolean):22:23 -> a
     2:3:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean):12 -> a
     4:4:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;)V"}
     5:5:void addReaderConcurrently(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode):28:28 -> a
     5:5:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):12 -> a
-com.android.tools.r8.ir.optimize.library.ClassOptimizer -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.ir.optimize.library.ClassOptimizer -> com.android.tools.r8.internal.Sc:
 # {"id":"sourceFile","fileName":"ClassOptimizer.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.DexMethod getConstructor -> c
@@ -176336,14 +176332,14 @@
     1:8:void <init>(com.android.tools.r8.graph.AppView):30:37 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:7:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):55:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     8:10:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):60:62 -> a
     1:1:com.android.tools.r8.graph.DexType getType():42:42 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.ConstructorOptimizer -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.ir.optimize.library.ConstructorOptimizer -> com.android.tools.r8.internal.Tg:
 # {"id":"sourceFile","fileName":"ConstructorOptimizer.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.DexMethod newInstance -> c
@@ -176353,23 +176349,23 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):27:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):49:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     5:7:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):51:53 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.EmptyVarargsUtil -> com.android.tools.r8.internal.en:
+com.android.tools.r8.ir.optimize.library.EmptyVarargsUtil -> com.android.tools.r8.internal.gn:
 # {"id":"sourceFile","fileName":"EmptyVarargsUtil.java"}
     1:5:void replaceWithNullIfEmptyArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.AffectedValues):21:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/ir/optimize/a;)V"}
     6:8:void replaceWithNullIfEmptyArray(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.AffectedValues):24:26 -> a
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.En:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.Hn:
 # {"id":"sourceFile","fileName":"EnumMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):30:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():955:955 -> a
     2:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176406,7 +176402,7 @@
     35:37:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):52 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.FieldSynthesis -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.ir.optimize.library.FieldSynthesis -> com.android.tools.r8.internal.Ep:
 # {"id":"sourceFile","fileName":"FieldSynthesis.java"}
     1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):27:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -176440,7 +176436,7 @@
     23:24:void com.android.tools.r8.graph.FieldCollection.appendInstanceField(com.android.tools.r8.graph.DexEncodedField):169:170 -> a
     23:24:void com.android.tools.r8.graph.DexClass.appendInstanceField(com.android.tools.r8.graph.DexEncodedField):437 -> a
     23:24:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):35 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.CJ:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.GJ:
 # {"id":"sourceFile","fileName":"LibraryMemberOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -176451,7 +176447,7 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):45:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)V"}
     2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):37:62 -> <init>
     28:33:boolean com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.isEnabled(com.android.tools.r8.graph.AppView):97:102 -> <init>
     28:33:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):65 -> <init>
@@ -176619,9 +176615,9 @@
     129:130:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):78:79 -> <init>
     1:2:void initializeFinalLibraryFields():84:85 -> a
     3:7:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):111:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IJ;)V"}
     8:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):124:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)V"}
     11:11:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     11:11:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176639,24 +176635,24 @@
     47:47:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
     47:47:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):180 -> a
     48:49:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):181:182 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.EJ:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.IJ:
 # {"id":"sourceFile","fileName":"LibraryMethodModelCollection.java"}
     com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/DJ;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/HJ;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Nw;"}
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState():25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HJ;"}
     com.android.tools.r8.graph.DexType getType() -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.DJ:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.HJ:
 # {"id":"sourceFile","fileName":"LibraryMethodModelCollection.java"}
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.GJ:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.KJ:
 # {"id":"sourceFile","fileName":"LibraryMethodSideEffectModelCollection.java"}
     java.util.Map finalMethodsWithoutSideEffects -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):30:32 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     4:4:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:71 -> <init>
@@ -176679,7 +176675,7 @@
     54:54:void <init>(com.android.tools.r8.graph.AppView):35 -> <init>
     55:55:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
     1:21:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):41:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/Du;"}
     22:23:void putAll(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Iterable,java.lang.Object):127:128 -> a
     22:23:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):58 -> a
     24:27:java.util.Map buildFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):62:65 -> a
@@ -176696,7 +176692,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:38:boolean isSideEffectFreeFinalMethod(com.android.tools.r8.graph.DexMethod,java.util.List):143:144 -> a
     39:39:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/v4;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/v4;)Z"}
     40:40:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     40:40:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176709,7 +176705,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/List;)Z"}
 com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoCollection -> R8$$REMOVED$$CLASS$$109:
 # {"id":"sourceFile","fileName":"LibraryOptimizationInfoCollection.java"}
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.HJ:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.LJ:
 # {"id":"sourceFile","fileName":"LibraryOptimizationInfoInitializer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -176761,7 +176757,7 @@
     29:29:void lambda$modelLibraryMethodsWithoutSideEffects$1(com.android.tools.r8.graph.DexMethod):162 -> a
     30:30:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):177:177 -> a
     30:30:void modelLibraryField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/rb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/vb0;)V"}
     31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):128:128 -> a
     31:31:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):177 -> a
     31:31:void modelLibraryField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):104 -> a
@@ -176788,7 +176784,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):128:128 -> b
     6:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):187 -> b
     7:9:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):188:190 -> b
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.tL:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.xL:
 # {"id":"sourceFile","fileName":"LogMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -176821,7 +176817,7 @@
     65:65:void <init>(com.android.tools.r8.graph.AppView):89:89 -> <init>
     1:2:int getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):144:145 -> a
     1:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     3:3:char com.android.tools.r8.graph.DexString.getFirstByteAsChar():58:58 -> a
     3:3:int getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -176851,10 +176847,10 @@
     32:32:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):124:124 -> a
     1:1:com.android.tools.r8.graph.DexType getType():107:107 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.MethodOptimizer -> com.android.tools.r8.internal.eO:
+com.android.tools.r8.ir.optimize.library.MethodOptimizer -> com.android.tools.r8.internal.iO:
 # {"id":"sourceFile","fileName":"MethodOptimizer.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.graph.DexMethod invoke -> c
@@ -176864,18 +176860,18 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):27:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):49:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     5:7:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):51:53 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.lU:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.pU:
 # {"id":"sourceFile","fileName":"ObjectMethodOptimizer.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     2:2:void optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):49:49 -> a
     2:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):43 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
@@ -176885,7 +176881,7 @@
     4:5:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):43 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.AU:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.EU:
 # {"id":"sourceFile","fileName":"ObjectsMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -176894,13 +176890,13 @@
     com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/f2;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():28:28 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):35:40 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):58:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     3:3:byte com.android.tools.r8.graph.DexString.byteAt(int):154:154 -> a
     3:3:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -177010,7 +177006,7 @@
     102:102:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):62 -> a
     103:111:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):108:116 -> a
     103:111:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):62 -> a
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsIsNull():2755:2755 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjectsIsNull():2761:2761 -> a
     112:112:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):116 -> a
     112:112:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):62 -> a
     113:113:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):118:118 -> a
@@ -177051,7 +177047,7 @@
     139:139:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):62 -> a
     1:1:com.android.tools.r8.graph.DexType getType():45:45 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.ResourcesMemberOptimizer -> com.android.tools.r8.internal.M80:
+com.android.tools.r8.ir.optimize.library.ResourcesMemberOptimizer -> com.android.tools.r8.internal.Q80:
 # {"id":"sourceFile","fileName":"ResourcesMemberOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -177068,7 +177064,7 @@
     9:28:boolean isResourcesSubtype(java.util.Map,com.android.tools.r8.graph.DexClass):69:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/E0;)Z"}
     29:32:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):106:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     33:36:void maybeInlineGetString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):121:124 -> a
     33:36:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):110 -> a
     37:37:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
@@ -177095,11 +177091,11 @@
     46:46:void maybeInlineGetString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     46:46:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):110 -> a
-    47:47:java.lang.String com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.getSingleStringValueOrNull(int):334:334 -> a
+    47:47:java.lang.String com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.getSingleStringValueOrNull(int):339:339 -> a
     47:47:void maybeInlineGetString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:47:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):110 -> a
-    48:48:java.lang.String com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.getSingleStringValueOrNull(int):334:334 -> a
+    48:48:java.lang.String com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.getSingleStringValueOrNull(int):339:339 -> a
     48:48:void maybeInlineGetString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):132 -> a
     48:48:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):110 -> a
     49:50:void maybeInlineGetString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):134:135 -> a
@@ -177111,25 +177107,25 @@
     13:27:boolean allowInliningOfGetStringCalls():50:64 -> b
     1:1:com.android.tools.r8.graph.DexType getType():94:94 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.Ld0:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.Pd0:
 # {"id":"sourceFile","fileName":"StatelessLibraryMethodModelCollection.java"}
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState():19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HJ;"}
     2:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):49:49 -> a
     2:2:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/DJ;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/HJ;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Nw;"}
     3:3:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19:19 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.ze0:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.De0:
 # {"id":"sourceFile","fileName":"StringBuilderMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/m2;"}
     boolean $assertionsDisabled -> e
@@ -177137,7 +177133,7 @@
     1:6:void <init>(com.android.tools.r8.graph.AppView):53:58 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/DJ;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;Lcom/android/tools/r8/internal/HJ;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Nw;"}
     2:4:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):84:86 -> a
     2:4:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):46 -> a
     5:5:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendMethod(com.android.tools.r8.graph.DexMethod):2452:2452 -> a
@@ -177180,9 +177176,9 @@
     32:32:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):46 -> a
     33:33:com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State createInitialState():63:63 -> a
     33:33:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState():46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HJ;"}
     34:34:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/MB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/ye0;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/OB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ce0;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)V"}
     35:35:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.isUnusedBuilder(com.android.tools.r8.ir.code.Value):182:182 -> a
     35:35:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):110 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -177222,7 +177218,7 @@
     61:62:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117 -> a
     63:68:void optimizeAppendOnUnusedStringBuilder(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):137:142 -> a
     63:68:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117 -> a
-    69:69:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjects():2751:2751 -> a
+    69:69:boolean com.android.tools.r8.utils.InternalOptions.canUseJavaUtilObjects():2757:2757 -> a
     69:69:void optimizeAppendOnUnusedStringBuilder(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):142 -> a
     69:69:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117 -> a
     70:70:void optimizeAppendOnUnusedStringBuilder(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):145:145 -> a
@@ -177265,18 +177261,18 @@
     100:100:void optimizeAppend(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):117 -> a
     1:1:com.android.tools.r8.graph.DexType getType():68:68 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.ye0:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.Ce0:
 # {"id":"sourceFile","fileName":"StringBuilderMethodOptimizer.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap unusedBuilders -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ze0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/De0;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():177:177 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):177:179 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ze0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/De0;)V"}
     1:3:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):190:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     4:5:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     4:5:boolean computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):203 -> a
     4:5:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):193 -> a
@@ -177332,8 +177328,8 @@
     156:156:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):193 -> a
     157:157:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):194:194 -> a
     158:158:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):194:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Xk0;)V"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.lf0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl0;)V"}
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.pf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -177341,18 +177337,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     boolean enableStringFormatOptimizations -> c
     com.android.tools.r8.com.google.common.collect.ImmutableMap valueOfToStringAppend -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean DEBUG -> e
     boolean $assertionsDisabled -> f
     1:3:void <clinit>():49:51 -> <clinit>
     1:28:void <init>(com.android.tools.r8.graph.AppView):58:85 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:void debugLog(com.android.tools.r8.ir.code.IRCode,java.lang.String):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     2:2:void optimizeStringIntIntToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToIntFunction):331 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/ef0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/if0;)V"}
     3:3:void optimizeStringIntIntToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToIntFunction):331:331 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getSecondArgument():104:104 -> a
     4:4:void optimizeStringIntIntToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToIntFunction):333 -> a
@@ -177370,7 +177366,7 @@
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     17:17:void optimizeStringStringToBooleanFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.BiPredicate):374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Ljava/util/function/BiPredicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Ljava/util/function/BiPredicate;)V"}
     18:18:void optimizeStringStringToBooleanFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.BiPredicate):374:374 -> a
     19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getSecondArgument():104:104 -> a
     19:19:void optimizeStringStringToBooleanFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.BiPredicate):375 -> a
@@ -177378,13 +177374,13 @@
     24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     24:24:void optimizeStringStringToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction):392 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/jf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/nf0;)V"}
     25:25:void optimizeStringStringToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction):392:392 -> a
     26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getSecondArgument():104:104 -> a
     26:26:void optimizeStringStringToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction):393 -> a
     27:30:void optimizeStringStringToIntFunction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction):393:396 -> a
     31:32:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):106:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     33:33:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():60:60 -> a
     33:33:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):108 -> a
     34:34:char com.android.tools.r8.graph.DexString.getFirstByteAsChar():58:58 -> a
@@ -177587,7 +177583,7 @@
     214:214:com.android.tools.r8.graph.DexString lambda$optimize$2(com.android.tools.r8.graph.DexString):210:210 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Lcom/android/tools/r8/graph/H2;"}
     215:215:void replaceCurrentInstructionWithConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.graph.DexString):424:424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/graph/H2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/graph/H2;)V"}
     216:216:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     216:216:void replaceCurrentInstructionWithConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.graph.DexString):424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -177603,13 +177599,13 @@
     224:224:void replaceCurrentInstructionWithConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.graph.DexString):432 -> a
     225:230:void replaceCurrentInstructionWithConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.graph.DexString):433:438 -> a
     231:231:void lambda$replaceCurrentInstructionWithConstString$4(com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.Phi):434:434 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/xW;)V"}
     232:232:boolean com.android.tools.r8.ir.code.Phi.removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.AffectedValues):286:286 -> a
     232:232:void lambda$replaceCurrentInstructionWithConstString$4(com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.code.Phi):434 -> a
     233:244:boolean localeIsNullOrRootOrEnglish(com.android.tools.r8.ir.code.Value):565:576 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     245:295:com.android.tools.r8.ir.code.InstructionListIterator optimizeFormat(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.optimize.AffectedValues):585:635 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/WB;Lcom/android/tools/r8/ir/optimize/a;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/YB;Lcom/android/tools/r8/ir/optimize/a;)Lcom/android/tools/r8/internal/Nw;"}
     296:309:com.android.tools.r8.ir.code.InstructionListIterator optimizeFormat(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.optimize.AffectedValues):632:645 -> a
     310:310:boolean isArrayElementAlwaysNull(com.android.tools.r8.ir.code.Value):763:763 -> a
     310:310:com.android.tools.r8.ir.code.InstructionListIterator optimizeFormat(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.optimize.AffectedValues):646 -> a
@@ -177646,7 +177642,7 @@
     406:454:com.android.tools.r8.ir.code.InstructionListIterator optimizeFormat(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.optimize.AffectedValues):707:755 -> a
     455:458:com.android.tools.r8.ir.code.InstructionListIterator optimizeFormat(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.optimize.AffectedValues):754:757 -> a
     459:475:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):797:813 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/C5;)Z"}
     476:476:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
     476:476:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):813 -> a
     477:477:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):817:817 -> a
@@ -177669,7 +177665,7 @@
     3:4:com.android.tools.r8.graph.DexString lambda$optimize$3(com.android.tools.r8.graph.DexString):213 -> b
     1:1:com.android.tools.r8.graph.DexType getType():94:94 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$SimpleStringFormatSpec -> com.android.tools.r8.internal.df0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$SimpleStringFormatSpec -> com.android.tools.r8.internal.hf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     java.util.List parts -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -177679,8 +177675,8 @@
     1:4:void <init>(java.util.List):473:476 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     1:39:com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$SimpleStringFormatSpec parse(boolean,java.lang.String):480:518 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/df0;"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$SimpleStringFormatSpec$Part -> com.android.tools.r8.internal.cf0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/hf0;"}
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$SimpleStringFormatSpec$Part -> com.android.tools.r8.internal.gf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     java.lang.String value -> a
     int placeholderIdx -> b
@@ -177690,49 +177686,49 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(CI)V"}
     1:1:boolean isLiteral():466:466 -> a
     1:1:boolean isPlaceholder():462:462 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToIntFunction -> com.android.tools.r8.internal.ef0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToIntFunction -> com.android.tools.r8.internal.if0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     int apply(com.android.tools.r8.graph.DexString,int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;II)I"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToStringFunction -> com.android.tools.r8.internal.ff0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntIntToStringFunction -> com.android.tools.r8.internal.jf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     com.android.tools.r8.graph.DexString apply(com.android.tools.r8.graph.DexString,int,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;II)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntToIntFunction -> com.android.tools.r8.internal.gf0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntToIntFunction -> com.android.tools.r8.internal.kf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     int apply(com.android.tools.r8.graph.DexString,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;I)I"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntToStringFunction -> com.android.tools.r8.internal.hf0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringIntToStringFunction -> com.android.tools.r8.internal.lf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     com.android.tools.r8.graph.DexString apply(com.android.tools.r8.graph.DexString,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;I)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringIntToIntFunction -> com.android.tools.r8.internal.if0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringIntToIntFunction -> com.android.tools.r8.internal.mf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     int apply(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/H2;I)I"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction -> com.android.tools.r8.internal.jf0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringStringToIntFunction -> com.android.tools.r8.internal.nf0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     int apply(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/H2;)I"}
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringToIntFunction -> com.android.tools.r8.internal.kf0:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer$StringToIntFunction -> com.android.tools.r8.internal.of0:
 # {"id":"sourceFile","fileName":"StringMethodOptimizer.java"}
     int apply(com.android.tools.r8.graph.DexString) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)I"}
-com.android.tools.r8.ir.optimize.library.info.ComputedBooleanMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.ir.optimize.library.info.ComputedBooleanMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Xe:
 # {"id":"sourceFile","fileName":"ComputedBooleanMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:35 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedByteMethodOptimizationInfoCollection -> com.android.tools.r8.internal.We:
+com.android.tools.r8.ir.optimize.library.info.ComputedByteMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Ye:
 # {"id":"sourceFile","fileName":"ComputedByteMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177743,12 +177739,12 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedByteValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedByte(int):41:41 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedCharacterMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.ir.optimize.library.info.ComputedCharacterMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Ze:
 # {"id":"sourceFile","fileName":"ComputedCharacterMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177759,12 +177755,12 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedCharValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedChar(int):45:45 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedDoubleMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.ir.optimize.library.info.ComputedDoubleMethodOptimizationInfoCollection -> com.android.tools.r8.internal.af:
 # {"id":"sourceFile","fileName":"ComputedDoubleMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177775,12 +177771,12 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedDoubleValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedDouble(long):49:49 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedFloatMethodOptimizationInfoCollection -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.ir.optimize.library.info.ComputedFloatMethodOptimizationInfoCollection -> com.android.tools.r8.internal.bf:
 # {"id":"sourceFile","fileName":"ComputedFloatMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177791,12 +177787,12 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedFloatValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedFloat(int):53:53 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedIntegerMethodOptimizationInfoCollection -> com.android.tools.r8.internal.af:
+com.android.tools.r8.ir.optimize.library.info.ComputedIntegerMethodOptimizationInfoCollection -> com.android.tools.r8.internal.cf:
 # {"id":"sourceFile","fileName":"ComputedIntegerMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177807,12 +177803,12 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedIntegerValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedInteger(int):57:57 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedLongMethodOptimizationInfoCollection -> com.android.tools.r8.internal.bf:
+com.android.tools.r8.ir.optimize.library.info.ComputedLongMethodOptimizationInfoCollection -> com.android.tools.r8.internal.df:
 # {"id":"sourceFile","fileName":"ComputedLongMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:6:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:30 -> a
@@ -177823,7 +177819,7 @@
     9:9:com.android.tools.r8.ir.analysis.value.SingleBoxedLongValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedLong(long):61:61 -> a
     9:9:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):33:33 -> a
-com.android.tools.r8.ir.optimize.library.info.ComputedMethodOptimizationInfoCollection -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.ir.optimize.library.info.ComputedMethodOptimizationInfoCollection -> com.android.tools.r8.internal.ef:
 # {"id":"sourceFile","fileName":"ComputedMethodOptimizationInfoCollection.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -177838,13 +177834,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
-com.android.tools.r8.ir.optimize.library.info.ComputedShortMethodOptimizationInfoCollection -> com.android.tools.r8.internal.df:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+com.android.tools.r8.ir.optimize.library.info.ComputedShortMethodOptimizationInfoCollection -> com.android.tools.r8.internal.ff:
 # {"id":"sourceFile","fileName":"ComputedShortMethodOptimizationInfoCollection.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):26:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;)Lcom/android/tools/r8/internal/B1;"}
     5:5:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
     5:5:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):29 -> a
     6:7:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30:31 -> a
@@ -177855,7 +177851,7 @@
     10:10:com.android.tools.r8.ir.analysis.value.SingleBoxedShortValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createBoxedShort(int):65:65 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):30 -> a
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValueOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier):34:34 -> a
-com.android.tools.r8.ir.optimize.library.primitive.BooleanMethodOptimizer -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.ir.optimize.library.primitive.BooleanMethodOptimizer -> com.android.tools.r8.internal.R6:
 # {"id":"sourceFile","fileName":"BooleanMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177864,11 +177860,11 @@
     2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleBoxedBoolean():0:0 -> a
     2:2:boolean isMatchingSingleBoxedPrimitive(com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
     3:4:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):59:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     5:8:void com.android.tools.r8.ir.optimize.library.primitive.PrimitiveMethodOptimizer.optimizeBoxingMethods(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues):71:74 -> a
     5:8:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):62 -> a
     9:10:void optimizeBoxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):90:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/ir/optimize/a;)V"}
     11:11:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
     11:11:void optimizeBoxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):91 -> a
     12:12:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
@@ -177884,13 +177880,13 @@
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> b
     2:2:void optimizeParseBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):69 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)V"}
     3:11:void optimizeParseBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):69:77 -> b
     1:1:com.android.tools.r8.graph.DexMethod getUnboxMethod():37:37 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():47:47 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.ByteMethodOptimizer -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.ir.optimize.library.primitive.ByteMethodOptimizer -> com.android.tools.r8.internal.I7:
 # {"id":"sourceFile","fileName":"ByteMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177904,7 +177900,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.CharacterMethodOptimizer -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.ir.optimize.library.primitive.CharacterMethodOptimizer -> com.android.tools.r8.internal.xb:
 # {"id":"sourceFile","fileName":"CharacterMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177918,7 +177914,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.DoubleMethodOptimizer -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.ir.optimize.library.primitive.DoubleMethodOptimizer -> com.android.tools.r8.internal.rm:
 # {"id":"sourceFile","fileName":"DoubleMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177932,7 +177928,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.FloatMethodOptimizer -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.ir.optimize.library.primitive.FloatMethodOptimizer -> com.android.tools.r8.internal.sq:
 # {"id":"sourceFile","fileName":"FloatMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177946,7 +177942,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.IntegerMethodOptimizer -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.ir.optimize.library.primitive.IntegerMethodOptimizer -> com.android.tools.r8.internal.yA:
 # {"id":"sourceFile","fileName":"IntegerMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177960,7 +177956,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.LongMethodOptimizer -> com.android.tools.r8.internal.QL:
+com.android.tools.r8.ir.optimize.library.primitive.LongMethodOptimizer -> com.android.tools.r8.internal.UL:
 # {"id":"sourceFile","fileName":"LongMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -177974,7 +177970,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.primitive.PrimitiveMethodOptimizer -> com.android.tools.r8.internal.NX:
+com.android.tools.r8.ir.optimize.library.primitive.PrimitiveMethodOptimizer -> com.android.tools.r8.internal.RX:
 # {"id":"sourceFile","fileName":"PrimitiveMethodOptimizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -177990,13 +177986,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)V"}
     9:12:void optimizeBoxingMethods(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues):71:74 -> a
     9:12:com.android.tools.r8.ir.code.InstructionListIterator optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Set):61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/Set;)Lcom/android/tools/r8/internal/Nw;"}
     13:13:boolean lambda$optimizeBoxMethod$0(com.android.tools.r8.ir.code.Instruction):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     14:14:void optimizeBoxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/ir/optimize/a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/ir/optimize/a;)V"}
     15:20:void optimizeBoxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):85:90 -> a
     21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     21:21:void optimizeBoxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AffectedValues):91 -> a
@@ -178005,7 +178001,7 @@
     24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():100:100 -> a
     24:24:void optimizeUnboxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)V"}
     25:25:void optimizeUnboxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):101:101 -> a
     26:26:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
     26:26:void optimizeUnboxMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):101 -> a
@@ -178030,10 +178026,10 @@
     com.android.tools.r8.graph.DexMethod getBoxMethod() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:boolean lambda$optimizeUnboxMethod$1(com.android.tools.r8.ir.code.Instruction):117:117 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     com.android.tools.r8.graph.DexMethod getUnboxMethod() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.optimize.library.primitive.ShortMethodOptimizer -> com.android.tools.r8.internal.eb0:
+com.android.tools.r8.ir.optimize.library.primitive.ShortMethodOptimizer -> com.android.tools.r8.internal.ib0:
 # {"id":"sourceFile","fileName":"ShortMethodOptimizer.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -178047,7 +178043,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.EC:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.GC:
 # {"id":"sourceFile","fileName":"JavaLangObjectsSideEffectCollection.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -178075,27 +178071,27 @@
     27:27:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> a
     27:27:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):54 -> a
     28:28:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):54:54 -> a
-com.android.tools.r8.ir.optimize.membervaluepropagation.D8MemberValuePropagation -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.ir.optimize.membervaluepropagation.D8MemberValuePropagation -> com.android.tools.r8.internal.wh:
 # {"id":"sourceFile","fileName":"D8MemberValuePropagation.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):26:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:void rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/H3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/H3;)V"}
     2:2:com.android.tools.r8.ir.code.InstructionListIterator rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/mw;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/ow;)Lcom/android/tools/r8/internal/Nw;"}
     3:3:void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Cw;)V"}
     4:4:com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Nw;"}
     5:5:com.android.tools.r8.ir.code.InstructionListIterator rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Ud0;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Yd0;)Lcom/android/tools/r8/internal/Nw;"}
     6:6:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
     6:6:com.android.tools.r8.ir.code.InstructionListIterator rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):72 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:com.android.tools.r8.ir.code.InstructionListIterator rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):72:73 -> a
     9:9:void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Vd0;)V"}
-com.android.tools.r8.ir.optimize.membervaluepropagation.MemberValuePropagation -> com.android.tools.r8.internal.pN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Zd0;)V"}
+com.android.tools.r8.ir.optimize.membervaluepropagation.MemberValuePropagation -> com.android.tools.r8.internal.tN:
 # {"id":"sourceFile","fileName":"MemberValuePropagation.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -178104,21 +178100,21 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):48:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     void rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/H3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/H3;)V"}
     com.android.tools.r8.ir.code.InstructionListIterator rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/mw;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/ow;)Lcom/android/tools/r8/internal/Nw;"}
     void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Cw;)V"}
     com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Nw;"}
     com.android.tools.r8.ir.code.InstructionListIterator rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Ud0;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Yd0;)Lcom/android/tools/r8/internal/Nw;"}
     void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Vd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Zd0;)V"}
     1:1:boolean com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.isSideEffectFree():65:65 -> a
     1:1:boolean applyAssumeInfo(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/B4;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/B4;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     2:2:boolean applyAssumeInfo(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -178178,7 +178174,7 @@
     57:57:boolean applyAssumeInfo(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):210 -> a
     58:68:boolean applyAssumeInfo(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):211:221 -> a
     69:69:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,java.util.function.Predicate):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/function/Predicate;)V"}
     70:70:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
     70:70:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,java.util.function.Predicate):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -178197,12 +178193,12 @@
     116:116:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     116:116:void run(com.android.tools.r8.ir.code.IRCode):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     117:122:void run(com.android.tools.r8.ir.code.IRCode):59:64 -> a
     123:123:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
     123:123:void run(com.android.tools.r8.ir.code.IRCode):64 -> a
     124:125:void run(com.android.tools.r8.ir.code.IRCode):65:66 -> a
-com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation -> com.android.tools.r8.internal.h10:
+com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation -> com.android.tools.r8.internal.l10:
 # {"id":"sourceFile","fileName":"R8MemberValuePropagation.java"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/C;"}
@@ -178211,7 +178207,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:17:void rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):61:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/H3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/H3;)V"}
     18:18:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.hasSingleKnownInterface():165:165 -> a
     18:18:void rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):77 -> a
     19:30:void rewriteArrayGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.ArrayGet):79:90 -> a
@@ -178233,7 +178229,7 @@
     52:52:boolean com.android.tools.r8.ir.code.Instruction.hasUnusedOutValue():158:158 -> a
     52:52:com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Nw;"}
     53:70:com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):130:147 -> a
     71:73:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMember):110:112 -> a
     71:73:com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):152 -> a
@@ -178274,11 +178270,11 @@
     121:121:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markAsPropagated():817 -> a
     121:121:com.android.tools.r8.ir.code.InstructionListIterator rewriteInvokeMethod(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):189 -> a
     122:122:com.android.tools.r8.ir.code.InstructionListIterator rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):203:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/mw;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/ow;)Lcom/android/tools/r8/internal/Nw;"}
     123:123:com.android.tools.r8.ir.code.InstructionListIterator rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Ud0;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Yd0;)Lcom/android/tools/r8/internal/Nw;"}
     124:132:com.android.tools.r8.ir.code.InstructionListIterator rewriteFieldGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):223:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/kp;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/np;)Lcom/android/tools/r8/internal/Nw;"}
     133:136:com.android.tools.r8.ir.code.InstructionListIterator rewriteFieldGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):230:233 -> a
     137:137:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull():1284:1284 -> a
     137:137:com.android.tools.r8.ir.code.InstructionListIterator rewriteFieldGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):233 -> a
@@ -178416,10 +178412,10 @@
     265:265:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):53:53 -> a
     265:265:com.android.tools.r8.ir.code.InstructionListIterator rewriteFieldGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):325 -> a
     266:266:java.lang.Boolean lambda$rewriteFieldGet$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):231:231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/wr;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/yr;)Ljava/lang/Boolean;"}
     267:268:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):351:352 -> a
     267:268:void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Aw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Cw;)V"}
     269:269:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     269:269:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):359 -> a
     269:269:void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):346 -> a
@@ -178435,7 +178431,7 @@
     279:279:void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):346 -> a
     280:281:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):376:377 -> a
     280:281:void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):371 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Vd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Zd0;)V"}
     282:282:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     282:282:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):384 -> a
     282:282:void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):371 -> a
@@ -178456,7 +178452,7 @@
 com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.B4:
 # {"id":"sourceFile","fileName":"AssumeInfo.java"}
     com.android.tools.r8.ir.analysis.type.DynamicType assumeType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.analysis.value.AbstractValue assumeValue -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     boolean isSideEffectFree -> c
@@ -178465,16 +178461,16 @@
     boolean $assertionsDisabled -> e
     1:4:void <clinit>():17:20 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):26:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/B1;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/B1;Z)V"}
     1:1:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder builder():33:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A4;"}
     2:2:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/B1;Z)Lcom/android/tools/r8/internal/B4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/B1;Z)Lcom/android/tools/r8/internal/B4;"}
     3:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo empty():44:44 -> a
     3:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):39 -> a
     4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):40:40 -> a
     5:14:com.android.tools.r8.ir.analysis.type.DynamicType internalMeetType(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.DynamicType):77:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo empty():44:44 -> b
     1:1:boolean isEmpty():57 -> b
     2:2:boolean isEmpty():60:60 -> b
@@ -178483,7 +178479,7 @@
 com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder -> com.android.tools.r8.internal.A4:
 # {"id":"sourceFile","fileName":"AssumeInfo.java"}
     com.android.tools.r8.ir.analysis.type.DynamicType assumeType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.analysis.value.AbstractValue assumeValue -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     boolean isSideEffectFree -> c
@@ -178514,20 +178510,20 @@
     10:19:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):24 -> a
     20:22:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):71:73 -> a
     20:22:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):24 -> a
-com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus -> com.android.tools.r8.internal.PN:
+com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus -> com.android.tools.r8.internal.TN:
 # {"id":"sourceFile","fileName":"MethodBoxingStatus.java"}
     com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus returnStatus -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cl0;"}
     com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[] argStatuses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/cl0;"}
     com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus NONE_UNBOXABLE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TN;"}
     com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus UNPROCESSED_CANDIDATE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TN;"}
     boolean $assertionsDisabled -> e
     1:4:void <clinit>():9:12 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):27:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yk0;[Lcom/android/tools/r8/internal/Yk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cl0;[Lcom/android/tools/r8/internal/cl0;)V"}
     1:1:boolean isNoneUnboxable():51:51 -> a
     1:1:boolean isUnprocessedCandidate():55:55 -> b
     1:9:java.lang.String toString():76:84 -> toString
@@ -178539,25 +178535,25 @@
     15:15:java.lang.String toString():88 -> toString
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:20:java.lang.String toString():89:93 -> toString
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxer -> com.android.tools.r8.internal.iS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxer -> com.android.tools.r8.internal.mS:
 # {"id":"sourceFile","fileName":"NumberUnboxer.java"}
     1:1:void <init>():16:16 -> <init>
     void analyze(com.android.tools.r8.ir.code.IRCode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     void unboxNumbers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxer$Empty -> com.android.tools.r8.internal.hS:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxer$Empty -> com.android.tools.r8.internal.lS:
 # {"id":"sourceFile","fileName":"NumberUnboxer.java"}
     1:1:void <init>():46:46 -> <init>
     1:1:void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:void analyze(com.android.tools.r8.ir.code.IRCode):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     3:3:void unboxNumbers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution -> com.android.tools.r8.internal.lS:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution -> com.android.tools.r8.internal.pS:
 # {"id":"sourceFile","fileName":"NumberUnboxerBoxingStatusResolution.java"}
     java.util.Map methodBoxingStatus -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -178570,7 +178566,7 @@
     2:7:void <init>(java.util.Map):28:33 -> <init>
     1:2:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     1:2:void resolve(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency):209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Eh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ih0;)V"}
     3:4:void resolve(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency):211:212 -> a
     5:6:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult get(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency):98:99 -> a
     5:6:void resolve(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency):213 -> a
@@ -178641,15 +178637,15 @@
     69:69:void register(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult):126 -> a
     69:69:void resolve(com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency):236 -> a
     70:71:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult getMethodBoxingStatusResult(com.android.tools.r8.graph.DexMethod):93:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/kS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/oS;"}
     72:72:boolean allProcessedAndUnboxable(java.util.Map):170:170 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;)V"}
     73:74:void lambda$allProcessedAndUnboxable$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):172:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TN;)V"}
     75:75:boolean allProcessed():183:183 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     76:76:void lambda$allProcessed$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/kS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/oS;)V"}
     77:77:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.getRet():62:62 -> a
     77:77:void lambda$allProcessed$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -178659,7 +178655,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:81:void lambda$allProcessed$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):186:187 -> a
     1:1:void lambda$noResultForNoneUnboxable$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):164:164 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/kS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/oS;)V"}
     2:2:void clearNoneUnboxable():179:179 -> b
     1:1:boolean noResultForNoneUnboxable():162:162 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -178692,31 +178688,31 @@
     26:26:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.getArg(int):70:70 -> d
     26:26:java.util.Map resolve():149 -> d
     27:36:java.util.Map resolve():149:158 -> d
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult -> com.android.tools.r8.internal.kS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult -> com.android.tools.r8.internal.oS:
 # {"id":"sourceFile","fileName":"NumberUnboxerBoxingStatusResolution.java"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult ret -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nS;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult[] args -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/nS;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():36:36 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult):42:45 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult create(com.android.tools.r8.graph.DexMethod):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/kS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/oS;"}
     2:2:boolean isNoneUnboxable():78:78 -> a
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult -> com.android.tools.r8.internal.jS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult -> com.android.tools.r8.internal.nS:
 # {"id":"sourceFile","fileName":"NumberUnboxerBoxingStatusResolution.java"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult TO_PROCESS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nS;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult UNBOX -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nS;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult$BoxingStatusResult NO_UNBOX -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nS;"}
     1:3:void <clinit>():49:51 -> <clinit>
     1:1:void <init>(java.lang.String,int):48:48 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerImpl -> com.android.tools.r8.internal.mS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerImpl -> com.android.tools.r8.internal.qS:
 # {"id":"sourceFile","fileName":"NumberUnboxerImpl.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -178726,7 +178722,7 @@
     java.util.Map candidateBoxingStatus -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map virtualMethodsRepresentative -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
@@ -178772,7 +178768,7 @@
     45:45:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus.merge(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):33:33 -> a
     45:45:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus lambda$registerMethodUnboxingStatusIfNeeded$4(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PN;)Lcom/android/tools/r8/internal/PN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/TN;)Lcom/android/tools/r8/internal/TN;"}
     46:60:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus.merge(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):33:47 -> a
     46:60:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus lambda$registerMethodUnboxingStatusIfNeeded$4(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):150 -> a
     61:66:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus.create(com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):19:24 -> a
@@ -178781,7 +178777,7 @@
     67:67:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus.merge(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):34:34 -> a
     67:67:com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus lambda$registerMethodUnboxingStatusIfNeeded$4(com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.optimize.numberunboxer.MethodBoxingStatus):150 -> a
     68:69:void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):73:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     70:70:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.create(com.android.tools.r8.graph.AppView):38:38 -> a
     70:70:void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):75 -> a
     71:80:void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):76:85 -> a
@@ -178794,13 +178790,13 @@
     91:93:void prepareForPrimaryOptimizationPass(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):88:90 -> a
     94:94:void lambda$prepareForPrimaryOptimizationPass$0(java.util.Set,java.util.Set):84:84 -> a
     95:95:void lambda$prepareForPrimaryOptimizationPass$1(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/yu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Au;)V"}
     96:96:java.util.List lambda$computeVirtualMethodRepresentative$2(com.android.tools.r8.graph.DexMethodSignature):101:101 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;)Ljava/util/List;"}
     97:97:boolean lambda$computeVirtualMethodRepresentative$3(com.android.tools.r8.graph.ProgramMethod):114:114 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     98:98:void registerMethodUnboxingStatusIfNeeded(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Yk0;[Lcom/android/tools/r8/internal/Yk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/cl0;[Lcom/android/tools/r8/internal/cl0;)V"}
     99:99:com.android.tools.r8.graph.DexMethod representative(com.android.tools.r8.graph.DexMethod):158:158 -> a
     99:99:void registerMethodUnboxingStatusIfNeeded(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):136 -> a
     100:100:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):1001:1001 -> a
@@ -178816,7 +178812,7 @@
     113:118:void registerMethodUnboxingStatusIfNeeded(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):146 -> a
     119:125:void registerMethodUnboxingStatusIfNeeded(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus,com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus[]):147:153 -> a
     126:132:void analyze(com.android.tools.r8.ir.code.IRCode):167:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     133:133:boolean com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus.mayBeUnboxable():56:56 -> a
     133:133:void analyze(com.android.tools.r8.ir.code.IRCode):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -178862,7 +178858,7 @@
     176:180:void analyze(com.android.tools.r8.ir.code.IRCode):195:199 -> a
     181:182:boolean shouldConsiderForUnboxing(com.android.tools.r8.ir.code.Value):234:235 -> a
     181:182:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus analyzeInput(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):257 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/cl0;"}
     183:183:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.DexType):252:252 -> a
     183:183:boolean shouldConsiderForUnboxing(com.android.tools.r8.ir.code.Value):235 -> a
     183:183:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus analyzeInput(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):257 -> a
@@ -178988,7 +178984,7 @@
     272:272:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus analyzeInput(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):258:258 -> a
     273:274:boolean shouldConsiderForUnboxing(com.android.tools.r8.ir.code.Value):234:235 -> a
     273:274:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus analyzeOutput(com.android.tools.r8.ir.code.Value):307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/cl0;"}
     275:275:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.DexType):252:252 -> a
     275:275:boolean shouldConsiderForUnboxing(com.android.tools.r8.ir.code.Value):235 -> a
     275:275:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus analyzeOutput(com.android.tools.r8.ir.code.Value):307 -> a
@@ -179005,7 +179001,7 @@
     298:298:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.DexType):252:252 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     299:305:void unboxNumbers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):350:356 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     306:308:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerTreeFixer.fixupTree(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48:50 -> a
     306:308:void unboxNumbers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):358 -> a
     309:309:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens$Builder.build(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerRewriter):110:110 -> a
@@ -179032,42 +179028,42 @@
     5:5:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.DexType):252:252 -> b
     5:5:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.ProgramMethod):242 -> b
     6:6:boolean shouldConsiderForUnboxing(com.android.tools.r8.graph.ProgramMethod):243:243 -> b
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens -> com.android.tools.r8.internal.oS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens -> com.android.tools.r8.internal.sS:
 # {"id":"sourceFile","fileName":"NumberUnboxerLens.java"}
     java.util.Map prototypeChangesPerMethod -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     int $r8$clinit -> q
       # {"id":"com.android.tools.r8.synthesized"}
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerRewriter):35:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/rS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/vS;)V"}
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):44:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> a
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):45 -> a
     3:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):45:46 -> a
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens$Builder -> com.android.tools.r8.internal.nS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens$Builder -> com.android.tools.r8.internal.rS:
 # {"id":"sourceFile","fileName":"NumberUnboxerLens.java"}
     java.util.Map prototypeChangesPerMethod -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():58:58 -> <clinit>
     1:5:void <init>():58:62 -> <init>
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer -> com.android.tools.r8.internal.qS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer -> com.android.tools.r8.internal.uS:
 # {"id":"sourceFile","fileName":"NumberUnboxerMethodReprocessingEnqueuer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens numberUnboxerLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sS;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens):32:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/oS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/sS;)V"}
     1:2:void enqueueAffectedCallees(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):55:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;)V"}
     3:6:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):59:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/graph/C5;)V"}
     7:7:boolean shouldReprocess(com.android.tools.r8.graph.DexMethod):51:51 -> a
     7:7:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):62 -> a
     8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):242:242 -> a
@@ -179088,7 +179084,7 @@
     14:14:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):114:114 -> a
     14:14:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod):64 -> a
     15:33:void enqueueAffectedCallers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):76:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;)V"}
     34:53:void enqueueAffectedCallers(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):77:96 -> a
     54:55:java.util.List lambda$enqueueAffectedCallers$2(com.android.tools.r8.graph.DexProgramClass):80:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
@@ -179104,19 +179100,19 @@
     59:61:void lambda$enqueueAffectedCallers$1(java.util.List,com.android.tools.r8.graph.ProgramMethod):86:88 -> a
     62:62:boolean lambda$enqueueAffectedCallers$3(java.util.List):93:93 -> a
     63:63:void lambda$enqueueAffectedCallers$4(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.List):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Ljava/util/List;)V"}
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer$AffectedMembersGraphLensUseRegistry -> com.android.tools.r8.internal.pS:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Ljava/util/List;)V"}
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer$AffectedMembersGraphLensUseRegistry -> com.android.tools.r8.internal.tS:
 # {"id":"sourceFile","fileName":"NumberUnboxerMethodReprocessingEnqueuer.java"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uS;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():101:101 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerMethodReprocessingEnqueuer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):105:106 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qS;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uS;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):115:115 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     2:2:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)V"}
     3:3:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     3:3:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):143 -> a
     4:4:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):143:143 -> a
@@ -179163,7 +179159,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):135:135 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerRewriter -> com.android.tools.r8.internal.rS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerRewriter -> com.android.tools.r8.internal.vS:
 # {"id":"sourceFile","fileName":"NumberUnboxerRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -179172,7 +179168,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):36:37 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/zR;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/DR;)Ljava/util/Set;"}
     2:2:boolean com.android.tools.r8.graph.lens.GraphLens.isNumberUnboxerLens():0:0 -> a
     2:2:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):46 -> a
     3:4:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):46:47 -> a
@@ -179182,11 +179178,11 @@
     8:8:void rewriteArgs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
-    9:9:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    9:9:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     9:9:void rewriteArgs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
-    10:10:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    10:10:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     10:10:void rewriteArgs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):167 -> a
     10:10:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
     11:12:void rewriteArgs(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):167:168 -> a
@@ -179220,11 +179216,11 @@
     52:52:void unboxInvokeValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):68 -> a
-    53:53:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    53:53:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     53:53:void unboxInvokeValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     53:53:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):68 -> a
-    54:54:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    54:54:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     54:54:void unboxInvokeValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):84 -> a
     54:54:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):68 -> a
     55:55:void unboxInvokeValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set):84:84 -> a
@@ -179275,7 +179271,7 @@
     100:100:void unboxReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):123 -> a
     100:100:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.lens.NonIdentityGraphLens):72 -> a
     101:104:com.android.tools.r8.ir.code.InvokeStatic computeBoxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):149:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/proto/k;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/WB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/proto/k;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/YB;"}
     105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
     105:105:com.android.tools.r8.ir.code.InvokeStatic computeBoxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):152 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -179293,7 +179289,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     115:115:com.android.tools.r8.ir.code.InvokeStatic computeBoxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):159:159 -> a
     1:4:com.android.tools.r8.ir.code.InvokeVirtual computeUnboxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):132:135 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/proto/k;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/cC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/proto/k;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/eC;"}
     5:5:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():36:36 -> b
     5:5:com.android.tools.r8.ir.code.InvokeVirtual computeUnboxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):135 -> b
     6:7:com.android.tools.r8.ir.code.InvokeVirtual computeUnboxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):135:136 -> b
@@ -179310,26 +179306,26 @@
     18:18:com.android.tools.r8.ir.code.InvokeVirtual computeUnboxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):140 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:com.android.tools.r8.ir.code.InvokeVirtual computeUnboxInvokeIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.ir.code.Position):141:141 -> b
-com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerTreeFixer -> com.android.tools.r8.internal.sS:
+com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerTreeFixer -> com.android.tools.r8.internal.wS:
 # {"id":"sourceFile","fileName":"NumberUnboxerTreeFixer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map unboxingResult -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map virtualMethodsRepresentative -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens$Builder lensBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rS;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):38:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Du;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):33:33 -> <init>
     3:3:com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens$Builder com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerLens.builder():55:55 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):33 -> <init>
     4:12:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):33:41 -> <init>
     1:1:void fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.fixup.MethodNamingUtility):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/ZN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/dO;)V"}
     2:2:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():224:224 -> a
     2:2:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():81 -> a
     2:2:void com.android.tools.r8.graph.MethodCollection.resetCaches():76 -> a
@@ -179349,7 +179345,7 @@
     7:7:boolean shouldReserveAsIfPinned(com.android.tools.r8.graph.ProgramMethod):62 -> a
     8:8:boolean shouldReserveAsIfPinned(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
     9:9:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.fixup.MethodNamingUtility):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZN;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dO;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     10:10:com.android.tools.r8.graph.DexMethod representative(com.android.tools.r8.graph.DexMethod):66:66 -> a
     10:10:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.fixup.MethodNamingUtility):71 -> a
     11:11:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):1001:1001 -> a
@@ -179410,7 +179406,7 @@
     92:92:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1544:1544 -> a
     92:92:void lambda$fixupEncodedMethod$1(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):95 -> a
     93:98:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):109:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/kS;)Lcom/android/tools/r8/graph/E2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;Lcom/android/tools/r8/internal/oS;)Lcom/android/tools/r8/graph/E2;"}
     99:99:boolean com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.shouldUnboxRet():87:87 -> a
     99:99:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):114 -> a
     100:100:boolean com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.shouldUnboxRet():87:87 -> a
@@ -179431,7 +179427,7 @@
     108:108:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):116 -> a
     109:109:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult):116:116 -> a
     110:110:com.android.tools.r8.graph.DexType lambda$fixupProto$2(com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult,int):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/kS;I)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/oS;I)Lcom/android/tools/r8/graph/I2;"}
     111:111:boolean com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.shouldUnboxArg(int):82:82 -> a
     111:111:com.android.tools.r8.graph.DexType lambda$fixupProto$2(com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult,int):113 -> a
     112:112:boolean com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult.shouldUnboxArg(int):82:82 -> a
@@ -179447,10 +179443,10 @@
     116:117:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType,boolean):103:104 -> a
     116:117:com.android.tools.r8.graph.DexType lambda$fixupProto$2(com.android.tools.r8.graph.DexType[],com.android.tools.r8.ir.optimize.numberunboxer.NumberUnboxerBoxingStatusResolution$MethodBoxingStatusResult,int):113 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.graph.fixup.MethodNamingUtility,com.android.tools.r8.graph.DexEncodedMethod):55:55 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZN;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dO;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
 com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency -> R8$$REMOVED$$CLASS$$110:
 # {"id":"sourceFile","fileName":"TransitiveDependency.java"}
-com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodArg -> com.android.tools.r8.internal.Dh0:
+com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodArg -> com.android.tools.r8.internal.Hh0:
 # {"id":"sourceFile","fileName":"TransitiveDependency.java"}
     int parameterIndex -> b
     boolean $assertionsDisabled -> c
@@ -179458,7 +179454,7 @@
     1:4:void <init>(int,com.android.tools.r8.graph.DexMethod):114:117 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)V"}
     1:1:com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodArg asMethodArg():131:131 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hh0;"}
     1:4:boolean equals(java.lang.Object):141:144 -> equals
     5:5:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodDependency.getMethod():66:66 -> equals
     5:5:boolean equals(java.lang.Object):145 -> equals
@@ -179473,17 +179469,17 @@
     2:2:int hashCode():136 -> hashCode
     3:3:int hashCode():136:136 -> hashCode
     1:3:java.lang.String toString():152:154 -> toString
-com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodDependency -> com.android.tools.r8.internal.Eh0:
+com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodDependency -> com.android.tools.r8.internal.Ih0:
 # {"id":"sourceFile","fileName":"TransitiveDependency.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):51:52 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodArg com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency.asMethodArg():30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hh0;"}
     1:1:com.android.tools.r8.graph.DexMethod getMethod():66:66 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodRet -> com.android.tools.r8.internal.Fh0:
+com.android.tools.r8.ir.optimize.numberunboxer.TransitiveDependency$MethodRet -> com.android.tools.r8.internal.Jh0:
 # {"id":"sourceFile","fileName":"TransitiveDependency.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):73:73 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
@@ -179499,23 +179495,23 @@
     1:1:int hashCode():88 -> hashCode
     2:2:int hashCode():88:88 -> hashCode
     1:3:java.lang.String toString():102:104 -> toString
-com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus -> com.android.tools.r8.internal.Yk0:
+com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus -> com.android.tools.r8.internal.cl0:
 # {"id":"sourceFile","fileName":"ValueBoxingStatus.java"}
     int boxingDelta -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset transitiveDependencies -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uu;"}
     com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus NOT_UNBOXABLE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cl0;"}
     boolean $assertionsDisabled -> d
     1:6:void <clinit>():18:23 -> <clinit>
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.of():101:101 -> <clinit>
     7:7:void <clinit>():23 -> <clinit>
     8:8:void <clinit>():23:23 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMultiset):50:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Uu;)V"}
     1:1:boolean isNotUnboxable():60:60 -> a
     2:5:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus merge(com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus):73:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yk0;)Lcom/android/tools/r8/internal/Yk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cl0;)Lcom/android/tools/r8/internal/cl0;"}
     6:6:int getBoxingDelta():64:64 -> a
     6:6:com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus merge(com.android.tools.r8.ir.optimize.numberunboxer.ValueBoxingStatus):76 -> a
     7:7:boolean mayBeUnboxable():56:56 -> a
@@ -179589,18 +179585,18 @@
     9:10:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMultiset.iterator():233:234 -> toString
     9:10:java.lang.String toString():105 -> toString
     11:17:java.lang.String toString():105:111 -> toString
-com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.jV:
+com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.nV:
 # {"id":"sourceFile","fileName":"OutlineCollection.java"}
     java.util.Map canonicalization -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.graph.lens.GraphLens appliedGraphLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Map outlines -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.lens.GraphLens):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     2:8:void <init>(com.android.tools.r8.graph.lens.GraphLens):28:34 -> <init>
     1:7:void set(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.List):44:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Ljava/util/ArrayList;)V"}
@@ -179613,11 +179609,11 @@
     11:11:void set(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.List):50 -> a
     12:12:void set(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.List):50:50 -> a
     13:32:void rewriteWithLens(com.android.tools.r8.graph.lens.GraphLens):55:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     33:39:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.lens.GraphLens,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):62:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Ljava/util/List;)V"}
     40:41:java.util.List rewriteOutlinesWithLens(java.util.List,com.android.tools.r8.graph.lens.GraphLens):79:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/ls;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/ns;)Ljava/util/List;"}
     42:42:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):183:183 -> a
     42:42:java.util.List rewriteOutlinesWithLens(java.util.List,com.android.tools.r8.graph.lens.GraphLens):80 -> a
     43:44:java.util.Map computeMethodsPerOutline(com.android.tools.r8.graph.AppView):96:97 -> a
@@ -179628,55 +179624,55 @@
     59:59:com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline.rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):634:634 -> a
     59:59:com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline lambda$rewriteOutlinesWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):80 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/sV;)Lcom/android/tools/r8/internal/sV;"}
-com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer -> com.android.tools.r8.internal.mV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/wV;)Lcom/android/tools/r8/internal/wV;"}
+com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer -> com.android.tools.r8.internal.qV:
 # {"id":"sourceFile","fileName":"OutlineOptimizationEventConsumer.java"}
     void acceptOutlineMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
     void finished(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer$EmptyOutlineOptimizationEventConsumer -> com.android.tools.r8.internal.lV:
+com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer$EmptyOutlineOptimizationEventConsumer -> com.android.tools.r8.internal.pV:
 # {"id":"sourceFile","fileName":"OutlineOptimizationEventConsumer.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer$EmptyOutlineOptimizationEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pV;"}
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():32:32 -> <init>
     1:1:void acceptOutlineMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection):41:41 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void finished(com.android.tools.r8.graph.AppView):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.oV:
+com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.sV:
 # {"id":"sourceFile","fileName":"Outliner.java"}
     1:1:void <init>():18:18 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     void rewriteWithLens() -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.nV:
+com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.rV:
 # {"id":"sourceFile","fileName":"Outliner.java"}
     1:1:void <init>():25:25 -> <init>
     1:1:void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     4:4:void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     5:5:void rewriteWithLens():58:58 -> a
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):34:34 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl -> com.android.tools.r8.internal.BV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl -> com.android.tools.r8.internal.FV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlineCollection outlineCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nV;"}
     java.util.Map outlineSites -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map generatedOutlines -> c
@@ -179706,9 +179702,9 @@
     6:6:void com.android.tools.r8.ir.optimize.outliner.OutlineCollection.remove(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):39:39 -> a
     6:6:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1362 -> a
     7:9:void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.lens.GraphLens):1367:1369 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     10:12:void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1379:1381 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/ir/optimize/info/z;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     13:13:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1562:1562 -> a
     13:13:void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1382 -> a
     14:18:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.outliner.OutlineCollection.computeMethodsSubjectToOutlining(com.android.tools.r8.graph.AppView):84:88 -> a
@@ -179740,7 +179736,7 @@
     65:66:void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1417 -> a
     67:71:void performOutlining(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1418:1422 -> a
     72:72:void lambda$performOutlining$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1390:1390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/Dt;)V"}
     73:73:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1074:1074 -> a
     73:73:void lambda$performOutlining$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1390 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -179752,23 +179748,23 @@
     82:84:void lambda$disallowInlining$3(java.util.List,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1433:1435 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/shaking/o1;)V"}
     85:101:void forEachSelectedOutliningMethod(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):1446:1462 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/yY;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/CY;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;)V"}
     102:102:void forEachSelectedOutliningMethod(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):1447:1447 -> a
     103:105:void lambda$forEachSelectedOutliningMethod$4(com.android.tools.r8.ir.conversion.IRConverter,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):1450:1452 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
     106:106:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
     106:106:void lambda$forEachSelectedOutliningMethod$4(com.android.tools.r8.ir.conversion.IRConverter,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):1452 -> a
     107:115:void lambda$forEachSelectedOutliningMethod$4(com.android.tools.r8.ir.conversion.IRConverter,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):1452:1460 -> a
     116:116:void rewriteWithLens():1470:1470 -> a
     117:122:void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1475:1480 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     123:123:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
     123:123:void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1480 -> a
     124:138:void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1480:1494 -> a
     139:139:void lambda$collectOutlineSites$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):1492:1492 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Ljava/util/List;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Ljava/util/List;Ljava/util/List;)V"}
     140:146:void getInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):1500:1506 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/function/Consumer;)V"}
     147:147:boolean com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.hasNext():236:236 -> a
     147:147:void getInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):1513 -> a
     148:157:void getInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):1514:1523 -> a
@@ -179777,9 +179773,9 @@
     175:175:void getInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):1537 -> a
     176:184:void getInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer):1537:1545 -> a
     185:185:void lambda$identifyOutlineSites$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):1558:1558 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Ljava/util/List;)V"}
     186:188:java.util.List buildOutlineMethods(com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):1568:1570 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mV;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qV;)Ljava/util/ArrayList;"}
     189:193:java.util.List selectOutlines():1617:1621 -> a
     189:193:java.util.List buildOutlineMethods(com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):1574 -> a
     194:197:java.util.List buildOutlineMethods(com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):1575:1578 -> a
@@ -179795,11 +179791,11 @@
     209:212:java.util.List buildOutlineMethods(com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):1587:1590 -> a
     213:236:java.util.List buildOutlineMethods(com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):1588:1611 -> a
     237:237:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$buildOutlineMethods$7(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):1584:1584 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/Ge;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/Ie;"}
     238:238:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$buildOutlineMethods$8(com.android.tools.r8.synthesis.SyntheticNaming):1589:1589 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     239:239:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1595:1595 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sV;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/synthesis/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wV;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/synthesis/M;)V"}
     240:240:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):99:99 -> a
     240:240:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1594 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -179819,29 +179815,29 @@
     251:251:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):94:94 -> a
     251:251:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1602 -> a
     252:252:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1603:1603 -> a
-    253:253:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    253:253:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     253:253:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1603 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     254:254:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1603 -> a
     255:255:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1605:1605 -> a
     256:256:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):89:89 -> a
     256:256:void lambda$buildOutlineMethods$10(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1604 -> a
     257:257:com.android.tools.r8.graph.Code lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.DexMethod):1602:1602 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sV;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wV;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/i0;"}
     258:258:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1640:1640 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     259:259:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
     259:259:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1640 -> a
     260:290:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1640:1670 -> a
     291:291:void lambda$applyOutliningCandidate$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set,java.util.List):1647:1647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)V"}
     292:298:void lambda$applyOutliningCandidate$12(java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Instruction):1657:1663 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Lw;Ljava/util/Set;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/Bt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Nw;Ljava/util/Set;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Dt;Ljava/util/ListIterator;Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1357:1357 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:3:void lambda$performOutlining$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1408:1409 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/Dt;)V"}
     4:4:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1074:1074 -> b
     4:4:void lambda$performOutlining$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1409 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -179853,7 +179849,7 @@
     9:9:void lambda$performOutlining$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1413:1413 -> b
     10:10:void lambda$performOutlining$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.code.IRCode):1412:1412 -> b
     11:12:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1552:1553 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)V"}
     13:13:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> b
     13:13:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1553 -> b
     14:16:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1553:1555 -> b
@@ -179864,27 +179860,27 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.graph.DexEncodedMethod.markNotProcessed():723:723 -> c
     3:3:void lambda$performOutlining$2(com.android.tools.r8.graph.ProgramMethod):1418 -> c
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.pV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.tV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.code.NumericType numericType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
     1:3:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):221:223 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uV;Lcom/android/tools/r8/internal/xS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yV;Lcom/android/tools/r8/internal/BS;)V"}
     1:1:java.lang.String getDetailsString():263:263 -> a
     2:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):288:297 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/sV;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/wV;I)I"}
     12:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):296:320 -> a
     37:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):317:317 -> a
     38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):314:314 -> a
     39:42:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):308:311 -> a
     43:60:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):305:322 -> a
     61:61:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):328:328 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     1:1:java.lang.String getInstructionName():268:268 -> b
     1:1:com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType getOutlineInstructionType():273:273 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yV;"}
     1:1:int compareTo(java.lang.Object):216:216 -> compareTo
     2:10:int compareTo(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction):250:258 -> compareTo
     2:10:int compareTo(java.lang.Object):216 -> compareTo
@@ -179892,12 +179888,12 @@
     1:1:int numberOfInputs():283:283 -> e
     1:5:boolean equals(java.lang.Object):241:245 -> equals
     1:1:int hashCode():233:233 -> hashCode
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.qV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.uV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.graph.DexMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.code.InvokeType invokeType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     boolean hasOutValue -> e
     com.android.tools.r8.graph.DexProto proto -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
@@ -179906,10 +179902,10 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():407:407 -> <clinit>
     1:8:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean,com.android.tools.r8.ir.code.ValueType[],com.android.tools.r8.graph.DexProto,boolean):421:428 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z[Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/graph/E2;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z[Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/graph/E2;Z)V"}
     1:1:java.lang.String getDetailsString():501:501 -> a
     2:4:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):535:537 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/sV;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/wV;I)I"}
     5:5:int com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline.argumentCount():622:622 -> a
     5:5:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):539 -> a
     6:11:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):525:530 -> a
@@ -179922,13 +179918,13 @@
     19:19:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):548 -> a
     20:25:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):548:553 -> a
     26:26:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):559:559 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     27:28:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     27:28:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):559 -> a
     29:29:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):559:559 -> a
     1:1:java.lang.String getInstructionName():506:506 -> b
     1:1:com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType getOutlineInstructionType():511:511 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yV;"}
     1:1:int compareTo(java.lang.Object):407:407 -> compareTo
     2:28:int compareTo(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction):469:495 -> compareTo
     2:28:int compareTo(java.lang.Object):407 -> compareTo
@@ -179936,7 +179932,7 @@
     1:1:int numberOfInputs():521:521 -> e
     1:8:boolean equals(java.lang.Object):456:463 -> equals
     1:1:int hashCode():448:448 -> hashCode
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.rV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.vV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.graph.DexType clazz -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -179944,7 +179940,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:java.lang.String getDetailsString():367:367 -> a
     2:3:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):392:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/sV;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/wV;I)I"}
     4:4:int com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline.argumentCount():622:622 -> a
     4:4:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):395 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -179952,13 +179948,13 @@
     5:5:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):395 -> a
     6:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int):395:397 -> a
     9:9:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):403:403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     10:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     10:11:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):403 -> a
     12:12:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):403:403 -> a
     1:1:java.lang.String getInstructionName():372:372 -> b
     1:1:com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType getOutlineInstructionType():377:377 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yV;"}
     1:1:int compareTo(java.lang.Object):332:332 -> compareTo
     2:6:int compareTo(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction):358:362 -> compareTo
     2:6:int compareTo(java.lang.Object):332 -> compareTo
@@ -179966,7 +179962,7 @@
     1:1:int numberOfInputs():387:387 -> e
     1:5:boolean equals(java.lang.Object):344:348 -> equals
     1:1:int hashCode():353:353 -> hashCode
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline -> com.android.tools.r8.internal.sV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline -> com.android.tools.r8.internal.wV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     java.util.List argumentTypes -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -179979,11 +179975,11 @@
     com.android.tools.r8.graph.DexProto proto -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():585:585 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):602:602 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Ljava/util/List;Ljava/util/ArrayList;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/I2;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Ljava/util/List;Ljava/util/ArrayList;Ljava/util/ArrayList;Lcom/android/tools/r8/graph/I2;II)V"}
     2:24:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):589:611 -> <init>
     25:25:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> <init>
     25:25:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):613 -> <init>
@@ -180076,7 +180072,7 @@
     68:68:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):610:610 -> <init>
     1:1:int argumentCount():622:622 -> a
     2:3:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):643:644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     4:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     4:5:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):644 -> a
     6:6:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):648:648 -> a
@@ -180084,7 +180080,7 @@
     7:8:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):648 -> a
     9:12:boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens):648:651 -> a
     13:13:boolean lambda$needsLensRewriting$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction):653:653 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/vV;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/zV;)Z"}
     1:1:int compareTo(java.lang.Object):585:585 -> compareTo
     2:6:com.android.tools.r8.graph.DexProto buildProto():626:630 -> compareTo
     2:6:int compareTo(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):702 -> compareTo
@@ -180106,85 +180102,85 @@
     1:18:boolean equals(java.lang.Object):659:676 -> equals
     1:6:int hashCode():684:689 -> hashCode
     1:37:java.lang.String toString():746:782 -> toString
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.tV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.xV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline outline -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1840:1841 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/internal/sV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/internal/wV;)V"}
     1:1:int computeHashCode():1885:1885 -> G0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():1851:1851 -> M0
     1:1:boolean isEmptyVoidMethod():1856:1856 -> T0
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):1864:1865 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1875:1875 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1880:1880 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     5:5:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):1895:1895 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):1890:1890 -> c
     1:1:java.lang.String toString():1870:1870 -> toString
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.vV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.zV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():144:144 -> <clinit>
     1:1:void <init>():144:144 -> <init>
     int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;Lcom/android/tools/r8/internal/sV;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;Lcom/android/tools/r8/internal/wV;I)I"}
     java.lang.String getDetailsString() -> a
     boolean needsLensRewriting(com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     java.lang.String getInstructionName() -> b
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType getOutlineInstructionType() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yV;"}
     boolean hasOutValue() -> d
     int numberOfInputs() -> e
     boolean equals(java.lang.Object) -> equals
     int hashCode() -> hashCode
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.uV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.yV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType ADD -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType SUB -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType MUL -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType DIV -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType REM -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType INVOKE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineInstruction$OutlineInstructionType NEW -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yV;"}
     1:7:void <clinit>():150:156 -> <clinit>
     1:1:void <init>(java.lang.String,int):149:149 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.wV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.AV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     java.util.List outlinesForMethod -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):1205:1206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;Ljava/util/List;)V"}
     1:1:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1211:1211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/sV;)V"}
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.xV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wV;)V"}
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.BV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.code.IRCode code -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     java.util.Set toRemove -> q
     java.util.Set invokesToOutlineMethods -> r
     int argumentsMapIndex -> s
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     boolean $assertionsDisabled -> u
     1:1:void <clinit>():1231:1231 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.Set,java.util.Set):1242:1246 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/internal/Bt;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/internal/Dt;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V"}
     1:9:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1251:1259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/sV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wV;)V"}
     10:10:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder com.android.tools.r8.ir.code.Position$OutlineCallerPosition.builder():634:634 -> a
     10:10:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1259 -> a
     11:12:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1259:1260 -> a
@@ -180239,48 +180235,48 @@
     104:104:void com.android.tools.r8.ir.optimize.AffectedValues.widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66 -> a
     104:104:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1333 -> a
     105:107:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1339:1341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wV;)V"}
     108:112:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):273:277 -> a
     108:112:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1340 -> a
     113:113:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1343:1343 -> a
     114:118:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1340:1344 -> a
     119:119:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1342:1342 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.yV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.CV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):1218:1219 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;)V"}
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1224:1226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/sV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wV;)V"}
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline):1225:1225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sV;)Ljava/util/List;"}
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.zV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wV;)Ljava/util/List;"}
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.DV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline outline -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wV;"}
     com.android.tools.r8.graph.DexMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     int position -> c
     int argumentMapIndex -> d
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():1680:1680 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.DexMethod):1687:1687 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/internal/sV;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/internal/wV;Lcom/android/tools/r8/graph/w2;)V"}
     2:6:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline,com.android.tools.r8.graph.DexMethod):1685:1689 -> <init>
     1:1:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):1709:1709 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/graph/j0;"}
     2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1725:1725 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
     3:3:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1753:1753 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     4:4:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):1759:1759 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     5:9:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1764:1768 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     10:10:int com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline.argumentCount():622:622 -> a
     10:10:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1768 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -180288,15 +180284,15 @@
     11:11:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1768 -> a
     12:22:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1768:1778 -> a
     23:23:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1784:1784 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     24:24:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1790:1790 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     25:25:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1805:1805 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     26:26:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():133:133 -> a
     26:26:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1805 -> a
     1:1:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1737:1737 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.getPrototypeChanges():501:501 -> b
     2:2:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1737 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -180334,7 +180330,7 @@
     22:22:boolean verifyRegister(int):1832:1832 -> b
     1:1:int instructionIndex(int):1699:1699 -> c
     2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):1795:1795 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     3:3:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):1827:1827 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     1:1:void clear():1732:1732 -> clear
@@ -180346,7 +180342,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     1:1:int getMoveExceptionRegister(int):1800:1800 -> f
     2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1812:1812 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     3:3:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder com.android.tools.r8.ir.code.Position$OutlinePosition.builder(com.android.tools.r8.graph.DexMethod):520:520 -> f
     3:3:com.android.tools.r8.ir.code.Position getCurrentPosition():1812 -> f
     4:4:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder.setOutlineMethodKey(com.android.tools.r8.graph.DexMethod):537:537 -> f
@@ -180359,7 +180355,7 @@
     9:10:com.android.tools.r8.ir.code.Position$OutlinePosition com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder.build():543:544 -> f
     9:10:com.android.tools.r8.ir.code.Position getCurrentPosition():1816 -> f
     1:1:int instructionOffset(int):1704:1704 -> g
-com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.AV:
+com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.EV:
 # {"id":"sourceFile","fileName":"OutlinerImpl.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -180377,18 +180373,18 @@
     com.android.tools.r8.graph.DexType returnType -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.code.Value returnValue -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     int returnValueUniqueUsersLeft -> l
     int pendingNewInstanceIndex -> m
     com.android.tools.r8.ir.optimize.outliner.OutlinerImpl this$0 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FV;"}
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():786:786 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):810:810 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FV;Lcom/android/tools/r8/graph/C5;Ljava/util/List;)V"}
     2:9:void <init>(com.android.tools.r8.ir.optimize.outliner.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):807:814 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.outliner.OutlinerImpl$Outline) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/sV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wV;)V"}
     1:2:void process():818:819 -> a
     3:6:void processInstruction(com.android.tools.r8.ir.code.Instruction):845:848 -> a
     3:6:void process():819 -> a
@@ -180490,7 +180486,7 @@
     124:134:void process():819 -> a
     135:136:void process():821:822 -> a
     137:138:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):889:890 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     139:139:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     139:139:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):892 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -180518,9 +180514,9 @@
     210:216:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):970:976 -> a
     217:217:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):971:971 -> a
     218:218:boolean lambda$canIncludeInstruction$0(com.android.tools.r8.ir.code.Value):892:892 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     219:219:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):982:982 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;I)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;I)Lcom/android/tools/r8/graph/I2;"}
     220:220:boolean com.android.tools.r8.ir.code.Instruction.isInvokePolymorphic():0:0 -> a
     220:220:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):982 -> a
     221:221:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):984:984 -> a
@@ -180532,7 +180528,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     225:228:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):991:994 -> a
     229:231:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):1021:1023 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/LB;I)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/NB;I)Lcom/android/tools/r8/graph/I2;"}
     232:232:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     232:232:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):1029 -> a
     233:236:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):1031:1034 -> a
@@ -180568,11 +180564,11 @@
     253:282:void candidate(int,int):1146:1175 -> a
     283:293:void reset(int):1180:1190 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):999:1005 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):1005 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     9:9:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):1005 -> b
     10:16:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):1008:1014 -> b
     17:17:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> b
@@ -180580,42 +180576,42 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> b
     18:18:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):1014 -> b
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.L5:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.N5:
 # {"id":"sourceFile","fileName":"BasicBlockMuncher.java"}
     1:1:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/iB;)V"}
     2:2:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1131:1131 -> a
     2:2:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):45 -> a
     3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasPrevious():53:53 -> a
     3:3:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):47 -> a
     4:37:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):48:81 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.O5:
 # {"id":"sourceFile","fileName":"BasicBlockPeephole.java"}
     boolean match(com.android.tools.r8.ir.code.InstructionListIterator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
-com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.Am:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.Cm:
 # {"id":"sourceFile","fileName":"DupDupDupPeephole.java"}
     com.android.tools.r8.ir.optimize.peepholes.Point dup1Exp -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point dup2Exp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point dup3Exp -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     1:10:void <init>():28:37 -> <init>
     11:11:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout.lookBackward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):33:33 -> <init>
     11:11:void <init>():37 -> <init>
     12:12:void <init>():37:37 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     3:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31 -> a
     4:4:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     5:10:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     11:11:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     11:11:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):46 -> a
     12:13:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):46:47 -> a
@@ -180711,27 +180707,27 @@
     65:65:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):33:33 -> a
     65:65:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):78 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33:33 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> b
     2:2:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33 -> b
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> b
     3:3:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33 -> b
     4:4:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33:33 -> b
     1:1:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35:35 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     4:4:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35:35 -> c
-com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.kL:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.oL:
 # {"id":"sourceFile","fileName":"LoadLoadDupPeephole.java"}
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
     1:8:void <init>():30:37 -> <init>
@@ -180739,7 +180735,7 @@
     9:9:void <init>():37 -> <init>
     10:10:void <init>():37:37 -> <init>
     1:5:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     6:6:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):45 -> a
     7:8:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):45:46 -> a
@@ -180777,23 +180773,23 @@
     28:31:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):61:64 -> a
     32:32:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):99:99 -> a
     32:32:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.RM:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.VM:
 # {"id":"sourceFile","fileName":"Match.java"}
     java.util.List instructions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:3:void <init>(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[],java.util.List):14:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
-com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.ZO:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.dP:
 # {"id":"sourceFile","fileName":"MoveLoadUpPeephole.java"}
     com.android.tools.r8.ir.code.Value local -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     int stackHeight -> b
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():33:33 -> <clinit>
     1:43:void <init>():33:75 -> <init>
@@ -180801,12 +180797,12 @@
     44:44:void <init>():75 -> <init>
     45:45:void <init>():75:75 -> <init>
     1:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):47:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Load.src():38:38 -> a
     4:4:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):52 -> a
     5:5:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):52:52 -> a
     6:9:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):79:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     10:33:boolean isPotentionalIncInstruction(com.android.tools.r8.ir.code.InstructionListIterator):117:140 -> a
     10:33:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):82 -> a
     34:34:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> a
@@ -180846,7 +180842,7 @@
     69:69:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):33:33 -> a
     69:69:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):111 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     2:2:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60 -> b
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> b
@@ -180855,23 +180851,23 @@
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     12:12:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):68 -> b
     13:13:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):69:69 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.hW:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.lW:
 # {"id":"sourceFile","fileName":"PeepholeExpression.java"}
     java.util.function.Predicate getPredicate() -> a
     void setIndex(int) -> a
     int getMin() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.iW:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.mW:
 # {"id":"sourceFile","fileName":"PeepholeHelper.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
     2:4:boolean lambda$withoutLocalInfo$0(java.util.function.Predicate,com.android.tools.r8.ir.code.Instruction):18:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Kw;)Z"}
     5:5:com.android.tools.r8.ir.code.Instruction resetNext(com.android.tools.r8.ir.code.InstructionListIterator,int):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;I)V"}
     6:7:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):59:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;Ljava/util/List;)V"}
     8:8:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     8:8:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -180883,37 +180879,37 @@
     11:12:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):62 -> a
     13:22:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):64:73 -> a
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Kw;)Z"}
     24:24:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     24:24:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)I"}
     25:25:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     26:26:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     26:26:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):50 -> a
     27:27:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):50:50 -> a
     1:3:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):38:40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)I"}
     4:4:com.android.tools.r8.ir.code.StackValue[] com.android.tools.r8.ir.code.StackValues.getStackValues():25:25 -> b
     4:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):40 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):40:41 -> b
     7:7:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Iw;)Z"}
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.jW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/Kw;)Z"}
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.nW:
 # {"id":"sourceFile","fileName":"PeepholeLayout.java"}
     java.util.List instructions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lW;"}
     boolean backwards -> c
     1:8:void <init>(boolean,com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):18:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z[Lcom/android/tools/r8/internal/hW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z[Lcom/android/tools/r8/internal/lW;)V"}
     1:4:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Lcom/android/tools/r8/internal/RM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Lcom/android/tools/r8/internal/VM;"}
     5:41:com.android.tools.r8.ir.optimize.peepholes.Match testDirection(java.util.function.Supplier,java.util.function.Supplier,java.lang.Runnable):48:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Ljava/util/function/Supplier;Ljava/lang/Runnable;)Lcom/android/tools/r8/internal/RM;"}
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.FW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Ljava/util/function/Supplier;Ljava/lang/Runnable;)Lcom/android/tools/r8/internal/VM;"}
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.JW:
 # {"id":"sourceFile","fileName":"Point.java"}
     java.util.function.Predicate predicate -> a
     int index -> b
@@ -180925,14 +180921,14 @@
     2:3:void setIndex(int):36:37 -> a
     1:1:int getMin():26:26 -> b
     1:1:int getMax():31:31 -> c
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.G40:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.K40:
 # {"id":"sourceFile","fileName":"RemoveDebugPositionPeephole.java"}
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():38:38 -> <clinit>
     1:10:void <init>():38:47 -> <init>
@@ -180940,7 +180936,7 @@
     11:11:void <init>():48 -> <init>
     12:12:void <init>():48:48 -> <init>
     1:5:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):52:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     6:6:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):56 -> a
     7:8:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):56:57 -> a
@@ -180954,21 +180950,21 @@
     24:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):72 -> a
     25:31:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):78:84 -> a
     32:32:boolean lambda$match$0(com.android.tools.r8.ir.code.DebugPosition,com.android.tools.r8.ir.code.Instruction):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh;Lcom/android/tools/r8/internal/Iw;)Z"}
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.Xd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qh;Lcom/android/tools/r8/internal/Kw;)Z"}
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.be0:
 # {"id":"sourceFile","fileName":"StoreLoadPeephole.java"}
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     1:6:void <init>():22:27 -> <init>
     7:7:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout.lookForward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):29:29 -> <init>
     7:7:void <init>():27 -> <init>
     8:8:void <init>():27:27 -> <init>
     1:5:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):31:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     6:6:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):35 -> a
     7:8:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):35:36 -> a
@@ -180999,16 +180995,16 @@
     26:27:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
     26:27:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):44 -> a
     28:31:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):45:48 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.Yd0:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.ce0:
 # {"id":"sourceFile","fileName":"StoreLoadToDupStorePeephole.java"}
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Wildcard dupsExp -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/im0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mm0;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():33:33 -> <clinit>
     1:7:void <init>():33:39 -> <init>
@@ -181016,13 +181012,13 @@
     8:8:void <init>():39 -> <init>
     9:9:void <init>():39:39 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37 -> a
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isDup2():0:0 -> a
     3:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37 -> a
     4:8:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):43:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     9:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     9:9:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):47 -> a
     10:11:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):47:48 -> a
@@ -181062,26 +181058,26 @@
     45:45:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):71 -> a
     46:54:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):72:80 -> a
     55:55:boolean lambda$match$1(com.android.tools.r8.ir.code.Load,com.android.tools.r8.ir.code.Instruction):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jL;Lcom/android/tools/r8/internal/Iw;)Z"}
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.Zd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nL;Lcom/android/tools/r8/internal/Kw;)Z"}
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.de0:
 # {"id":"sourceFile","fileName":"StoreSequenceLoadPeephole.java"}
     com.android.tools.r8.ir.code.Store store -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ae0;"}
     int stackHeight -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.Wildcard seqExp -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/im0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mm0;"}
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JW;"}
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nW;"}
     1:48:void <init>():34:81 -> <init>
     49:49:com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout.lookForward(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[]):29:29 -> <init>
     49:49:void <init>():81 -> <init>
     50:50:void <init>():81:81 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> a
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):42 -> a
     3:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43:43 -> a
@@ -181089,7 +181085,7 @@
     4:4:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43 -> a
     5:11:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43:49 -> a
     12:17:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NJ;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RJ;)Z"}
     18:18:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.peepholes.Point.get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     18:18:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):90 -> a
     19:20:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):90:91 -> a
@@ -181129,9 +181125,9 @@
     60:60:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):125 -> a
     61:61:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):126:126 -> a
     62:62:boolean lambda$match$3(com.android.tools.r8.ir.code.Load,com.android.tools.r8.ir.code.Instruction):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jL;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nL;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
     2:2:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56 -> b
     3:3:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:56 -> b
@@ -181139,7 +181135,7 @@
     4:4:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56 -> b
     5:14:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:65 -> b
     1:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):72:73 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     3:3:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     4:4:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):74:74 -> c
@@ -181155,7 +181151,7 @@
     10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Load.src():38:38 -> c
     10:10:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):75 -> c
     11:11:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):75:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.im0:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.mm0:
 # {"id":"sourceFile","fileName":"Wildcard.java"}
     java.util.function.Predicate predicate -> a
     int index -> b
@@ -181167,16 +181163,16 @@
     2:3:void setIndex(int):37:38 -> a
     1:1:int getMin():27:27 -> b
     1:1:int getMax():32:32 -> c
-com.android.tools.r8.ir.optimize.phis.EffectivelyTrivialPhiOptimization -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.ir.optimize.phis.EffectivelyTrivialPhiOptimization -> com.android.tools.r8.internal.Km:
 # {"id":"sourceFile","fileName":"EffectivelyTrivialPhiOptimization.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     1:3:boolean removeEffectivelyTrivialPhis():42:44 -> a
     4:4:java.util.LinkedList com.android.tools.r8.ir.code.IRCode.getBlocks():1450:1450 -> a
     4:4:boolean removeEffectivelyTrivialPhis():44 -> a
@@ -181185,7 +181181,7 @@
     15:15:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
     15:15:boolean removeEffectivelyTrivialPhis():53 -> a
     16:16:void removeEffectivelyTrivialPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tW;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xW;Lcom/android/tools/r8/ir/optimize/a;Ljava/util/IdentityHashMap;)V"}
     17:18:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     17:18:com.android.tools.r8.ir.optimize.phis.EffectivelyTrivialPhiOptimization$SingleValueOrValue computeEffectivelyTrivialPhiValue(com.android.tools.r8.ir.code.Phi):154 -> a
     17:18:void removeEffectivelyTrivialPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.AffectedValues,java.util.Map):67 -> a
@@ -181208,45 +181204,45 @@
     146:146:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> a
     146:146:void addPhiToRemove(java.util.Map,com.android.tools.r8.ir.code.Phi):199 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/xW;)V"}
     147:147:void addPhiToRemove(java.util.Map,com.android.tools.r8.ir.code.Phi):199:199 -> a
     148:148:boolean lambda$removeEffectivelyTrivialPhi$0(com.android.tools.r8.ir.code.Instruction):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
-com.android.tools.r8.ir.optimize.phis.EffectivelyTrivialPhiOptimization$SingleValueOrValue -> com.android.tools.r8.internal.Hm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
+com.android.tools.r8.ir.optimize.phis.EffectivelyTrivialPhiOptimization$SingleValueOrValue -> com.android.tools.r8.internal.Jm:
 # {"id":"sourceFile","fileName":"EffectivelyTrivialPhiOptimization.java"}
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gc0;"}
     com.android.tools.r8.ir.code.Value value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.util.Set phis -> c
     1:4:void <init>(java.util.Set,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.code.Value):220:223 -> <init>
     1:4:void <init>(java.util.Set,com.android.tools.r8.ir.code.Value):217 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     5:8:void <init>(java.util.Set,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.code.Value):220:223 -> <init>
     5:8:void <init>(java.util.Set):209 -> <init>
     9:12:void <init>(java.util.Set,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.code.Value):220:223 -> <init>
     9:12:void <init>(java.util.Set,com.android.tools.r8.ir.analysis.value.SingleValue):213 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/cc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/gc0;)V"}
     1:1:java.util.Set getPhis():235:235 -> a
     1:1:com.android.tools.r8.ir.analysis.value.SingleValue getSingleValue():231:231 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gc0;"}
     1:1:com.android.tools.r8.ir.code.Value getValue():243:243 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:boolean hasSingleValue():227:227 -> d
     1:1:boolean hasValue():239:239 -> e
-com.android.tools.r8.ir.optimize.string.StringBuilderAction -> com.android.tools.r8.internal.pe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction -> com.android.tools.r8.internal.te0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     1:1:boolean isReplaceArgumentByStringConcat():38:38 -> a
     2:5:com.android.tools.r8.ir.code.Value insertStringConstantInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.lang.String):384:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Ljava/lang/String;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Ljava/lang/String;)Lcom/android/tools/r8/internal/bl0;"}
     6:19:com.android.tools.r8.ir.code.Value insertStringConstantInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.lang.String):386:399 -> a
     20:20:com.android.tools.r8.ir.code.Value insertStringConstantInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.lang.String):398:398 -> a
     21:31:void removeStringBuilderInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):409:419 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     32:33:boolean lambda$removeStringBuilderInstruction$0(com.android.tools.r8.ir.optimize.string.StringBuilderOracle,com.android.tools.r8.ir.code.Value):412:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/We0;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/af0;Lcom/android/tools/r8/internal/bl0;)Z"}
     34:34:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOracle$DefaultStringBuilderOracle.isStringBuilderType(com.android.tools.r8.graph.DexType):96:96 -> a
     34:34:boolean lambda$removeStringBuilderInstruction$0(com.android.tools.r8.ir.optimize.string.StringBuilderOracle,com.android.tools.r8.ir.code.Value):413 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -181254,19 +181250,19 @@
     35:35:boolean lambda$removeStringBuilderInstruction$0(com.android.tools.r8.ir.optimize.string.StringBuilderOracle,com.android.tools.r8.ir.code.Value):413 -> a
     1:1:boolean isAllowedToBeOverwrittenByRemoveStringBuilderAction():34:34 -> b
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat asReplaceArgumentByStringConcat():42:42 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/le0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$1 -> com.android.tools.r8.internal.he0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pe0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$1 -> com.android.tools.r8.internal.le0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():368:368 -> <clinit>
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$AppendWithNewConstantString -> com.android.tools.r8.internal.ie0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$AppendWithNewConstantString -> com.android.tools.r8.internal.me0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     java.lang.String replacement -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():101:101 -> <clinit>
     1:2:void <init>(java.lang.String):105:106 -> <init>
     1:9:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):117:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     10:10:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
     10:10:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):125 -> a
     11:13:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):126:128 -> a
@@ -181306,40 +181302,40 @@
     48:48:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):137:137 -> a
     49:49:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):132:132 -> a
     1:1:boolean isAllowedToBeOverwrittenByRemoveStringBuilderAction():145:145 -> b
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$RemoveStringBuilderAction -> com.android.tools.r8.internal.je0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$RemoveStringBuilderAction -> com.android.tools.r8.internal.ne0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     com.android.tools.r8.ir.optimize.string.StringBuilderAction$RemoveStringBuilderAction INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/je0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ne0;"}
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>():46:46 -> <init>
     1:1:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     1:1:boolean isAllowedToBeOverwrittenByRemoveStringBuilderAction():67:67 -> b
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByExistingString -> com.android.tools.r8.internal.ke0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByExistingString -> com.android.tools.r8.internal.oe0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     com.android.tools.r8.ir.code.Value string -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Value):255:256 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):267:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     1:1:boolean isAllowedToBeOverwrittenByRemoveStringBuilderAction():272:272 -> b
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat -> com.android.tools.r8.internal.le0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat -> com.android.tools.r8.internal.pe0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     com.android.tools.r8.ir.code.Value first -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Value second -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.lang.String newConstant -> c
     com.android.tools.r8.ir.code.Value outValue -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean removeInstruction -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():276:276 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.lang.String,com.android.tools.r8.ir.code.Value):285:291 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Ljava/lang/String;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Ljava/lang/String;Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):321:321 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     2:2:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     2:2:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):322 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -181361,37 +181357,37 @@
     27:34:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):340:347 -> a
     35:35:boolean isReplaceArgumentByStringConcat():353:353 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat asReplaceArgumentByStringConcat():358:358 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/le0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByConstantString -> com.android.tools.r8.internal.me0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pe0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByConstantString -> com.android.tools.r8.internal.qe0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     java.lang.String replacement -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
     1:2:void <init>(java.lang.String):78:79 -> <init>
     1:3:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):90:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByExistingString -> com.android.tools.r8.internal.ne0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByExistingString -> com.android.tools.r8.internal.re0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     com.android.tools.r8.ir.code.Value existingString -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Value):169:170 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:2:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):181:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     1:1:boolean isAllowedToBeOverwrittenByRemoveStringBuilderAction():187:187 -> b
-com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByStringConcat -> com.android.tools.r8.internal.oe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceByStringConcat -> com.android.tools.r8.internal.se0:
 # {"id":"sourceFile","fileName":"StringBuilderAction.java"}
     com.android.tools.r8.ir.code.Value first -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Value second -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     java.lang.String newConstant -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():191:191 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.lang.String):198:203 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Ljava/lang/String;)V"}
     1:12:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):229:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/optimize/a;Lcom/android/tools/r8/internal/Ze0;)V"}
     13:13:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():36:36 -> a
     13:13:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):240 -> a
     14:14:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):242:242 -> a
@@ -181406,17 +181402,17 @@
     23:23:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):245:245 -> a
     24:27:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):244:247 -> a
     28:28:void perform(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.AffectedValues,com.android.tools.r8.ir.optimize.string.StringBuilderOracle):239:239 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer -> com.android.tools.r8.internal.te0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer -> com.android.tools.r8.internal.xe0:
 # {"id":"sourceFile","fileName":"StringBuilderAppendOptimizer.java"}
     com.android.tools.r8.ir.optimize.string.StringBuilderOracle oracle -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ze0;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():83:83 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):89:90 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     1:2:void lambda$optimizeOnGraphs$0(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):554 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ne0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Re0;)V"}
     3:8:void lambda$optimizeOnGraphs$0(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):555:560 -> a
     9:9:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNode.isNewInstanceNode():0:0 -> a
     9:9:void lambda$optimizeOnGraphs$0(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):560 -> a
@@ -181439,7 +181435,7 @@
     29:29:void lambda$optimizeOnGraphs$0(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):585 -> a
     30:30:void lambda$optimizeOnGraphs$0(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):585:585 -> a
     31:32:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):100:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     33:33:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     33:33:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):102 -> a
     34:34:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveNewInstance():272:272 -> a
@@ -181449,7 +181445,7 @@
     35:35:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103 -> a
     36:36:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):103:103 -> a
     37:86:java.util.Map optimizeOnGraphs(com.android.tools.r8.ir.code.IRCode,java.util.Map):540:589 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Map;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Map;)Ljava/util/IdentityHashMap;"}
     87:116:java.util.Collection computeProcessingOrder(java.util.Map,java.util.Map,java.util.Map):622:651 -> a
     87:116:java.util.Map optimizeOnGraphs(com.android.tools.r8.ir.code.IRCode,java.util.Map):604 -> a
     117:117:java.util.Map optimizeOnGraphs(com.android.tools.r8.ir.code.IRCode,java.util.Map):604:604 -> a
@@ -181468,7 +181464,7 @@
     1:1:java.lang.String getRewriterId():95:95 -> b
     2:4:java.util.Map computeStringBuilderGraphs(com.android.tools.r8.ir.code.IRCode):156:158 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):108 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:5:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.bottom():29:29 -> b
     5:5:java.util.Map computeStringBuilderGraphs(com.android.tools.r8.ir.code.IRCode):161 -> b
     5:5:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):108 -> b
@@ -181500,27 +181496,27 @@
     389:389:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):123 -> b
     390:391:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):124:125 -> b
     1:1:com.android.tools.r8.ir.code.Value lambda$optimizeOnGraphs$1(com.android.tools.r8.ir.code.IRCode):598:598 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/bl0;"}
     2:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.stringClassType(com.android.tools.r8.graph.AppView):423:424 -> c
     2:3:com.android.tools.r8.ir.code.Value lambda$optimizeOnGraphs$1(com.android.tools.r8.ir.code.IRCode):598 -> c
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.ValueFactory.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> c
     4:4:com.android.tools.r8.ir.code.Value lambda$optimizeOnGraphs$1(com.android.tools.r8.ir.code.IRCode):598 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$1 -> com.android.tools.r8.internal.qe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$1 -> com.android.tools.r8.internal.ue0:
 # {"id":"sourceFile","fileName":"StringBuilderAppendOptimizer.java"}
     com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis val$analysis -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xB;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderEscapeTransferFunction val$transferFunction -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/we0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ae0;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/te0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xe0;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():173:173 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer,com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeTransferFunction):173:173 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/te0;Lcom/android/tools/r8/internal/vB;Lcom/android/tools/r8/internal/we0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xe0;Lcom/android/tools/r8/internal/xB;Lcom/android/tools/r8/internal/Ae0;)V"}
     1:2:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     1:2:boolean visitAllAliasing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):422 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ve0;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/ze0;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Z"}
     3:4:boolean visitAllAliasing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):425:426 -> a
     5:5:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isEscaped(com.android.tools.r8.ir.code.Value):92:92 -> a
     5:5:boolean visitAllAliasing(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):427 -> a
@@ -181533,7 +181529,7 @@
     17:17:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl.getState():92:92 -> a
     17:17:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):467 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/List;)Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/List;)Lcom/android/tools/r8/internal/Nh0;"}
     18:19:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):467:468 -> a
     20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():140:140 -> a
     20:20:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):468 -> a
@@ -181562,7 +181558,7 @@
     65:65:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     65:65:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):521 -> a
     66:67:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):181:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     68:68:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     68:68:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):183 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -181584,9 +181580,9 @@
     108:108:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):224 -> a
     109:112:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):225:228 -> a
     113:113:void lambda$process$0(com.android.tools.r8.ir.code.Value):198:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     114:117:void addNodeToRootAndTail(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):236:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ne0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Re0;)V"}
     118:118:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNode.isMutateNode():0:0 -> a
     118:118:boolean shouldAddNodeToGraph(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode):249 -> a
     118:118:void addNodeToRootAndTail(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):240 -> a
@@ -181618,7 +181614,7 @@
     128:129:void addNodeToRootAndTail(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):241 -> a
     130:130:void addNodeToRootAndTail(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):242:242 -> a
     131:131:void createNodesForInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):264:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/ve0;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/ze0;Ljava/util/function/BiConsumer;)V"}
     132:132:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     132:132:void createNodesForInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):264 -> a
     133:134:void createNodesForInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):267:268 -> a
@@ -181632,16 +181628,16 @@
     144:144:void createNodesForInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):279 -> a
     145:146:void createNodesForInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):279:280 -> a
     147:147:void lambda$createNodesForStringBuilderInstruction$7(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode,com.android.tools.r8.ir.code.Value):322:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/De0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/He0;Lcom/android/tools/r8/internal/bl0;)V"}
     148:148:void lambda$createNodesForStringBuilderInstruction$9(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.string.StringBuilderNode$AppendNode,com.android.tools.r8.ir.code.Value):341:341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Ae0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Ee0;Lcom/android/tools/r8/internal/bl0;)V"}
     149:149:void lambda$createNodesForStringBuilderInstruction$11(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):349:349 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     150:150:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ToStringNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createToStringNode(com.android.tools.r8.ir.code.InvokeMethod):657:657 -> a
     150:150:void lambda$createNodesForStringBuilderInstruction$11(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):349 -> a
     151:151:void lambda$createNodesForStringBuilderInstruction$11(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):348:348 -> a
     152:152:void insertImplicitToStringNode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):388:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Ee0;Lcom/android/tools/r8/internal/ve0;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/Ie0;Lcom/android/tools/r8/internal/ze0;Ljava/util/function/BiConsumer;)V"}
     153:153:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isLiveStringBuilder(com.android.tools.r8.ir.code.Value):88:88 -> a
     153:153:void insertImplicitToStringNode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -181652,9 +181648,9 @@
     156:156:void insertImplicitToStringNode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):389 -> a
     157:162:void insertImplicitToStringNode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):390:395 -> a
     163:163:void lambda$insertImplicitToStringNode$19(java.util.function.BiConsumer,com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode,com.android.tools.r8.ir.code.Value):393:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Ce0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Ge0;Lcom/android/tools/r8/internal/bl0;)V"}
     164:171:void lambda$joiner$21(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState,java.util.List,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):474:481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/se0;Ljava/util/List;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ne0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t1;Lcom/android/tools/r8/internal/we0;Ljava/util/List;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Re0;)V"}
     172:172:com.android.tools.r8.ir.optimize.string.StringBuilderNode$SplitReferenceNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createSplitReferenceNode():637:637 -> a
     172:172:void lambda$joiner$21(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState,java.util.List,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):487 -> a
     173:176:void lambda$joiner$21(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState,java.util.List,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):489:492 -> a
@@ -181667,21 +181663,21 @@
     180:180:void lambda$joiner$21(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState,java.util.List,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):495 -> a
     181:181:com.android.tools.r8.ir.optimize.string.StringBuilderNode$EscapeNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createEscapeNode():629:629 -> a
     181:181:void lambda$createNodesForInstruction$3(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/bl0;)V"}
     182:182:void lambda$createNodesForInstruction$3(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):275:275 -> a
     183:183:com.android.tools.r8.ir.optimize.string.StringBuilderNode$EscapeNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createEscapeNode():629:629 -> a
     183:183:void lambda$process$1(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value):201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/bl0;)V"}
     184:184:void lambda$process$1(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value):200:200 -> a
     185:185:com.android.tools.r8.ir.optimize.string.StringBuilderNode$LoopNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createLoopNode():641:641 -> a
     185:185:com.android.tools.r8.ir.optimize.string.StringBuilderNode lambda$joiner$22(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):516 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ne0;)Lcom/android/tools/r8/internal/Ne0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Re0;)Lcom/android/tools/r8/internal/Re0;"}
     186:187:void com.android.tools.r8.ir.optimize.string.StringBuilderNode.addSuccessor(com.android.tools.r8.ir.optimize.string.StringBuilderNode):181:182 -> a
     186:187:com.android.tools.r8.ir.optimize.string.StringBuilderNode lambda$joiner$22(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):517 -> a
     1:1:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isBottom():104:104 -> b
     1:1:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isUnreachable():112 -> b
     1:1:void visitStringBuilderValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):403 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/ve0;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/ze0;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     2:2:void visitStringBuilderValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):406:406 -> b
     3:3:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isLiveStringBuilder(com.android.tools.r8.ir.code.Value):88:88 -> b
     3:3:void visitStringBuilderValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):406 -> b
@@ -181708,9 +181704,9 @@
     20:20:void visitStringBuilderValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):411 -> b
     21:22:void visitStringBuilderValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.Consumer,java.util.function.Consumer):411:412 -> b
     23:23:void lambda$process$2(java.util.Map,java.util.Map,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderNode):218:218 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Ne0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/Re0;)V"}
     24:28:void createNodesForStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):295:299 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/ve0;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/ze0;Ljava/util/function/BiConsumer;)V"}
     29:29:com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createNewInstanceNode(com.android.tools.r8.ir.code.NewInstance):645:645 -> b
     29:29:void createNodesForStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):299 -> b
     30:35:void createNodesForStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):298:303 -> b
@@ -181781,58 +181777,58 @@
     168:168:void createNodesForStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState,java.util.function.BiConsumer):371:371 -> b
     169:169:com.android.tools.r8.ir.optimize.string.StringBuilderNode$EscapeNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createEscapeNode():629:629 -> b
     169:169:void lambda$createNodesForInstruction$4(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):276 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/bl0;)V"}
     170:170:void lambda$createNodesForInstruction$4(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):276:276 -> b
     171:171:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> b
     171:171:void lambda$createNodesForStringBuilderInstruction$12(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):350 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     172:172:void lambda$createNodesForStringBuilderInstruction$12(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):350:350 -> b
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$MutateNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createMutateNode():633:633 -> c
     1:1:void lambda$createNodesForInstruction$5(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):283 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForInstruction$5(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):283:283 -> c
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> c
     3:3:void lambda$createNodesForStringBuilderInstruction$13(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):355 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:void lambda$createNodesForStringBuilderInstruction$13(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):355:355 -> c
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$MutateNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createMutateNode():633:633 -> d
     1:1:void lambda$createNodesForInstruction$6(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):284 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForInstruction$6(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):284:284 -> d
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> d
     3:3:void lambda$createNodesForStringBuilderInstruction$14(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):356 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:void lambda$createNodesForStringBuilderInstruction$14(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):356:356 -> d
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$MutateNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createMutateNode():633:633 -> e
     1:1:void lambda$createNodesForStringBuilderInstruction$10(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):342 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForStringBuilderInstruction$10(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Value):342:342 -> e
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderNode$OtherStringBuilderNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createOtherStringBuilderNode(com.android.tools.r8.ir.code.Instruction):665:665 -> e
     3:3:void lambda$createNodesForStringBuilderInstruction$15(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):362 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:void lambda$createNodesForStringBuilderInstruction$15(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):362:362 -> e
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$OtherStringBuilderNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createOtherStringBuilderNode(com.android.tools.r8.ir.code.Instruction):665:665 -> f
     1:1:void lambda$createNodesForStringBuilderInstruction$16(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):364 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForStringBuilderInstruction$16(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):364:364 -> f
     1:1:void lambda$createNodesForStringBuilderInstruction$17(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):375:375 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ToStringNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createToStringNode(com.android.tools.r8.ir.code.InvokeMethod):657:657 -> g
     2:2:void lambda$createNodesForStringBuilderInstruction$17(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):375 -> g
     3:3:void lambda$createNodesForStringBuilderInstruction$17(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):375:375 -> g
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> h
     1:1:void lambda$createNodesForStringBuilderInstruction$18(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):376 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForStringBuilderInstruction$18(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):376:376 -> h
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> i
     1:1:void lambda$createNodesForStringBuilderInstruction$8(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):323 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$createNodesForStringBuilderInstruction$8(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):323:323 -> i
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode com.android.tools.r8.ir.optimize.string.StringBuilderNode.createInspectionNode(com.android.tools.r8.ir.code.Instruction):661:661 -> j
     1:1:void lambda$insertImplicitToStringNode$20(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):394 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)V"}
     2:2:void lambda$insertImplicitToStringNode$20(java.util.function.BiConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):394:394 -> j
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$2 -> com.android.tools.r8.internal.re0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$2 -> com.android.tools.r8.internal.ve0:
 # {"id":"sourceFile","fileName":"StringBuilderAppendOptimizer.java"}
     java.util.Map val$stringBuilderDependencies -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -181845,10 +181841,10 @@
     1:1:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode,java.util.function.Function):630 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;Ljava/util/function/Function;)V"}
     2:6:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode,java.util.function.Function):630:634 -> a
     7:7:java.util.List getFinalStateForRoots(java.util.Collection):642:642 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState -> com.android.tools.r8.internal.se0:
+com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$StringBuilderGraphState -> com.android.tools.r8.internal.we0:
 # {"id":"sourceFile","fileName":"StringBuilderAppendOptimizer.java"}
     java.util.Map roots -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
@@ -181857,7 +181853,7 @@
     boolean isPartOfLoop -> c
     1:3:void <init>(java.util.Map,java.util.Map):135:137 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/util/IdentityHashMap;)V"}
-com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState -> com.android.tools.r8.internal.ve0:
+com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState -> com.android.tools.r8.internal.ze0:
 # {"id":"sourceFile","fileName":"StringBuilderEscapeState.java"}
     java.util.Map aliasesToDefinitions -> b
     java.util.Map definitionsToAliases -> c
@@ -181865,9 +181861,9 @@
     java.util.Set liveStringBuilders -> e
     java.util.Set newlyEscaped -> f
     com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState BOTTOM -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ze0;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState EMPTY -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ze0;"}
     boolean $assertionsDisabled -> i
     1:4:void <clinit>():23:26 -> <clinit>
     1:6:void <init>():45:50 -> <init>
@@ -181875,10 +181871,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/HashSet;)V"}
     12:21:void <init>(java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set):59:68 -> <init>
     1:1:boolean isLiveStringBuilder(com.android.tools.r8.ir.code.Value):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     2:2:boolean isBottom():104:104 -> a
     2:2:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ve0;)Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ze0;)Lcom/android/tools/r8/internal/ze0;"}
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):119:119 -> a
     4:4:boolean isBottom():104:104 -> a
     4:4:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):119 -> a
@@ -181933,7 +181929,7 @@
     4:4:int hashCode():163 -> hashCode
     5:5:int hashCode():163:163 -> hashCode
     6:6:int hashCode():157:157 -> hashCode
-com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder -> com.android.tools.r8.internal.ue0:
+com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder -> com.android.tools.r8.internal.ye0:
 # {"id":"sourceFile","fileName":"StringBuilderEscapeState.java"}
     java.util.Map aliasesToDefinitions -> a
     java.util.Map definitionsToAliases -> b
@@ -181942,18 +181938,18 @@
     java.util.Set newlyEscaping -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState previous -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ze0;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():176:176 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):186:186 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ze0;)V"}
     2:11:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):182:191 -> <init>
     1:4:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder addAliasesToDefinitions(com.android.tools.r8.ir.code.Value,java.util.Set):195:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)Lcom/android/tools/r8/internal/ue0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)Lcom/android/tools/r8/internal/ye0;"}
     5:8:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder addAlias(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):211:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     9:18:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState build():280:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ze0;"}
     19:22:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState build():288:291 -> a
     23:23:java.util.Set com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.getNewlyEscaped():100:100 -> a
     23:23:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState build():295 -> a
@@ -181961,31 +181957,31 @@
     24:27:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState build():295:298 -> a
     28:28:boolean lambda$build$2(java.util.Set):289:289 -> a
     1:4:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder addDefinitionsToAliases(com.android.tools.r8.ir.code.Value,java.util.Set):203:206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)Lcom/android/tools/r8/internal/ue0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)Lcom/android/tools/r8/internal/ye0;"}
     5:7:void ensureAliasesToDefinitions():248:250 -> b
     1:1:void lambda$ensureAliasesToDefinitions$0(com.android.tools.r8.ir.code.Value,java.util.Set):251:251 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     2:4:void ensureDefinitionToAliases():256:258 -> c
     1:1:void lambda$ensureDefinitionToAliases$1(com.android.tools.r8.ir.code.Value,java.util.Set):259:259 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/Set;)V"}
     2:3:void ensureNewLiveStringBuilders():270:271 -> d
-com.android.tools.r8.ir.optimize.string.StringBuilderEscapeTransferFunction -> com.android.tools.r8.internal.we0:
+com.android.tools.r8.ir.optimize.string.StringBuilderEscapeTransferFunction -> com.android.tools.r8.internal.Ae0:
 # {"id":"sourceFile","fileName":"StringBuilderEscapeTransferFunction.java"}
     com.android.tools.r8.ir.optimize.string.StringBuilderOracle oracle -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ze0;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOracle):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ve0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ze0;)V"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeInitialState(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):22:22 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/z1;"}
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.empty():33:33 -> a
     3:3:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState computeInitialState(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):109 -> a
     3:3:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeInitialState(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):22 -> a
     4:4:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/ve0;)Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/ze0;)Lcom/android/tools/r8/internal/ze0;"}
     5:5:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isBottom():104:104 -> a
     5:5:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):34 -> a
     6:6:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.builder():172:172 -> a
@@ -181997,7 +181993,7 @@
     8:9:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):37 -> a
     10:23:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):39:52 -> a
     24:24:void lambda$applyBlock$0(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder,com.android.tools.r8.ir.code.Phi):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ue0;Lcom/android/tools/r8/internal/tW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ye0;Lcom/android/tools/r8/internal/xW;)V"}
     25:25:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder.addLiveStringBuilder(com.android.tools.r8.ir.code.Value):242:242 -> a
     25:25:void lambda$applyBlock$0(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder,com.android.tools.r8.ir.code.Phi):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -182014,7 +182010,7 @@
     30:31:void lambda$applyBlock$0(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder,com.android.tools.r8.ir.code.Phi):47 -> a
     32:32:void lambda$applyBlock$0(com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder,com.android.tools.r8.ir.code.Phi):48:48 -> a
     33:33:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/ve0;)Lcom/android/tools/r8/internal/ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/ze0;)Lcom/android/tools/r8/internal/ze0;"}
     34:34:boolean com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.isBottom():104:104 -> a
     34:34:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):58 -> a
     35:35:com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState$Builder com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState.builder():172:172 -> a
@@ -182092,18 +182088,18 @@
     102:103:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):100 -> a
     104:104:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.string.StringBuilderEscapeState):103:103 -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult applyBlock(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):22:22 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderHelper -> com.android.tools.r8.internal.xe0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderHelper -> com.android.tools.r8.internal.Be0:
 # {"id":"sourceFile","fileName":"StringBuilderHelper.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:29:java.lang.String extractConstantArgument(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):47:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/I2;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/I2;)Ljava/lang/String;"}
     30:30:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isNullType():0:0 -> a
     30:30:java.lang.String extractConstantArgument(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):75 -> a
     31:34:java.lang.String extractConstantArgument(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):76:79 -> a
     35:52:java.lang.Number extractConstantNumber(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Value):86:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)Ljava/lang/Number;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)Ljava/lang/Number;"}
     53:53:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     53:53:java.lang.Number extractConstantNumber(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Value):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -182112,7 +182108,7 @@
     55:55:java.lang.Number extractConstantNumber(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Value):104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     56:76:java.lang.Number extractConstantNumber(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Value):104:124 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNode -> com.android.tools.r8.internal.Ne0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode -> com.android.tools.r8.internal.Re0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     java.util.Set successors -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashSet;"}
@@ -182129,21 +182125,21 @@
     4:4:void <init>():71 -> <init>
     5:9:void <init>():71:75 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$AppendNode asAppendNode():140:140 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ae0;"}
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode asImplicitToStringNode():160:160 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ce0;"}
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode asInitNode():136:136 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/De0;"}
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode asInitOrAppend():144:144 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ee0;"}
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode asNewInstanceNode():132:132 -> k
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode asImplicitToStringNode():160:160 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ge0;"}
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode asInitNode():136:136 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/He0;"}
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode asInitOrAppend():144:144 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ie0;"}
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode asNewInstanceNode():132:132 -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Me0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():164:164 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:2:com.android.tools.r8.ir.optimize.string.StringBuilderNode getSinglePredecessor():194:195 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ne0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Re0;"}
     1:2:com.android.tools.r8.ir.optimize.string.StringBuilderNode getSingleSuccessor():176:177 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ne0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Re0;"}
     1:1:boolean hasSinglePredecessor():190:190 -> o
     1:1:boolean hasSingleSuccessor():172:172 -> p
     1:1:boolean isInitNode():0:0 -> q
@@ -182169,163 +182165,163 @@
     11:11:java.util.Set getSuccessors():186:186 -> t
     11:11:void removeNode():213 -> t
     12:14:void removeNode():213:215 -> t
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$AppendNode -> com.android.tools.r8.internal.Ae0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$AppendNode -> com.android.tools.r8.internal.Ee0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.InvokeVirtual instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eC;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode implicitToStringNode -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ce0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ge0;"}
     java.lang.String constantArgument -> g
     com.android.tools.r8.ir.code.Value nonConstantArgument -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     1:2:void <init>(com.android.tools.r8.ir.code.InvokeVirtual):409:410 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eC;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():435:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     2:2:void setConstantArgument(java.lang.String):450:450 -> a
     3:3:void setImplicitToStringNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode):455:455 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ce0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge0;)V"}
     4:4:void setNonConstantArgument(com.android.tools.r8.ir.code.Value):470:470 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     1:1:com.android.tools.r8.ir.code.Value getNonConstantArgument():475:475 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.String getConstantArgument():480:480 -> c
     1:1:boolean hasConstantArgument():485:485 -> d
     1:1:boolean hasNonConstantArgument():465:465 -> e
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode getImplicitToStringNode():460:460 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ce0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ge0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$AppendNode asAppendNode():425:425 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ae0;"}
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode asInitOrAppend():430:430 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ee0;"}
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode asInitOrAppend():430:430 -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ie0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():445:445 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$EscapeNode -> com.android.tools.r8.internal.Be0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$EscapeNode -> com.android.tools.r8.internal.Fe0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     1:1:void <init>():219:219 -> <init>
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode -> com.android.tools.r8.internal.Ce0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode -> com.android.tools.r8.internal.Ge0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode initOrAppend -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ne0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Re0;"}
     1:2:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode):609:610 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ee0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ie0;)V"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode asImplicitToStringNode():624:624 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ce0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode -> com.android.tools.r8.internal.De0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ge0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode -> com.android.tools.r8.internal.He0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.InvokeDirect instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IB;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode implicitToStringNode -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ce0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ge0;"}
     java.lang.String constantArgument -> g
     com.android.tools.r8.ir.code.Value nonConstantArgument -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():307:307 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.InvokeDirect):315:316 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IB;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():341:341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     2:2:void setConstantArgument(java.lang.String):356:356 -> a
     3:3:void setNonConstantArgument(com.android.tools.r8.ir.code.Value):371:371 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     4:4:void setImplicitToStringNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode):376:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ce0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge0;)V"}
     1:2:com.android.tools.r8.ir.code.Value getNonConstantArgument():391:392 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     1:1:java.lang.String getConstantArgument():361:361 -> c
     1:1:boolean hasConstantArgument():366:366 -> d
     1:1:boolean hasNonConstantArgument():386:386 -> e
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode getImplicitToStringNode():381:381 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ce0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ge0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitNode asInitNode():331:331 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/De0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/He0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode asInitOrAppend():336:336 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ee0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ie0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():351:351 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:1:boolean isInitOrAppend():326:326 -> r
     1:1:boolean isStringBuilderInstructionNode():346:346 -> s
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode -> com.android.tools.r8.internal.Ee0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode -> com.android.tools.r8.internal.Ie0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     void setConstantArgument(java.lang.String) -> a
     void setImplicitToStringNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ce0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ge0;)V"}
     void setNonConstantArgument(com.android.tools.r8.ir.code.Value) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     com.android.tools.r8.ir.code.Value getNonConstantArgument() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     java.lang.String getConstantArgument() -> c
     boolean hasConstantArgument() -> d
     boolean hasNonConstantArgument() -> e
     com.android.tools.r8.ir.optimize.string.StringBuilderNode$ImplicitToStringNode getImplicitToStringNode() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ce0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode -> com.android.tools.r8.internal.Fe0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ge0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$InspectingNode -> com.android.tools.r8.internal.Je0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.Instruction instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction):535:536 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():551:551 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():561:561 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:1:boolean isStringBuilderInstructionNode():556:556 -> s
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$LoopNode -> com.android.tools.r8.internal.Ge0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$LoopNode -> com.android.tools.r8.internal.Ke0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     1:1:void <init>():263:263 -> <init>
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$MutateNode -> com.android.tools.r8.internal.He0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$MutateNode -> com.android.tools.r8.internal.Le0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     1:1:void <init>():239:239 -> <init>
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode -> com.android.tools.r8.internal.Ie0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode -> com.android.tools.r8.internal.Me0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.NewInstance instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rQ;"}
     1:2:void <init>(com.android.tools.r8.ir.code.NewInstance):276:277 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rQ;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$NewInstanceNode asNewInstanceNode():287:287 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ie0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Me0;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():302:302 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:1:boolean isStringBuilderInstructionNode():297:297 -> s
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$OtherStringBuilderNode -> com.android.tools.r8.internal.Je0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$OtherStringBuilderNode -> com.android.tools.r8.internal.Ne0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.Instruction instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction):571:572 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():587:587 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():597:597 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:1:boolean isStringBuilderInstructionNode():592:592 -> s
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$SplitReferenceNode -> com.android.tools.r8.internal.Ke0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$SplitReferenceNode -> com.android.tools.r8.internal.Oe0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     1:1:void <init>():251:251 -> <init>
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction -> com.android.tools.r8.internal.Le0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction -> com.android.tools.r8.internal.Pe0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.Instruction getInstruction() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderNode$ToStringNode -> com.android.tools.r8.internal.Me0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderNode$ToStringNode -> com.android.tools.r8.internal.Qe0:
 # {"id":"sourceFile","fileName":"StringBuilderNode.java"}
     com.android.tools.r8.ir.code.InvokeMethod instruction -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NB;"}
     1:2:void <init>(com.android.tools.r8.ir.code.InvokeMethod):496:497 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;)V"}
     1:1:com.android.tools.r8.ir.code.Instruction getInstruction():512:512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kw;"}
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction asStringBuilderInstructionNode():522:522 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Le0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pe0;"}
     1:1:boolean isStringBuilderInstructionNode():517:517 -> s
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher -> com.android.tools.r8.internal.Ue0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher -> com.android.tools.r8.internal.Ye0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$PeepholePattern[] peepholePatterns -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Te0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xe0;"}
     1:1:void <clinit>():454:454 -> <clinit>
     1:2:java.lang.String getConstantArgumentForNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):344:345 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ee0;Lcom/android/tools/r8/internal/Se0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ie0;Lcom/android/tools/r8/internal/We0;)Ljava/lang/String;"}
     3:3:java.lang.String getOptimizedConstantArgument(com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):352:352 -> a
     3:3:java.lang.String getConstantArgumentForNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):347 -> a
     4:4:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
@@ -182334,20 +182330,20 @@
     4:4:java.lang.String getConstantArgumentForNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):347 -> a
     5:8:java.lang.String getOptimizedConstantArgument(com.android.tools.r8.ir.optimize.string.StringBuilderNode$StringBuilderInstruction,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):353:356 -> a
     5:8:java.lang.String getConstantArgumentForNode(com.android.tools.r8.ir.optimize.string.StringBuilderNode$InitOrAppendNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):347 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchAppends -> com.android.tools.r8.internal.Oe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchAppends -> com.android.tools.r8.internal.Se0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     1:1:void <init>():113:113 -> <init>
     1:24:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):118:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Se0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/We0;)Z"}
     25:28:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):140:143 -> a
     29:31:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):142:144 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchNonMaterializing -> com.android.tools.r8.internal.Pe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchNonMaterializing -> com.android.tools.r8.internal.Te0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():366:366 -> <clinit>
     1:1:void <init>():366:366 -> <init>
     1:1:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):373:373 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Se0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/We0;)Z"}
     2:2:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNode.isSplitReferenceNode():0:0 -> a
     2:2:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):378 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isLooping(com.android.tools.r8.ir.optimize.string.StringBuilderNode):78:78 -> a
@@ -182408,7 +182404,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     59:60:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):420:421 -> a
     61:66:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):420:425 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchToString -> com.android.tools.r8.internal.Qe0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchToString -> com.android.tools.r8.internal.Ue0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():161:161 -> <clinit>
@@ -182416,7 +182412,7 @@
     1:1:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isEscaping(com.android.tools.r8.ir.optimize.string.StringBuilderNode):82:82 -> a
     1:1:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Se0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/We0;)Z"}
     2:2:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isEscaping(com.android.tools.r8.ir.optimize.string.StringBuilderNode):82:82 -> a
     2:2:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):168 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isInspecting(com.android.tools.r8.ir.optimize.string.StringBuilderNode):86:86 -> a
@@ -182445,7 +182441,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     42:44:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):203:205 -> a
     45:49:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):204:208 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchToStringIntoStringConcat -> com.android.tools.r8.internal.Re0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchToStringIntoStringConcat -> com.android.tools.r8.internal.Ve0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():224:224 -> <clinit>
@@ -182453,7 +182449,7 @@
     1:1:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isEscaping(com.android.tools.r8.ir.optimize.string.StringBuilderNode):82:82 -> a
     1:1:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Se0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/We0;)Z"}
     2:2:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isEscaping(com.android.tools.r8.ir.optimize.string.StringBuilderNode):82:82 -> a
     2:2:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):231 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState.isInspecting(com.android.tools.r8.ir.optimize.string.StringBuilderNode):86:86 -> a
@@ -182512,12 +182508,12 @@
     102:102:com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat com.android.tools.r8.ir.optimize.string.StringBuilderAction$ReplaceArgumentByStringConcat.replaceByValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):296:296 -> a
     102:102:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):330 -> a
     103:107:boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState):333:337 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState -> com.android.tools.r8.internal.Se0:
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState -> com.android.tools.r8.internal.We0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     java.util.Map actions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.ir.optimize.string.StringBuilderOracle oracle -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ve0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ze0;"}
     java.util.Set escaping -> c
     java.util.Set inspectingCapacity -> d
     java.util.Set looping -> e
@@ -182529,17 +182525,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.function.Supplier newValueSupplier -> i
     1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.ir.optimize.string.StringBuilderOracle,java.util.function.Supplier):62:62 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Ve0;Ljava/util/function/Supplier;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Ze0;Ljava/util/function/Supplier;)V"}
     2:21:void <init>(java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.ir.optimize.string.StringBuilderOracle,java.util.function.Supplier):51:70 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNewOutValue():90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
-com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$PeepholePattern -> com.android.tools.r8.internal.Te0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
+com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$PeepholePattern -> com.android.tools.r8.internal.Xe0:
 # {"id":"sourceFile","fileName":"StringBuilderNodeMuncher.java"}
     boolean optimize(com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNode,com.android.tools.r8.ir.optimize.string.StringBuilderNodeMuncher$MunchingState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Ne0;Lcom/android/tools/r8/internal/Se0;)Z"}
-com.android.tools.r8.ir.optimize.string.StringBuilderOracle -> com.android.tools.r8.internal.We0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/Re0;Lcom/android/tools/r8/internal/We0;)Z"}
+com.android.tools.r8.ir.optimize.string.StringBuilderOracle -> com.android.tools.r8.internal.af0:
 # {"id":"sourceFile","fileName":"StringBuilderOracle.java"}
-com.android.tools.r8.ir.optimize.string.StringBuilderOracle$DefaultStringBuilderOracle -> com.android.tools.r8.internal.Ve0:
+com.android.tools.r8.ir.optimize.string.StringBuilderOracle$DefaultStringBuilderOracle -> com.android.tools.r8.internal.Ze0:
 # {"id":"sourceFile","fileName":"StringBuilderOracle.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -182548,7 +182544,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):56:57 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     1:2:boolean isModeledStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,java.util.function.Predicate):64:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Kw;)Z"}
     3:3:boolean isStringBuilderType(com.android.tools.r8.graph.DexType):96:96 -> a
     3:3:boolean isModeledStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,java.util.function.Predicate):65 -> a
     4:6:boolean isModeledStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,java.util.function.Predicate):66:68 -> a
@@ -182579,16 +182575,16 @@
     15:15:boolean isModeledStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,java.util.function.Predicate):69 -> a
     16:18:boolean isModeledStringBuilderInstruction(com.android.tools.r8.ir.code.Instruction,java.util.function.Predicate):72:74 -> a
     19:20:boolean hasStringBuilderType(com.android.tools.r8.ir.code.Value):89:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)Z"}
     21:21:boolean isStringBuilderType(com.android.tools.r8.graph.DexType):96:96 -> a
     21:21:boolean hasStringBuilderType(com.android.tools.r8.ir.code.Value):90 -> a
     22:22:boolean isToString(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/bl0;)Z"}
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     23:23:boolean isToString(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):105 -> a
     24:31:boolean isToString(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):105:112 -> a
     32:36:java.lang.String getConstantArgument(com.android.tools.r8.ir.code.Instruction):120:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Ljava/lang/String;"}
     37:38:boolean isAppendWithSubArray(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):186:187 -> a
     37:38:java.lang.String getConstantArgument(com.android.tools.r8.ir.code.Instruction):124 -> a
     39:39:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendSubArrayMethod(com.android.tools.r8.graph.DexMethod):2475:2475 -> a
@@ -182674,7 +182670,7 @@
     72:78:java.lang.String getConstantStringForInit(com.android.tools.r8.ir.code.InvokeDirect):152:158 -> a
     72:78:java.lang.String getConstantArgument(com.android.tools.r8.ir.code.Instruction):127 -> a
     79:84:boolean canObserveStringBuilderCall(com.android.tools.r8.ir.code.Instruction):193:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Z"}
     85:85:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):2457:2457 -> a
     85:85:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectOrCharSequenceMethod(com.android.tools.r8.graph.DexMethod):2466 -> a
     85:85:boolean canObserveStringBuilderCall(com.android.tools.r8.ir.code.Instruction):198 -> a
@@ -182704,7 +182700,7 @@
     101:101:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isStringType(com.android.tools.r8.graph.DexItemFactory):307:307 -> a
     101:101:boolean canObserveStringBuilderCall(com.android.tools.r8.ir.code.Instruction):200 -> a
     1:5:boolean isAppend(com.android.tools.r8.ir.code.Instruction):177:181 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     6:6:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendMethod(com.android.tools.r8.graph.DexMethod):2452:2452 -> b
     6:6:boolean isAppend(com.android.tools.r8.ir.code.Instruction):181 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -182717,40 +182713,40 @@
     10:10:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendMethod(com.android.tools.r8.graph.DexMethod):2452:2452 -> b
     10:10:boolean isAppend(com.android.tools.r8.ir.code.Instruction):182 -> b
     11:16:boolean isConstructorInvokeSideEffectFree(com.android.tools.r8.ir.code.Instruction):246:251 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OB;)Z"}
     17:17:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> b
     17:17:boolean isConstructorInvokeSideEffectFree(com.android.tools.r8.ir.code.Instruction):252 -> b
     18:22:boolean isConstructorInvokeSideEffectFree(com.android.tools.r8.ir.code.Instruction):251:255 -> b
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> b
     23:23:boolean isConstructorInvokeSideEffectFree(com.android.tools.r8.ir.code.Instruction):256 -> b
     24:24:boolean isConstructorInvokeSideEffectFree(com.android.tools.r8.ir.code.Instruction):255:255 -> b
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.cb:
 # {"id":"sourceFile","fileName":"CfUtilityMethodsForCodeOptimizations.java"}
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):32:32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     2:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createSynthesizedType(java.lang.String):3057:3058 -> a
     2:3:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):32 -> a
     4:8:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):33:37 -> a
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.Fb:
 # {"id":"sourceFile","fileName":"CheckCastAndInstanceOfMethodSpecialization.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.utils.collections.SortedProgramMethodSet candidatesForInstanceOfOptimization -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cc0;"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/C;"}
     boolean $assertionsDisabled -> e
     1:4:void <clinit>():38:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):50:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):47:47 -> <init>
     3:3:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create():30:30 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):47 -> <init>
     4:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):47:53 -> <init>
     1:1:void addCandidateForOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.conversion.MethodProcessor):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/pO;)V"}
     2:2:boolean com.android.tools.r8.ir.conversion.IRConverter.isInWave():338:338 -> a
     2:2:void addCandidateForOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.conversion.MethodProcessor):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -182783,7 +182779,7 @@
     18:18:void addCandidateForOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.conversion.MethodProcessor):65 -> a
     19:20:void addCandidateForOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.conversion.MethodProcessor):67:68 -> a
     21:21:void lambda$addCandidateForOptimization$0(com.android.tools.r8.ir.conversion.MethodProcessor):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pO;)V"}
     22:22:void execute(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor):79:79 -> a
     22:22:void lambda$addCandidateForOptimization$0(com.android.tools.r8.ir.conversion.MethodProcessor):65 -> a
     23:23:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
@@ -182814,7 +182810,7 @@
     33:33:void execute(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor):83:83 -> a
     33:33:void lambda$addCandidateForOptimization$0(com.android.tools.r8.ir.conversion.MethodProcessor):65 -> a
     34:39:void processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor):91:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/KX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/OX;)V"}
     40:40:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
     40:40:void processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -182918,14 +182914,14 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     int numberOfArgumentRegisters -> c
     java.util.Map liveAtEntrySets -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.ir.code.Value firstArgumentValue -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.code.Value lastArgumentValue -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode mode -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     java.util.TreeSet freeRegisters -> h
@@ -182937,7 +182933,7 @@
     java.util.List inactive -> l
     java.util.PriorityQueue unhandled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList expiredHere -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     java.util.List moveExceptionIntervals -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     int firstParallelMoveTemporary -> p
@@ -182945,7 +182941,7 @@
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195:195 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     2:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145:166 -> <init>
     24:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
     24:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):166 -> <init>
@@ -182972,12 +182968,12 @@
     40:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap com.android.tools.r8.ir.code.BasicBlock.getLocalsAtEntry():121:121 -> a
     40:40:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3264 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     41:41:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3264:3264 -> a
     42:42:com.android.tools.r8.graph.ProgramMethod getProgramMethod():209:209 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     43:44:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):259:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/vu;Ljava/util/ArrayList;Lcom/android/tools/r8/ir/regalloc/f;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/xu;Ljava/util/ArrayList;Lcom/android/tools/r8/ir/regalloc/f;Ljava/util/IdentityHashMap;)V"}
     45:45:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> a
     45:45:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):261 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -183128,7 +183124,7 @@
     275:275:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister() -> a
     275:275:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/internal/Nz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/internal/Pz;)V"}
     276:284:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3141:3149 -> a
     285:285:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> a
     285:285:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3149 -> a
@@ -183137,9 +183133,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     287:287:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3152:3152 -> a
     288:289:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):329:330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/a;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/a;)Z"}
     290:290:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):436:436 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/ir/regalloc/a;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/ir/regalloc/a;)Z"}
     291:291:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     291:291:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):441 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -183175,7 +183171,7 @@
     306:306:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):443 -> a
     306:306:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):436 -> a
     307:307:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):521:521 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/Mh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/Oh;"}
     308:308:boolean com.android.tools.r8.ir.code.Position.isSome():159:159 -> a
     308:308:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):521 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -183195,7 +183191,7 @@
     328:333:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):539:544 -> a
     334:353:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):527:546 -> a
     354:354:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):636:636 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
     355:355:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> a
     355:355:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):637 -> a
     356:356:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
@@ -183206,7 +183202,7 @@
     357:357:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):637 -> a
     358:358:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):639:639 -> a
     359:359:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):786:786 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     360:360:boolean com.android.tools.r8.ir.code.Value.isFixedRegisterValue():0:0 -> a
     360:360:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):787 -> a
     361:361:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):791:791 -> a
@@ -183216,7 +183212,7 @@
     366:366:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     366:366:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.ir.code.IRCode):2531 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/G5;ILjava/util/ArrayList;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/I5;ILjava/util/ArrayList;Lcom/android/tools/r8/internal/Dt;)V"}
     367:367:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     367:367:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.ir.code.IRCode):2531 -> a
     368:368:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
@@ -183372,7 +183368,7 @@
     482:482:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1253 -> a
     483:487:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1253:1257 -> a
     488:488:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1293:1293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/internal/Kz;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/internal/Mz;)I"}
     489:489:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> a
     489:489:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1296 -> a
     490:490:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
@@ -183672,7 +183668,7 @@
     804:804:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2429:2429 -> a
     805:805:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2428:2428 -> a
     806:806:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2605:2605 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;)V"}
     807:807:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():311:311 -> a
     807:807:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2607 -> a
     808:808:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():311:311 -> a
@@ -183746,131 +183742,136 @@
     908:908:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2735:2735 -> a
     908:908:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2709 -> a
     909:918:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2706:2715 -> a
-    919:919:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    919:919:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2718 -> a
-    920:926:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2719:2725 -> a
-    927:949:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2811:2833 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Z"}
-    950:950:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855:2855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DB;Lcom/android/tools/r8/internal/J5;)V"}
-    951:951:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    951:951:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2960 -> a
+    919:919:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    919:919:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2715 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    951:951:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
-    952:955:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2960:2963 -> a
-    952:955:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
-    956:956:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> a
-    956:956:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2964 -> a
-    956:956:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
-    957:957:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    957:957:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2856 -> a
-    958:967:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2860:2869 -> a
-    968:968:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    968:968:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2870 -> a
+    920:920:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> a
+    920:920:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2715 -> a
+    921:921:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    921:921:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2718 -> a
+    922:928:void computeLiveRanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2719:2725 -> a
+    929:951:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2811:2833 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Z"}
+    952:952:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855:2855 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FB;Lcom/android/tools/r8/internal/L5;)V"}
+    953:953:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    953:953:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2960 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    969:969:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
-    969:969:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2870 -> a
-    970:970:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    953:953:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
+    954:957:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2960:2963 -> a
+    954:957:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
+    958:958:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> a
+    958:958:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2964 -> a
+    958:958:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2855 -> a
+    959:959:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    959:959:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2856 -> a
+    960:969:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2860:2869 -> a
+    970:970:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
     970:970:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2870 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    971:972:int com.android.tools.r8.ir.code.BasicBlock.numberInstructions(int):730:731 -> a
-    971:972:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2871 -> a
-    973:974:void com.android.tools.r8.ir.code.Instruction.setNumber(int):406:407 -> a
-    973:974:int com.android.tools.r8.ir.code.BasicBlock.numberInstructions(int):731 -> a
+    971:971:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> a
+    971:971:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2870 -> a
+    972:972:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    972:972:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2870 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    973:974:int com.android.tools.r8.ir.code.BasicBlock.numberInstructions(int):730:731 -> a
     973:974:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2871 -> a
-    975:988:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2875:2888 -> a
-    989:989:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> a
-    989:989:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2889 -> a
-    990:991:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():765:766 -> a
-    990:991:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2891 -> a
-    992:992:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2892:2892 -> a
-    993:994:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2840:2841 -> a
-    993:994:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2892 -> a
-    995:996:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2893:2894 -> a
-    997:997:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    997:997:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2846 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    997:997:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    998:998:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2846:2846 -> a
-    998:998:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    975:976:void com.android.tools.r8.ir.code.Instruction.setNumber(int):406:407 -> a
+    975:976:int com.android.tools.r8.ir.code.BasicBlock.numberInstructions(int):731 -> a
+    975:976:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2871 -> a
+    977:990:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2875:2888 -> a
+    991:991:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> a
+    991:991:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2889 -> a
+    992:993:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():765:766 -> a
+    992:993:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2891 -> a
+    994:994:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2892:2892 -> a
+    995:996:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2840:2841 -> a
+    995:996:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2892 -> a
+    997:998:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2893:2894 -> a
     999:999:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    999:999:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2847 -> a
+    999:999:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2846 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     999:999:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1000:1000:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2847:2847 -> a
+    1000:1000:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2846:2846 -> a
     1000:1000:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1001:1001:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:522 -> a
-    1001:1001:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2848 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1001:1001:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    1001:1001:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2847 -> a
     1001:1001:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1002:1003:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
-    1002:1003:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2848 -> a
-    1002:1003:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1004:1004:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:517 -> a
-    1004:1004:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2849 -> a
+    1002:1002:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2847:2847 -> a
+    1002:1002:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    1003:1003:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:522 -> a
+    1003:1003:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2848 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1004:1004:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1005:1006:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:518 -> a
-    1005:1006:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2849 -> a
-    1005:1006:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
-    1007:1017:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2897:2907 -> a
-    1018:1018:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    1018:1018:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907 -> a
+    1003:1003:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    1004:1005:void com.android.tools.r8.ir.code.Value.removeUser(com.android.tools.r8.ir.code.Instruction):522:523 -> a
+    1004:1005:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2848 -> a
+    1004:1005:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    1006:1006:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:517 -> a
+    1006:1006:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2849 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1019:1024:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907:2912 -> a
-    1025:1028:void com.android.tools.r8.ir.code.Value.linkTo(com.android.tools.r8.ir.code.Value):306:309 -> a
-    1025:1028:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2916 -> a
-    1029:1029:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2921:2921 -> a
-    1030:1043:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2929:2942 -> a
-    1030:1043:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
-    1044:1044:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    1044:1044:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2942 -> a
+    1006:1006:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    1007:1008:void com.android.tools.r8.ir.code.Value.addUser(com.android.tools.r8.ir.code.Instruction):517:518 -> a
+    1007:1008:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2849 -> a
+    1007:1008:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2895 -> a
+    1009:1019:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2897:2907 -> a
+    1020:1020:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    1020:1020:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1044:1044:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
-    1045:1045:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2942:2942 -> a
-    1045:1045:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
+    1021:1026:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2907:2912 -> a
+    1027:1030:void com.android.tools.r8.ir.code.Value.linkTo(com.android.tools.r8.ir.code.Value):306:309 -> a
+    1027:1030:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2916 -> a
+    1031:1031:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2921:2921 -> a
+    1032:1045:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2929:2942 -> a
+    1032:1045:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
     1046:1046:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    1046:1046:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2943 -> a
+    1046:1046:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1046:1046:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
-    1047:1057:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2945:2955 -> a
-    1047:1057:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
-    1058:1058:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863:2863 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XO;Lcom/android/tools/r8/internal/XO;)I"}
-    1059:1059:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
-    1059:1059:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863 -> a
+    1047:1047:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2942:2942 -> a
+    1047:1047:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
+    1048:1048:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    1048:1048:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2943 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1048:1048:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
+    1049:1059:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2945:2955 -> a
+    1049:1059:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2922 -> a
     1060:1060:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863:2863 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bP;Lcom/android/tools/r8/internal/bP;)I"}
     1061:1061:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     1061:1061:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1062:1066:void increaseCapacity(int,boolean):3053:3057 -> a
+    1062:1062:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863:2863 -> a
+    1063:1063:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
+    1063:1063:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2863 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1064:1068:void increaseCapacity(int,boolean):3053:3057 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1067:1089:int getFreeConsecutiveRegisters(int,boolean):3065:3087 -> a
-    1090:1093:int getNextFreeRegister(java.util.Iterator):3133:3136 -> a
-    1090:1093:int getFreeConsecutiveRegisters(int,boolean):3088 -> a
-    1094:1097:int getNextFreeRegister(java.util.Iterator):3133:3136 -> a
-    1094:1097:int getFreeConsecutiveRegisters(int,boolean):3092 -> a
-    1098:1112:int getFreeConsecutiveRegisters(int,boolean):3095:3109 -> a
-    1113:1124:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3071:3082 -> a
-    1125:1125:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3158:3158 -> a
+    1069:1091:int getFreeConsecutiveRegisters(int,boolean):3065:3087 -> a
+    1092:1095:int getNextFreeRegister(java.util.Iterator):3133:3136 -> a
+    1092:1095:int getFreeConsecutiveRegisters(int,boolean):3088 -> a
+    1096:1099:int getNextFreeRegister(java.util.Iterator):3133:3136 -> a
+    1096:1099:int getFreeConsecutiveRegisters(int,boolean):3092 -> a
+    1100:1114:int getFreeConsecutiveRegisters(int,boolean):3095:3109 -> a
+    1115:1126:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):3071:3082 -> a
+    1127:1127:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3158:3158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)V"}
-    1126:1126:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
-    1126:1126:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3159 -> a
+    1128:1128:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
+    1128:1128:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3159 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1127:1128:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3160:3161 -> a
-    1129:1129:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> a
-    1129:1129:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3162 -> a
-    1130:1134:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3162:3166 -> a
-    1135:1135:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> a
-    1135:1135:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3166 -> a
-    1136:1136:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
-    1136:1136:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3168 -> a
+    1129:1130:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3160:3161 -> a
+    1131:1131:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> a
+    1131:1131:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3162 -> a
+    1132:1136:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3162:3166 -> a
+    1137:1137:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> a
+    1137:1137:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3166 -> a
+    1138:1138:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
+    1138:1138:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1137:1137:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
-    1137:1137:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3168 -> a
-    1138:1138:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3169:3169 -> a
-    1139:1139:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):3271:3271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;ILjava/util/List;)V"}
+    1139:1139:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
+    1139:1139:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3168 -> a
+    1140:1140:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3169:3169 -> a
+    1141:1141:void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List):3271:3271 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;ILjava/util/List;)V"}
     1:1:void allocateRegisters():218:218 -> b
     2:4:boolean noLinkedValues():3218:3220 -> b
     2:4:void allocateRegisters():218 -> b
@@ -183995,7 +183996,7 @@
     120:120:void computeLiveRanges():2582:2582 -> b
     120:120:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():655 -> b
     120:120:void allocateRegisters():226 -> b
-    121:121:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():2833:2833 -> b
+    121:121:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():2839:2839 -> b
     121:121:void computeLiveRanges():2582 -> b
     121:121:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():655 -> b
     121:121:void allocateRegisters():226 -> b
@@ -184006,7 +184007,7 @@
     123:123:void computeLiveRanges():2582:2582 -> b
     123:123:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():655 -> b
     123:123:void allocateRegisters():226 -> b
-    124:124:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():2842:2842 -> b
+    124:124:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():2848:2848 -> b
     124:124:void computeLiveRanges():2582 -> b
     124:124:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():655 -> b
     124:124:void allocateRegisters():226 -> b
@@ -184051,882 +184052,900 @@
     142:142:void allocateRegisters():229:229 -> b
     143:143:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
     143:143:void allocateRegisters():234 -> b
-    144:150:void allocateRegisters():234:240 -> b
-    151:151:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
-    151:151:void allocateRegisters():240 -> b
-    152:157:void allocateRegisters():241:246 -> b
-    158:163:void clearState():551:556 -> b
-    158:163:void allocateRegisters():247 -> b
-    164:164:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):319:319 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
-    165:165:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
-    165:165:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):319 -> b
+    144:146:void allocateRegisters():234:236 -> b
+    147:147:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> b
+    147:147:void allocateRegisters():236 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    148:148:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> b
+    148:148:void allocateRegisters():236 -> b
+    149:152:void allocateRegisters():237:240 -> b
+    153:153:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
+    153:153:void allocateRegisters():240 -> b
+    154:159:void allocateRegisters():241:246 -> b
+    160:165:void clearState():551:556 -> b
+    160:165:void allocateRegisters():247 -> b
     166:166:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):319:319 -> b
-    167:179:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):617:629 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
-    180:180:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    180:180:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):819 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
+    167:167:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
+    167:167:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):319 -> b
+    168:168:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):319:319 -> b
+    169:181:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):617:629 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
+    182:182:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    182:182:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):819 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    180:180:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):631 -> b
-    181:181:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):820:820 -> b
-    181:181:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):631 -> b
-    182:186:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:626 -> b
-    187:187:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
-    187:187:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1435 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)Z"}
-    188:188:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1435:1435 -> b
-    189:189:boolean com.android.tools.r8.utils.InternalOptions.canUseSameArrayAndResultRegisterInArrayGetWide():2800:2800 -> b
+    182:182:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):631 -> b
+    183:183:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):820:820 -> b
+    183:183:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):631 -> b
+    184:188:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:626 -> b
+    189:189:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
     189:189:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1435 -> b
-    190:190:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> b
-    191:191:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    191:191:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1442 -> b
-    192:192:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1442:1442 -> b
-    193:193:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
-    193:193:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> b
-    194:194:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    194:194:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1451 -> b
-    195:196:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1451:1452 -> b
-    197:197:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):667:667 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)Z"}
+    190:190:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1435:1435 -> b
+    191:191:boolean com.android.tools.r8.utils.InternalOptions.canUseSameArrayAndResultRegisterInArrayGetWide():2806:2806 -> b
+    191:191:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1435 -> b
+    192:192:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> b
+    193:193:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    193:193:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1442 -> b
+    194:194:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1442:1442 -> b
+    195:195:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
+    195:195:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> b
+    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    196:196:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1451 -> b
+    197:198:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1451:1452 -> b
+    199:199:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):667:667 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IZ)I"}
-    198:206:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):800:808 -> b
-    198:206:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    207:219:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():468:480 -> b
-    207:219:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
-    207:219:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    220:221:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():485:486 -> b
-    220:221:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
-    220:221:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
-    220:221:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    222:222:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getLimit():22:22 -> b
-    222:222:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():487 -> b
+    200:208:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):800:808 -> b
+    200:208:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
+    209:221:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():468:480 -> b
+    209:221:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
+    209:221:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
+    222:223:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():485:486 -> b
+    222:223:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
+    222:223:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
+    222:223:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
+    224:224:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getLimit():22:22 -> b
+    224:224:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():487 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    222:222:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
-    222:222:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
-    222:222:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    223:223:void com.android.tools.r8.ir.regalloc.LiveIntervals.updateRegisterConstraint(int):253:253 -> b
-    223:223:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():487 -> b
-    223:223:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
-    223:223:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
-    223:223:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    224:224:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):809:809 -> b
+    224:224:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
+    224:224:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
     224:224:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    225:225:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():331:331 -> b
-    225:225:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):811 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    225:225:void com.android.tools.r8.ir.regalloc.LiveIntervals.updateRegisterConstraint(int):253:253 -> b
+    225:225:void com.android.tools.r8.ir.regalloc.LiveIntervals.recomputeLimit():487 -> b
+    225:225:void com.android.tools.r8.ir.regalloc.LiveIntervals.undoSplits():481 -> b
+    225:225:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):808 -> b
     225:225:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    226:226:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():332:332 -> b
-    226:226:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):811 -> b
+    226:226:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):809:809 -> b
     226:226:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
-    227:227:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):671:671 -> b
-    228:229:void pinArgumentRegisters():3034:3035 -> b
-    228:229:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    230:230:void increaseCapacity(int,boolean):3057:3057 -> b
-    230:230:void pinArgumentRegisters():3035 -> b
-    230:230:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    231:231:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    231:231:void pinArgumentRegisters():3040 -> b
-    231:231:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    232:232:void pinArgumentRegisters():3041:3041 -> b
+    227:227:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():331:331 -> b
+    227:227:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):811 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    227:227:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
+    228:228:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():332:332 -> b
+    228:228:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):811 -> b
+    228:228:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):670 -> b
+    229:229:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):671:671 -> b
+    230:231:void pinArgumentRegisters():3034:3035 -> b
+    230:231:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
+    232:232:void increaseCapacity(int,boolean):3057:3057 -> b
+    232:232:void pinArgumentRegisters():3035 -> b
     232:232:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    233:233:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
-    233:233:void pinArgumentRegisters():3042 -> b
+    233:233:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    233:233:void pinArgumentRegisters():3040 -> b
     233:233:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    234:234:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getNextConsecutive():339:339 -> b
-    234:234:void pinArgumentRegisters():3039 -> b
+    234:234:void pinArgumentRegisters():3041:3041 -> b
     234:234:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
-    235:237:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):848:850 -> b
-    235:237:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    238:238:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    238:238:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):852 -> b
-    238:238:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    239:239:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853:853 -> b
-    239:239:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    240:240:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    240:240:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    235:235:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
+    235:235:void pinArgumentRegisters():3042 -> b
+    235:235:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
+    236:236:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getNextConsecutive():339:339 -> b
+    236:236:void pinArgumentRegisters():3039 -> b
+    236:236:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674 -> b
+    237:239:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):848:850 -> b
+    237:239:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    240:240:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    240:240:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):852 -> b
     240:240:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    241:249:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853:861 -> b
-    241:249:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    250:250:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
-    250:250:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):863 -> b
+    241:241:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853:853 -> b
+    241:241:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    242:242:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    242:242:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    250:250:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    251:251:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):863:863 -> b
-    251:251:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    252:252:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():400:400 -> b
-    252:252:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):864 -> b
+    242:242:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    243:251:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):853:861 -> b
+    243:251:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    252:252:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
+    252:252:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):863 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     252:252:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    253:253:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
-    253:253:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():401 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    253:253:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):864 -> b
+    253:253:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):863:863 -> b
     253:253:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    254:254:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
-    254:254:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():546 -> b
-    254:254:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):867 -> b
+    254:254:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():400:400 -> b
+    254:254:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):864 -> b
     254:254:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    255:255:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():546:546 -> b
-    255:255:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):867 -> b
+    255:255:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
+    255:255:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():401 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    255:255:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):864 -> b
     255:255:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    256:256:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
-    256:256:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():547 -> b
+    256:256:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
+    256:256:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():546 -> b
     256:256:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):867 -> b
     256:256:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    257:257:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getPosition():18:18 -> b
-    257:257:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):869 -> b
+    257:257:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():546:546 -> b
+    257:257:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):867 -> b
     257:257:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    258:258:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):869:869 -> b
+    258:258:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
+    258:258:int com.android.tools.r8.ir.regalloc.LiveIntervals.numberOfUsesWithConstraint():547 -> b
+    258:258:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):867 -> b
     258:258:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    259:259:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    259:259:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877 -> b
+    259:259:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getPosition():18:18 -> b
+    259:259:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):869 -> b
     259:259:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    260:260:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877:877 -> b
+    260:260:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):869:869 -> b
     260:260:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    261:261:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> b
+    261:261:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
     261:261:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     261:261:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    262:268:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877:883 -> b
-    262:268:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    269:269:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getNextConsecutive():339:339 -> b
-    269:269:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):885 -> b
-    269:269:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    270:270:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):901:901 -> b
-    270:270:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    271:271:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> b
-    271:271:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):902 -> b
+    262:262:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877:877 -> b
+    262:262:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    263:263:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> b
+    263:263:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    263:263:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    264:270:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):877:883 -> b
+    264:270:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    271:271:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getNextConsecutive():339:339 -> b
+    271:271:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):885 -> b
     271:271:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    272:272:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> b
-    272:272:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):902 -> b
+    272:272:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):901:901 -> b
     272:272:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    273:273:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):903:903 -> b
+    273:273:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> b
+    273:273:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):902 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     273:273:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    274:274:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
-    274:274:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):903 -> b
+    274:274:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock.entry():796:796 -> b
+    274:274:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):902 -> b
     274:274:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    275:275:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):904:904 -> b
+    275:275:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):903:903 -> b
     275:275:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    276:276:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    276:276:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):904 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    276:276:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
+    276:276:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):903 -> b
     276:276:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    277:281:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):905:909 -> b
-    277:281:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    282:282:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    282:282:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):910 -> b
+    277:277:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):904:904 -> b
+    277:277:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    278:278:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    278:278:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):904 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    282:282:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    283:285:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):915:917 -> b
-    283:285:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    286:286:void increaseCapacity(int,boolean):3057:3057 -> b
-    286:286:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):918 -> b
-    286:286:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    287:287:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):921:921 -> b
-    287:287:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    288:288:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
-    288:288:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> b
+    278:278:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    279:283:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):905:909 -> b
+    279:283:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    284:284:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    284:284:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):910 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    284:284:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    285:287:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):915:917 -> b
+    285:287:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    288:288:void increaseCapacity(int,boolean):3057:3057 -> b
+    288:288:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):918 -> b
     288:288:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    289:301:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922:934 -> b
-    289:301:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    302:302:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.clear():244:244 -> b
-    302:302:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):934 -> b
+    289:289:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):921:921 -> b
+    289:289:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    290:290:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
+    290:290:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    302:302:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    303:303:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):936:936 -> b
-    303:303:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    304:304:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
-    304:304:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1078 -> b
+    290:290:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    291:303:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922:934 -> b
+    291:303:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    304:304:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.clear():244:244 -> b
+    304:304:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):934 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    304:304:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     304:304:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    305:305:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    305:305:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> b
-    305:305:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    305:305:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):936:936 -> b
     305:305:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    306:307:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1079:1080 -> b
-    306:307:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
-    306:307:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    308:308:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> b
-    308:308:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1081 -> b
+    306:306:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
+    306:306:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1078 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    308:308:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
-    308:308:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    309:310:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1081:1082 -> b
-    309:310:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
-    309:310:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    311:311:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    311:311:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1083 -> b
+    306:306:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    306:306:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    307:307:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    307:307:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> b
+    307:307:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    307:307:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    308:309:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1079:1080 -> b
+    308:309:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    308:309:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    310:310:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> b
+    310:310:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1081 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    311:311:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
-    311:311:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    312:312:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    312:312:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1084 -> b
+    310:310:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    310:310:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    311:312:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1081:1082 -> b
+    311:312:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
+    311:312:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    313:313:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    313:313:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1083 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    312:312:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
-    312:312:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    313:313:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1085:1085 -> b
     313:313:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     313:313:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    314:314:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    314:314:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> b
+    314:314:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    314:314:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1084 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     314:314:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     314:314:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
     315:315:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1085:1085 -> b
     315:315:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     315:315:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    316:316:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    316:316:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1086 -> b
+    316:316:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    316:316:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> b
     316:316:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     316:316:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    317:317:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> b
+    317:317:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1085:1085 -> b
     317:317:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     317:317:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    318:318:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
-    318:318:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1097 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    318:318:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    318:318:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    318:318:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1086 -> b
+    318:318:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     318:318:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    319:319:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    319:319:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1098 -> b
-    319:319:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    319:319:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> b
+    319:319:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):938 -> b
     319:319:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    320:321:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1098:1099 -> b
-    320:321:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    320:321:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    322:322:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
-    322:322:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1100 -> b
+    320:320:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
+    320:320:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1097 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    322:322:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    322:322:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
-    323:323:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1100 -> b
-    323:323:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    323:323:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    324:324:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1101:1101 -> b
+    320:320:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    320:320:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    321:321:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    321:321:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1098 -> b
+    321:321:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    321:321:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    322:323:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1098:1099 -> b
+    322:323:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    322:323:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
+    324:324:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1100 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     324:324:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     324:324:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    325:325:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    325:325:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1102 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Binop.leftValue():45:45 -> b
+    325:325:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1100 -> b
     325:325:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     325:325:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    326:326:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    326:326:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1103 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    326:326:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1101:1101 -> b
     326:326:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     326:326:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
     327:327:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    327:327:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1104 -> b
+    327:327:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1102 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     327:327:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     327:327:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    328:332:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1104:1108 -> b
-    328:332:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    328:332:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    333:333:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    333:333:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1108 -> b
+    328:328:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    328:328:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1103 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    333:333:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    333:333:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    334:334:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    334:334:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1109 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    334:334:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
-    334:334:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    328:328:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    328:328:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    329:329:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    329:329:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1104 -> b
+    329:329:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    329:329:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    330:334:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1104:1108 -> b
+    330:334:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    330:334:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
     335:335:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    335:335:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1110 -> b
+    335:335:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1108 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     335:335:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     335:335:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    336:336:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1110:1110 -> b
+    336:336:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    336:336:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1109 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     336:336:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     336:336:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    337:337:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    337:337:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1127 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    337:337:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    337:337:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    337:337:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1110 -> b
+    337:337:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
     337:337:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    338:342:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1128:1132 -> b
-    338:342:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    338:342:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    343:343:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> b
-    343:343:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1132 -> b
-    343:343:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    343:343:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    344:344:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> b
-    344:344:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1132 -> b
-    344:344:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    344:344:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    345:346:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1133:1134 -> b
-    345:346:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    345:346:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    347:347:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    347:347:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1135 -> b
+    338:338:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1110:1110 -> b
+    338:338:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):939 -> b
+    338:338:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    339:339:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    339:339:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1127 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    347:347:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    347:347:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    348:348:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    348:348:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1136 -> b
+    339:339:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    339:339:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    340:344:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1128:1132 -> b
+    340:344:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    340:344:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    345:345:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> b
+    345:345:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1132 -> b
+    345:345:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    345:345:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    346:346:boolean com.android.tools.r8.ir.code.Value.isLinked():327:327 -> b
+    346:346:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1132 -> b
+    346:346:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    346:346:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    347:348:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1133:1134 -> b
+    347:348:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    347:348:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    349:349:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    349:349:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1135 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    348:348:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    348:348:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    349:395:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1138:1184 -> b
-    349:395:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    349:395:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    396:396:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getStartOfConsecutive():147:147 -> b
-    396:396:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1186 -> b
-    396:396:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    396:396:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    397:400:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1188:1191 -> b
-    397:400:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    397:400:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    401:401:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getNextConsecutive():154:154 -> b
-    401:401:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1192 -> b
-    401:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
-    401:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    402:402:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    402:402:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):945 -> b
-    402:402:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    403:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):950:959 -> b
-    403:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    413:413:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    413:413:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):959 -> b
-    413:413:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    414:414:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):959:959 -> b
-    414:414:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    415:415:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
-    415:415:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):960 -> b
+    349:349:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    349:349:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    350:350:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    350:350:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1136 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    350:350:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    350:350:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    351:397:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1138:1184 -> b
+    351:397:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    351:397:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    398:398:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getStartOfConsecutive():147:147 -> b
+    398:398:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1186 -> b
+    398:398:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    398:398:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    399:402:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1188:1191 -> b
+    399:402:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    399:402:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    403:403:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getNextConsecutive():154:154 -> b
+    403:403:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1192 -> b
+    403:403:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):944 -> b
+    403:403:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    404:404:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    404:404:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):945 -> b
+    404:404:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    405:414:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):950:959 -> b
+    405:414:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    415:415:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    415:415:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):959 -> b
     415:415:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    416:417:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):960:961 -> b
-    416:417:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    418:418:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    418:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):961 -> b
-    418:418:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    419:424:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):961:966 -> b
-    419:424:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    425:425:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    425:425:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):966 -> b
-    425:425:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    426:439:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):966:979 -> b
-    426:439:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    440:440:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    440:440:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):979 -> b
-    440:440:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    441:441:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):979:979 -> b
-    441:441:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    442:442:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
-    442:442:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980 -> b
+    416:416:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):959:959 -> b
+    416:416:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    417:417:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
+    417:417:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):960 -> b
+    417:417:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    418:419:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):960:961 -> b
+    418:419:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    420:420:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    420:420:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):961 -> b
+    420:420:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    421:426:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):961:966 -> b
+    421:426:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    427:427:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    427:427:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):966 -> b
+    427:427:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    428:441:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):966:979 -> b
+    428:441:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    442:442:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    442:442:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):979 -> b
     442:442:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    443:444:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980:981 -> b
-    443:444:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    445:445:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    445:445:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> b
-    445:445:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    446:451:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981:986 -> b
-    446:451:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    452:452:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    452:452:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):986 -> b
-    452:452:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    453:461:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):986:994 -> b
-    453:461:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    462:462:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegisterLimit():279:279 -> b
-    462:462:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1635 -> b
+    443:443:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):979:979 -> b
+    443:443:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    444:444:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
+    444:444:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980 -> b
+    444:444:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    445:446:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980:981 -> b
+    445:446:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    447:447:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    447:447:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981 -> b
+    447:447:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    448:453:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):981:986 -> b
+    448:453:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    454:454:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    454:454:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):986 -> b
+    454:454:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    455:463:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):986:994 -> b
+    455:463:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    464:464:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegisterLimit():279:279 -> b
+    464:464:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1635 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    462:462:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    462:462:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    463:470:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1636:1643 -> b
-    463:470:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    463:470:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    471:471:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
-    471:471:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1647 -> b
-    471:471:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    471:471:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    472:472:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    472:472:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1647 -> b
+    464:464:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    464:464:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    465:472:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1636:1643 -> b
+    465:472:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    465:472:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    473:473:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
+    473:473:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1647 -> b
+    473:473:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    473:473:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    474:474:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    474:474:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1647 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    472:472:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    472:472:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    473:475:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
-    473:475:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1648 -> b
-    473:475:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    473:475:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    476:480:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1658:1662 -> b
-    476:480:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    476:480:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    481:481:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
-    481:481:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664 -> b
-    481:481:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    481:481:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    482:488:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664:1670 -> b
-    482:488:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    482:488:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    489:489:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
-    489:489:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670 -> b
+    474:474:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    474:474:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    475:477:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
+    475:477:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1648 -> b
+    475:477:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    475:477:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    478:482:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1658:1662 -> b
+    478:482:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    478:482:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    483:483:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
+    483:483:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664 -> b
+    483:483:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    483:483:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    484:484:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664:1664 -> b
+    484:484:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    484:484:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    485:485:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> b
+    485:485:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    489:489:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    489:489:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    490:490:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
-    490:490:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670 -> b
-    490:490:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    490:490:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    491:491:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670:1670 -> b
-    491:491:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    491:491:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    492:492:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    492:492:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1671 -> b
-    492:492:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    492:492:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    493:493:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1678:1678 -> b
-    493:493:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    493:493:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    494:494:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    494:494:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1679 -> b
+    485:485:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    485:485:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    486:486:boolean com.android.tools.r8.graph.ProgramMethod.isReachabilitySensitive():184:184 -> b
+    486:486:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664 -> b
+    486:486:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    486:486:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    487:493:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1664:1670 -> b
+    487:493:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    487:493:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    494:494:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
+    494:494:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     494:494:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     494:494:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    495:496:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1687:1688 -> b
-    495:496:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    495:496:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    495:495:int com.android.tools.r8.ir.code.Value.requiredRegisters():276:276 -> b
+    495:495:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670 -> b
+    495:495:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    495:495:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    496:496:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1670:1670 -> b
+    496:496:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    496:496:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
     497:497:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    497:497:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1690 -> b
+    497:497:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1671 -> b
     497:497:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     497:497:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    498:498:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1695:1695 -> b
+    498:498:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1678:1678 -> b
     498:498:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     498:498:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    499:499:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    499:499:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1696 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    499:499:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    499:499:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1679 -> b
     499:499:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     499:499:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    500:500:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1698:1698 -> b
-    500:500:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    500:500:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    501:501:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    501:501:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1700 -> b
-    501:501:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    501:501:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    502:502:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1708:1708 -> b
+    500:501:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1687:1688 -> b
+    500:501:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    500:501:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    502:502:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    502:502:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1690 -> b
     502:502:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     502:502:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    503:503:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    503:503:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    503:503:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1695:1695 -> b
     503:503:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     503:503:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    504:504:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    504:504:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1710 -> b
+    504:504:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    504:504:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1696 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     504:504:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     504:504:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    505:506:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1711:1712 -> b
-    505:506:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    505:506:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    507:507:boolean com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.isBlocked(int):102:102 -> b
-    507:507:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1714 -> b
+    505:505:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1698:1698 -> b
+    505:505:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    505:505:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    506:506:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    506:506:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1700 -> b
+    506:506:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    506:506:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    507:507:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1708:1708 -> b
     507:507:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     507:507:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    508:508:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715:1715 -> b
+    508:508:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    508:508:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1709 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     508:508:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     508:508:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    509:509:int toInstructionPosition(int):1416:1416 -> b
-    509:509:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715 -> b
+    509:509:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    509:509:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1710 -> b
     509:509:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     509:509:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    510:510:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    510:510:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> b
-    510:510:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    510:510:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    511:520:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1722:1731 -> b
-    511:520:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    511:520:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    521:521:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1049:1049 -> b
-    521:521:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
-    521:521:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    521:521:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    522:522:boolean com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.isBlocked(int):102:102 -> b
-    522:522:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1051 -> b
-    522:522:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
-    522:522:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    522:522:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    523:529:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1052:1058 -> b
-    523:529:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
-    523:529:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    523:529:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    530:530:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
-    530:530:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1811 -> b
+    510:511:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1711:1712 -> b
+    510:511:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    510:511:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    512:512:boolean com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.isBlocked(int):102:102 -> b
+    512:512:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1714 -> b
+    512:512:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    512:512:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    513:513:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715:1715 -> b
+    513:513:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    513:513:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    514:514:int toInstructionPosition(int):1416:1416 -> b
+    514:514:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1715 -> b
+    514:514:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    514:514:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    515:515:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    515:515:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1720 -> b
+    515:515:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    515:515:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    516:525:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1722:1731 -> b
+    516:525:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    516:525:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    526:526:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1049:1049 -> b
+    526:526:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
+    526:526:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    526:526:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    527:527:boolean com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.isBlocked(int):102:102 -> b
+    527:527:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1051 -> b
+    527:527:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
+    527:527:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    527:527:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    528:534:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1052:1058 -> b
+    528:534:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1731 -> b
+    528:534:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    528:534:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    535:535:java.lang.Integer com.android.tools.r8.ir.regalloc.LiveIntervals.getHint():99:99 -> b
+    535:535:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1811 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    530:530:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    530:530:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    530:530:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    531:531:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1813:1813 -> b
-    531:531:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    531:531:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    531:531:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    532:532:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    532:532:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1821 -> b
-    532:532:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    532:532:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    532:532:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    533:534:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1822:1823 -> b
-    533:534:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    533:534:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    533:534:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    535:535:com.android.tools.r8.com.google.common.collect.HashMultiset com.android.tools.r8.com.google.common.collect.HashMultiset.create():41:41 -> b
-    535:535:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1824 -> b
     535:535:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     535:535:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     535:535:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    536:538:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1825:1827 -> b
-    536:538:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    536:538:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    536:538:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    539:539:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    539:539:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1827 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    539:539:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    539:539:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    539:539:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    540:540:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1828:1828 -> b
+    536:536:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1813:1813 -> b
+    536:536:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    536:536:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    536:536:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    537:537:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    537:537:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1821 -> b
+    537:537:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    537:537:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    537:537:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    538:539:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1822:1823 -> b
+    538:539:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    538:539:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    538:539:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    540:540:com.android.tools.r8.com.google.common.collect.HashMultiset com.android.tools.r8.com.google.common.collect.HashMultiset.create():41:41 -> b
+    540:540:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1824 -> b
     540:540:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     540:540:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     540:540:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    541:541:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> b
-    541:541:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1829 -> b
-    541:541:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    541:541:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    541:541:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    542:543:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1829:1830 -> b
-    542:543:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    542:543:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    542:543:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    544:544:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> b
-    544:544:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1830 -> b
+    541:543:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1825:1827 -> b
+    541:543:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    541:543:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    541:543:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    544:544:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    544:544:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1827 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     544:544:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     544:544:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     544:544:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    545:545:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1830:1830 -> b
+    545:545:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1828:1828 -> b
     545:545:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     545:545:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     545:545:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    546:546:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    546:546:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1832 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    546:546:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():91:91 -> b
+    546:546:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1829 -> b
     546:546:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     546:546:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     546:546:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    547:547:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1834:1834 -> b
-    547:547:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    547:547:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    547:547:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    548:548:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):65:65 -> b
-    548:548:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1834 -> b
-    548:548:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    548:548:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    548:548:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    549:551:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1163:1165 -> b
-    549:551:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
-    549:551:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    549:551:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    549:551:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    552:552:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):222:222 -> b
-    552:552:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
-    552:552:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    547:548:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1829:1830 -> b
+    547:548:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    547:548:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    547:548:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    549:549:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> b
+    549:549:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1830 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    549:549:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    549:549:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    549:549:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    550:550:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1830:1830 -> b
+    550:550:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    550:550:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    550:550:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    551:551:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    551:551:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1832 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    551:551:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    551:551:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    551:551:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    552:552:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1834:1834 -> b
     552:552:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     552:552:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     552:552:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    553:553:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.of():101:101 -> b
-    553:553:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):223 -> b
-    553:553:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
-    553:553:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    553:553:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):65:65 -> b
+    553:553:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1834 -> b
     553:553:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
     553:553:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     553:553:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    554:554:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):225:225 -> b
-    554:554:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
-    554:554:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
-    554:554:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    554:554:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    554:554:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    555:557:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837:1839 -> b
-    555:557:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
-    555:557:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    555:557:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    558:570:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1740:1752 -> b
-    558:570:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    558:570:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    571:571:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.hasUses():392:392 -> b
-    571:571:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
-    571:571:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    571:571:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    572:572:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
-    572:572:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
-    572:572:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    572:572:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    573:573:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1766 -> b
-    573:573:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    573:573:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    574:574:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
-    574:574:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
-    574:574:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    574:574:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    575:575:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegisterLimit():279:279 -> b
-    575:575:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2062 -> b
+    554:556:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1163:1165 -> b
+    554:556:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    554:556:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    554:556:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    554:556:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    557:557:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):222:222 -> b
+    557:557:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
+    557:557:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    557:557:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    557:557:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    557:557:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    558:558:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.of():101:101 -> b
+    558:558:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):223 -> b
+    558:558:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
+    558:558:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    558:558:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    558:558:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    558:558:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    559:559:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):225:225 -> b
+    559:559:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1165 -> b
+    559:559:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837 -> b
+    559:559:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    559:559:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    559:559:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    560:562:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1837:1839 -> b
+    560:562:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1734 -> b
+    560:562:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    560:562:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    563:575:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1740:1752 -> b
+    563:575:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    563:575:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    576:576:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.hasUses():392:392 -> b
+    576:576:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
+    576:576:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    576:576:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    577:577:java.util.TreeSet com.android.tools.r8.ir.regalloc.LiveIntervals.getUses():257:257 -> b
+    577:577:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
+    577:577:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    577:577:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    578:578:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1766 -> b
+    578:578:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    578:578:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    579:579:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
+    579:579:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766 -> b
+    579:579:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    579:579:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    580:580:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegisterLimit():279:279 -> b
+    580:580:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2062 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    575:575:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    575:575:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    575:575:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    576:584:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2065:2073 -> b
-    576:584:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    576:584:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    576:584:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    585:585:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    585:585:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2074 -> b
+    580:580:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    580:580:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    580:580:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    581:589:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2065:2073 -> b
+    581:589:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    581:589:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    581:589:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    590:590:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    590:590:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2074 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    585:585:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    585:585:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    585:585:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    586:590:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2076:2080 -> b
-    586:590:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    586:590:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    586:590:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    591:599:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2079:2087 -> b
-    591:599:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    591:599:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    591:599:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    600:600:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    600:600:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2088 -> b
+    590:590:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    590:590:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    590:590:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    591:595:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2076:2080 -> b
+    591:595:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    591:595:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    591:595:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    596:604:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2079:2087 -> b
+    596:604:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    596:604:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    596:604:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    605:605:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    605:605:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2088 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    600:600:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    600:600:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    600:600:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    601:601:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    601:601:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2089 -> b
-    601:601:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    601:601:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    601:601:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    602:615:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2090:2103 -> b
-    602:615:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    602:615:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    602:615:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    616:616:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    616:616:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2104 -> b
-    616:616:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    616:616:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    616:616:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    617:618:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2108:2109 -> b
-    617:618:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    617:618:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    617:618:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    619:619:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
-    619:619:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2109 -> b
-    619:619:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    619:619:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    619:619:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    620:622:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2114:2116 -> b
-    620:622:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    620:622:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    620:622:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    623:623:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
-    623:623:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2120 -> b
-    623:623:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    623:623:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    623:623:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    624:636:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2120:2132 -> b
-    624:636:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    624:636:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    624:636:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    637:639:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
-    637:639:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2140 -> b
-    637:639:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    637:639:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    637:639:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    640:656:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2142:2158 -> b
-    640:656:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    640:656:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    640:656:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    657:659:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
-    657:659:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2162 -> b
-    657:659:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    657:659:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    657:659:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    660:662:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
-    660:662:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2163 -> b
-    660:662:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    660:662:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    660:662:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    663:668:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2165:2170 -> b
-    663:668:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    663:668:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    663:668:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    669:669:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1281:1281 -> b
-    669:669:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
-    669:669:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    669:669:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    669:669:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    670:670:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
-    670:670:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1284 -> b
-    670:670:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
-    670:670:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    670:670:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    670:670:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    671:671:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    671:671:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1284 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    671:671:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
-    671:671:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    671:671:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    671:671:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    672:673:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1287:1288 -> b
-    672:673:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
-    672:673:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    672:673:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    672:673:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    674:674:void increaseCapacity(int):3048:3048 -> b
-    674:674:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1288 -> b
+    605:605:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    605:605:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    605:605:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    606:606:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    606:606:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2089 -> b
+    606:606:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    606:606:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    606:606:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    607:620:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2090:2103 -> b
+    607:620:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    607:620:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    607:620:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    621:621:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    621:621:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2104 -> b
+    621:621:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    621:621:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    621:621:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    622:623:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2108:2109 -> b
+    622:623:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    622:623:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    622:623:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    624:624:void com.android.tools.r8.ir.regalloc.RegisterPositionsImpl.setBlocked(int):97:97 -> b
+    624:624:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2109 -> b
+    624:624:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    624:624:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    624:624:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    625:627:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2114:2116 -> b
+    625:627:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    625:627:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    625:627:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    628:628:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.regalloc.LiveIntervals.getType():78:78 -> b
+    628:628:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2120 -> b
+    628:628:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    628:628:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    628:628:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    629:641:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2120:2132 -> b
+    629:641:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    629:641:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    629:641:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    642:644:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
+    642:644:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2140 -> b
+    642:644:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    642:644:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    642:644:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    645:661:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2142:2158 -> b
+    645:661:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    645:661:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    645:661:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    662:664:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
+    662:664:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2162 -> b
+    662:664:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    662:664:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    662:664:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    665:667:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2198:2200 -> b
+    665:667:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2163 -> b
+    665:667:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    665:667:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    665:667:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    668:673:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2165:2170 -> b
+    668:673:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    668:673:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    668:673:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    674:674:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1281:1281 -> b
     674:674:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
     674:674:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
     674:674:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     674:674:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    675:677:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
-    675:677:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2173 -> b
-    675:677:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    675:677:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    675:677:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    678:684:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2174:2180 -> b
-    678:684:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    678:684:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    678:684:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    685:685:void increaseCapacity(int):3048:3048 -> b
-    685:685:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2181 -> b
-    685:685:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    685:685:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    685:685:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    686:686:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2184:2184 -> b
-    686:686:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    686:686:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    686:686:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    687:694:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2208:2215 -> b
-    687:694:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2186 -> b
-    687:694:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    687:694:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    687:694:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    695:696:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2189:2190 -> b
-    695:696:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    695:696:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    695:696:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    697:704:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2208:2215 -> b
-    697:704:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2191 -> b
-    697:704:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
-    697:704:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    697:704:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    705:705:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():400:400 -> b
-    705:705:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
-    705:705:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    705:705:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    706:706:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
-    706:706:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():401 -> b
+    675:675:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
+    675:675:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1284 -> b
+    675:675:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
+    675:675:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    675:675:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    675:675:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    676:676:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    676:676:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1284 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    706:706:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
-    706:706:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    706:706:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    707:707:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getPosition():18:18 -> b
-    707:707:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
+    676:676:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
+    676:676:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    676:676:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    676:676:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    677:678:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1287:1288 -> b
+    677:678:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
+    677:678:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    677:678:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    677:678:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    679:679:void increaseCapacity(int):3048:3048 -> b
+    679:679:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1288 -> b
+    679:679:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2172 -> b
+    679:679:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    679:679:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    679:679:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    680:682:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
+    680:682:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2173 -> b
+    680:682:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    680:682:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    680:682:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    683:689:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2174:2180 -> b
+    683:689:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    683:689:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    683:689:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    690:690:void increaseCapacity(int):3048:3048 -> b
+    690:690:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2181 -> b
+    690:690:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    690:690:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    690:690:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    691:691:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2184:2184 -> b
+    691:691:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    691:691:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    691:691:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    692:699:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2208:2215 -> b
+    692:699:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2186 -> b
+    692:699:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    692:699:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    692:699:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    700:701:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2189:2190 -> b
+    700:701:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    700:701:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    700:701:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    702:709:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2208:2215 -> b
+    702:709:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2191 -> b
+    702:709:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1773 -> b
+    702:709:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    702:709:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    710:710:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():400:400 -> b
+    710:710:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
+    710:710:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    710:710:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    711:711:boolean com.android.tools.r8.ir.regalloc.LiveIntervalsUse.hasConstraint():48:48 -> b
+    711:711:com.android.tools.r8.ir.regalloc.LiveIntervalsUse com.android.tools.r8.ir.regalloc.LiveIntervals.firstUseWithConstraint():401 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    707:707:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    707:707:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    708:709:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768:1769 -> b
-    708:709:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    708:709:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    710:712:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
-    710:712:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1770 -> b
-    710:712:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    710:712:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    713:721:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1771:1779 -> b
-    713:721:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    713:721:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    722:722:void increaseCapacity(int):3048:3048 -> b
-    722:722:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1780 -> b
-    722:722:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    722:722:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    723:723:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1783:1783 -> b
-    723:723:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    723:723:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    724:726:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
-    724:726:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1785 -> b
-    724:726:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    724:726:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    727:728:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1794:1795 -> b
-    727:728:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    727:728:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    711:711:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
+    711:711:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    711:711:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    712:712:int com.android.tools.r8.ir.regalloc.LiveIntervalsUse.getPosition():18:18 -> b
+    712:712:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1767 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    712:712:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    712:712:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    713:714:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768:1769 -> b
+    713:714:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    713:714:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    715:717:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
+    715:717:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1770 -> b
+    715:717:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    715:717:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    718:726:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1771:1779 -> b
+    718:726:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    718:726:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    727:727:void increaseCapacity(int):3048:3048 -> b
+    727:727:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1780 -> b
+    727:727:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    727:727:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    728:728:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1783:1783 -> b
+    728:728:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    728:728:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
     729:731:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
-    729:731:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1796 -> b
+    729:731:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1785 -> b
     729:731:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
     729:731:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    732:732:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1797:1797 -> b
-    732:732:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
-    732:732:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
-    733:778:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:723 -> b
-    779:787:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):696:704 -> b
-    788:788:int highestUsedRegister():603:603 -> b
-    788:788:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):706 -> b
-    789:789:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
-    789:789:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707 -> b
-    790:793:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:710 -> b
-    794:794:int highestUsedRegister():603:603 -> b
-    794:794:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):684 -> b
-    795:795:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
-    795:795:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685 -> b
-    796:802:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685:691 -> b
-    803:842:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):688:727 -> b
-    843:843:int highestUsedRegister():603:603 -> b
-    843:843:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):728 -> b
-    844:844:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):727:727 -> b
-    845:845:int highestUsedRegister():603:603 -> b
-    845:845:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):730 -> b
-    846:846:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):729:729 -> b
-    847:864:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1005:1022 -> b
+    732:733:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1794:1795 -> b
+    732:733:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    732:733:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    734:736:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1928:1930 -> b
+    734:736:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1796 -> b
+    734:736:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    734:736:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    737:737:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1797:1797 -> b
+    737:737:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):996 -> b
+    737:737:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):676 -> b
+    738:783:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):678:723 -> b
+    784:792:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):696:704 -> b
+    793:793:int highestUsedRegister():603:603 -> b
+    793:793:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):706 -> b
+    794:794:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
+    794:794:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707 -> b
+    795:798:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:710 -> b
+    799:799:int highestUsedRegister():603:603 -> b
+    799:799:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):684 -> b
+    800:800:com.android.tools.r8.utils.InternalOptions options():644:644 -> b
+    800:800:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685 -> b
+    801:807:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685:691 -> b
+    808:847:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):688:727 -> b
+    848:848:int highestUsedRegister():603:603 -> b
+    848:848:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):728 -> b
+    849:849:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):727:727 -> b
+    850:850:int highestUsedRegister():603:603 -> b
+    850:850:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):730 -> b
+    851:851:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):729:729 -> b
+    852:869:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1005:1022 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    865:865:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
-    865:865:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1023 -> b
-    866:866:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    866:866:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1025 -> b
+    870:870:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.regalloc.LiveIntervals.getSplitParent():211:211 -> b
+    870:870:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1023 -> b
+    871:871:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    871:871:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1025 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    867:867:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    867:867:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1025 -> b
-    868:884:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1027:1043 -> b
-    885:886:void lambda$invariantsHold$4(java.util.TreeSet,int):1030:1031 -> b
-    887:887:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1458:1458 -> b
+    872:872:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    872:872:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1025 -> b
+    873:889:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1027:1043 -> b
+    890:891:void lambda$invariantsHold$4(java.util.TreeSet,int):1030:1031 -> b
+    892:892:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1458:1458 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;I)Z"}
-    888:888:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
-    888:888:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1459 -> b
+    893:893:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> b
+    893:893:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1459 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    889:889:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1459:1459 -> b
-    890:890:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
-    890:890:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461 -> b
+    894:894:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1459:1459 -> b
+    895:895:com.android.tools.r8.ir.regalloc.LiveIntervals com.android.tools.r8.ir.code.Value.getLiveIntervals():727:727 -> b
+    895:895:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    891:891:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461:1461 -> b
-    892:892:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    892:892:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461 -> b
+    896:896:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461:1461 -> b
+    897:897:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    897:897:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1461 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    893:893:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1462:1462 -> b
-    894:898:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220:2224 -> b
+    898:898:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1462:1462 -> b
+    899:903:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220:2224 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;IZ)V"}
-    899:899:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
-    899:899:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2225 -> b
-    900:907:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2226:2233 -> b
-    908:908:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
-    908:908:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2234 -> b
-    909:913:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2234:2238 -> b
-    914:915:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():331:332 -> b
-    914:915:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2241 -> b
-    916:926:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2242:2252 -> b
-    927:927:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3260:3260 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+    904:904:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):349:349 -> b
+    904:904:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2225 -> b
+    905:912:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2226:2233 -> b
+    913:913:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> b
+    913:913:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2234 -> b
+    914:918:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2234:2238 -> b
+    919:920:void com.android.tools.r8.ir.regalloc.LiveIntervals.clearRegisterAssignment():331:332 -> b
+    919:920:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2241 -> b
+    921:931:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2242:2252 -> b
+    932:932:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3260:3260 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     1:1:com.android.tools.r8.utils.InternalOptions options():644:644 -> c
     1:1:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1528 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)Z"}
     2:2:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1528:1528 -> c
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():2848:2848 -> c
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():2854:2854 -> c
     3:3:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1528 -> c
     4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1531:1531 -> c
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> c
@@ -184978,12 +184997,12 @@
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)Z"}
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467:1467 -> d
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():2881:2881 -> d
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():2887:2887 -> d
     6:6:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467 -> d
     7:7:com.android.tools.r8.utils.InternalOptions options():644:644 -> d
     7:7:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467 -> d
     8:8:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467:1467 -> d
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():3071:3071 -> d
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():3077:3077 -> d
     9:9:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1467 -> d
     10:10:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1470:1470 -> d
     11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> d
@@ -185057,7 +185076,7 @@
     57:57:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1513 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.utils.InternalOptions options():644:644 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     2:12:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1616:1626 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;)Z"}
     1:1:void clearUserInfo():2746:2746 -> f
@@ -185346,7 +185365,7 @@
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.ir.regalloc.a:
 # {"id":"sourceFile","fileName":"LinearScanRegisterAllocator.java"}
     com.android.tools.r8.ir.code.Value value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.graph.DebugLocalInfo local -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j0;"}
     int register -> d
@@ -185355,7 +185374,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():101:101 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):108:114 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;III)V"}
     1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):119:121 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/a;)I"}
     1:1:int compareTo(java.lang.Object):101:101 -> compareTo
@@ -185363,7 +185382,7 @@
 com.android.tools.r8.ir.regalloc.LiveIntervals -> com.android.tools.r8.ir.regalloc.c:
 # {"id":"sourceFile","fileName":"LiveIntervals.java"}
     com.android.tools.r8.ir.code.Value value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     com.android.tools.r8.ir.regalloc.LiveIntervals nextConsecutive -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/c;"}
     com.android.tools.r8.ir.regalloc.LiveIntervals previousConsecutive -> d
@@ -185373,7 +185392,7 @@
     java.util.List splitChildren -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList sortedSplitChildrenEnds -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     boolean sortedChildren -> h
     java.util.List ranges -> i
     java.util.TreeSet uses -> j
@@ -185388,7 +185407,7 @@
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     2:3:void <init>(com.android.tools.r8.ir.code.Value):32:33 -> <init>
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.code.Value):33 -> <init>
@@ -185529,7 +185548,7 @@
     1:2:int getStart():265:266 -> e
     3:8:boolean overlapsPosition(int):336:341 -> e
     1:1:com.android.tools.r8.ir.code.Value getValue():74:74 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bl0;"}
     2:3:void setRegister(int):283:284 -> g
     1:1:int toInstructionPosition(int):66:66 -> h
     1:1:com.android.tools.r8.ir.regalloc.LiveIntervals splitBefore(int):417 -> h
@@ -185618,37 +185637,37 @@
 com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.ir.regalloc.f:
 # {"id":"sourceFile","fileName":"RegisterAllocator.java"}
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;ILjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;ILjava/util/List;)V"}
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
     com.android.tools.r8.graph.ProgramMethod getProgramMethod() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/C5;"}
     boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     void allocateRegisters() -> b
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;I)I"}
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)V"}
     com.android.tools.r8.graph.AppView getAppView() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/y;"}
     int registersUsed() -> d
     com.android.tools.r8.utils.InternalOptions options() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
 com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.ir.regalloc.g:
 # {"id":"sourceFile","fileName":"RegisterMove.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     int dst -> c
     int src -> d
     com.android.tools.r8.ir.code.Instruction definition -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kw;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():13:13 -> <clinit>
     1:5:void <init>(int,int,com.android.tools.r8.ir.analysis.type.TypeElement):20:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/aj0;)V"}
     6:11:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.Instruction):27:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/Kw;)V"}
     1:6:boolean isBlocked(java.util.Set,java.util.Map):44:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/TreeSet;Ljava/util/HashMap;)Z"}
     7:10:boolean writes(int):36:39 -> a
@@ -185673,17 +185692,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     int usedTempRegisters -> c
     com.android.tools.r8.ir.code.InstructionListIterator insertAt -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nw;"}
     com.android.tools.r8.ir.code.Position position -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     int tempRegister -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.InstructionListIterator,int,com.android.tools.r8.ir.code.Position):45:45 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;ILcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;ILcom/android/tools/r8/internal/TW;)V"}
     2:19:void <init>(com.android.tools.r8.ir.code.InstructionListIterator,int,com.android.tools.r8.ir.code.Position):31:48 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.code.InstructionListIterator,int):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;I)V"}
     1:5:void addMove(com.android.tools.r8.ir.regalloc.RegisterMove):56:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/g;)V"}
     6:6:void schedule():66:66 -> a
@@ -185819,7 +185838,7 @@
 com.android.tools.r8.ir.regalloc.SpillMove -> com.android.tools.r8.ir.regalloc.m:
 # {"id":"sourceFile","fileName":"SpillMove.java"}
     com.android.tools.r8.ir.analysis.type.TypeElement type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
     com.android.tools.r8.ir.regalloc.LiveIntervals from -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/c;"}
     com.android.tools.r8.ir.regalloc.LiveIntervals to -> c
@@ -185827,7 +185846,7 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):19:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/ir/regalloc/c;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/ir/regalloc/c;)V"}
     6:6:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):23 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -185876,18 +185895,18 @@
     java.util.Map instructionToPhiMoves -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.ir.code.IRCode code -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator allocator -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/regalloc/b;"}
     com.android.tools.r8.ir.analysis.type.TypeElement objectType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rd;"}
     java.util.Map blockStartMap -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     int usedTempRegisters -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):46:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/regalloc/b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/regalloc/b;)V"}
     2:21:void <init>(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):30:49 -> <init>
     22:22:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.objectClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):412:412 -> <init>
     22:22:void <init>(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):49 -> <init>
@@ -185904,7 +185923,7 @@
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> a
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/ir/regalloc/c;)Lcom/android/tools/r8/internal/Wi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/ir/regalloc/c;)Lcom/android/tools/r8/internal/aj0;"}
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):164:164 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):165 -> a
@@ -185946,7 +185965,7 @@
     55:56:boolean lambda$pruneParallelMoveSets$3(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.regalloc.SpillMove):237 -> a
     57:57:boolean lambda$pruneParallelMoveSets$3(java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.ir.regalloc.SpillMove):239:239 -> a
     58:58:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):248:248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/internal/J5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/internal/L5;)V"}
     59:59:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     59:59:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -185966,7 +185985,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     106:107:boolean lambda$removeArgumentRestores$4(com.android.tools.r8.ir.regalloc.SpillMove):310:311 -> a
     108:119:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):316:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/Set;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/Set;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/internal/TW;)V"}
     120:120:int com.android.tools.r8.ir.regalloc.LiveIntervals.getRegister():275:275 -> a
     120:120:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):327 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -185993,7 +186012,7 @@
     143:143:com.android.tools.r8.utils.InternalOptions com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator.options():644:644 -> a
     143:143:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):343 -> a
     144:144:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):343:343 -> a
-    145:145:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():2817:2817 -> a
+    145:145:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():2823:2823 -> a
     145:145:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):343 -> a
     146:146:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):343:343 -> a
     147:147:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.regalloc.LiveIntervals.getValue():74:74 -> a
@@ -186028,7 +186047,7 @@
     174:174:int com.android.tools.r8.ir.code.Instruction.getNumber():402:402 -> a
     174:174:boolean needsMovesBeforeInstruction(com.android.tools.r8.ir.code.Instruction):176 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
     175:177:boolean needsMovesBeforeInstruction(com.android.tools.r8.ir.code.Instruction):177:179 -> a
     1:3:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):114:116 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/ir/regalloc/c;Lcom/android/tools/r8/ir/regalloc/c;)V"}
@@ -186068,7 +186087,7 @@
 # {"id":"sourceFile","fileName":"CheckCastSourceCode.java"}
 com.android.tools.r8.ir.synthetic.ConstClassSourceCode -> R8$$REMOVED$$CLASS$$113:
 # {"id":"sourceFile","fileName":"ConstClassSourceCode.java"}
-com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.fn:
+com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.hn:
 # {"id":"sourceFile","fileName":"EmulateDispatchSyntheticCfCodeProvider.java"}
     com.android.tools.r8.graph.DexMethod forwardingMethod -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -186100,12 +186119,12 @@
     61:61:com.android.tools.r8.graph.CfCode generateCfCode():100 -> a
     62:66:com.android.tools.r8.graph.CfCode generateCfCode():100:104 -> a
     67:68:void lambda$generateCfCode$0(com.android.tools.r8.cf.code.CfFrame$Builder):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i9$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k9$a;)V"}
     1:4:void addReturn(java.util.List):116:119 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     1:2:void loadExtraParameters(java.util.List):109:110 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Vn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCfCodeProvider.java"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
@@ -186115,20 +186134,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/graph/I2;)V"}
     12:16:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):65:69 -> a
     17:31:void addCfSwitch(java.util.List,java.util.function.BiConsumer,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder,boolean):85:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Ez;Ljava/lang/Object;Lcom/android/tools/r8/internal/i9$a;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Gz;Ljava/lang/Object;Lcom/android/tools/r8/internal/k9$a;Z)V"}
     32:32:boolean com.android.tools.r8.utils.ArrayUtils.isSorted(int[]):94:94 -> a
     32:32:void addCfSwitch(java.util.List,java.util.function.BiConsumer,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder,boolean):99 -> a
     33:51:void addCfSwitch(java.util.List,java.util.function.BiConsumer,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder,boolean):100:118 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Pn:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Sn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCfCodeProvider.java"}
     com.android.tools.r8.graph.DexType returnType -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cn;"}
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):190:191 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/vn;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xn;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/internal/B1;)V"}
     3:3:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getInstanceFieldData(com.android.tools.r8.graph.DexField):190:190 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):192 -> <init>
     4:4:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getInstanceFieldData(com.android.tools.r8.graph.DexField):190:190 -> <init>
@@ -186151,16 +186170,16 @@
     8:15:com.android.tools.r8.graph.CfCode generateCfCode():210:217 -> a
     16:17:void addReturnValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue):221:222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/B1;)V"}
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingMethodDispatchCfCodeProvider -> com.android.tools.r8.internal.Qn:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingMethodDispatchCfCodeProvider -> com.android.tools.r8.internal.Tn:
 # {"id":"sourceFile","fileName":"EnumUnboxingCfCodeProvider.java"}
     com.android.tools.r8.graph.DexMethod superEnumMethod -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap methodMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():122:122 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):132:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/az;)V"}
     1:3:com.android.tools.r8.graph.CfCodeWithLens generateCfCode():139:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/J;"}
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1.iterator():1202:1202 -> a
@@ -186179,20 +186198,20 @@
     26:34:void addReturnInvoke(java.util.List,com.android.tools.r8.graph.DexMethod):161:169 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/w2;)V"}
     35:35:void addReturnInvoke(java.util.List,com.android.tools.r8.graph.DexMethod):166:166 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Un:
 # {"id":"sourceFile","fileName":"EnumUnboxingCfCodeProvider.java"}
     com.android.tools.r8.graph.DexType enumType -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cn;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData):236:238 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Cn;)V"}
     1:44:com.android.tools.r8.graph.CfCode generateCfCode():250:293 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/G;"}
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():292:292 -> a
     46:60:com.android.tools.r8.graph.CfCode generateCfCode():288:302 -> a
     61:69:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfFrame,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):273:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/i9;Ljava/lang/Integer;Lcom/android/tools/r8/internal/B1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/k9;Ljava/lang/Integer;Lcom/android/tools/r8/internal/B1;)V"}
     70:70:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrame.clone():120:120 -> a
     70:70:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfFrame,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):282 -> a
     71:71:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrame.clone():120:120 -> a
@@ -186201,14 +186220,14 @@
     72:72:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrame.clone():120:120 -> a
     72:72:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfFrame,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):282 -> a
     73:73:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfFrame,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):282:282 -> a
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.ap:
 # {"id":"sourceFile","fileName":"FieldAccessorBuilder.java"}
     com.android.tools.r8.graph.DexField field -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.utils.OptionalBool isSetter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.graph.DexMethod sourceMethod -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean $assertionsDisabled -> e
@@ -186219,7 +186238,7 @@
     3:4:void <init>():28:29 -> <init>
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder apply(java.util.function.Consumer):39:39 -> a
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/Xo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/ap;"}
     2:2:com.android.tools.r8.graph.CfCode build():85:85 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/G;"}
     3:6:boolean validate():138:141 -> a
@@ -186241,10 +186260,10 @@
     24:24:com.android.tools.r8.graph.CfCode build():118 -> a
     25:29:com.android.tools.r8.graph.CfCode build():120:124 -> a
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():57:57 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ap;"}
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():68:68 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xo;"}
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Mq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ap;"}
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Oq:
 # {"id":"sourceFile","fileName":"ForwardMethodBuilder.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -186255,7 +186274,7 @@
     boolean sourceMethodHasExtraUnusedParameter -> d
     boolean staticSource -> e
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType invokeType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nq;"}
     java.lang.Boolean isInterface -> g
     boolean castResult -> h
     boolean isConstructorDelegate -> i
@@ -186267,9 +186286,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     2:15:void <init>(com.android.tools.r8.graph.DexItemFactory):61:74 -> <init>
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder applyIf(boolean,java.util.function.Consumer,java.util.function.Consumer):92:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/Mq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/Oq;"}
     4:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticTarget(com.android.tools.r8.graph.DexMethod,boolean):124:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/Mq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/Oq;"}
     7:11:com.android.tools.r8.graph.CfCode buildCf():179:183 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/G;"}
     12:12:boolean isStaticSource():347:347 -> a
@@ -186306,7 +186325,7 @@
     68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):152:152 -> a
     68:68:com.android.tools.r8.graph.CfCode buildCf():236 -> a
     69:69:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):299:299 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/uu;)V"}
     70:70:boolean isStaticSource():347:347 -> a
     70:70:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):303 -> a
     71:71:boolean isStaticTarget():351:351 -> a
@@ -186321,7 +186340,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     79:80:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):314:315 -> a
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):138:140 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/Mq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/Oq;"}
     4:14:int getInvokeOpcode():320:330 -> b
     1:4:boolean validate():368:371 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -186344,16 +186363,16 @@
     14:14:boolean validate():374 -> c
     15:23:boolean validate():374:382 -> c
     24:27:boolean validate():381:384 -> c
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.Lq:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.Nq:
 # {"id":"sourceFile","fileName":"ForwardMethodBuilder.java"}
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType STATIC -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nq;"}
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType VIRTUAL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nq;"}
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType INTERFACE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nq;"}
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType SPECIAL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nq;"}
     1:4:void <clinit>():51:54 -> <clinit>
     1:1:void <init>(java.lang.String,int):50:50 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
@@ -186361,9 +186380,9 @@
 # {"id":"sourceFile","fileName":"InstanceOfSourceCode.java"}
 com.android.tools.r8.ir.synthetic.NewInstanceSourceCode -> R8$$REMOVED$$CLASS$$115:
 # {"id":"sourceFile","fileName":"NewInstanceSourceCode.java"}
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider -> com.android.tools.r8.internal.N10:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider -> com.android.tools.r8.internal.R10:
 # {"id":"sourceFile","fileName":"RecordCfCodeProvider.java"}
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.L10:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.P10:
 # {"id":"sourceFile","fileName":"RecordCfCodeProvider.java"}
     com.android.tools.r8.graph.DexMethod getFieldsAsObjects -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -186376,7 +186395,7 @@
     2:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createSynthesizedType(java.lang.String):3057:3058 -> a
     2:3:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):150 -> a
     4:5:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):151:152 -> a
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.M10:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.Q10:
 # {"id":"sourceFile","fileName":"RecordCfCodeProvider.java"}
     com.android.tools.r8.graph.DexField[] fields -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/l1;"}
@@ -186398,7 +186417,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Ljava/util/List;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     27:27:void lambda$loadFieldAsObject$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128:128 -> a
     28:28:void lambda$loadFieldAsObject$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:125 -> a
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.mg0:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.qg0:
 # {"id":"sourceFile","fileName":"SyntheticCfCodeProvider.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -186412,7 +186431,7 @@
     2:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):30 -> a
     4:4:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):152:152 -> a
     4:4:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):30 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.rg0:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.vg0:
 # {"id":"sourceFile","fileName":"SyntheticSourceCode.java"}
     int nextRegister -> a
     int receiverRegister -> b
@@ -186422,13 +186441,13 @@
     java.util.List traceEvents -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.ir.code.Position position -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     java.util.function.Predicate doesNotEndBlock -> g
     java.util.function.Predicate endsBlock -> h
     boolean $assertionsDisabled -> i
     1:5:void <clinit>():22:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):42:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;)V"}
     2:18:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):30:46 -> <init>
     19:20:int nextRegister(com.android.tools.r8.ir.code.ValueType):63:64 -> <init>
     19:20:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):46 -> <init>
@@ -186441,19 +186460,19 @@
     4:4:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int):106:106 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/graph/j0;"}
     5:6:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):121:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/wt;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/yt;)I"}
     7:7:void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     8:8:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IZ)V"}
     9:9:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;IIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;IIZ)V"}
     10:10:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILcom/android/tools/r8/internal/yt;)V"}
     11:11:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/yt;)V"}
     12:12:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/TW;"}
     13:13:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():133:133 -> a
     13:13:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):186 -> a
     1:1:boolean verifyCurrentInstructionCanThrow():196:196 -> b
@@ -186461,19 +186480,19 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.conversion.IRBuilder.getMethod():493:493 -> b
     3:3:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):142 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)V"}
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.conversion.IRBuilder.getMethod():493:493 -> b
     4:4:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):142 -> b
     5:5:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):142:142 -> b
     6:6:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):141:141 -> b
     1:1:int instructionIndex(int):96:96 -> c
     2:2:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):176:176 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Lcom/android/tools/r8/internal/t8;"}
     3:3:boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo):201:201 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Z"}
     1:3:void clear():134:136 -> clear
     1:1:boolean lambda$static$0(com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Z"}
     2:2:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):116:116 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     3:4:void setUp():127:128 -> d
@@ -186487,13 +186506,13 @@
     7:9:void setUp():128 -> d
     10:10:void setUp():129:129 -> d
     1:1:boolean lambda$static$1(com.android.tools.r8.ir.conversion.IRBuilder):26:26 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wt;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yt;)Z"}
     2:2:int instructionCount():83:83 -> e
     3:3:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):111:111 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/j0;"}
     1:1:int getMoveExceptionRegister(int):181:181 -> f
     2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():191:191 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TW;"}
     1:1:int instructionOffset(int):101:101 -> g
 com.android.tools.r8.ir.synthetic.ThrowCfCodeProvider -> R8$$REMOVED$$CLASS$$116:
 # {"id":"sourceFile","fileName":"ThrowCfCodeProvider.java"}
@@ -186544,7 +186563,7 @@
     26:28:void generateConversion(java.util.List,com.android.tools.r8.graph.DexMethod,boolean):125 -> a
     29:38:void generateConversion(java.util.List,com.android.tools.r8.graph.DexMethod,boolean):123:132 -> a
     39:41:void generateConversion(java.util.List,com.android.tools.r8.graph.DexMethod,boolean):127:129 -> a
-com.android.tools.r8.ir.synthetic.apiconverter.EqualsCfCodeProvider -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.ir.synthetic.apiconverter.EqualsCfCodeProvider -> com.android.tools.r8.internal.oo:
 # {"id":"sourceFile","fileName":"EqualsCfCodeProvider.java"}
     com.android.tools.r8.graph.DexField wrapperField -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -186558,13 +186577,13 @@
     54:57:com.android.tools.r8.graph.CfCode generateCfCode():85:88 -> a
 com.android.tools.r8.ir.synthetic.apiconverter.HashCodeCfCodeProvider -> R8$$REMOVED$$CLASS$$117:
 # {"id":"sourceFile","fileName":"HashCodeCfCodeProvider.java"}
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider -> com.android.tools.r8.internal.YR:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider -> com.android.tools.r8.internal.cS:
 # {"id":"sourceFile","fileName":"NullableConversionCfCodeProvider.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):52:52 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)V"}
     1:6:void generateNullCheck(java.util.List):56:61 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$ArrayConversionCfCodeProvider -> com.android.tools.r8.internal.VR:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$ArrayConversionCfCodeProvider -> com.android.tools.r8.internal.ZR:
 # {"id":"sourceFile","fileName":"NullableConversionCfCodeProvider.java"}
     com.android.tools.r8.graph.DexType typeArray -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -186574,7 +186593,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):76:79 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.WR:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.aS:
 # {"id":"sourceFile","fileName":"NullableConversionCfCodeProvider.java"}
     java.lang.Iterable enumFields -> c
     com.android.tools.r8.graph.DexType enumType -> d
@@ -186595,7 +186614,7 @@
     34:34:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrame.clone():120:120 -> a
     34:34:com.android.tools.r8.graph.CfCode generateCfCode():188 -> a
     35:38:com.android.tools.r8.graph.CfCode generateCfCode():188:191 -> a
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$WrapperConversionCfCodeProvider -> com.android.tools.r8.internal.XR:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$WrapperConversionCfCodeProvider -> com.android.tools.r8.internal.bS:
 # {"id":"sourceFile","fileName":"NullableConversionCfCodeProvider.java"}
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -186619,7 +186638,7 @@
     3:3:void com.android.tools.r8.internal.Arrays.ensureFromTo(int,int,int):0 -> a
     4:4:void ensureFromTo(int,int,int):0:0 -> a
     4:4:void com.android.tools.r8.internal.Arrays.ensureFromTo(int,int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62,"4":63,"5":64},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62,"4":63,"5":64},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     59:59:void ensureFromTo(int,int,int):55:55 -> a
     59:59:void com.android.tools.r8.internal.Arrays.ensureFromTo(int,int,int):0 -> a
     60:60:void ensureFromTo(int,int,int):55:55 -> a
@@ -186627,15 +186646,15 @@
     62:62:void ensureFromTo(int,int,int):55:55 -> a
     63:63:void ensureFromTo(int,int,int):55:55 -> a
     64:64:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.ir:
 # {"id":"sourceFile","fileName":"Function.java"}
     boolean containsKey(java.lang.Object) -> containsKey
     int size() -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.us:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.ws:
 # {"id":"sourceFile","fileName":"Hash.java"}
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Ls:
 # {"id":"sourceFile","fileName":"HashCommon.java"}
     1:1:int mix(int):89:89 -> a
     2:2:long mix(long):113:113 -> a
@@ -186688,7 +186707,7 @@
     boolean remove(boolean) -> d
     1:4:boolean equals(java.lang.Object):32:35 -> equals
     1:5:int hashCode():46:50 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.D6:
 # {"id":"sourceFile","fileName":"BooleanArraySet.java"}
     boolean[] a -> b
     int size -> c
@@ -186697,12 +186716,12 @@
       # {"id":"com.android.tools.r8.synthesized"}
     5:5:void <init>(boolean[],int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.BooleanArraySet.<init>(boolean[],int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     82:82:void <init>(boolean[],int):77:77 -> <init>
     82:82:void com.android.tools.r8.internal.BooleanArraySet.<init>(boolean[],int):0 -> <init>
     83:83:void <init>(boolean[],int):0:0 -> <init>
     83:83:void com.android.tools.r8.internal.BooleanArraySet.<init>(boolean[],int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     160:160:void <init>(boolean[],int):77:77 -> <init>
     160:160:void com.android.tools.r8.internal.BooleanArraySet.<init>(boolean[],int):0 -> <init>
     161:161:void <init>(boolean[],int):77:77 -> <init>
@@ -186727,17 +186746,17 @@
     2:4:boolean remove(boolean):116:118 -> d
     1:1:boolean isEmpty():139:139 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():86:86 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():86:86 -> iterator
     2:2:java.util.Iterator iterator():25 -> iterator
     1:1:int size():110:110 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.A6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.C6:
 # {"id":"sourceFile","fileName":"BooleanArraySet.java"}
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D6;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):86:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;)V"}
     1:1:boolean hasNext():90:90 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):25:25 -> hasNext
     2:2:boolean hasNext():90 -> hasNext
@@ -186753,17 +186772,17 @@
     4:4:boolean[] com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.access$100(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):25:25 -> remove
     4:4:void remove():100 -> remove
     5:5:void remove():100:100 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.E6:
 # {"id":"sourceFile","fileName":"BooleanArrays.java"}
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():75:75 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.G6:
 # {"id":"sourceFile","fileName":"BooleanCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
 com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> R8$$REMOVED$$CLASS$$120:
 # {"id":"sourceFile","fileName":"BooleanCollections.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.H6:
 # {"id":"sourceFile","fileName":"BooleanCollections.java"}
     1:1:void <init>():31:31 -> <init>
     1:1:boolean addAll(java.util.Collection):52:52 -> addAll
@@ -186772,19 +186791,19 @@
     1:1:int hashCode():44:44 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanBidirectionalIterator iterator():38:38 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():30 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanBidirectionalIterator iterator():38:38 -> iterator
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:boolean removeAll(java.util.Collection):54:54 -> removeAll
     1:1:boolean retainAll(java.util.Collection):56:56 -> retainAll
     1:1:int size():40:40 -> size
     1:1:java.lang.Object[] toArray():35:35 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.I6:
 # {"id":"sourceFile","fileName":"BooleanCollections.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D6;"}
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):169:171 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;)V"}
     1:1:boolean add(java.lang.Object):166:166 -> add
     2:2:boolean add(java.lang.Boolean):207:207 -> add
     2:2:boolean add(java.lang.Object):166 -> add
@@ -186797,7 +186816,7 @@
     1:1:boolean isEmpty():180:180 -> isEmpty
     1:1:java.util.Iterator iterator():166:166 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():183:183 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():86:86 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():183 -> iterator
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():183:183 -> iterator
@@ -186812,15 +186831,15 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):194:194 -> toArray
     2:2:java.lang.Object[] toArray():196:196 -> toArray
     1:1:java.lang.String toString():233:233 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.L6:
 # {"id":"sourceFile","fileName":"BooleanIterator.java"}
     boolean nextBoolean() -> q
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.P6:
 # {"id":"sourceFile","fileName":"BooleanIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M6;"}
     1:1:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.M6:
 # {"id":"sourceFile","fileName":"BooleanIterators.java"}
     1:1:void <init>():33:33 -> <init>
     1:1:boolean previousBoolean():41:41 -> a
@@ -186830,7 +186849,7 @@
     1:1:int nextIndex():43:43 -> nextIndex
     1:1:int previousIndex():45:45 -> previousIndex
     1:1:boolean nextBoolean():39:39 -> q
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.N6:
 # {"id":"sourceFile","fileName":"BooleanIterators.java"}
     boolean element -> b
     int curr -> c
@@ -186843,25 +186862,25 @@
     1:1:int previousIndex():90:90 -> previousIndex
     1:3:boolean nextBoolean():74:76 -> q
     4:4:boolean nextBoolean():74:74 -> q
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.O6:
 # {"id":"sourceFile","fileName":"BooleanIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L6;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):495:496 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L6;)V"}
     1:1:boolean hasNext():499:499 -> hasNext
     1:1:boolean nextBoolean():501:501 -> q
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.V6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.X6:
 # {"id":"sourceFile","fileName":"BooleanSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V6;"}
     1:1:void <clinit>():48:48 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.V6:
 # {"id":"sourceFile","fileName":"BooleanSets.java"}
     1:1:void <init>():32:32 -> <init>
     1:1:java.lang.Object clone():36:36 -> clone
     1:1:boolean equals(java.lang.Object):39:39 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.W6:
 # {"id":"sourceFile","fileName":"BooleanSets.java"}
     boolean element -> b
     1:2:void <init>(boolean):56:57 -> <init>
@@ -186872,7 +186891,7 @@
     1:1:boolean remove(boolean):62:62 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator iterator():64:64 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():53 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.singleton(boolean):99:99 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanListIterator iterator():64 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():53 -> iterator
@@ -186941,7 +186960,7 @@
     9:9:char com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet$1.nextChar():94:94 -> toString
     9:9:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.chars.AbstractCharCollection.toString():166 -> toString
     10:11:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.chars.AbstractCharCollection.toString():169:170 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet -> com.android.tools.r8.internal.fb:
+com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet -> com.android.tools.r8.internal.hb:
 # {"id":"sourceFile","fileName":"CharArraySet.java"}
     char[] a -> b
     int size -> c
@@ -186959,13 +186978,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharIterator iterator():86:86 -> iterator
     1:1:java.util.Iterator iterator():25 -> iterator
     1:1:int size():110:110 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet$1 -> com.android.tools.r8.internal.eb:
+com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet$1 -> com.android.tools.r8.internal.gb:
 # {"id":"sourceFile","fileName":"CharArraySet.java"}
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hb;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet):86:86 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hb;)V"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.chars.AbstractCharIterator.<init>():30:30 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet):86 -> <init>
     3:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.chars.CharArraySet):87:87 -> <init>
@@ -187006,7 +187025,7 @@
     1:1:boolean containsValue(java.lang.Object):50:50 -> containsValue
     boolean containsValue(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():220:220 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():37:37 -> entrySet
     1:4:boolean equals(java.lang.Object):238:241 -> equals
     1:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):87:88 -> get
@@ -187061,7 +187080,7 @@
     1:1:void <init>():38:38 -> <init>
     boolean containsKey(int) -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():196:196 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():36:36 -> entrySet
     1:4:boolean equals(java.lang.Object):214:217 -> equals
     1:3:int hashCode():206:208 -> hashCode
@@ -187086,10 +187105,10 @@
 # {"id":"sourceFile","fileName":"AbstractInt2ObjectSortedMap.java"}
     1:1:void <init>():27:27 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap.int2ObjectEntrySet():1157:1157 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():175:175 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():25 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():175:175 -> entrySet
     1:1:java.util.Set entrySet():25 -> entrySet
     1:1:java.lang.Integer firstKey():58:58 -> firstKey
@@ -187115,14 +187134,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O;)V"}
     1:1:int firstInt():94:94 -> T
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:void clear():90:90 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():92:92 -> comparator
     1:1:java.util.Comparator comparator():84 -> comparator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):102:102 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/tA;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):98:98 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:boolean contains(int):86:86 -> h
     1:1:int size():88:88 -> size
     1:1:int lastInt():96:96 -> v
@@ -187142,7 +187161,7 @@
     1:1:void <init>():38:38 -> <init>
     boolean containsKey(int) -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():196:196 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():36:36 -> entrySet
     1:4:boolean equals(java.lang.Object):214:217 -> equals
     1:3:int hashCode():206:208 -> hashCode
@@ -187166,10 +187185,10 @@
 # {"id":"sourceFile","fileName":"AbstractInt2ReferenceSortedMap.java"}
     1:1:void <init>():27:27 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.int2ReferenceEntrySet():1157:1157 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():175:175 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():25 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():175:175 -> entrySet
     1:1:java.util.Set entrySet():25 -> entrySet
     1:1:java.lang.Integer firstKey():58:58 -> firstKey
@@ -187178,7 +187197,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):34:34 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):25 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1157:1157 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     2:2:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1157:1157 -> keySet
     1:1:java.lang.Integer lastKey():66:66 -> lastKey
     1:1:java.lang.Object lastKey():25 -> lastKey
@@ -187196,14 +187215,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U;)V"}
     1:1:int firstInt():94:94 -> T
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:void clear():90:90 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():92:92 -> comparator
     1:1:java.util.Comparator comparator():84 -> comparator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):102:102 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/tA;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):98:98 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:boolean contains(int):86:86 -> h
     1:1:int size():88:88 -> size
     1:1:int lastInt():96:96 -> v
@@ -187214,7 +187233,7 @@
     1:1:void <init>():30:30 -> <init>
     1:2:int[] toArray(int[]):109:110 -> a
     3:4:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):128:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rz;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tz;)Z"}
     1:1:boolean add(java.lang.Object):29:29 -> add
     2:2:boolean add(int):49:49 -> add
     3:3:boolean add(java.lang.Integer):84:84 -> add
@@ -187232,7 +187251,7 @@
 # {"id":"sourceFile","fileName":"AbstractIntList.java"}
     1:1:void <init>():27:27 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aA;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/cA;)Z"}
     1:1:int compareTo(java.util.List):324:324 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> a
     2:2:int compareTo(java.util.List):325 -> a
@@ -187255,7 +187274,7 @@
     1:1:void clear():275:275 -> clear
     1:1:int compareTo(java.lang.Object):26:26 -> compareTo
     1:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):207:210 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/aA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/cA;"}
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):209:209 -> e
     1:5:boolean equals(java.lang.Object):297:301 -> equals
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> equals
@@ -187281,10 +187300,10 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():122 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():26 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():122 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():122 -> iterator
     3:3:java.util.Iterator iterator():26 -> iterator
@@ -187293,14 +187312,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureIndex(int):0:0 -> k
     2:2:void com.android.tools.r8.internal.AbstractIntList.ensureIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76,"4":77},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76,"4":77},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     37:37:void ensureIndex(int):35:35 -> k
     37:37:void com.android.tools.r8.internal.AbstractIntList.ensureIndex(int):0 -> k
     38:38:void ensureIndex(int):34:34 -> k
     38:38:void com.android.tools.r8.internal.AbstractIntList.ensureIndex(int):0 -> k
     39:39:void ensureIndex(int):0:0 -> k
     39:39:void com.android.tools.r8.internal.AbstractIntList.ensureIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":78,"2":79,"3":80,"4":81,"5":82},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":78,"2":79,"3":80,"4":81,"5":82},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     73:73:void ensureIndex(int):34:34 -> k
     73:73:void com.android.tools.r8.internal.AbstractIntList.ensureIndex(int):0 -> k
     74:74:void ensureIndex(int):35:35 -> k
@@ -187317,14 +187336,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureRestrictedIndex(int):0:0 -> l
     2:2:void com.android.tools.r8.internal.AbstractIntList.ensureRestrictedIndex(int):0 -> l
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94,"4":95},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94,"4":95},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     46:46:void ensureRestrictedIndex(int):44:44 -> l
     46:46:void com.android.tools.r8.internal.AbstractIntList.ensureRestrictedIndex(int):0 -> l
     47:47:void ensureRestrictedIndex(int):43:43 -> l
     47:47:void com.android.tools.r8.internal.AbstractIntList.ensureRestrictedIndex(int):0 -> l
     48:48:void ensureRestrictedIndex(int):0:0 -> l
     48:48:void com.android.tools.r8.internal.AbstractIntList.ensureRestrictedIndex(int):0 -> l
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98,"4":99,"5":100},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98,"4":99,"5":100},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     91:91:void ensureRestrictedIndex(int):43:43 -> l
     91:91:void com.android.tools.r8.internal.AbstractIntList.ensureRestrictedIndex(int):0 -> l
     92:92:void ensureRestrictedIndex(int):44:44 -> l
@@ -187338,7 +187357,7 @@
     100:100:void ensureRestrictedIndex(int):43:43 -> l
     1:1:int lastIndexOf(java.lang.Object):449:449 -> lastIndexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> listIterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> listIterator
     2:2:java.util.ListIterator listIterator():26 -> listIterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():130:130 -> m
@@ -187346,7 +187365,7 @@
     2:4:int indexOf(int):183:185 -> m
     1:5:int lastIndexOf(int):191:195 -> n
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int) -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/dA;"}
     1:1:java.lang.Integer remove(int):459:459 -> remove
     1:1:java.lang.Object remove(int):26 -> remove
     1:1:java.lang.Object set(int,java.lang.Object):26:26 -> set
@@ -187380,7 +187399,7 @@
     9:9:void getElements(int,int[],int,int):581:581 -> a
     10:14:void removeElements(int,int):586:590 -> a
     15:15:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):653:653 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aA;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/cA;)Z"}
     16:16:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):648:648 -> a
     16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):385 -> a
     16:16:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):654 -> a
@@ -187398,7 +187417,7 @@
     3:4:int set(int,int):571:572 -> c
     1:1:int compareTo(java.lang.Object):519:519 -> compareTo
     1:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):632:635 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/aA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/cA;"}
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):634:634 -> e
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):429:429 -> get
     1:1:java.lang.Object get(int):519 -> get
@@ -187407,7 +187426,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():130 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():122 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():519 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):601:602 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():130 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():122 -> iterator
@@ -187419,7 +187438,7 @@
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):601:602 -> listIterator
     3:4:java.util.ListIterator listIterator(int):519 -> listIterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):601:602 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/dA;"}
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.remove(int):459:459 -> remove
     1:1:java.lang.Object remove(int):519 -> remove
     1:1:java.lang.Object set(int,java.lang.Object):519:519 -> set
@@ -187495,7 +187514,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):18:18 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(java.lang.Integer):46:46 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):18 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.Uw:
 # {"id":"sourceFile","fileName":"Int2IntArrayMap.java"}
     int[] key -> c
     int[] value -> d
@@ -187514,7 +187533,7 @@
     1:3:int get(int):194:196 -> get
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():184:184 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():32 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():217:217 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():257:257 -> keySet
     1:1:java.util.Set keySet():32 -> keySet
@@ -187525,16 +187544,16 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):245:245 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():261 -> values
     2:2:java.util.Collection values():32 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Tw:
 # {"id":"sourceFile","fileName":"Int2IntArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uw;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uw;)V"}
     1:6:boolean contains(java.lang.Object):157:162 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:7:boolean remove(java.lang.Object):167:173 -> remove
@@ -187557,14 +187576,14 @@
     1:1:int size():152:152 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):32:32 -> size
     2:2:int size():152 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Sw:
 # {"id":"sourceFile","fileName":"Int2IntArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tw;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tw;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -187593,13 +187612,13 @@
     9:9:void remove():119 -> remove
     10:10:void remove():119:119 -> remove
     11:11:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Tw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Vw:
 # {"id":"sourceFile","fileName":"Int2IntFunction.java"}
     boolean containsKey(int) -> a
     int put(int,int) -> b
     int get(int) -> get
     int remove(int) -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.cx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.ex:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     int[] key -> c
     int[] value -> d
@@ -187612,11 +187631,11 @@
     int maxFill -> k
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet entries -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zw;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ww;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.<init>():27:27 -> <init>
     1:1:void <init>(int,float):118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
@@ -187640,7 +187659,7 @@
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2IntEntrySet():76 -> e
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():175 -> e
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():25 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet int2IntEntrySet():1156:1157 -> entrySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2IntEntrySet():76 -> entrySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():175 -> entrySet
@@ -187663,7 +187682,7 @@
     1:11:int get(int):607:617 -> get
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet int2IntEntrySet():1156:1157 -> h
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():76 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:int realSize():196:196 -> hashCode
     1:1:int hashCode():1442 -> hashCode
     2:9:int hashCode():1443:1450 -> hashCode
@@ -187676,7 +187695,7 @@
     1:1:boolean isEmpty():664:664 -> isEmpty
     1:1:java.util.Set keySet():76:76 -> keySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1235:1236 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:2:int lastIntKey():824:825 -> lastKey
     1:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.lastKey():66 -> lastKey
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.lastKey():25 -> lastKey
@@ -187713,27 +187732,27 @@
     3:3:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.tailMap(java.lang.Object):25 -> tailMap
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1269:1287 -> values
     1:19:java.util.Collection values():76 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Uw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Ww:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1269:1269 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:1:void clear():1284:1284 -> clear
     1:1:boolean contains(int):1280:1280 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1272:1272 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1272:1272 -> iterator
     2:2:java.util.Iterator iterator():1269 -> iterator
     1:1:int size():1276:1276 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Xw:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ax;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):998:998 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:1:void add(java.lang.Object):996:996 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):993:993 -> add
     2:2:void add(java.lang.Object):996 -> add
@@ -187745,12 +187764,12 @@
     1:1:void set(java.lang.Object):996:996 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):990:990 -> set
     2:2:void set(java.lang.Object):996 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Yw:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1182:1182 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:1:void add(java.lang.Object):1165:1165 -> add
     2:2:void add(java.lang.Integer):1181:1181 -> add
     2:2:void add(java.lang.Object):1165 -> add
@@ -187763,43 +187782,43 @@
     2:2:void set(java.lang.Integer):1178:1178 -> set
     2:2:void set(java.lang.Object):1165 -> set
     1:1:int nextInt():1184:1184 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Zw:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1189:1189 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1189 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:2:int firstInt():1216:1217 -> T
     3:3:int firstInt():1216:1216 -> T
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):1227:1227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:void clear():1212:1212 -> clear
     1:1:java.util.Comparator comparator():1189:1189 -> comparator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):1231:1231 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/tA;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):1229:1229 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:boolean contains(int):1202:1202 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1194:1194 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1189 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1194:1194 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1189 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1194:1194 -> iterator
     3:3:java.util.Iterator iterator():1189 -> iterator
     1:3:boolean remove(int):1206:1208 -> k
     1:1:int size():1198:1198 -> size
     1:2:int lastInt():1221:1222 -> v
     3:3:int lastInt():1221:1221 -> v
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.ax:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):690:691 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;I)V"}
     1:1:int getIntKey():696:696 -> a
     1:3:boolean equals(java.lang.Object):732:734 -> equals
     1:1:int getIntValue():700:700 -> getIntValue
@@ -187817,13 +187836,13 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):727:727 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):687 -> setValue
     1:1:java.lang.String toString():742:742 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.bx:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1033:1033 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1033 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:1:void clear():1121:1121 -> clear
     1:1:java.util.Comparator comparator():1038:1038 -> comparator
     1:17:boolean contains(java.lang.Object):1058:1074 -> contains
@@ -187835,10 +187854,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1042:1042 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1033 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1035:1035 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1035:1035 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1033 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1035:1035 -> iterator
     3:3:java.util.Iterator iterator():1033 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry last():1052:1053 -> last
@@ -187862,17 +187881,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1033:1033 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1044:1044 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1033 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.cx:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):856:856 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):847 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):849:858 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):847 -> <init>
     1:14:void ensureIndexKnown():891:904 -> a
@@ -187886,12 +187905,12 @@
     1:2:int previousIndex():912:913 -> previousIndex
     1:44:void remove():932:975 -> remove
     45:45:void remove():933:933 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.dx:
 # {"id":"sourceFile","fileName":"Int2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1260:1260 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;)V"}
     1:1:void add(java.lang.Object):1244:1244 -> add
     2:2:void add(java.lang.Integer):1255:1255 -> add
     2:2:void add(java.lang.Object):1244 -> add
@@ -187904,15 +187923,15 @@
     2:2:void set(java.lang.Integer):1252:1252 -> set
     2:2:void set(java.lang.Object):1244 -> set
     1:1:int nextInt():1262:1262 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.ex:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.gx:
 # {"id":"sourceFile","fileName":"Int2IntMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.dx:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.fx:
 # {"id":"sourceFile","fileName":"Int2IntMap.java"}
     int getIntKey() -> a
     int getIntValue() -> getIntValue
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.nx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.px:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     int[] key -> c
     int[] value -> d
@@ -187922,11 +187941,11 @@
     int maxFill -> h
     int size -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keys -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ix;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hx;"}
     1:9:void <init>(int,float):79:87 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     10:10:void <init>(int,float):81:81 -> <init>
@@ -187953,7 +187972,7 @@
     1:11:int get(int):301:311 -> get
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():625:626 -> h
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():46 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:int realSize():156:156 -> hashCode
     1:1:int hashCode():837 -> hashCode
     2:9:int hashCode():838:845 -> hashCode
@@ -187976,62 +187995,62 @@
     1:1:int size():353:353 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():687:705 -> values
     1:19:java.util.Collection values():46 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.hx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):687:687 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:void clear():702:702 -> clear
     1:1:boolean contains(int):698:698 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():690:690 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():690:690 -> iterator
     2:2:java.util.Iterator iterator():687 -> iterator
     1:1:int size():694:694 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ix:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):527:527 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):527 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry next():531:531 -> next
     1:1:java.lang.Object next():527 -> next
     1:2:void remove():535:536 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.jx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):635:635 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:java.lang.Integer next():640:640 -> next
     1:1:java.lang.Object next():634 -> next
     1:1:int nextInt():637:637 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.kx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):642:642 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):642 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:void clear():663:663 -> clear
     1:1:boolean contains(int):653:653 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():645:645 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():645:645 -> iterator
     2:2:java.util.Iterator iterator():642 -> iterator
     1:3:boolean remove(int):657:659 -> k
     1:1:int size():649:649 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.lx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):383:384 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;I)V"}
     1:1:int getIntKey():389:389 -> a
     1:3:boolean equals(java.lang.Object):425:427 -> equals
     1:1:int getIntValue():393:393 -> getIntValue
@@ -188049,17 +188068,17 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):420:420 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):380 -> setValue
     1:1:java.lang.String toString():435:435 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.mx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):547:547 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):547 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:void clear():620:620 -> clear
     1:17:boolean contains(java.lang.Object):557:573 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():549:549 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():549:549 -> iterator
     2:2:java.util.Iterator iterator():547 -> iterator
     1:8:boolean remove(java.lang.Object):579:586 -> remove
@@ -188073,19 +188092,19 @@
     23:23:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):46:46 -> remove
     23:23:boolean remove(java.lang.Object):608 -> remove
     1:1:int size():616:616 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.lx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.nx:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):439:450 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):439 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:17:int nextEntry():457:473 -> a
     18:18:int nextEntry():457:457 -> a
     1:1:boolean hasNext():454:454 -> hasNext
@@ -188097,30 +188116,30 @@
     14:23:void remove():510 -> remove
     24:25:void remove():513:514 -> remove
     26:26:void remove():506:506 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.mx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.ox:
 # {"id":"sourceFile","fileName":"Int2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):678:678 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/px;)V"}
     1:1:java.lang.Integer next():683:683 -> next
     1:1:java.lang.Object next():677 -> next
     1:1:int nextInt():680:680 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap -> com.android.tools.r8.internal.Ix:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry tree -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     int count -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tx;"}
     boolean modified -> i
     boolean[] dirPath -> j
     1:1:void <init>():67:67 -> <init>
@@ -188128,7 +188147,7 @@
     2:2:void <init>():63 -> <init>
     3:4:void <init>():68:69 -> <init>
     5:5:void <init>(java.util.Comparator):97:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ox;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qx;)V"}
     6:8:void <init>(int[],java.lang.Object[],java.util.Comparator):141:143 -> <init>
     6:8:void <init>(int[],java.lang.Object[]):152 -> <init>
     6:8:void com.android.tools.r8.internal.Int2ObjectAVLTreeMap.<init>(int[],java.lang.Object[]):0 -> <init>
@@ -188138,7 +188157,7 @@
     9:9:void com.android.tools.r8.internal.Int2ObjectAVLTreeMap.<init>(int[],java.lang.Object[]):0 -> <init>
     10:10:void <init>(int[],java.lang.Object[]):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.Int2ObjectAVLTreeMap.<init>(int[],java.lang.Object[]):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":12,"2":13,"3":14},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":12,"2":13,"3":14},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     11:11:void <init>(int[],java.lang.Object[],java.util.Comparator):142:142 -> <init>
     11:11:void <init>(int[],java.lang.Object[]):152 -> <init>
     11:11:void com.android.tools.r8.internal.Int2ObjectAVLTreeMap.<init>(int[],java.lang.Object[]):0 -> <init>
@@ -188216,18 +188235,18 @@
     135:136:int firstIntKey():883:884 -> a
     137:137:int firstIntKey():883:883 -> a
     138:138:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1146:1146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     1:53:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():986:1038 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     54:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1142:1142 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:1:int compare(int,int):175:175 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1138:1138 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:6:void clear():647:652 -> clear
     1:1:java.lang.Object clone():36:36 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1526:1533 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ix;"}
     10:10:void allocatePaths():207:207 -> clone
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1534 -> clone
     11:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1535:1539 -> clone
@@ -188242,13 +188261,13 @@
     52:52:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1529:1529 -> clone
     1:1:java.util.Comparator comparator():36:36 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1134:1134 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:3:boolean containsValue(java.lang.Object):636:638 -> containsValue
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator.next():1098:1098 -> containsValue
     4:4:boolean containsValue(java.lang.Object):640 -> containsValue
     5:5:boolean containsValue(java.lang.Object):641:641 -> containsValue
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):183:185 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ux;"}
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():691:691 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry findKey(int):185 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right():699:699 -> d
@@ -188258,7 +188277,7 @@
     1:2:java.lang.Object get(int):878:879 -> get
     1:1:boolean isEmpty():873:873 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1087:1088 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:47:java.lang.Object remove(int):411:457 -> remove
     48:48:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.balance():759:759 -> remove
     48:48:java.lang.Object remove(int):458 -> remove
@@ -188298,17 +188317,17 @@
     222:222:java.lang.Object remove(int):425 -> remove
     1:1:int size():869:869 -> size
     1:15:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1116:1130 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1 -> com.android.tools.r8.internal.ox:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1 -> com.android.tools.r8.internal.qx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2 -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2 -> com.android.tools.r8.internal.sx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     java.util.Comparator comparator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/px;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):986:987 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:void clear():1026:1026 -> clear
     1:1:java.util.Comparator comparator():994:994 -> comparator
     1:5:boolean contains(java.lang.Object):1007:1011 -> contains
@@ -188318,10 +188337,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1034:1034 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):986 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():986 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
     3:3:java.util.Iterator iterator():986 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry last():1030:1030 -> last
@@ -188339,12 +188358,12 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):986:986 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1036:1036 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):986 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2$1 -> com.android.tools.r8.internal.px:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2$1 -> com.android.tools.r8.internal.rx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2 this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2):987:987 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sx;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):987:987 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):989:989 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):987 -> compare
@@ -188352,64 +188371,64 @@
     3:3:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):989 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):987 -> compare
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$3 -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$3 -> com.android.tools.r8.internal.tx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1116:1116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:void clear():1127:1127 -> clear
     1:1:boolean contains(java.lang.Object):1121:1121 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1118:1118 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1118:1118 -> iterator
     2:2:java.util.Iterator iterator():1116 -> iterator
     1:1:int size():1124:1124 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry -> com.android.tools.r8.internal.sx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry -> com.android.tools.r8.internal.ux:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry left -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     int info -> f
     1:1:void <init>():674:674 -> <init>
     2:3:void <init>(int,java.lang.Object):682:683 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:2:void pred(boolean):717:718 -> a
     3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):731:732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ux;)V"}
     5:6:void balance(int):765:766 -> a
     1:2:void succ(boolean):724:725 -> b
     3:4:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):738:739 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ux;)V"}
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next():781:782 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     1:1:boolean pred():705:705 -> c
     1:1:java.lang.Object clone():662:662 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry clone():805:812 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry clone():808:808 -> clone
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev():790:791 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     1:1:boolean succ():711:711 -> e
     1:3:boolean equals(java.lang.Object):818:820 -> equals
     1:1:int hashCode():824:824 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):796:797 -> setValue
     1:1:java.lang.String toString():828:828 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.vx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):971:971 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:void add(java.lang.Object):970:970 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):982:982 -> add
     2:2:void add(java.lang.Object):970 -> add
     1:1:void set(java.lang.Object):970:970 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):980:980 -> set
     2:2:void set(java.lang.Object):970 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.wx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1047:1047 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:void add(java.lang.Object):1046:1046 -> add
     2:2:void add(java.lang.Integer):1068:1068 -> add
     2:2:void add(java.lang.Object):1046 -> add
@@ -188422,43 +188441,43 @@
     2:2:void set(java.lang.Integer):1065:1065 -> set
     2:2:void set(java.lang.Object):1046 -> set
     1:1:int nextInt():1050:1050 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeySet -> com.android.tools.r8.internal.vx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeySet -> com.android.tools.r8.internal.xx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1071:1071 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1):1071 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1071 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
     3:3:java.util.Iterator iterator():1071 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap -> com.android.tools.r8.internal.Fx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     int from -> b
     int to -> c
     boolean bottom -> d
     boolean top -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wx;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yx;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ax;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,int,boolean,int,boolean):1180:1186 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;IZIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;IZIZ)V"}
     1:1:boolean containsKey(int):1296:1296 -> a
     2:3:java.lang.Object put(int,java.lang.Object):1317:1318 -> a
     2:3:java.lang.Object com.android.tools.r8.internal.Int2ObjectAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     4:4:java.lang.Object put(int,java.lang.Object):0:0 -> a
     4:4:java.lang.Object com.android.tools.r8.internal.Int2ObjectAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327,"4":1328},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327,"4":1328},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     1322:1324:java.lang.Object put(int,java.lang.Object):1318:1320 -> a
     1322:1324:java.lang.Object com.android.tools.r8.internal.Int2ObjectAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
     1325:1325:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
@@ -188466,18 +188485,18 @@
     1327:1327:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
     1328:1328:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
     1329:1333:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1360:1364 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     1334:1336:int firstIntKey():1404:1406 -> a
     1337:1337:int firstIntKey():1405:1405 -> a
     1:56:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1206:1261 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     57:58:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1355:1356 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1350:1351 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:4:void clear():1190:1193 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1346:1346 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1346:1346 -> comparator
     2:2:java.util.Comparator comparator():1157 -> comparator
     1:5:boolean containsValue(java.lang.Object):1300:1304 -> containsValue
@@ -188486,7 +188505,7 @@
     6:6:int lastIntKey():1411:1411 -> d
     1:1:java.lang.Object get(int):1313:1313 -> get
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1371:1376 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):197:197 -> i
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1376 -> i
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():691:691 -> i
@@ -188504,7 +188523,7 @@
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1423:1423 -> isEmpty
     3:3:boolean isEmpty():1342 -> isEmpty
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1389:1394 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):197:197 -> j
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1394 -> j
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():691:691 -> j
@@ -188515,17 +188534,17 @@
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1394 -> j
     10:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1396:1399 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1269:1270 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:4:java.lang.Object remove(int):1325:1328 -> remove
     1:5:int size():1332:1336 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1274:1291 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.wx:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.yx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1206:1206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:void clear():1248:1248 -> clear
     1:1:java.util.Comparator comparator():1216:1216 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2.comparator():994:994 -> comparator
@@ -188546,10 +188565,10 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1423:1423 -> isEmpty
     4:4:boolean isEmpty():1244 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1206 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
     3:3:java.util.Iterator iterator():1206 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry last():1253:1253 -> last
@@ -188564,55 +188583,55 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1206:1206 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1259:1259 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1206 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.xx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.zx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1274:1274 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:void clear():1288:1288 -> clear
     1:1:boolean contains(java.lang.Object):1280:1280 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1276:1276 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1276:1276 -> iterator
     2:2:java.util.Iterator iterator():1274 -> iterator
     1:1:int size():1284:1284 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ax:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1263:1263 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1):1263 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1263 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
     3:3:java.util.Iterator iterator():1263 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Bx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1450:1450 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:void add(java.lang.Object):1449:1449 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1461:1461 -> add
     2:2:void add(java.lang.Object):1449 -> add
     1:1:void set(java.lang.Object):1449:1449 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1459:1459 -> set
     2:2:void set(java.lang.Object):1449 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Cx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fx;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1422:1423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:2:void updateNext():1445:1446 -> d
     1:2:void updatePrevious():1441:1442 -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Dx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1472:1472 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:void add(java.lang.Object):1471:1471 -> add
     2:2:void add(java.lang.Integer):1493:1493 -> add
     2:2:void add(java.lang.Object):1471 -> add
@@ -188625,34 +188644,34 @@
     2:2:void set(java.lang.Integer):1490:1490 -> set
     2:2:void set(java.lang.Object):1471 -> set
     1:1:int nextInt():1475:1475 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Cx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ex:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1503:1503 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1):1503 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fx;)V"}
     1:1:void add(java.lang.Object):1511:1511 -> add
     1:1:java.lang.Object next():1505:1505 -> next
     1:1:java.lang.Object previous():1507:1507 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Gx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry curr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ux;"}
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):904:904 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):903:905 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry nextEntry():922:926 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry nextEntry():922:922 -> a
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():932:936 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ux;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry previousEntry():932:932 -> b
     1:1:void updateNext():919:919 -> d
     1:1:void updatePrevious():929:929 -> e
@@ -188666,16 +188685,16 @@
     1:1:int previousIndex():942:942 -> previousIndex
     1:9:void remove():945:953 -> remove
     10:10:void remove():945:945 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Fx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Hx:
 # {"id":"sourceFile","fileName":"Int2ObjectAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1096:1096 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1):1096 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
     1:1:void add(java.lang.Object):1104:1104 -> add
     1:1:java.lang.Object next():1098:1098 -> next
     1:1:java.lang.Object previous():1100:1100 -> previous
     1:1:void set(java.lang.Object):1102:1102 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.Lx:
 # {"id":"sourceFile","fileName":"Int2ObjectArrayMap.java"}
     int[] key -> b
     java.lang.Object[] value -> c
@@ -188685,7 +188704,7 @@
     2:20:java.lang.Object put(int,java.lang.Object):226:244 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet int2ObjectEntrySet():185:185 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():32 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:4:void clear():205:208 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap clone():280:286 -> clone
     1:7:java.lang.Object clone():32 -> clone
@@ -188704,16 +188723,16 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):185:185 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():266 -> values
     2:2:java.util.Collection values():32 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.Kx:
 # {"id":"sourceFile","fileName":"Int2ObjectArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lx;)V"}
     1:5:boolean contains(java.lang.Object):159:163 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:6:boolean remove(java.lang.Object):168:173 -> remove
@@ -188742,14 +188761,14 @@
     1:1:int size():154:154 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):32:32 -> size
     2:2:int size():154 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Jx:
 # {"id":"sourceFile","fileName":"Int2ObjectArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kx;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kx;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -188783,37 +188802,37 @@
     13:13:void remove():120 -> remove
     14:14:void remove():120:120 -> remove
     15:15:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.Mx:
 # {"id":"sourceFile","fileName":"Int2ObjectFunction.java"}
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
     java.lang.Object get(int) -> get
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction -> R8$$REMOVED$$CLASS$$126:
 # {"id":"sourceFile","fileName":"Int2ObjectFunctions.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.Mx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.Ox:
 # {"id":"sourceFile","fileName":"Int2ObjectMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Lx:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Nx:
 # {"id":"sourceFile","fileName":"Int2ObjectMap.java"}
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps -> com.android.tools.r8.internal.Qx:
 # {"id":"sourceFile","fileName":"Int2ObjectMaps.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap EMPTY_MAP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Px;"}
     1:1:void <clinit>():74:74 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap -> com.android.tools.r8.internal.Nx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap -> com.android.tools.r8.internal.Px:
 # {"id":"sourceFile","fileName":"Int2ObjectMaps.java"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.<init>():32:32 -> <init>
     1:1:void <init>():36 -> <init>
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.containsKey(int):36:36 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():43:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.clear():44:44 -> clear
     1:1:java.lang.Object clone():58:58 -> clone
     1:1:boolean containsValue(java.lang.Object):38:38 -> containsValue
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():49:49 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():34:34 -> entrySet
     1:2:boolean equals(java.lang.Object):65:66 -> equals
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.get(int):34:34 -> get
@@ -188821,15 +188840,15 @@
     1:1:boolean isEmpty():60:60 -> isEmpty
     1:1:java.util.Set keySet():34:34 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():52:52 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     1:1:void putAll(java.util.Map):40:40 -> putAll
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.size():42:42 -> size
     1:1:java.lang.String toString():69:69 -> toString
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():55:55 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():55:55 -> values
     2:2:java.util.Collection values():34 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Xx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Zx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     int[] key -> b
     java.lang.Object[] value -> c
@@ -188839,18 +188858,18 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ux;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ux;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Px;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rx;"}
     1:9:void <init>(int,float):78:86 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     10:10:void <init>(int,float):80:80 -> <init>
     11:11:int size():317:317 -> <init>
     11:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,float):123 -> <init>
     11:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,float):123:124 -> <init>
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):131 -> <init>
     1:17:int insert(int,java.lang.Object):190:206 -> a
@@ -188859,7 +188878,7 @@
     20:29:boolean containsKey(int):280:289 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet int2ObjectEntrySet():575:576 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():45 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:5:void clear():309:313 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap clone():759:769 -> clone
     1:11:java.lang.Object clone():45 -> clone
@@ -188899,63 +188918,63 @@
     1:1:int size():317:317 -> size
     1:1:java.util.Collection values():45:45 -> values
     2:20:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():634:652 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.Px:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.Rx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):634:634 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:void clear():649:649 -> clear
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
     2:2:java.util.Iterator iterator():634 -> iterator
     1:1:int size():641:641 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Qx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Sx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vx;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):479:479 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):479 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry next():483:483 -> next
     1:1:java.lang.Object next():479 -> next
     1:2:void remove():487:488 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Tx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):585:585 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:java.lang.Integer next():590:590 -> next
     1:1:java.lang.Object next():584 -> next
     1:1:int nextInt():587:587 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Ux:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):592:592 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):592 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:void clear():613:613 -> clear
     1:1:boolean contains(int):603:603 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():595:595 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():595:595 -> iterator
     2:2:java.util.Iterator iterator():592 -> iterator
     1:3:boolean remove(int):607:609 -> k
     1:1:int size():599:599 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Vx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):347:348 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;I)V"}
     1:1:int getIntKey():353:353 -> a
     1:3:boolean equals(java.lang.Object):375:377 -> equals
     1:1:java.lang.Integer getKey():370:370 -> getKey
@@ -188964,17 +188983,17 @@
     1:1:int hashCode():381:381 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):361:362 -> setValue
     1:1:java.lang.String toString():385:385 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Wx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):499:499 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):499 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:void clear():570:570 -> clear
     1:16:boolean contains(java.lang.Object):509:524 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
     2:2:java.util.Iterator iterator():499 -> iterator
     1:8:boolean remove(java.lang.Object):530:537 -> remove
@@ -188992,19 +189011,19 @@
     26:26:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):45:45 -> remove
     26:26:boolean remove(java.lang.Object):558 -> remove
     1:1:int size():566:566 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.Vx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.Xx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):389:400 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):389 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:17:int nextEntry():407:423 -> a
     18:18:int nextEntry():407:407 -> a
     1:1:boolean hasNext():404:404 -> hasNext
@@ -189016,32 +189035,32 @@
     16:25:void remove():462 -> remove
     26:27:void remove():465:466 -> remove
     28:28:void remove():457:457 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Yx:
 # {"id":"sourceFile","fileName":"Int2ObjectOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):628:628 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
     1:1:java.lang.Object next():630:630 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.qy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.sy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry tree -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     int count -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry lastEntry -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ay;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dy;"}
     boolean modified -> i
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry[] nodePath -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ey;"}
     1:1:void <init>():68:68 -> <init>
     2:3:void allocatePaths():210:211 -> <init>
     2:3:void <init>():64 -> <init>
@@ -189080,14 +189099,14 @@
     128:129:int firstIntKey():827:828 -> a
     130:130:int firstIntKey():827:827 -> a
     131:131:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1092:1092 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     1:53:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():930:982 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     54:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1088:1088 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:1:int compare(int,int):176:176 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1084:1084 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:6:void clear():601:606 -> clear
     1:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap clone():1465:1472 -> clone
     1:8:java.lang.Object clone():37 -> clone
@@ -189113,13 +189132,13 @@
     52:52:java.lang.Object clone():37 -> clone
     1:1:java.util.Comparator comparator():37:37 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1080:1080 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:3:boolean containsValue(java.lang.Object):590:592 -> containsValue
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator.next():1040:1040 -> containsValue
     4:4:boolean containsValue(java.lang.Object):594 -> containsValue
     5:5:boolean containsValue(java.lang.Object):595:595 -> containsValue
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry findKey(int):184:186 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ey;"}
     4:4:int compare(int,int):176:176 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry findKey(int):186 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.left():645:645 -> d
@@ -189129,7 +189148,7 @@
     7:8:int lastIntKey():832:833 -> d
     9:9:int lastIntKey():832:832 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry locateKey(int):196:198 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ey;"}
     4:4:int compare(int,int):176:176 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry locateKey(int):198 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.left():645:645 -> e
@@ -189139,7 +189158,7 @@
     1:2:java.lang.Object get(int):822:823 -> get
     1:1:boolean isEmpty():817:817 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1029:1030 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:8:java.lang.Object remove(int):368:375 -> remove
     9:9:int compare(int,int):176:176 -> remove
     9:9:java.lang.Object remove(int):375 -> remove
@@ -189164,15 +189183,15 @@
     267:267:java.lang.Object remove(int):388:388 -> remove
     1:1:int size():813:813 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1058:1076 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.Zx:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.cy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     java.util.Comparator comparator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ay;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):930:931 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:void clear():970:970 -> clear
     1:1:java.util.Comparator comparator():938:938 -> comparator
     1:5:boolean contains(java.lang.Object):951:955 -> contains
@@ -189182,10 +189201,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):978:978 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):930 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():930 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
     3:3:java.util.Iterator iterator():930 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry last():974:974 -> last
@@ -189203,73 +189222,73 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):930:930 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):980:980 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):930 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.ay:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2):931:931 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zx;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cy;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):931:931 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):933:933 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):931 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.ay:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.dy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1058:1058 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:void clear():1073:1073 -> clear
     1:1:boolean contains(java.lang.Object):1065:1065 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1061:1061 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1061:1061 -> iterator
     2:2:java.util.Iterator iterator():1058 -> iterator
     1:1:int size():1069:1069 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.ey:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry left -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry right -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     int info -> f
     1:1:void <init>():628:628 -> <init>
     2:3:void <init>(int,java.lang.Object):636:637 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:2:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry):685:686 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ey;)V"}
     3:4:void black(boolean):719:720 -> a
     1:2:void pred(boolean):671:672 -> b
     3:4:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry):692:693 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ey;)V"}
     5:5:boolean black():713:713 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry next():727:728 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     1:1:java.lang.Object clone():616:616 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry clone():751:758 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry clone():754:754 -> clone
     1:1:boolean pred():659:659 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry prev():736:737 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     1:3:boolean equals(java.lang.Object):764:766 -> equals
     1:1:boolean succ():665:665 -> f
     1:1:int hashCode():770:770 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):742:743 -> setValue
     1:1:java.lang.String toString():774:774 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.fy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):915:915 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:void add(java.lang.Object):914:914 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):926:926 -> add
     2:2:void add(java.lang.Object):914 -> add
     1:1:void set(java.lang.Object):914:914 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):924:924 -> set
     2:2:void set(java.lang.Object):914 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.gy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):991:991 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:void add(java.lang.Object):990:990 -> add
     2:2:void add(java.lang.Integer):1012:1012 -> add
     2:2:void add(java.lang.Object):990 -> add
@@ -189282,43 +189301,43 @@
     2:2:void set(java.lang.Integer):1009:1009 -> set
     2:2:void set(java.lang.Object):990 -> set
     1:1:int nextInt():994:994 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.hy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1015:1015 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1015 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1015 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
     3:3:java.util.Iterator iterator():1015 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.ny:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.py:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     int from -> b
     int to -> c
     boolean bottom -> d
     boolean top -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gy;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iy;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ky;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,int,boolean,int,boolean):1126:1132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;IZIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;IZIZ)V"}
     1:1:boolean containsKey(int):1235:1235 -> a
     2:3:java.lang.Object put(int,java.lang.Object):1256:1257 -> a
     2:3:java.lang.Object com.android.tools.r8.internal.Int2ObjectRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     4:4:java.lang.Object put(int,java.lang.Object):0:0 -> a
     4:4:java.lang.Object com.android.tools.r8.internal.Int2ObjectRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1264,"2":1265,"3":1266,"4":1267},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1264,"2":1265,"3":1266,"4":1267},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     1261:1263:java.lang.Object put(int,java.lang.Object):1257:1259 -> a
     1261:1263:java.lang.Object com.android.tools.r8.internal.Int2ObjectRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
     1264:1264:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
@@ -189326,18 +189345,18 @@
     1266:1266:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
     1267:1267:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
     1268:1272:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):1299:1303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     1273:1275:int firstIntKey():1343:1345 -> a
     1276:1276:int firstIntKey():1344:1344 -> a
     1:52:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():1152:1203 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     53:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int):1294:1295 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int):1289:1290 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:4:void clear():1136:1139 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1285:1285 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1285:1285 -> comparator
     2:2:java.util.Comparator comparator():1103 -> comparator
     1:5:boolean containsValue(java.lang.Object):1239:1243 -> containsValue
@@ -189346,7 +189365,7 @@
     6:6:int lastIntKey():1350:1350 -> d
     1:1:java.lang.Object get(int):1252:1252 -> get
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1310:1320 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1361:1361 -> isEmpty
     1:1:boolean isEmpty():1281 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):849:849 -> isEmpty
@@ -189355,19 +189374,19 @@
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1362:1362 -> isEmpty
     3:3:boolean isEmpty():1281 -> isEmpty
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry lastEntry():1328:1338 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1211:1212 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:4:java.lang.Object remove(int):1264:1267 -> remove
     1:5:int size():1271:1275 -> size
     1:15:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1216:1230 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.gy:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.iy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ny;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/py;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1152:1152 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:void clear():1191:1191 -> clear
     1:1:java.util.Comparator comparator():1162:1162 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2.comparator():938:938 -> comparator
@@ -189388,10 +189407,10 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1362:1362 -> isEmpty
     4:4:boolean isEmpty():1189 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1152 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
     3:3:java.util.Iterator iterator():1152 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry last():1195:1195 -> last
@@ -189406,55 +189425,55 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1152:1152 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1201:1201 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1152 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.jy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ny;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/py;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1216:1216 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:void clear():1227:1227 -> clear
     1:1:boolean contains(java.lang.Object):1221:1221 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1218:1218 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1218:1218 -> iterator
     2:2:java.util.Iterator iterator():1216 -> iterator
     1:1:int size():1224:1224 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.ky:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ny;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/py;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1205:1205 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1205 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1205 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
     3:3:java.util.Iterator iterator():1205 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.ly:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1389:1389 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:void add(java.lang.Object):1388:1388 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1400:1400 -> add
     2:2:void add(java.lang.Object):1388 -> add
     1:1:void set(java.lang.Object):1388:1388 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1398:1398 -> set
     2:2:void set(java.lang.Object):1388 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.ky:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.my:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ny;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/py;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1361:1362 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:2:void updateNext():1384:1385 -> d
     1:2:void updatePrevious():1380:1381 -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ny:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1411:1411 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:void add(java.lang.Object):1410:1410 -> add
     2:2:void add(java.lang.Integer):1432:1432 -> add
     2:2:void add(java.lang.Object):1410 -> add
@@ -189467,34 +189486,34 @@
     2:2:void set(java.lang.Integer):1429:1429 -> set
     2:2:void set(java.lang.Object):1410 -> set
     1:1:int nextInt():1414:1414 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.my:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.oy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1442:1442 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1442 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/py;)V"}
     1:1:void add(java.lang.Object):1450:1450 -> add
     1:1:java.lang.Object next():1444:1444 -> next
     1:1:java.lang.Object previous():1446:1446 -> previous
     1:1:void set(java.lang.Object):1448:1448 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.qy:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry prev -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry curr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ey;"}
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):848:848 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):847:849 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry nextEntry():866:870 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry nextEntry():866:866 -> a
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry previousEntry():876:880 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ey;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry previousEntry():876:876 -> b
     1:1:void updateNext():863:863 -> d
     1:1:void updatePrevious():873:873 -> e
@@ -189508,60 +189527,60 @@
     1:1:int previousIndex():886:886 -> previousIndex
     1:9:void remove():889:897 -> remove
     10:10:void remove():889:889 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.py:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.ry:
 # {"id":"sourceFile","fileName":"Int2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1038:1038 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$1):1038 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sy;)V"}
     1:1:void add(java.lang.Object):1046:1046 -> add
     1:1:java.lang.Object next():1040:1040 -> next
     1:1:java.lang.Object previous():1042:1042 -> previous
     1:1:void set(java.lang.Object):1044:1044 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.internal.ry:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.internal.ty:
 # {"id":"sourceFile","fileName":"Int2ObjectSortedMap.java"}
     int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator() -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     int lastIntKey() -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet() -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values() -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> com.android.tools.r8.internal.ty:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> com.android.tools.r8.internal.vy:
 # {"id":"sourceFile","fileName":"Int2ObjectSortedMaps.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap EMPTY_MAP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uy;"}
     1:1:void <clinit>():105:105 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.uy:
 # {"id":"sourceFile","fileName":"Int2ObjectSortedMaps.java"}
     1:1:void <init>():48:48 -> <init>
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/ty;"}
     1:1:int firstIntKey():73:73 -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():53:53 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet():46 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():53:53 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet():53:53 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ry;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/ty;"}
     1:1:java.util.Comparator comparator():46:46 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():50:50 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:1:int lastIntKey():75:75 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():59:59 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():46 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():59:59 -> entrySet
     1:1:java.util.Set entrySet():46 -> entrySet
     1:1:int firstIntKey():73:73 -> firstKey
@@ -189573,9 +189592,9 @@
     3:3:java.util.SortedMap headMap(java.lang.Object):46:46 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():62:62 -> keySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():46 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():62:62 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():62:62 -> keySet
     3:3:java.util.Set keySet():46 -> keySet
     1:1:int lastIntKey():75:75 -> lastKey
@@ -189589,21 +189608,21 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(java.lang.Integer):85:85 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):46 -> tailMap
     3:3:java.util.SortedMap tailMap(java.lang.Object):46:46 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Ny:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry tree -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     int count -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ay;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yy;"}
     boolean modified -> i
     boolean[] dirPath -> j
     1:1:void <init>():67:67 -> <init>
@@ -189681,14 +189700,14 @@
     136:137:int firstIntKey():883:884 -> a
     138:138:int firstIntKey():883:883 -> a
     139:139:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1146:1146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1142:1142 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:1:int compare(int,int):175:175 -> c
     2:54:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():986:1038 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     55:55:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1138:1138 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:6:void clear():647:652 -> clear
     1:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap clone():1526:1533 -> clone
     1:8:java.lang.Object clone():36 -> clone
@@ -189714,12 +189733,12 @@
     51:51:java.lang.Object clone():36 -> clone
     1:1:java.util.Comparator comparator():36:36 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1134:1134 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:3:boolean containsValue(java.lang.Object):636:638 -> containsValue
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator.next():1098:1098 -> containsValue
     4:4:boolean containsValue(java.lang.Object):640 -> containsValue
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry findKey(int):183:185 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/zy;"}
     4:4:int compare(int,int):175:175 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry findKey(int):185 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left():691:691 -> d
@@ -189729,7 +189748,7 @@
     7:8:int lastIntKey():888:889 -> d
     9:9:int lastIntKey():888:888 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):195:197 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/zy;"}
     4:4:int compare(int,int):175:175 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):197 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left():691:691 -> e
@@ -189739,7 +189758,7 @@
     1:2:java.lang.Object get(int):878:879 -> get
     1:1:boolean isEmpty():873:873 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1087:1088 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:8:java.lang.Object remove(int):411:418 -> remove
     9:9:int compare(int,int):175:175 -> remove
     9:9:java.lang.Object remove(int):418 -> remove
@@ -189782,15 +189801,15 @@
     214:214:java.lang.Object remove(int):425 -> remove
     1:1:int size():869:869 -> size
     1:15:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1116:1130 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.vy:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.xy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     java.util.Comparator comparator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):986:987 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:void clear():1026:1026 -> clear
     1:1:java.util.Comparator comparator():994:994 -> comparator
     1:5:boolean contains(java.lang.Object):1007:1011 -> contains
@@ -189800,10 +189819,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1034:1034 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):986 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():986 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():998:998 -> iterator
     3:3:java.util.Iterator iterator():986 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1030:1030 -> last
@@ -189821,73 +189840,73 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):986:986 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1036:1036 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):986 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.wy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):987:987 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xy;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):987:987 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):989:989 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):987 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.yy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1116:1116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:void clear():1127:1127 -> clear
     1:1:boolean contains(java.lang.Object):1121:1121 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1118:1118 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1118:1118 -> iterator
     2:2:java.util.Iterator iterator():1116 -> iterator
     1:1:int size():1124:1124 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.zy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     int info -> f
     1:1:void <init>():674:674 -> <init>
     2:3:void <init>(int,java.lang.Object):682:683 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:2:void pred(boolean):717:718 -> a
     3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):731:732 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zy;)V"}
     5:6:void balance(int):765:766 -> a
     1:2:void succ(boolean):724:725 -> b
     3:4:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):738:739 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zy;)V"}
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next():781:782 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     1:1:boolean pred():705:705 -> c
     1:1:java.lang.Object clone():662:662 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry clone():805:812 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry clone():808:808 -> clone
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev():790:791 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     1:1:boolean succ():711:711 -> e
     1:3:boolean equals(java.lang.Object):818:820 -> equals
     1:1:int hashCode():824:824 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):796:797 -> setValue
     1:1:java.lang.String toString():828:828 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Ay:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):971:971 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:void add(java.lang.Object):970:970 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):982:982 -> add
     2:2:void add(java.lang.Object):970 -> add
     1:1:void set(java.lang.Object):970:970 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):980:980 -> set
     2:2:void set(java.lang.Object):970 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.By:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1047:1047 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:void add(java.lang.Object):1046:1046 -> add
     2:2:void add(java.lang.Integer):1068:1068 -> add
     2:2:void add(java.lang.Object):1046 -> add
@@ -189900,43 +189919,43 @@
     2:2:void set(java.lang.Integer):1065:1065 -> set
     2:2:void set(java.lang.Object):1046 -> set
     1:1:int nextInt():1050:1050 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Cy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1071:1071 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1071 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1071 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1073:1073 -> iterator
     3:3:java.util.Iterator iterator():1071 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Iy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Ky:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     int from -> b
     int to -> c
     boolean bottom -> d
     boolean top -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/By;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dy;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ey;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,int,boolean,int,boolean):1180:1186 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;IZIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;IZIZ)V"}
     1:1:boolean containsKey(int):1296:1296 -> a
     2:3:java.lang.Object put(int,java.lang.Object):1317:1318 -> a
     2:3:java.lang.Object com.android.tools.r8.internal.Int2ReferenceAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     4:4:java.lang.Object put(int,java.lang.Object):0:0 -> a
     4:4:java.lang.Object com.android.tools.r8.internal.Int2ReferenceAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327,"4":1328},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1325,"2":1326,"3":1327,"4":1328},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     1322:1324:java.lang.Object put(int,java.lang.Object):1318:1320 -> a
     1322:1324:java.lang.Object com.android.tools.r8.internal.Int2ReferenceAVLTreeMap$Submap.put(int,java.lang.Object):0 -> a
     1325:1325:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
@@ -189944,18 +189963,18 @@
     1327:1327:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
     1328:1328:java.lang.Object put(int,java.lang.Object):1318:1318 -> a
     1329:1333:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1360:1364 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     1334:1336:int firstIntKey():1404:1406 -> a
     1337:1337:int firstIntKey():1405:1405 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1355:1356 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:56:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1206:1261 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     57:58:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1350:1351 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:4:void clear():1190:1193 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1346:1346 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1346:1346 -> comparator
     2:2:java.util.Comparator comparator():1157 -> comparator
     1:4:boolean containsValue(java.lang.Object):1300:1303 -> containsValue
@@ -189964,7 +189983,7 @@
     6:6:int lastIntKey():1411:1411 -> d
     1:1:java.lang.Object get(int):1313:1313 -> get
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1371:1381 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1422:1422 -> isEmpty
     1:1:boolean isEmpty():1342 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):905:905 -> isEmpty
@@ -189973,19 +189992,19 @@
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1423:1423 -> isEmpty
     3:3:boolean isEmpty():1342 -> isEmpty
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1389:1399 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1269:1270 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:4:java.lang.Object remove(int):1325:1328 -> remove
     1:5:int size():1332:1336 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1274:1291 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.By:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Dy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ky;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1206:1206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:void clear():1248:1248 -> clear
     1:1:java.util.Comparator comparator():1216:1216 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.comparator():994:994 -> comparator
@@ -190006,10 +190025,10 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1423:1423 -> isEmpty
     4:4:boolean isEmpty():1244 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1206 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1209:1209 -> iterator
     3:3:java.util.Iterator iterator():1206 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1253:1253 -> last
@@ -190024,55 +190043,55 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1206:1206 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1259:1259 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1206 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Cy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Ey:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ky;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1274:1274 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:void clear():1288:1288 -> clear
     1:1:boolean contains(java.lang.Object):1280:1280 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1276:1276 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1276:1276 -> iterator
     2:2:java.util.Iterator iterator():1274 -> iterator
     1:1:int size():1284:1284 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Fy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ky;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1263:1263 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1263 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1263 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1264:1264 -> iterator
     3:3:java.util.Iterator iterator():1263 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Gy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1450:1450 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:void add(java.lang.Object):1449:1449 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1461:1461 -> add
     2:2:void add(java.lang.Object):1449 -> add
     1:1:void set(java.lang.Object):1449:1449 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1459:1459 -> set
     2:2:void set(java.lang.Object):1449 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Hy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ky;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1422:1423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:2:void updateNext():1445:1446 -> d
     1:2:void updatePrevious():1441:1442 -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Gy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Iy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1472:1472 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:void add(java.lang.Object):1471:1471 -> add
     2:2:void add(java.lang.Integer):1493:1493 -> add
     2:2:void add(java.lang.Object):1471 -> add
@@ -190085,34 +190104,34 @@
     2:2:void set(java.lang.Integer):1490:1490 -> set
     2:2:void set(java.lang.Object):1471 -> set
     1:1:int nextInt():1475:1475 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Jy:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1503:1503 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1503 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ky;)V"}
     1:1:void add(java.lang.Object):1511:1511 -> add
     1:1:java.lang.Object next():1505:1505 -> next
     1:1:java.lang.Object previous():1507:1507 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Ly:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zy;"}
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):904:904 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):903:905 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():922:926 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry nextEntry():922:922 -> a
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():932:936 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zy;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry previousEntry():932:932 -> b
     1:1:void updateNext():919:919 -> d
     1:1:void updatePrevious():929:929 -> e
@@ -190126,16 +190145,16 @@
     1:1:int previousIndex():942:942 -> previousIndex
     1:9:void remove():945:953 -> remove
     10:10:void remove():945:945 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Ky:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.My:
 # {"id":"sourceFile","fileName":"Int2ReferenceAVLTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1096:1096 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1096 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:void add(java.lang.Object):1104:1104 -> add
     1:1:java.lang.Object next():1098:1098 -> next
     1:1:java.lang.Object previous():1100:1100 -> previous
     1:1:void set(java.lang.Object):1102:1102 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Qy:
 # {"id":"sourceFile","fileName":"Int2ReferenceArrayMap.java"}
     int[] key -> b
     java.lang.Object[] value -> c
@@ -190146,7 +190165,7 @@
     2:20:java.lang.Object put(int,java.lang.Object):226:244 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():185:185 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():32 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:4:void clear():205:208 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap clone():280:286 -> clone
     1:7:java.lang.Object clone():32 -> clone
@@ -190157,25 +190176,25 @@
     1:2:java.lang.Object get(int):195:196 -> get
     1:1:boolean isEmpty():221:221 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():262:262 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():262:262 -> keySet
     2:2:java.util.Set keySet():32 -> keySet
     1:8:java.lang.Object remove(int):250:257 -> remove
     1:1:int size():201:201 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():266:266 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):185:185 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():266 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Ny:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Py:
 # {"id":"sourceFile","fileName":"Int2ReferenceArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qy;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qy;)V"}
     1:5:boolean contains(java.lang.Object):159:163 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:6:boolean remove(java.lang.Object):168:173 -> remove
@@ -190201,14 +190220,14 @@
     1:1:int size():154:154 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):32:32 -> size
     2:2:int size():154 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.My:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Oy:
 # {"id":"sourceFile","fileName":"Int2ReferenceArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Py;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Py;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -190242,7 +190261,7 @@
     13:13:void remove():120 -> remove
     14:14:void remove():120:120 -> remove
     15:15:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Ry:
 # {"id":"sourceFile","fileName":"Int2ReferenceFunction.java"}
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
@@ -190250,7 +190269,7 @@
     java.lang.Object remove(int) -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction -> R8$$REMOVED$$CLASS$$127:
 # {"id":"sourceFile","fileName":"Int2ReferenceFunctions.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.az:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     int[] key -> b
     java.lang.Object[] value -> c
@@ -190263,11 +190282,11 @@
     int maxFill -> j
     int size -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet entries -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ty;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sy;"}
     1:1:void <init>(int,float):117:117 -> <init>
     1:1:void <init>():139 -> <init>
     2:41:void <init>(int,float):87:126 -> <init>
@@ -190279,18 +190298,18 @@
     40:41:int firstIntKey():757:758 -> a
     42:42:int firstIntKey():757:757 -> a
     43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):780:780 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):772:772 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:24:void fixPointers(int,int):726:749 -> c
     25:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):776:776 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet int2ReferenceEntrySet():1098:1099 -> c
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():75 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     28:29:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet int2ReferenceEntrySet():1098:1099 -> c
     28:29:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():75 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:6:void clear():607:612 -> clear
     1:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap clone():1346:1357 -> clone
     1:12:java.lang.Object clone():75 -> clone
@@ -190298,7 +190317,7 @@
     13:13:java.lang.Object clone():75 -> clone
     1:1:java.util.Comparator comparator():75:75 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():784:784 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:4:boolean containsValue(java.lang.Object):593:596 -> containsValue
     1:25:void fixPointers(int):693:717 -> d
     26:27:int lastIntKey():766:767 -> d
@@ -190316,7 +190335,7 @@
     2:10:int hashCode():1373:1381 -> hashCode
     1:1:boolean isEmpty():620:620 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1177:1178 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:1:void putAll(java.util.Map):225:225 -> putAll
     2:3:void ensureCapacity(int):198:199 -> putAll
     2:3:void putAll(java.util.Map):225 -> putAll
@@ -190332,28 +190351,28 @@
     8:15:java.lang.Object remove(int):304:311 -> remove
     1:1:int size():616:616 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1199:1217 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Qy:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Sy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1199:1199 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:1:void clear():1214:1214 -> clear
     1:1:boolean contains(java.lang.Object):1210:1210 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1202:1202 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1202:1202 -> iterator
     2:2:java.util.Iterator iterator():1199 -> iterator
     1:1:int size():1206:1206 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ty:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wy;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):942:942 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:1:void add(java.lang.Object):940:940 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):937:937 -> add
     2:2:void add(java.lang.Object):940 -> add
@@ -190365,12 +190384,12 @@
     1:1:void set(java.lang.Object):940:940 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):934:934 -> set
     2:2:void set(java.lang.Object):940 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Sy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Uy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1124:1124 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:1:void add(java.lang.Object):1107:1107 -> add
     2:2:void add(java.lang.Integer):1123:1123 -> add
     2:2:void add(java.lang.Object):1107 -> add
@@ -190383,43 +190402,43 @@
     2:2:void set(java.lang.Integer):1120:1120 -> set
     2:2:void set(java.lang.Object):1107 -> set
     1:1:int nextInt():1126:1126 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Vy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1131:1131 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:2:int firstInt():1158:1159 -> T
     3:3:int firstInt():1158:1158 -> T
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):1169:1169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:void clear():1154:1154 -> clear
     1:1:java.util.Comparator comparator():1131:1131 -> comparator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int):1173:1173 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/tA;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):1171:1171 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     1:1:boolean contains(int):1144:1144 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1136:1136 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1131 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1136:1136 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1131 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():1136:1136 -> iterator
     3:3:java.util.Iterator iterator():1131 -> iterator
     1:3:boolean remove(int):1148:1150 -> k
     1:1:int size():1140:1140 -> size
     1:2:int lastInt():1163:1164 -> v
     3:3:int lastInt():1163:1163 -> v
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Wy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):646:647 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;I)V"}
     1:1:int getIntKey():652:652 -> a
     1:3:boolean equals(java.lang.Object):674:676 -> equals
     1:1:java.lang.Integer getKey():669:669 -> getKey
@@ -190428,13 +190447,13 @@
     1:1:int hashCode():680:680 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):660:661 -> setValue
     1:1:java.lang.String toString():684:684 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Vy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Xy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):977:977 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):977 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:1:void clear():1063:1063 -> clear
     1:1:java.util.Comparator comparator():982:982 -> comparator
     1:16:boolean contains(java.lang.Object):1002:1017 -> contains
@@ -190446,10 +190465,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):986:986 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):977 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():979:979 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():979:979 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():977 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():979:979 -> iterator
     3:3:java.util.Iterator iterator():977 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():996:997 -> last
@@ -190473,17 +190492,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):977:977 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):988:988 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):977 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Yy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):798:798 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):789 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):791:800 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):789 -> <init>
     1:14:void ensureIndexKnown():833:846 -> a
@@ -190497,45 +190516,45 @@
     1:2:int previousIndex():854:855 -> previousIndex
     1:46:void remove():874:919 -> remove
     47:47:void remove():875:875 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Zy:
 # {"id":"sourceFile","fileName":"Int2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yy;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/az;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1193:1193 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
     1:1:void add(java.lang.Object):1192:1192 -> add
     1:1:java.lang.Object next():1195:1195 -> next
     1:1:java.lang.Object previous():1188:1188 -> previous
     1:1:void set(java.lang.Object):1190:1190 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.az:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.cz:
 # {"id":"sourceFile","fileName":"Int2ReferenceMap.java"}
     java.lang.Object put(java.lang.Integer,java.lang.Object) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet() -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values() -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Zy:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.bz:
 # {"id":"sourceFile","fileName":"Int2ReferenceMap.java"}
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.cz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.ez:
 # {"id":"sourceFile","fileName":"Int2ReferenceMaps.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dz;"}
     1:1:void <clinit>():75:75 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.bz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.dz:
 # {"id":"sourceFile","fileName":"Int2ReferenceMaps.java"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():32:32 -> <init>
     1:1:void <init>():37 -> <init>
     1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int):36:36 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():44:44 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.clear():44:44 -> clear
     1:1:java.lang.Object clone():59:59 -> clone
     1:1:boolean containsValue(java.lang.Object):39:39 -> containsValue
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():50:50 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():35:35 -> entrySet
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.get(int):34:34 -> get
@@ -190543,15 +190562,15 @@
     1:1:boolean isEmpty():61:61 -> isEmpty
     1:1:java.util.Set keySet():35:35 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():53:53 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     1:1:void putAll(java.util.Map):41:41 -> putAll
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.size():42:42 -> size
     1:1:java.lang.String toString():70:70 -> toString
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():56:56 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():56:56 -> values
     2:2:java.util.Collection values():35 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.nz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     int[] key -> b
     java.lang.Object[] value -> c
@@ -190562,25 +190581,25 @@
     int size -> h
     float f -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keys -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fz;"}
     1:9:void <init>(int,float):78:86 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     10:10:void <init>(int,float):80:80 -> <init>
     11:11:void <init>():99:99 -> <init>
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):123:124 -> <init>
     12:13:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):131 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;)V"}
     1:17:int insert(int,java.lang.Object):190:206 -> a
     1:17:java.lang.Object put(int,java.lang.Object):212 -> a
     18:19:java.lang.Object put(int,java.lang.Object):214:215 -> a
     20:29:boolean containsKey(int):280:289 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():575:576 -> c
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():45 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:5:void clear():309:313 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap clone():759:769 -> clone
     1:11:java.lang.Object clone():45 -> clone
@@ -190604,7 +190623,7 @@
     1:1:boolean isEmpty():321:321 -> isEmpty
     1:1:java.util.Set keySet():45:45 -> keySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():618:619 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     1:1:void putAll(java.util.Map):183:183 -> putAll
     2:3:void ensureCapacity(int):158:159 -> putAll
     2:3:void putAll(java.util.Map):183 -> putAll
@@ -190620,63 +190639,63 @@
     7:14:java.lang.Object remove(int):251:258 -> remove
     1:1:int size():317:317 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():634:652 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.dz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.fz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):634:634 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:void clear():649:649 -> clear
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
     2:2:java.util.Iterator iterator():634 -> iterator
     1:1:int size():641:641 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.gz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):479:479 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):479 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry next():483:483 -> next
     1:1:java.lang.Object next():479 -> next
     1:2:void remove():487:488 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):585:585 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:java.lang.Integer next():590:590 -> next
     1:1:java.lang.Object next():584 -> next
     1:1:int nextInt():587:587 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.iz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):592:592 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):592 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:void clear():613:613 -> clear
     1:1:boolean contains(int):603:603 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():595:595 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():595:595 -> iterator
     2:2:java.util.Iterator iterator():592 -> iterator
     1:3:boolean remove(int):607:609 -> k
     1:1:int size():599:599 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.jz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):347:348 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;I)V"}
     1:1:int getIntKey():353:353 -> a
     1:3:boolean equals(java.lang.Object):375:377 -> equals
     1:1:java.lang.Integer getKey():370:370 -> getKey
@@ -190685,17 +190704,17 @@
     1:1:int hashCode():381:381 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):361:362 -> setValue
     1:1:java.lang.String toString():385:385 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.kz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):499:499 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):499 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:void clear():570:570 -> clear
     1:16:boolean contains(java.lang.Object):509:524 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
     2:2:java.util.Iterator iterator():499 -> iterator
     1:7:boolean remove(java.lang.Object):530:536 -> remove
@@ -190709,19 +190728,19 @@
     23:23:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):558 -> remove
     1:1:int size():566:566 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.lz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):389:400 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):389 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:17:int nextEntry():407:423 -> a
     18:18:int nextEntry():407:407 -> a
     1:1:boolean hasNext():404:404 -> hasNext
@@ -190733,32 +190752,32 @@
     16:25:void remove():462 -> remove
     26:27:void remove():465:466 -> remove
     28:28:void remove():457:457 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.mz:
 # {"id":"sourceFile","fileName":"Int2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):628:628 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:java.lang.Object next():630:630 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Fz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     int count -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qz;"}
     boolean modified -> i
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry[] nodePath -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/rz;"}
     1:1:void <init>():68:68 -> <init>
     2:3:void allocatePaths():210:211 -> <init>
     2:3:void <init>():64 -> <init>
@@ -190797,14 +190816,14 @@
     128:129:int firstIntKey():827:828 -> a
     130:130:int firstIntKey():827:827 -> a
     131:131:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1092:1092 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1088:1088 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:1:int compare(int,int):176:176 -> c
     2:54:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():930:982 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     55:55:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1084:1084 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:6:void clear():601:606 -> clear
     1:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap clone():1465:1472 -> clone
     1:8:java.lang.Object clone():37 -> clone
@@ -190830,12 +190849,12 @@
     52:52:java.lang.Object clone():37 -> clone
     1:1:java.util.Comparator comparator():37:37 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1080:1080 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:3:boolean containsValue(java.lang.Object):590:592 -> containsValue
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator.next():1040:1040 -> containsValue
     4:4:boolean containsValue(java.lang.Object):594 -> containsValue
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):184:186 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rz;"}
     4:4:int compare(int,int):176:176 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):186 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.left():645:645 -> d
@@ -190845,7 +190864,7 @@
     7:8:int lastIntKey():832:833 -> d
     9:9:int lastIntKey():832:832 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):196:198 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rz;"}
     4:4:int compare(int,int):176:176 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):198 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.left():645:645 -> e
@@ -190855,7 +190874,7 @@
     1:2:java.lang.Object get(int):822:823 -> get
     1:1:boolean isEmpty():817:817 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1029:1030 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:8:java.lang.Object remove(int):368:375 -> remove
     9:9:int compare(int,int):176:176 -> remove
     9:9:java.lang.Object remove(int):375 -> remove
@@ -190880,15 +190899,15 @@
     267:267:java.lang.Object remove(int):388:388 -> remove
     1:1:int size():813:813 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1058:1076 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.nz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.pz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     java.util.Comparator comparator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):930:931 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:void clear():970:970 -> clear
     1:1:java.util.Comparator comparator():938:938 -> comparator
     1:5:boolean contains(java.lang.Object):951:955 -> contains
@@ -190898,10 +190917,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):978:978 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):930 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():930 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():942:942 -> iterator
     3:3:java.util.Iterator iterator():930 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():974:974 -> last
@@ -190919,73 +190938,73 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):930:930 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):980:980 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):930 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.mz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.oz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):931:931 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pz;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):931:931 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):933:933 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):931 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.qz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1058:1058 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:void clear():1073:1073 -> clear
     1:1:boolean contains(java.lang.Object):1065:1065 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1061:1061 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1061:1061 -> iterator
     2:2:java.util.Iterator iterator():1058 -> iterator
     1:1:int size():1069:1069 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.pz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.rz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     int info -> f
     1:1:void <init>():628:628 -> <init>
     2:3:void <init>(int,java.lang.Object):636:637 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:2:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):685:686 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rz;)V"}
     3:4:void black(boolean):719:720 -> a
     1:2:void pred(boolean):671:672 -> b
     3:4:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):692:693 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rz;)V"}
     5:5:boolean black():713:713 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next():727:728 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     1:1:java.lang.Object clone():616:616 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry clone():751:758 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry clone():754:754 -> clone
     1:1:boolean pred():659:659 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev():736:737 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     1:3:boolean equals(java.lang.Object):764:766 -> equals
     1:1:boolean succ():665:665 -> f
     1:1:int hashCode():770:770 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):742:743 -> setValue
     1:1:java.lang.String toString():774:774 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.sz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):915:915 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:void add(java.lang.Object):914:914 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):926:926 -> add
     2:2:void add(java.lang.Object):914 -> add
     1:1:void set(java.lang.Object):914:914 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):924:924 -> set
     2:2:void set(java.lang.Object):914 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.tz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):991:991 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:void add(java.lang.Object):990:990 -> add
     2:2:void add(java.lang.Integer):1012:1012 -> add
     2:2:void add(java.lang.Object):990 -> add
@@ -190998,43 +191017,43 @@
     2:2:void set(java.lang.Integer):1009:1009 -> set
     2:2:void set(java.lang.Object):990 -> set
     1:1:int nextInt():994:994 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.sz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.uz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1015:1015 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1015 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1015 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1016:1016 -> iterator
     3:3:java.util.Iterator iterator():1015 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Cz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     int from -> b
     int to -> c
     boolean bottom -> d
     boolean top -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tz;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vz;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,int,boolean,int,boolean):1126:1132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;IZIZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;IZIZ)V"}
     1:1:boolean containsKey(int):1235:1235 -> a
     2:3:java.lang.Object put(int,java.lang.Object):1256:1257 -> a
     2:3:java.lang.Object com.android.tools.r8.internal.Int2ReferenceRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     4:4:java.lang.Object put(int,java.lang.Object):0:0 -> a
     4:4:java.lang.Object com.android.tools.r8.internal.Int2ReferenceRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1264,"2":1265,"3":1266,"4":1267},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1264,"2":1265,"3":1266,"4":1267},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     1261:1263:java.lang.Object put(int,java.lang.Object):1257:1259 -> a
     1261:1263:java.lang.Object com.android.tools.r8.internal.Int2ReferenceRBTreeMap$Submap.put(int,java.lang.Object):0 -> a
     1264:1264:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
@@ -191042,18 +191061,18 @@
     1266:1266:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
     1267:1267:java.lang.Object put(int,java.lang.Object):1257:1257 -> a
     1268:1272:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1299:1303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     1273:1275:int firstIntKey():1343:1345 -> a
     1276:1276:int firstIntKey():1344:1344 -> a
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1294:1295 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:52:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1152:1203 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     53:54:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1289:1290 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:4:void clear():1136:1139 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1285:1285 -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1285:1285 -> comparator
     2:2:java.util.Comparator comparator():1103 -> comparator
     1:4:boolean containsValue(java.lang.Object):1239:1242 -> containsValue
@@ -191062,7 +191081,7 @@
     6:6:int lastIntKey():1350:1350 -> d
     1:1:java.lang.Object get(int):1252:1252 -> get
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1310:1320 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1361:1361 -> isEmpty
     1:1:boolean isEmpty():1281 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):849:849 -> isEmpty
@@ -191071,19 +191090,19 @@
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1362:1362 -> isEmpty
     3:3:boolean isEmpty():1281 -> isEmpty
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1328:1338 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1211:1212 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:4:java.lang.Object remove(int):1264:1267 -> remove
     1:5:int size():1271:1275 -> size
     1:15:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1216:1230 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.tz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.vz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1152:1152 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:void clear():1191:1191 -> clear
     1:1:java.util.Comparator comparator():1162:1162 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2.comparator():938:938 -> comparator
@@ -191104,10 +191123,10 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1362:1362 -> isEmpty
     4:4:boolean isEmpty():1189 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1152 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1155:1155 -> iterator
     3:3:java.util.Iterator iterator():1152 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1195:1195 -> last
@@ -191122,55 +191141,55 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1152:1152 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1201:1201 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1152 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.wz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1216:1216 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:void clear():1227:1227 -> clear
     1:1:boolean contains(java.lang.Object):1221:1221 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1218:1218 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1218:1218 -> iterator
     2:2:java.util.Iterator iterator():1216 -> iterator
     1:1:int size():1224:1224 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.xz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1205:1205 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1205 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1205 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1206:1206 -> iterator
     3:3:java.util.Iterator iterator():1205 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.yz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1389:1389 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:void add(java.lang.Object):1388:1388 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1400:1400 -> add
     2:2:void add(java.lang.Object):1388 -> add
     1:1:void set(java.lang.Object):1388:1388 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1398:1398 -> set
     2:2:void set(java.lang.Object):1388 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.zz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1361:1362 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:2:void updateNext():1384:1385 -> d
     1:2:void updatePrevious():1380:1381 -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Az:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1411:1411 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:void add(java.lang.Object):1410:1410 -> add
     2:2:void add(java.lang.Integer):1432:1432 -> add
     2:2:void add(java.lang.Object):1410 -> add
@@ -191183,34 +191202,34 @@
     2:2:void set(java.lang.Integer):1429:1429 -> set
     2:2:void set(java.lang.Object):1410 -> set
     1:1:int nextInt():1414:1414 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.zz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Bz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1442:1442 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1442 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cz;)V"}
     1:1:void add(java.lang.Object):1450:1450 -> add
     1:1:java.lang.Object next():1444:1444 -> next
     1:1:java.lang.Object previous():1446:1446 -> previous
     1:1:void set(java.lang.Object):1448:1448 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Dz:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rz;"}
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):848:848 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):847:849 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry nextEntry():866:870 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry nextEntry():866:866 -> a
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry previousEntry():876:880 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rz;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry previousEntry():876:876 -> b
     1:1:void updateNext():863:863 -> d
     1:1:void updatePrevious():873:873 -> e
@@ -191224,78 +191243,78 @@
     1:1:int previousIndex():886:886 -> previousIndex
     1:9:void remove():889:897 -> remove
     10:10:void remove():889:889 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Cz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Ez:
 # {"id":"sourceFile","fileName":"Int2ReferenceRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1038:1038 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1038 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fz;)V"}
     1:1:void add(java.lang.Object):1046:1046 -> add
     1:1:java.lang.Object next():1040:1040 -> next
     1:1:java.lang.Object previous():1042:1042 -> previous
     1:1:void set(java.lang.Object):1044:1044 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.Gz:
 # {"id":"sourceFile","fileName":"Int2ReferenceSortedMap.java"}
     int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator() -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     int lastIntKey() -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet() -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Gz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Iz:
 # {"id":"sourceFile","fileName":"Int2ReferenceSortedMaps.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hz;"}
     1:1:void <clinit>():105:105 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Hz:
 # {"id":"sourceFile","fileName":"Int2ReferenceSortedMaps.java"}
     1:1:void <init>():48:48 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     2:2:int firstIntKey():73:73 -> a
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):71:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():46:46 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():53:53 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():53:53 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):68:68 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator() -> comparator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ox;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qx;"}
     1:1:java.util.Comparator comparator():46:46 -> comparator
     1:1:int lastIntKey():75:75 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():46:46 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():46:46 -> entrySet
     1:1:java.lang.Object firstKey():46:46 -> firstKey
     1:1:java.util.SortedMap headMap(java.lang.Object):46:46 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():59:59 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:java.lang.Integer firstKey():95:95 -> j
     1:1:java.lang.Integer lastKey():100:100 -> k
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():46:46 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     2:2:java.util.Set keySet():46:46 -> keySet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():62:62 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     1:1:java.lang.Object lastKey():46:46 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):46:46 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):46:46 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.Mz:
 # {"id":"sourceFile","fileName":"IntArrayList.java"}
     int[] a -> b
     int size -> c
@@ -191308,7 +191327,7 @@
     6:6:void com.android.tools.r8.internal.IntArrayList1.<init>(int):0 -> <init>
     7:7:void <init>(int):0:0 -> <init>
     7:7:void com.android.tools.r8.internal.IntArrayList1.<init>(int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75,"2":76,"3":77,"4":78,"5":79},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75,"2":76,"3":77,"4":78,"5":79},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     74:74:void <init>(int):67:67 -> <init>
     74:74:void com.android.tools.r8.internal.IntArrayList1.<init>(int):0 -> <init>
     75:75:void <init>(int):67:67 -> <init>
@@ -191335,7 +191354,7 @@
     4:4:void com.android.tools.r8.internal.IntArrayList1.getElements(int,int[],int,int):0 -> a
     5:5:void getElements(int,int[],int,int):0:0 -> a
     5:5:void com.android.tools.r8.internal.IntArrayList1.getElements(int,int[],int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12,"4":13,"5":14},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12,"4":13,"5":14},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureOffsetLength(int,int,int):72:72 -> a
     6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays.ensureOffsetLength(int[],int,int):288 -> a
     6:6:void getElements(int,int[],int,int):300 -> a
@@ -191346,7 +191365,7 @@
     7:7:void com.android.tools.r8.internal.IntArrayList1.getElements(int,int[],int,int):0 -> a
     8:8:void getElements(int,int[],int,int):0:0 -> a
     8:8:void com.android.tools.r8.internal.IntArrayList1.getElements(int,int[],int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15,"2":16,"3":17,"4":18,"5":19},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15,"2":16,"3":17,"4":18,"5":19},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     9:9:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureOffsetLength(int,int,int):71:71 -> a
     9:9:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays.ensureOffsetLength(int[],int,int):288 -> a
     9:9:void getElements(int,int[],int,int):300 -> a
@@ -191384,7 +191403,7 @@
     20:22:void removeElements(int,int):310:312 -> a
     23:24:int[] toArray(int[]):332:333 -> a
     25:31:boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):351:357 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aA;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/cA;)Z"}
     1:2:boolean add(int):198:199 -> add
     1:5:void add(int,int):189:193 -> b
     1:2:int getInt(int):205:206 -> c
@@ -191394,12 +191413,12 @@
     3:3:int com.android.tools.r8.internal.IntArrayList1.getInt(int):0 -> c
     4:4:int getInt(int):0:0 -> c
     4:4:int com.android.tools.r8.internal.IntArrayList1.getInt(int):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":416,"2":417,"3":418,"4":419},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":416,"2":417,"3":418,"4":419},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     209:209:int getInt(int):205:205 -> c
     209:209:int com.android.tools.r8.internal.IntArrayList1.getInt(int):0 -> c
     210:210:int getInt(int):0:0 -> c
     210:210:int com.android.tools.r8.internal.IntArrayList1.getInt(int):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":420,"2":421,"3":422},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":420,"2":421,"3":422},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     415:415:int getInt(int):205:205 -> c
     415:415:int com.android.tools.r8.internal.IntArrayList1.getInt(int):0 -> c
     416:416:int getInt(int):205:205 -> c
@@ -191416,12 +191435,12 @@
     426:426:int com.android.tools.r8.internal.IntArrayList1.set(int,int):0 -> c
     427:427:int set(int,int):0:0 -> c
     427:427:int com.android.tools.r8.internal.IntArrayList1.set(int,int):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":903,"2":904,"3":905,"4":906},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":903,"2":904,"3":905,"4":906},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     664:664:int set(int,int):237:237 -> c
     664:664:int com.android.tools.r8.internal.IntArrayList1.set(int,int):0 -> c
     665:665:int set(int,int):0:0 -> c
     665:665:int com.android.tools.r8.internal.IntArrayList1.set(int,int):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":907,"2":908,"3":909},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":907,"2":908,"3":909},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     902:902:int set(int,int):237:237 -> c
     902:902:int com.android.tools.r8.internal.IntArrayList1.set(int,int):0 -> c
     903:903:int set(int,int):237:237 -> c
@@ -191441,12 +191460,12 @@
     5:5:int com.android.tools.r8.internal.IntArrayList1.removeInt(int):0 -> i
     6:6:int removeInt(int):0:0 -> i
     6:6:int com.android.tools.r8.internal.IntArrayList1.removeInt(int):0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450,"4":451},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450,"4":451},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     226:226:int removeInt(int):220:220 -> i
     226:226:int com.android.tools.r8.internal.IntArrayList1.removeInt(int):0 -> i
     227:227:int removeInt(int):0:0 -> i
     227:227:int com.android.tools.r8.internal.IntArrayList1.removeInt(int):0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":452,"2":453,"3":454},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":452,"2":453,"3":454},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     447:447:int removeInt(int):220:220 -> i
     447:447:int com.android.tools.r8.internal.IntArrayList1.removeInt(int):0 -> i
     448:448:int removeInt(int):220:220 -> i
@@ -191463,21 +191482,21 @@
     1:1:int indexOf(int):210:210 -> m
     1:1:int lastIndexOf(int):215:215 -> n
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):383:384 -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/dA;"}
     1:1:void grow(int):184:184 -> p
     2:6:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays.grow(int[],int,int):159:163 -> p
     2:6:void grow(int):184 -> p
     7:7:void grow(int):184:184 -> p
     1:6:boolean removeAll(java.util.Collection):373:378 -> removeAll
     1:1:int size():249:249 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.Lz:
 # {"id":"sourceFile","fileName":"IntArrayList.java"}
     int pos -> b
     int last -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList,int):384:385 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kz;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mz;I)V"}
     1:2:void add(int):393:394 -> a
     1:2:void set(int):397:398 -> b
     3:3:void set(int):397:397 -> b
@@ -191489,14 +191508,14 @@
     1:5:void remove():401:405 -> remove
     6:6:void remove():401:401 -> remove
     1:1:int nextInt():388:388 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.Pz:
 # {"id":"sourceFile","fileName":"IntArraySet.java"}
     int[] a -> b
     int size -> c
     1:2:void <init>():43:44 -> <init>
     3:4:void <init>(int):50:51 -> <init>
     5:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):57:57 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qA;)V"}
     6:7:void <init>(int):50:51 -> <init>
     6:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):57 -> <init>
     8:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):58:58 -> <init>
@@ -191510,12 +191529,12 @@
       # {"id":"com.android.tools.r8.synthesized"}
     17:17:void <init>(int[],int):0:0 -> <init>
     17:17:void com.android.tools.r8.internal.IntArraySet.<init>(int[],int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175,"4":176},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175,"4":176},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     94:94:void <init>(int[],int):77:77 -> <init>
     94:94:void com.android.tools.r8.internal.IntArraySet.<init>(int[],int):0 -> <init>
     95:95:void <init>(int[],int):0:0 -> <init>
     95:95:void com.android.tools.r8.internal.IntArraySet.<init>(int[],int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     172:172:void <init>(int[],int):77:77 -> <init>
     172:172:void com.android.tools.r8.internal.IntArraySet.<init>(int[],int):0 -> <init>
     173:173:void <init>(int[],int):77:77 -> <init>
@@ -191537,20 +191556,20 @@
     1:1:boolean contains(int):106 -> h
     1:1:boolean isEmpty():139:139 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():86:86 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():86:86 -> iterator
     2:2:java.util.Iterator iterator():25 -> iterator
     1:1:int findKey(int):80:80 -> k
     1:1:boolean remove(int):114 -> k
     2:4:boolean remove(int):116:118 -> k
     1:1:int size():110:110 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.Oz:
 # {"id":"sourceFile","fileName":"IntArraySet.java"}
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):86:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pz;)V"}
     1:1:boolean hasNext():90:90 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):25:25 -> hasNext
     2:2:boolean hasNext():90 -> hasNext
@@ -191566,22 +191585,22 @@
     3:3:int nextInt():95 -> t
     4:4:int nextInt():95:95 -> t
     5:5:int nextInt():94:94 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Qz:
 # {"id":"sourceFile","fileName":"IntArrays.java"}
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():80:80 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Rz:
 # {"id":"sourceFile","fileName":"IntBidirectionalIterator.java"}
     int previousInt() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Tz:
 # {"id":"sourceFile","fileName":"IntCollection.java"}
     boolean add(int) -> add
     boolean contains(int) -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> R8$$REMOVED$$CLASS$$128:
 # {"id":"sourceFile","fileName":"IntCollections.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Uz:
 # {"id":"sourceFile","fileName":"IntCollections.java"}
     1:1:void <init>():31:31 -> <init>
     1:1:boolean addAll(java.util.Collection):52:52 -> addAll
@@ -191589,20 +191608,20 @@
     1:1:boolean contains(int):33:33 -> h
     1:1:int hashCode():44:44 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():30:30 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:java.util.Iterator iterator():30:30 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():38:38 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     1:1:boolean removeAll(java.util.Collection):54:54 -> removeAll
     1:1:boolean retainAll(java.util.Collection):56:56 -> retainAll
     1:1:int size():40:40 -> size
     1:1:java.lang.Object[] toArray():35:35 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Vz:
 # {"id":"sourceFile","fileName":"IntCollections.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pz;"}
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):169:171 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pz;)V"}
     1:1:boolean add(java.lang.Object):166:166 -> add
     2:2:boolean add(java.lang.Integer):207:207 -> add
     2:2:boolean add(java.lang.Object):166 -> add
@@ -191616,7 +191635,7 @@
     1:1:boolean isEmpty():180:180 -> isEmpty
     1:1:java.util.Iterator iterator():166:166 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():183:183 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.iterator():86:86 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():183 -> iterator
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():183:183 -> iterator
@@ -191631,18 +191650,18 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):194:194 -> toArray
     2:2:java.lang.Object[] toArray():196:196 -> toArray
     1:1:java.lang.String toString():233:233 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Wz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Yz:
 # {"id":"sourceFile","fileName":"IntIterator.java"}
     int nextInt() -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Zz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.bA:
 # {"id":"sourceFile","fileName":"IntIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zz;"}
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):211:211 -> a
     1:1:int com.android.tools.r8.internal.IntIterators.unwrap(com.android.tools.r8.internal.IntIterator,int[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wz;[I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yz;[I)I"}
     2:4:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):195:197 -> a
     2:4:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):211 -> a
     2:4:int com.android.tools.r8.internal.IntIterators.unwrap(com.android.tools.r8.internal.IntIterator,int[]):0 -> a
@@ -191654,7 +191673,7 @@
     6:6:int com.android.tools.r8.internal.IntIterators.unwrap(com.android.tools.r8.internal.IntIterator,int[]):0 -> a
     7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):0:0 -> a
     7:7:int com.android.tools.r8.internal.IntIterators.unwrap(com.android.tools.r8.internal.IntIterator,int[]):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11,"4":12,"5":13},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11,"4":12,"5":13},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):194:194 -> a
     8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):211 -> a
     8:8:int com.android.tools.r8.internal.IntIterators.unwrap(com.android.tools.r8.internal.IntIterator,int[]):0 -> a
@@ -191668,7 +191687,7 @@
     12:12:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):211 -> a
     13:13:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):194:194 -> a
     13:13:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):211 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Zz:
 # {"id":"sourceFile","fileName":"IntIterators.java"}
     1:1:void <init>():33:33 -> <init>
     1:1:int previousInt():41:41 -> c
@@ -191678,15 +191697,15 @@
     1:1:int nextIndex():43:43 -> nextIndex
     1:1:int previousIndex():45:45 -> previousIndex
     1:1:int nextInt():39:39 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.aA:
 # {"id":"sourceFile","fileName":"IntIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):553:554 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yz;)V"}
     1:1:boolean hasNext():557:557 -> hasNext
     1:1:int nextInt():559:559 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.aA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.cA:
 # {"id":"sourceFile","fileName":"IntList.java"}
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
@@ -191696,17 +191715,17 @@
     int set(int,int) -> c
     int removeInt(int) -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator() -> listIterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.bA:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.dA:
 # {"id":"sourceFile","fileName":"IntListIterator.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.dA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.fA:
 # {"id":"sourceFile","fileName":"IntLists.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eA;"}
     1:1:void <clinit>():159:159 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.eA:
 # {"id":"sourceFile","fileName":"IntLists.java"}
     1:1:void <init>():49:49 -> <init>
     1:1:void getElements(int,int[],int,int):131:131 -> a
@@ -191734,18 +191753,18 @@
     1:1:int indexOf(java.lang.Object):101:101 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():110:110 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():47 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():110:110 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():47 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():110:110 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():110:110 -> iterator
     4:4:java.util.Iterator iterator():47 -> iterator
     1:1:boolean rem(int):53:53 -> j
     1:1:int lastIndexOf(java.lang.Object):106:106 -> lastIndexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():108:108 -> listIterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():108:108 -> listIterator
     2:2:java.util.ListIterator listIterator():47 -> listIterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):112:112 -> listIterator
@@ -191758,7 +191777,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):123:123 -> subList
     1:1:java.util.List subList(int,int):47 -> subList
     1:1:java.lang.String toString():153:153 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.mA:
 # {"id":"sourceFile","fileName":"IntOpenHashSet.java"}
     int[] key -> b
     int mask -> c
@@ -191771,7 +191790,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     9:9:void <init>(int,float):63:63 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):198:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rz;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tz;)Z"}
     2:3:void ensureCapacity(int):189:190 -> a
     2:3:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):198 -> a
     4:4:int size():316:316 -> a
@@ -191801,7 +191820,7 @@
     2:2:int hashCode():547:547 -> hashCode
     1:1:boolean isEmpty():320:320 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():423:423 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():423:423 -> iterator
     2:2:java.util.Iterator iterator():36 -> iterator
     1:1:boolean remove(int):272:272 -> k
@@ -191820,19 +191839,19 @@
     9:13:void shiftKeys(int):248:252 -> m
     9:13:boolean removeEntry(int):257 -> m
     1:1:int size():316:316 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.lA:
 # {"id":"sourceFile","fileName":"IntOpenHashSet.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mA;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet):340:351 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1):340 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mA;)V"}
     1:1:boolean hasNext():355:355 -> hasNext
     1:6:void remove():404:409 -> remove
     7:12:void shiftKeys(int):384:389 -> remove
@@ -191844,38 +191863,38 @@
     26:26:void remove():404:404 -> remove
     1:15:int nextInt():358:372 -> t
     16:16:int nextInt():358:358 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.qA:
 # {"id":"sourceFile","fileName":"IntSet.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.qA:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.sA:
 # {"id":"sourceFile","fileName":"IntSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rA;"}
     1:1:void <clinit>():48:48 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.pA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.rA:
 # {"id":"sourceFile","fileName":"IntSets.java"}
     1:1:void <init>():32:32 -> <init>
     1:1:java.lang.Object clone():36:36 -> clone
     1:1:boolean equals(java.lang.Object):39:39 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.tA:
 # {"id":"sourceFile","fileName":"IntSortedSet.java"}
     int firstInt() -> T
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/tA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tA;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rz;"}
     int lastInt() -> v
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.vA:
 # {"id":"sourceFile","fileName":"IntSortedSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uA;"}
     1:1:void <clinit>():88:88 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.uA:
 # {"id":"sourceFile","fileName":"IntSortedSets.java"}
     1:1:void <init>():32:32 -> <init>
     1:1:java.lang.Object clone():81:81 -> clone
@@ -191901,7 +191920,7 @@
 # {"id":"sourceFile","fileName":"AbstractLongCollection.java"}
     1:1:void <init>():30:30 -> <init>
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     1:1:boolean add(long):49:49 -> a
     1:1:boolean add(java.lang.Object):29:29 -> add
     2:2:boolean add(java.lang.Long):84:84 -> add
@@ -191917,7 +191936,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator():130:130 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator iterator():122 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     2:2:int compareTo(java.util.List):324:324 -> a
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator():130:130 -> a
     3:3:int compareTo(java.util.List):325 -> a
@@ -191981,14 +192000,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureIndex(int):0:0 -> j
     2:2:void com.android.tools.r8.internal.AbstractLongList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76,"4":77},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76,"4":77},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     37:37:void ensureIndex(int):35:35 -> j
     37:37:void com.android.tools.r8.internal.AbstractLongList.ensureIndex(int):0 -> j
     38:38:void ensureIndex(int):34:34 -> j
     38:38:void com.android.tools.r8.internal.AbstractLongList.ensureIndex(int):0 -> j
     39:39:void ensureIndex(int):0:0 -> j
     39:39:void com.android.tools.r8.internal.AbstractLongList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":78,"2":79,"3":80,"4":81,"5":82},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":78,"2":79,"3":80,"4":81,"5":82},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     73:73:void ensureIndex(int):34:34 -> j
     73:73:void com.android.tools.r8.internal.AbstractLongList.ensureIndex(int):0 -> j
     74:74:void ensureIndex(int):35:35 -> j
@@ -192005,14 +192024,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureRestrictedIndex(int):0:0 -> k
     2:2:void com.android.tools.r8.internal.AbstractLongList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94,"4":95},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94,"4":95},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     46:46:void ensureRestrictedIndex(int):44:44 -> k
     46:46:void com.android.tools.r8.internal.AbstractLongList.ensureRestrictedIndex(int):0 -> k
     47:47:void ensureRestrictedIndex(int):43:43 -> k
     47:47:void com.android.tools.r8.internal.AbstractLongList.ensureRestrictedIndex(int):0 -> k
     48:48:void ensureRestrictedIndex(int):0:0 -> k
     48:48:void com.android.tools.r8.internal.AbstractLongList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98,"4":99,"5":100},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98,"4":99,"5":100},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     91:91:void ensureRestrictedIndex(int):43:43 -> k
     91:91:void com.android.tools.r8.internal.AbstractLongList.ensureRestrictedIndex(int):0 -> k
     92:92:void ensureRestrictedIndex(int):44:44 -> k
@@ -192057,7 +192076,7 @@
     13:14:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():130 -> a
     13:14:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.iterator():122 -> a
     13:14:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():519 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     1:1:void add(int,java.lang.Object):519:519 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.add(int,java.lang.Long):409:409 -> add
     2:2:void add(int,java.lang.Object):519 -> add
@@ -192143,7 +192162,7 @@
     2:2:void set(java.lang.Object):28 -> set
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> R8$$REMOVED$$CLASS$$131:
 # {"id":"sourceFile","fileName":"AbstractLongSet.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.EL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.IL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     long[] key -> b
     java.lang.Object[] value -> c
@@ -192153,11 +192172,11 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FL;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DL;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AL;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():36:36 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap.<init>():38 -> <init>
     1:1:void <init>(int,float):78 -> <init>
@@ -192250,52 +192269,52 @@
     12:16:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap.toString():233:237 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():634:652 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.wL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.AL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):634:634 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:1:void clear():649:649 -> clear
     1:1:boolean contains(java.lang.Object):645:645 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():637:637 -> iterator
     2:2:java.util.Iterator iterator():634 -> iterator
     1:1:int size():641:641 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.xL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.BL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AL;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):479:479 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):479 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry next():483:483 -> next
     1:1:java.lang.Object next():479 -> next
     1:2:void remove():487:488 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.yL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.CL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):585:585 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:1:java.lang.Long next():590:590 -> next
     1:1:java.lang.Object next():584 -> next
     1:1:long nextLong():587:587 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.zL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.DL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):592:592 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):592 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet.<init>():26:26 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):592 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):592 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():595:595 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     1:1:boolean contains(long):603:603 -> b
     1:3:boolean remove(long):607:609 -> c
     1:3:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet.rem(long):71 -> c
@@ -192310,13 +192329,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():595:595 -> iterator
     1:1:java.util.Iterator iterator():592 -> iterator
     1:1:int size():599:599 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.AL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.EL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):347:348 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;I)V"}
     1:3:boolean equals(java.lang.Object):375:377 -> equals
     1:1:java.lang.Long getKey():370:370 -> getKey
     1:1:java.lang.Object getKey():344 -> getKey
@@ -192324,17 +192343,17 @@
     1:1:int hashCode():381:381 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):361:362 -> setValue
     1:1:java.lang.String toString():385:385 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.BL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.FL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):499:499 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):499 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:1:void clear():570:570 -> clear
     1:16:boolean contains(java.lang.Object):509:524 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():501:501 -> iterator
     2:2:java.util.Iterator iterator():499 -> iterator
     1:7:boolean remove(java.lang.Object):530:536 -> remove
@@ -192348,19 +192367,19 @@
     23:23:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):558 -> remove
     1:1:int size():566:566 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.CL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.GL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KL;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):389:400 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):389 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:17:int nextEntry():407:423 -> a
     18:18:int nextEntry():407:407 -> a
     1:1:boolean hasNext():404:404 -> hasNext
@@ -192372,14 +192391,14 @@
     16:25:void remove():462 -> remove
     26:27:void remove():465:466 -> remove
     28:28:void remove():457:457 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.DL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.HL:
 # {"id":"sourceFile","fileName":"Long2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IL;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):628:628 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IL;)V"}
     1:1:java.lang.Object next():630:630 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.GL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.KL:
 # {"id":"sourceFile","fileName":"LongArrayList.java"}
     long[] a -> b
     int size -> c
@@ -192390,7 +192409,7 @@
     4:4:void com.android.tools.r8.internal.LongArrayList.<init>(int):0 -> <init>
     5:5:void <init>(int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.LongArrayList.<init>(int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":73,"2":74,"3":75,"4":76,"5":77},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":73,"2":74,"3":75,"4":76,"5":77},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     72:72:void <init>(int):67:67 -> <init>
     72:72:void com.android.tools.r8.internal.LongArrayList.<init>(int):0 -> <init>
     73:73:void <init>(int):67:67 -> <init>
@@ -192424,12 +192443,12 @@
     4:4:long com.android.tools.r8.internal.LongArrayList.set(int,long):0 -> b
     5:5:long set(int,long):0:0 -> b
     5:5:long com.android.tools.r8.internal.LongArrayList.set(int,long):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":481,"2":482,"3":483,"4":484},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":481,"2":482,"3":483,"4":484},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     242:242:long set(int,long):237:237 -> b
     242:242:long com.android.tools.r8.internal.LongArrayList.set(int,long):0 -> b
     243:243:long set(int,long):0:0 -> b
     243:243:long com.android.tools.r8.internal.LongArrayList.set(int,long):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":485,"2":486,"3":487},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":485,"2":486,"3":487},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     480:480:long set(int,long):237:237 -> b
     480:480:long com.android.tools.r8.internal.LongArrayList.set(int,long):0 -> b
     481:481:long set(int,long):237:237 -> b
@@ -192450,12 +192469,12 @@
     3:3:long com.android.tools.r8.internal.LongArrayList.getLong(int):0 -> d
     4:4:long getLong(int):0:0 -> d
     4:4:long com.android.tools.r8.internal.LongArrayList.getLong(int):0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":416,"2":417,"3":418,"4":419},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":416,"2":417,"3":418,"4":419},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     209:209:long getLong(int):205:205 -> d
     209:209:long com.android.tools.r8.internal.LongArrayList.getLong(int):0 -> d
     210:210:long getLong(int):0:0 -> d
     210:210:long com.android.tools.r8.internal.LongArrayList.getLong(int):0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":420,"2":421,"3":422},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":420,"2":421,"3":422},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     415:415:long getLong(int):205:205 -> d
     415:415:long com.android.tools.r8.internal.LongArrayList.getLong(int):0 -> d
     416:416:long getLong(int):205:205 -> d
@@ -192474,12 +192493,12 @@
     5:5:long com.android.tools.r8.internal.LongArrayList.removeLong(int):0 -> f
     6:6:long removeLong(int):0:0 -> f
     6:6:long com.android.tools.r8.internal.LongArrayList.removeLong(int):0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450,"4":451},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":448,"2":449,"3":450,"4":451},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     226:226:long removeLong(int):220:220 -> f
     226:226:long com.android.tools.r8.internal.LongArrayList.removeLong(int):0 -> f
     227:227:long removeLong(int):0:0 -> f
     227:227:long com.android.tools.r8.internal.LongArrayList.removeLong(int):0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":452,"2":453,"3":454},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":452,"2":453,"3":454},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     447:447:long removeLong(int):220:220 -> f
     447:447:long com.android.tools.r8.internal.LongArrayList.removeLong(int):0 -> f
     448:448:long removeLong(int):220:220 -> f
@@ -192496,14 +192515,14 @@
     1:2:java.util.ListIterator listIterator(int):43 -> listIterator
     1:6:boolean removeAll(java.util.Collection):373:378 -> removeAll
     1:1:int size():249:249 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.FL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.JL:
 # {"id":"sourceFile","fileName":"LongArrayList.java"}
     int pos -> b
     int last -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KL;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList,int):384:385 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GL;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KL;I)V"}
     1:1:long previousLong():389:389 -> a
     2:3:void add(long):393:394 -> a
     1:2:void set(long):397:398 -> b
@@ -192517,10 +192536,10 @@
     6:6:void remove():401:401 -> remove
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrays -> R8$$REMOVED$$CLASS$$132:
 # {"id":"sourceFile","fileName":"LongArrays.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.KL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.OL:
 # {"id":"sourceFile","fileName":"LongIterator.java"}
     long nextLong() -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.LL:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.PL:
 # {"id":"sourceFile","fileName":"LongList.java"}
     void add(int,long) -> a
     void removeElements(int,int) -> a
@@ -192560,14 +192579,14 @@
     1:1:boolean containsValue(java.lang.Object):49:49 -> containsValue
     boolean containsValue(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():211:211 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():36:36 -> entrySet
     1:4:boolean equals(java.lang.Object):229:232 -> equals
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):79:79 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):34 -> get
     1:3:int hashCode():221:223 -> hashCode
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap.object2IntEntrySet() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):34:34 -> put
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):89:91 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):34 -> put
@@ -192619,7 +192638,7 @@
     java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.comparator() -> comparator
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap.containsKey(java.lang.Object) -> containsKey
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.keySet() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():134:134 -> entrySet
     1:1:java.util.Set entrySet():26 -> entrySet
     1:3:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap.equals(java.lang.Object):199:201 -> equals
@@ -192634,7 +192653,7 @@
     3:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap.hashCode():192:193 -> hashCode
     1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap.headMap(java.lang.Object):1079:1079 -> headMap
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.object2ObjectEntrySet() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.keySet():74:74 -> keySet
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectFunction.put(java.lang.Object,java.lang.Object) -> put
     1:14:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap.putAll(java.util.Map):58:71 -> putAll
@@ -192713,7 +192732,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():123 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():27 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():123 -> iterator
     2:2:java.util.Iterator iterator():27 -> iterator
@@ -192722,14 +192741,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureIndex(int):0:0 -> j
     2:2:void com.android.tools.r8.internal.AbstractObjectList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76,"2":77,"3":78,"4":79},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76,"2":77,"3":78,"4":79},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     38:38:void ensureIndex(int):36:36 -> j
     38:38:void com.android.tools.r8.internal.AbstractObjectList.ensureIndex(int):0 -> j
     39:39:void ensureIndex(int):35:35 -> j
     39:39:void com.android.tools.r8.internal.AbstractObjectList.ensureIndex(int):0 -> j
     40:40:void ensureIndex(int):0:0 -> j
     40:40:void com.android.tools.r8.internal.AbstractObjectList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82,"4":83,"5":84},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82,"4":83,"5":84},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     75:75:void ensureIndex(int):35:35 -> j
     75:75:void com.android.tools.r8.internal.AbstractObjectList.ensureIndex(int):0 -> j
     76:76:void ensureIndex(int):36:36 -> j
@@ -192746,14 +192765,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureRestrictedIndex(int):0:0 -> k
     2:2:void com.android.tools.r8.internal.AbstractObjectList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":94,"2":95,"3":96,"4":97},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":94,"2":95,"3":96,"4":97},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     47:47:void ensureRestrictedIndex(int):45:45 -> k
     47:47:void com.android.tools.r8.internal.AbstractObjectList.ensureRestrictedIndex(int):0 -> k
     48:48:void ensureRestrictedIndex(int):44:44 -> k
     48:48:void com.android.tools.r8.internal.AbstractObjectList.ensureRestrictedIndex(int):0 -> k
     49:49:void ensureRestrictedIndex(int):0:0 -> k
     49:49:void com.android.tools.r8.internal.AbstractObjectList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     93:93:void ensureRestrictedIndex(int):44:44 -> k
     93:93:void com.android.tools.r8.internal.AbstractObjectList.ensureRestrictedIndex(int):0 -> k
     94:94:void ensureRestrictedIndex(int):45:45 -> k
@@ -192766,7 +192785,7 @@
     101:101:void ensureRestrictedIndex(int):44:44 -> k
     102:102:void ensureRestrictedIndex(int):44:44 -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int) -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:5:int lastIndexOf(java.lang.Object):192:196 -> lastIndexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> listIterator
     1:1:java.util.ListIterator listIterator():27 -> listIterator
@@ -192801,13 +192820,13 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():131 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.iterator():123 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():375 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):457:458 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():131 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.iterator():123 -> iterator
     3:4:java.util.Iterator iterator():375 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):457:458 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):457:458 -> listIterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():131 -> listIterator
     1:2:java.util.ListIterator listIterator():375 -> listIterator
@@ -192910,14 +192929,14 @@
     1:1:boolean containsValue(java.lang.Object):49:49 -> containsValue
     boolean containsValue(int) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():211:211 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set entrySet():36:36 -> entrySet
     1:4:boolean equals(java.lang.Object):229:232 -> equals
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):79:79 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):34 -> get
     1:3:int hashCode():221:223 -> hashCode
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap.reference2IntEntrySet() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):34:34 -> put
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):89:91 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):34 -> put
@@ -192980,7 +192999,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():123 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():27 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():123 -> iterator
     2:2:java.util.Iterator iterator():27 -> iterator
@@ -192989,14 +193008,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureIndex(int):0:0 -> j
     2:2:void com.android.tools.r8.internal.AbstractReferenceList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76,"2":77,"3":78,"4":79},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76,"2":77,"3":78,"4":79},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     38:38:void ensureIndex(int):36:36 -> j
     38:38:void com.android.tools.r8.internal.AbstractReferenceList.ensureIndex(int):0 -> j
     39:39:void ensureIndex(int):35:35 -> j
     39:39:void com.android.tools.r8.internal.AbstractReferenceList.ensureIndex(int):0 -> j
     40:40:void ensureIndex(int):0:0 -> j
     40:40:void com.android.tools.r8.internal.AbstractReferenceList.ensureIndex(int):0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82,"4":83,"5":84},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82,"4":83,"5":84},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     75:75:void ensureIndex(int):35:35 -> j
     75:75:void com.android.tools.r8.internal.AbstractReferenceList.ensureIndex(int):0 -> j
     76:76:void ensureIndex(int):36:36 -> j
@@ -193013,14 +193032,14 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:void ensureRestrictedIndex(int):0:0 -> k
     2:2:void com.android.tools.r8.internal.AbstractReferenceList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":94,"2":95,"3":96,"4":97},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":94,"2":95,"3":96,"4":97},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     47:47:void ensureRestrictedIndex(int):45:45 -> k
     47:47:void com.android.tools.r8.internal.AbstractReferenceList.ensureRestrictedIndex(int):0 -> k
     48:48:void ensureRestrictedIndex(int):44:44 -> k
     48:48:void com.android.tools.r8.internal.AbstractReferenceList.ensureRestrictedIndex(int):0 -> k
     49:49:void ensureRestrictedIndex(int):0:0 -> k
     49:49:void com.android.tools.r8.internal.AbstractReferenceList.ensureRestrictedIndex(int):0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     93:93:void ensureRestrictedIndex(int):44:44 -> k
     93:93:void com.android.tools.r8.internal.AbstractReferenceList.ensureRestrictedIndex(int):0 -> k
     94:94:void ensureRestrictedIndex(int):45:45 -> k
@@ -193033,7 +193052,7 @@
     101:101:void ensureRestrictedIndex(int):44:44 -> k
     102:102:void ensureRestrictedIndex(int):44:44 -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int) -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:5:int lastIndexOf(java.lang.Object):192:196 -> lastIndexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator():131:131 -> listIterator
     1:1:java.util.ListIterator listIterator():27 -> listIterator
@@ -193067,13 +193086,13 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.listIterator():131 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.iterator():123 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():340 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):422:423 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.listIterator():131 -> iterator
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.iterator():123 -> iterator
     3:4:java.util.Iterator iterator():340 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):422:423 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):422:423 -> listIterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.listIterator():131 -> listIterator
     1:2:java.util.ListIterator listIterator():340 -> listIterator
@@ -193121,7 +193140,7 @@
     1:6:int hashCode():46:51 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> R8$$REMOVED$$CLASS$$146:
 # {"id":"sourceFile","fileName":"AbstractReferenceSortedSet.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.CS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.GS:
 # {"id":"sourceFile","fileName":"Object2BooleanArrayMap.java"}
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -193204,16 +193223,16 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):245:245 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():266 -> values
     2:2:java.util.Collection values():32 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.BS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.FS:
 # {"id":"sourceFile","fileName":"Object2BooleanArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GS;)V"}
     1:5:boolean contains(java.lang.Object):159:163 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:6:boolean remove(java.lang.Object):168:173 -> remove
@@ -193239,14 +193258,14 @@
     1:1:int size():154:154 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):32:32 -> size
     2:2:int size():154 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.AS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ES:
 # {"id":"sourceFile","fileName":"Object2BooleanArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FS;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FS;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -193280,7 +193299,7 @@
     13:13:void remove():120 -> remove
     14:14:void remove():120:120 -> remove
     15:15:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.FS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.JS:
 # {"id":"sourceFile","fileName":"Object2IntArrayMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -193303,7 +193322,7 @@
     3:3:boolean containsValue(int):216:216 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():185:185 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():32 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():221:221 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():262:262 -> keySet
     1:1:java.util.Set keySet():32 -> keySet
@@ -193313,16 +193332,16 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):245:245 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():266 -> values
     2:2:java.util.Collection values():32 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.ES:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.IS:
 # {"id":"sourceFile","fileName":"Object2IntArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JS;)V"}
     1:5:boolean contains(java.lang.Object):159:163 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:6:boolean remove(java.lang.Object):168:173 -> remove
@@ -193348,14 +193367,14 @@
     1:1:int size():154:154 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):32:32 -> size
     2:2:int size():154 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.DS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.HS:
 # {"id":"sourceFile","fileName":"Object2IntArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ES;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IS;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ES;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IS;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -193389,7 +193408,7 @@
     13:13:void remove():120 -> remove
     14:14:void remove():120:120 -> remove
     15:15:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.OS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.SS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -193402,11 +193421,11 @@
     int maxFill -> k
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet entries -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KS;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.<init>():28:28 -> <init>
     1:1:void <init>(int,float):118 -> <init>
     1:1:void <init>():140 -> <init>
@@ -193435,7 +193454,7 @@
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2IntEntrySet():76 -> e
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():136 -> e
     26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():26 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet object2IntEntrySet():1151:1152 -> entrySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2IntEntrySet():76 -> entrySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():136 -> entrySet
@@ -193456,10 +193475,10 @@
     1:1:java.util.SortedMap headMap(java.lang.Object):76 -> headMap
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet object2IntEntrySet():1151:1152 -> i
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():76 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():667:667 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1218:1219 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:java.util.Set keySet():76:76 -> keySet
     1:2:java.lang.Object lastKey():820:821 -> lastKey
     3:3:java.lang.Object lastKey():820:820 -> lastKey
@@ -193479,27 +193498,27 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):76 -> tailMap
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1252:1270 -> values
     1:19:java.util.Collection values():76 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.GS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.KS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1252:1252 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void clear():1267:1267 -> clear
     1:1:boolean contains(int):1263:1263 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1255:1255 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1255:1255 -> iterator
     2:2:java.util.Iterator iterator():1252 -> iterator
     1:1:int size():1259:1259 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.HS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.LS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KS;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):995:995 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void add(java.lang.Object):993:993 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):990:990 -> add
     2:2:void add(java.lang.Object):993 -> add
@@ -193511,23 +193530,23 @@
     1:1:void set(java.lang.Object):993:993 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):987:987 -> set
     2:2:void set(java.lang.Object):993 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.IS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.MS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1168:1168 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void add(java.lang.Object):1167:1167 -> add
     1:1:java.lang.Object next():1170:1170 -> next
     1:1:java.lang.Object previous():1163:1163 -> previous
     1:1:void set(java.lang.Object):1165:1165 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.JS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.NS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1172:1172 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1172 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void clear():1195:1195 -> clear
     1:1:java.util.Comparator comparator():1208:1208 -> comparator
     1:1:boolean contains(java.lang.Object):1185:1185 -> contains
@@ -193537,10 +193556,10 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1172 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1177:1177 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1172 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1177:1177 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1172 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1177:1177 -> iterator
     3:3:java.util.Iterator iterator():1172 -> iterator
     1:2:java.lang.Object last():1204:1205 -> last
@@ -193551,13 +193570,13 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1172 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1210:1210 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1172 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.KS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.OS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):693:694 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;I)V"}
     1:3:boolean equals(java.lang.Object):728:730 -> equals
     1:1:int getIntValue():703:703 -> getIntValue
     1:1:java.lang.Object getKey():699:699 -> getKey
@@ -193573,13 +193592,13 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):723:723 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):690 -> setValue
     1:1:java.lang.String toString():738:738 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.LS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.PS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1030:1030 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1030 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void clear():1116:1116 -> clear
     1:1:java.util.Comparator comparator():1035:1035 -> comparator
     1:16:boolean contains(java.lang.Object):1055:1070 -> contains
@@ -193591,10 +193610,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1039:1039 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1030 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1030 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
     3:3:java.util.Iterator iterator():1030 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry last():1049:1050 -> last
@@ -193618,17 +193637,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1030:1030 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1041:1041 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1030 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.MS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.QS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):852:852 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):843 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):845:854 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):843 -> <init>
     1:14:void ensureIndexKnown():887:900 -> a
@@ -193642,12 +193661,12 @@
     1:2:int previousIndex():908:909 -> previousIndex
     1:45:void remove():928:972 -> remove
     46:46:void remove():929:929 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.NS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.RS:
 # {"id":"sourceFile","fileName":"Object2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SS;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1243:1243 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SS;)V"}
     1:1:void add(java.lang.Object):1227:1227 -> add
     2:2:void add(java.lang.Integer):1238:1238 -> add
     2:2:void add(java.lang.Object):1227 -> add
@@ -193660,10 +193679,10 @@
     2:2:void set(java.lang.Integer):1235:1235 -> set
     2:2:void set(java.lang.Object):1227 -> set
     1:1:int nextInt():1245:1245 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.PS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.TS:
 # {"id":"sourceFile","fileName":"Object2IntMap.java"}
     int getIntValue() -> getIntValue
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.YS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.cT:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -193673,11 +193692,11 @@
     int maxFill -> h
     int size -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet entries -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XS;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/US;"}
     1:9:void <init>(int,float):78:86 -> <init>
     1:9:void <init>():99 -> <init>
     1:17:int insert(java.lang.Object,int):189:205 -> b
@@ -193711,10 +193730,10 @@
     2:10:int hashCode():827:835 -> hashCode
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():617:618 -> i
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():45 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():357:357 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():657:658 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:java.util.Set keySet():45:45 -> keySet
     1:1:void putAll(java.util.Map):182:182 -> putAll
     2:3:void ensureCapacity(int):158:159 -> putAll
@@ -193728,60 +193747,60 @@
     1:1:int size():353:353 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():676:694 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.QS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.US:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):676:676 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:void clear():691:691 -> clear
     1:1:boolean contains(int):687:687 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():679:679 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():679:679 -> iterator
     2:2:java.util.Iterator iterator():676 -> iterator
     1:1:int size():683:683 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.RS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.VS:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/US;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):521:521 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):521 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry next():525:525 -> next
     1:1:java.lang.Object next():521 -> next
     1:2:void remove():529:530 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.SS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.WS:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):627:627 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:java.lang.Object next():629:629 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.TS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.XS:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):631:631 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):631 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:void clear():652:652 -> clear
     1:1:boolean contains(java.lang.Object):642:642 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
     2:2:java.util.Iterator iterator():631 -> iterator
     1:3:boolean remove(java.lang.Object):646:648 -> remove
     1:1:int size():638:638 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.US:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.YS:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):383:384 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;I)V"}
     1:3:boolean equals(java.lang.Object):418:420 -> equals
     1:1:int getIntValue():393:393 -> getIntValue
     1:1:java.lang.Object getKey():389:389 -> getKey
@@ -193797,17 +193816,17 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):413:413 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):380 -> setValue
     1:1:java.lang.String toString():428:428 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.VS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ZS:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):541:541 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):541 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:void clear():612:612 -> clear
     1:16:boolean contains(java.lang.Object):551:566 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
     2:2:java.util.Iterator iterator():541 -> iterator
     1:7:boolean remove(java.lang.Object):572:578 -> remove
@@ -193821,19 +193840,19 @@
     23:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):600 -> remove
     1:1:int size():608:608 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.WS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.aT:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):432:443 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):432 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:17:int nextEntry():450:466 -> a
     18:18:int nextEntry():450:450 -> a
     1:1:boolean hasNext():447:447 -> hasNext
@@ -193845,16 +193864,16 @@
     15:24:void remove():504 -> remove
     25:26:void remove():507:508 -> remove
     27:27:void remove():499:499 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.XS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.bT:
 # {"id":"sourceFile","fileName":"Object2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):667:667 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;)V"}
     1:1:java.lang.Integer next():672:672 -> next
     1:1:java.lang.Object next():666 -> next
     1:1:int nextInt():669:669 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.hT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.lT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     java.lang.Object[] key -> b
     long[] value -> c
@@ -193864,11 +193883,11 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dT;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.<init>():36:36 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.<init>():38 -> <init>
     1:1:void <init>(int,float):78 -> <init>
@@ -193910,7 +193929,7 @@
     10:15:long removeEntry(int):168 -> e
     16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet object2LongEntrySet():617:618 -> e
     16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():45 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iT;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.entrySet():211:211 -> entrySet
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.entrySet():36 -> entrySet
     1:3:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.equals(java.lang.Object):229:231 -> equals
@@ -193963,60 +193982,60 @@
     12:15:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.toString():249:252 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values():676:694 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.ZS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.dT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):676:676 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():679:679 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     1:1:boolean contains(long):687:687 -> b
     1:1:void clear():691:691 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():679:679 -> iterator
     1:1:java.util.Iterator iterator():676 -> iterator
     1:1:int size():683:683 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.aT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.eT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dT;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):521:521 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):521 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry next():525:525 -> next
     1:1:java.lang.Object next():521 -> next
     1:2:void remove():529:530 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.bT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):627:627 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:java.lang.Object next():629:629 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.cT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.gT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):631:631 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):631 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:void clear():652:652 -> clear
     1:1:boolean contains(java.lang.Object):642:642 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
     2:2:java.util.Iterator iterator():631 -> iterator
     1:3:boolean remove(java.lang.Object):646:648 -> remove
     1:1:int size():638:638 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.dT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.hT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):383:384 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;I)V"}
     1:3:boolean equals(java.lang.Object):418:420 -> equals
     1:1:java.lang.Object getKey():389:389 -> getKey
     1:1:java.lang.Long getValue():406:406 -> getValue
@@ -194031,17 +194050,17 @@
     5:5:java.lang.Long setValue(java.lang.Long):413:413 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):380 -> setValue
     1:1:java.lang.String toString():428:428 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.eT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.iT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):541:541 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):541 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:void clear():612:612 -> clear
     1:16:boolean contains(java.lang.Object):551:566 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
     2:2:java.util.Iterator iterator():541 -> iterator
     1:7:boolean remove(java.lang.Object):572:578 -> remove
@@ -194055,19 +194074,19 @@
     23:23:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):600 -> remove
     1:1:int size():608:608 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.fT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.jT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):432:443 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):432 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:17:int nextEntry():450:466 -> a
     18:18:int nextEntry():450:450 -> a
     1:1:boolean hasNext():447:447 -> hasNext
@@ -194079,23 +194098,23 @@
     15:24:void remove():504 -> remove
     25:26:void remove():507:508 -> remove
     27:27:void remove():499:499 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.gT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.kT:
 # {"id":"sourceFile","fileName":"Object2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):667:667 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lT;)V"}
     1:1:java.lang.Long next():672:672 -> next
     1:1:java.lang.Object next():666 -> next
     1:1:long nextLong():669:669 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.qT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.uT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
     int mask -> d
     boolean containsNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy strategy -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/us;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ws;"}
     int first -> g
     int last -> h
     long[] link -> i
@@ -194103,14 +194122,14 @@
     int maxFill -> k
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet entries -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mT;"}
     1:1:void <init>(int,float,com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):119:119 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):144 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/us;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ws;)V"}
     2:43:void <init>(int,float,com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):88:129 -> <init>
     2:43:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):144 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap subMap(java.lang.Object,java.lang.Object):794:794 -> a
@@ -194130,7 +194149,7 @@
     1:4:boolean containsValue(java.lang.Object):614:617 -> containsValue
     1:25:void fixPointers(int):707:731 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1178:1179 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     3:43:void rehash(int):1293:1333 -> e
     1:4:java.lang.Object removeEntry(int):224:227 -> f
     5:11:void shiftKeys(int):298:304 -> f
@@ -194148,7 +194167,7 @@
     1:1:java.util.SortedMap headMap(java.lang.Object):74 -> headMap
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1111:1112 -> i
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():74 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:boolean isEmpty():641:641 -> isEmpty
     1:7:java.lang.Object removeNullEntry():233:239 -> j
     1:2:java.lang.Object lastKey():780:781 -> lastKey
@@ -194173,27 +194192,27 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):74 -> tailMap
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1200:1218 -> values
     1:19:java.util.Collection values():74 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.iT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.mT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1200:1200 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void clear():1215:1215 -> clear
     1:1:boolean contains(java.lang.Object):1211:1211 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1203:1203 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1203:1203 -> iterator
     2:2:java.util.Iterator iterator():1200 -> iterator
     1:1:int size():1207:1207 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.jT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.nT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mT;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):957:957 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void add(java.lang.Object):955:955 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):952:952 -> add
     2:2:void add(java.lang.Object):955 -> add
@@ -194205,23 +194224,23 @@
     1:1:void set(java.lang.Object):955:955 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):949:949 -> set
     2:2:void set(java.lang.Object):955 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.kT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.oT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1128:1128 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void add(java.lang.Object):1127:1127 -> add
     1:1:java.lang.Object next():1130:1130 -> next
     1:1:java.lang.Object previous():1123:1123 -> previous
     1:1:void set(java.lang.Object):1125:1125 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.lT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.pT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1132:1132 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void clear():1155:1155 -> clear
     1:1:java.util.Comparator comparator():1168:1168 -> comparator
     1:1:boolean contains(java.lang.Object):1145:1145 -> contains
@@ -194231,10 +194250,10 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1132 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1137:1137 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1132 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1137:1137 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1132 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1137:1137 -> iterator
     3:3:java.util.Iterator iterator():1132 -> iterator
     1:2:java.lang.Object last():1164:1165 -> last
@@ -194245,26 +194264,26 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1132 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1170:1170 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1132 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.mT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.qT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):667:668 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;I)V"}
     1:3:boolean equals(java.lang.Object):688:690 -> equals
     1:1:java.lang.Object getKey():673:673 -> getKey
     1:1:java.lang.Object getValue():677:677 -> getValue
     1:1:int hashCode():694:694 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):681:682 -> setValue
     1:1:java.lang.String toString():698:698 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.nT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.rT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):992:992 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):992 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void clear():1076:1076 -> clear
     1:1:java.util.Comparator comparator():997:997 -> comparator
     1:15:boolean contains(java.lang.Object):1017:1031 -> contains
@@ -194276,10 +194295,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1001:1001 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):992 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():994:994 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():994:994 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():992 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():994:994 -> iterator
     3:3:java.util.Iterator iterator():992 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1011:1012 -> last
@@ -194302,17 +194321,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):992:992 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1003:1003 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):992 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.oT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.sT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):812:812 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):803 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):805:814 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):803 -> <init>
     1:14:void ensureIndexKnown():847:860 -> a
@@ -194326,37 +194345,37 @@
     1:2:int previousIndex():868:869 -> previousIndex
     1:47:void remove():888:934 -> remove
     48:48:void remove():889:889 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.pT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.tT:
 # {"id":"sourceFile","fileName":"Object2ObjectLinkedOpenCustomHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1194:1194 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uT;)V"}
     1:1:void add(java.lang.Object):1193:1193 -> add
     1:1:java.lang.Object next():1196:1196 -> next
     1:1:java.lang.Object previous():1189:1189 -> previous
     1:1:void set(java.lang.Object):1191:1191 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.rT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.vT:
 # {"id":"sourceFile","fileName":"Object2ObjectMap.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap -> com.android.tools.r8.internal.JT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap -> com.android.tools.r8.internal.NT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry tree -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     int count -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yT;"}
     boolean modified -> i
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry[] nodePath -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/zT;"}
     1:1:void <init>():68:68 -> <init>
     2:3:void allocatePaths():200:201 -> <init>
     2:3:void <init>():64 -> <init>
@@ -194397,7 +194416,7 @@
     4:4:boolean containsValue(java.lang.Object):584 -> containsValue
     5:5:boolean containsValue(java.lang.Object):585:585 -> containsValue
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry findKey(java.lang.Object):174:176 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/zT;"}
     4:4:int compare(java.lang.Object,java.lang.Object):166:166 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry findKey(java.lang.Object):176 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.left():635:635 -> d
@@ -194405,12 +194424,12 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.right():643:643 -> d
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry findKey(java.lang.Object):176 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1005:1006 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:2:java.lang.Object firstKey():817:818 -> firstKey
     3:3:java.lang.Object firstKey():817:817 -> firstKey
     1:2:java.lang.Object get(java.lang.Object):812:813 -> get
     1:51:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():920:970 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:boolean isEmpty():807:807 -> isEmpty
     1:2:java.lang.Object lastKey():822:823 -> lastKey
     3:3:java.lang.Object lastKey():822:822 -> lastKey
@@ -194471,14 +194490,14 @@
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):37 -> subMap
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1034:1052 -> values
     1:19:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 -> com.android.tools.r8.internal.tT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 -> com.android.tools.r8.internal.xT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     java.util.Comparator comparator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):920:921 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:void clear():958:958 -> clear
     1:1:java.util.Comparator comparator():928:928 -> comparator
     1:4:boolean contains(java.lang.Object):941:944 -> contains
@@ -194488,10 +194507,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):966:966 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):920 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():932:932 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():932:932 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():920 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():932:932 -> iterator
     3:3:java.util.Iterator iterator():920 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():962:962 -> last
@@ -194509,36 +194528,36 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):920:920 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):968:968 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):920 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1$1 -> com.android.tools.r8.internal.sT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1$1 -> com.android.tools.r8.internal.wT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1):921:921 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xT;)V"}
     1:1:int compare(java.lang.Object,java.lang.Object):921:921 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):923:923 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):921 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.uT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.yT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):1034:1034 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:void clear():1049:1049 -> clear
     1:1:boolean contains(java.lang.Object):1041:1041 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1037:1037 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1037:1037 -> iterator
     2:2:java.util.Iterator iterator():1034 -> iterator
     1:1:int size():1045:1045 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.vT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.zT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap$BasicEntry.key -> b
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap$BasicEntry.value -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry left -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry right -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     int info -> f
     1:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap$BasicEntry.<init>(java.lang.Object,java.lang.Object):87:89 -> <init>
     1:3:void <init>():618 -> <init>
@@ -194547,21 +194566,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)V"}
     7:7:void <init>(java.lang.Object,java.lang.Object):627:627 -> <init>
     1:2:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry):675:676 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zT;)V"}
     3:4:void black(boolean):709:710 -> a
     1:2:void pred(boolean):661:662 -> b
     3:4:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry):682:683 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zT;)V"}
     5:5:boolean black():703:703 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry next():717:718 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     1:1:java.lang.Object clone():606:606 -> clone
     2:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry clone():741:748 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry clone():744:744 -> clone
     1:1:boolean pred():649:649 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry prev():726:727 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     1:3:boolean equals(java.lang.Object):754:756 -> equals
     1:1:boolean succ():655:655 -> f
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap$BasicEntry.getKey():93:93 -> getKey
@@ -194569,54 +194588,54 @@
     1:1:int hashCode():760:760 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):732:733 -> setValue
     1:1:java.lang.String toString():764:764 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.wT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.AT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):905:905 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:void add(java.lang.Object):904:904 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):916:916 -> add
     2:2:void add(java.lang.Object):904 -> add
     1:1:void set(java.lang.Object):904:904 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):914:914 -> set
     2:2:void set(java.lang.Object):904 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.xT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.BT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):979:979 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:void add(java.lang.Object):988:988 -> add
     1:1:java.lang.Object next():982:982 -> next
     1:1:java.lang.Object previous():984:984 -> previous
     1:1:void set(java.lang.Object):986:986 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.yT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.CT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):991:991 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1):991 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():992:992 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():992:992 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():991 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():992:992 -> iterator
     3:3:java.util.Iterator iterator():991 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.GT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.KT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     java.lang.Object from -> b
     java.lang.Object to -> c
     boolean bottom -> d
     boolean top -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ET;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,java.lang.Object,boolean,java.lang.Object,boolean):1102:1103 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;Ljava/lang/Object;ZLjava/lang/Object;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;Ljava/lang/Object;ZLjava/lang/Object;Z)V"}
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> <init>
     3:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,java.lang.Object,boolean,java.lang.Object,boolean):1103 -> <init>
     4:9:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,java.lang.Object,boolean,java.lang.Object,boolean):1103:1108 -> <init>
@@ -194649,12 +194668,12 @@
     5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> d
     5:5:boolean in(java.lang.Object):1124 -> d
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1185:1186 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:3:java.lang.Object firstKey():1317:1319 -> firstKey
     4:4:java.lang.Object firstKey():1318:1318 -> firstKey
     1:1:java.lang.Object get(java.lang.Object):1226:1226 -> get
     1:50:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():1128:1177 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1335:1335 -> isEmpty
     1:1:boolean isEmpty():1255 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):839:839 -> isEmpty
@@ -194663,7 +194682,7 @@
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1336:1336 -> isEmpty
     3:3:boolean isEmpty():1255 -> isEmpty
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1284:1289 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):188:188 -> j
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1289 -> j
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> j
@@ -194682,7 +194701,7 @@
     17:17:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> j
     17:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1294 -> j
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1302:1307 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):188:188 -> k
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1307 -> k
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> k
@@ -194707,12 +194726,12 @@
     1:5:int size():1245:1249 -> size
     1:15:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1190:1204 -> values
     1:15:java.util.Collection values():1079 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.zT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.DT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1128:1128 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:void clear():1165:1165 -> clear
     1:1:java.util.Comparator comparator():1138:1138 -> comparator
     2:2:java.util.Comparator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1.comparator():928:928 -> comparator
@@ -194733,10 +194752,10 @@
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1336:1336 -> isEmpty
     4:4:boolean isEmpty():1163 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1131:1131 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1131:1131 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1128 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1131:1131 -> iterator
     3:3:java.util.Iterator iterator():1128 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1169:1169 -> last
@@ -194751,49 +194770,49 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1128:1128 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1175:1175 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1128 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.AT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.ET:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1190:1190 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:void clear():1201:1201 -> clear
     1:1:boolean contains(java.lang.Object):1195:1195 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1192:1192 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1192:1192 -> iterator
     2:2:java.util.Iterator iterator():1190 -> iterator
     1:1:int size():1198:1198 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.BT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.FT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1179:1179 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1):1179 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1180:1180 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1180:1180 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1179 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1180:1180 -> iterator
     3:3:java.util.Iterator iterator():1179 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.CT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.GT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1363:1363 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:void add(java.lang.Object):1362:1362 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1374:1374 -> add
     2:2:void add(java.lang.Object):1362 -> add
     1:1:void set(java.lang.Object):1362:1362 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1372:1372 -> set
     2:2:void set(java.lang.Object):1362 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.DT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.HT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1335:1336 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:2:void updateNext():1358:1359 -> d
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> d
     3:3:void updateNext():1359 -> d
@@ -194802,42 +194821,42 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):166:166 -> e
     3:3:void updatePrevious():1355 -> e
     4:4:void updatePrevious():1355:1355 -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ET:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.IT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1385:1385 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:void add(java.lang.Object):1394:1394 -> add
     1:1:java.lang.Object next():1388:1388 -> next
     1:1:java.lang.Object previous():1390:1390 -> previous
     1:1:void set(java.lang.Object):1392:1392 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.FT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.JT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1404:1404 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1):1404 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KT;)V"}
     1:1:void add(java.lang.Object):1412:1412 -> add
     1:1:java.lang.Object next():1406:1406 -> next
     1:1:java.lang.Object previous():1408:1408 -> previous
     1:1:void set(java.lang.Object):1410:1410 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.HT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.LT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry prev -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry curr -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zT;"}
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):838:838 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     2:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):837:839 -> <init>
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry nextEntry():856:860 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry nextEntry():856:856 -> a
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry previousEntry():866:870 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zT;"}
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry previousEntry():866:866 -> b
     1:1:void updateNext():853:853 -> d
     1:1:void updatePrevious():863:863 -> e
@@ -194851,16 +194870,16 @@
     1:1:int previousIndex():876:876 -> previousIndex
     1:9:void remove():879:887 -> remove
     10:10:void remove():879:879 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.IT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.MT:
 # {"id":"sourceFile","fileName":"Object2ObjectRBTreeMap.java"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):1014:1014 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1):1014 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NT;)V"}
     1:1:void add(java.lang.Object):1022:1022 -> add
     1:1:java.lang.Object next():1016:1016 -> next
     1:1:java.lang.Object previous():1018:1018 -> previous
     1:1:void set(java.lang.Object):1020:1020 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.ST:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.WT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
@@ -194873,11 +194892,11 @@
     int maxFill -> j
     int size -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet entries -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RT;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OT;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.<init>():36:36 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap.<init>():38 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.<init>():28 -> <init>
@@ -194979,27 +194998,27 @@
     14:18:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap.toString():219:223 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1181:1199 -> values
     1:19:java.util.Collection values():74 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.KT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.OT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1181:1181 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void clear():1196:1196 -> clear
     1:1:boolean contains(java.lang.Object):1192:1192 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1184:1184 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1184:1184 -> iterator
     2:2:java.util.Iterator iterator():1181 -> iterator
     1:1:int size():1188:1188 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.LT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.PT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OT;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):938:938 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void add(java.lang.Object):936:936 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):933:933 -> add
     2:2:void add(java.lang.Object):936 -> add
@@ -195011,23 +195030,23 @@
     1:1:void set(java.lang.Object):936:936 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):930:930 -> set
     2:2:void set(java.lang.Object):936 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.MT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.QT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1109:1109 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void add(java.lang.Object):1108:1108 -> add
     1:1:java.lang.Object next():1111:1111 -> next
     1:1:java.lang.Object previous():1104:1104 -> previous
     1:1:void set(java.lang.Object):1106:1106 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.NT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.RT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1113:1113 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1113 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void clear():1136:1136 -> clear
     1:1:java.util.Comparator comparator():1149:1149 -> comparator
     1:1:boolean contains(java.lang.Object):1126:1126 -> contains
@@ -195037,10 +195056,10 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1113 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1118:1118 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1113 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1118:1118 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1113 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1118:1118 -> iterator
     3:3:java.util.Iterator iterator():1113 -> iterator
     1:2:java.lang.Object last():1145:1146 -> last
@@ -195051,26 +195070,26 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1113 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1151:1151 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1113 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.OT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.ST:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):648:649 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;I)V"}
     1:3:boolean equals(java.lang.Object):669:671 -> equals
     1:1:java.lang.Object getKey():654:654 -> getKey
     1:1:java.lang.Object getValue():658:658 -> getValue
     1:1:int hashCode():675:675 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):662:663 -> setValue
     1:1:java.lang.String toString():679:679 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.PT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.TT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):973:973 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):973 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void clear():1057:1057 -> clear
     1:1:java.util.Comparator comparator():978:978 -> comparator
     1:15:boolean contains(java.lang.Object):998:1012 -> contains
@@ -195082,10 +195101,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):982:982 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):973 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():975:975 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():975:975 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():973 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():975:975 -> iterator
     3:3:java.util.Iterator iterator():973 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry last():992:993 -> last
@@ -195108,17 +195127,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):973:973 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):984:984 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):973 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.QT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.UT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):793:793 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):784 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):786:795 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):784 -> <init>
     1:14:void ensureIndexKnown():828:841 -> a
@@ -195132,17 +195151,17 @@
     1:2:int previousIndex():849:850 -> previousIndex
     1:47:void remove():869:915 -> remove
     48:48:void remove():870:870 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.RT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.VT:
 # {"id":"sourceFile","fileName":"Object2ReferenceLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ST;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1175:1175 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ST;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
     1:1:void add(java.lang.Object):1174:1174 -> add
     1:1:java.lang.Object next():1177:1177 -> next
     1:1:java.lang.Object previous():1170:1170 -> previous
     1:1:void set(java.lang.Object):1172:1172 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.UT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.YT:
 # {"id":"sourceFile","fileName":"ObjectArrayList.java"}
     java.lang.Object[] a -> b
     int size -> c
@@ -195153,7 +195172,7 @@
     4:4:void com.android.tools.r8.internal.ObjectArrayList.<init>(int):0 -> <init>
     5:5:void <init>(int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.ObjectArrayList.<init>(int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87,"5":88},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87,"5":88},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     83:83:void <init>(int):78:78 -> <init>
     83:83:void com.android.tools.r8.internal.ObjectArrayList.<init>(int):0 -> <init>
     84:84:void <init>(int):78:78 -> <init>
@@ -195180,12 +195199,12 @@
     3:3:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.get(int):0 -> get
     4:4:java.lang.Object get(int):0:0 -> get
     4:4:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.get(int):0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":488,"2":489,"3":490,"4":491},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":488,"2":489,"3":490,"4":491},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     245:245:java.lang.Object get(int):241:241 -> get
     245:245:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.get(int):0 -> get
     246:246:java.lang.Object get(int):0:0 -> get
     246:246:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.get(int):0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     487:487:java.lang.Object get(int):241:241 -> get
     487:487:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.get(int):0 -> get
     488:488:java.lang.Object get(int):241:241 -> get
@@ -195198,7 +195217,7 @@
     1:1:int indexOf(java.lang.Object):246:246 -> indexOf
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):384:385 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:1:int lastIndexOf(java.lang.Object):251:251 -> lastIndexOf
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):384:385 -> listIterator
     1:2:java.util.ListIterator listIterator(int):50 -> listIterator
@@ -195209,12 +195228,12 @@
     6:6:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.remove(int):0 -> remove
     7:7:java.lang.Object remove(int):0:0 -> remove
     7:7:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.remove(int):0 -> remove
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":521,"2":522,"3":523,"4":524},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":521,"2":522,"3":523,"4":524},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     263:263:java.lang.Object remove(int):256:256 -> remove
     263:263:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.remove(int):0 -> remove
     264:264:java.lang.Object remove(int):0:0 -> remove
     264:264:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.remove(int):0 -> remove
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     520:520:java.lang.Object remove(int):256:256 -> remove
     520:520:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.remove(int):0 -> remove
     521:521:java.lang.Object remove(int):256:256 -> remove
@@ -195233,12 +195252,12 @@
     4:4:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.set(int,java.lang.Object):0 -> set
     5:5:java.lang.Object set(int,java.lang.Object):0:0 -> set
     5:5:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.set(int,java.lang.Object):0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     279:279:java.lang.Object set(int,java.lang.Object):274:274 -> set
     279:279:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.set(int,java.lang.Object):0 -> set
     280:280:java.lang.Object set(int,java.lang.Object):0:0 -> set
     280:280:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.set(int,java.lang.Object):0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":559,"2":560,"3":561},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":559,"2":560,"3":561},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     554:554:java.lang.Object set(int,java.lang.Object):274:274 -> set
     554:554:java.lang.Object com.android.tools.r8.internal.ObjectArrayList.set(int,java.lang.Object):0 -> set
     555:555:java.lang.Object set(int,java.lang.Object):274:274 -> set
@@ -195249,14 +195268,14 @@
     560:560:java.lang.Object set(int,java.lang.Object):274:274 -> set
     561:561:java.lang.Object set(int,java.lang.Object):274:274 -> set
     1:1:int size():287:287 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.TT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.XT:
 # {"id":"sourceFile","fileName":"ObjectArrayList.java"}
     int pos -> b
     int last -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YT;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList,int):385:386 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UT;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YT;I)V"}
     1:2:void add(java.lang.Object):394:395 -> add
     1:1:boolean hasNext():387:387 -> hasNext
     1:1:boolean hasPrevious():388:388 -> hasPrevious
@@ -195268,7 +195287,7 @@
     6:6:void remove():402:402 -> remove
     1:2:void set(java.lang.Object):398:399 -> set
     3:3:void set(java.lang.Object):398:398 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.WT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.aU:
 # {"id":"sourceFile","fileName":"ObjectArraySet.java"}
     java.lang.Object[] a -> b
     int size -> c
@@ -195277,12 +195296,12 @@
       # {"id":"com.android.tools.r8.synthesized"}
     5:5:void <init>(java.lang.Object[],int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.ObjectArraySet.<init>(int,java.lang.Object[]):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     82:82:void <init>(java.lang.Object[],int):77:77 -> <init>
     82:82:void com.android.tools.r8.internal.ObjectArraySet.<init>(int,java.lang.Object[]):0 -> <init>
     83:83:void <init>(java.lang.Object[],int):0:0 -> <init>
     83:83:void com.android.tools.r8.internal.ObjectArraySet.<init>(int,java.lang.Object[]):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     160:160:void <init>(java.lang.Object[],int):77:77 -> <init>
     160:160:void com.android.tools.r8.internal.ObjectArraySet.<init>(int,java.lang.Object[]):0 -> <init>
     161:161:void <init>(java.lang.Object[],int):77:77 -> <init>
@@ -195302,18 +195321,18 @@
     1:1:boolean contains(java.lang.Object):107:107 -> contains
     1:1:boolean isEmpty():142:142 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():86:86 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():86:86 -> iterator
     2:2:java.util.Iterator iterator():25 -> iterator
     1:6:boolean remove(java.lang.Object):115:120 -> remove
     1:1:int size():111:111 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.VT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.ZT:
 # {"id":"sourceFile","fileName":"ObjectArraySet.java"}
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aU;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):86:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aU;)V"}
     1:1:boolean hasNext():90:90 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):25:25 -> hasNext
     2:2:boolean hasNext():90 -> hasNext
@@ -195334,19 +195353,19 @@
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):25:25 -> remove
     8:8:void remove():101 -> remove
     9:9:void remove():101:101 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.XT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.bU:
 # {"id":"sourceFile","fileName":"ObjectArrays.java"}
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():72:72 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.ZT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.dU:
 # {"id":"sourceFile","fileName":"ObjectBidirectionalIterator.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.aU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.eU:
 # {"id":"sourceFile","fileName":"ObjectCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> R8$$REMOVED$$CLASS$$147:
 # {"id":"sourceFile","fileName":"ObjectCollections.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.bU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.fU:
 # {"id":"sourceFile","fileName":"ObjectCollections.java"}
     1:1:void <init>():31:31 -> <init>
     1:1:boolean addAll(java.util.Collection):52:52 -> addAll
@@ -195354,22 +195373,22 @@
     1:1:boolean contains(java.lang.Object):33:33 -> contains
     1:1:int hashCode():44:44 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():38:38 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():38:38 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():30 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():38:38 -> iterator
     3:3:java.util.Iterator iterator():30 -> iterator
     1:1:boolean removeAll(java.util.Collection):54:54 -> removeAll
     1:1:boolean retainAll(java.util.Collection):56:56 -> retainAll
     1:1:int size():40:40 -> size
     1:1:java.lang.Object[] toArray():35:35 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.cU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.gU:
 # {"id":"sourceFile","fileName":"ObjectCollections.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aU;"}
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):136:138 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aU;)V"}
     1:1:boolean add(java.lang.Object):141:141 -> add
     1:1:boolean addAll(java.util.Collection):167:167 -> addAll
     1:1:void clear():159:159 -> clear
@@ -195380,7 +195399,7 @@
     1:1:boolean isEmpty():147:147 -> isEmpty
     1:1:java.util.Iterator iterator():133:133 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150:150 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet.iterator():86:86 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150 -> iterator
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150:150 -> iterator
@@ -195395,14 +195414,14 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):161:161 -> toArray
     2:2:java.lang.Object[] toArray():163:163 -> toArray
     1:1:java.lang.String toString():173:173 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.eU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.iU:
 # {"id":"sourceFile","fileName":"ObjectIterator.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.iU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.mU:
 # {"id":"sourceFile","fileName":"ObjectIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator EMPTY_ITERATOR -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jU;"}
     1:1:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.fU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.jU:
 # {"id":"sourceFile","fileName":"ObjectIterators.java"}
     1:1:void <init>():33:33 -> <init>
     1:1:java.lang.Object clone():51:51 -> clone
@@ -195412,7 +195431,7 @@
     1:1:int nextIndex():43:43 -> nextIndex
     1:1:java.lang.Object previous():41:41 -> previous
     1:1:int previousIndex():45:45 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.gU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.kU:
 # {"id":"sourceFile","fileName":"ObjectIterators.java"}
     java.lang.Object element -> b
     int curr -> c
@@ -195425,35 +195444,35 @@
     1:3:java.lang.Object previous():92:94 -> previous
     4:4:java.lang.Object previous():92:92 -> previous
     1:1:int previousIndex():102:102 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.hU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.lU:
 # {"id":"sourceFile","fileName":"ObjectIterators.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iU;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):505:506 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iU;)V"}
     1:1:boolean hasNext():509:509 -> hasNext
     1:1:java.lang.Object next():511:511 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.jU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.nU:
 # {"id":"sourceFile","fileName":"ObjectList.java"}
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.kU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.oU:
 # {"id":"sourceFile","fileName":"ObjectListIterator.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.mU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.qU:
 # {"id":"sourceFile","fileName":"ObjectSet.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.pU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.tU:
 # {"id":"sourceFile","fileName":"ObjectSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rU;"}
     1:1:void <clinit>():45:45 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.nU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.rU:
 # {"id":"sourceFile","fileName":"ObjectSets.java"}
     1:1:void <init>():32:32 -> <init>
     1:1:java.lang.Object clone():36:36 -> clone
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:boolean remove(java.lang.Object):34:34 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.oU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.sU:
 # {"id":"sourceFile","fileName":"ObjectSets.java"}
     java.lang.Object element -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r1;"}
@@ -195464,7 +195483,7 @@
     1:1:boolean contains(java.lang.Object):66:66 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():70:70 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():59 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):111:111 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():70 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():59 -> iterator
@@ -195477,16 +195496,16 @@
     1:1:boolean removeAll(java.util.Collection):76:76 -> removeAll
     1:1:boolean retainAll(java.util.Collection):78:78 -> retainAll
     1:1:int size():72:72 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.qU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.uU:
 # {"id":"sourceFile","fileName":"ObjectSortedSet.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.sU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.wU:
 # {"id":"sourceFile","fileName":"ObjectSortedSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vU;"}
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.rU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.vU:
 # {"id":"sourceFile","fileName":"ObjectSortedSets.java"}
     1:1:void <init>():33:33 -> <init>
     1:1:java.lang.Object clone():62:62 -> clone
@@ -195499,28 +195518,28 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):31 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):54:54 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):31 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.m20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.q20:
 # {"id":"sourceFile","fileName":"Reference2BooleanFunction.java"}
     boolean getBoolean(java.lang.Object) -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction -> R8$$REMOVED$$CLASS$$148:
 # {"id":"sourceFile","fileName":"Reference2BooleanFunctions.java"}
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton -> R8$$REMOVED$$CLASS$$149:
 # {"id":"sourceFile","fileName":"Reference2BooleanFunctions.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.o20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.s20:
 # {"id":"sourceFile","fileName":"Reference2BooleanMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet() -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A30;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.n20:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.r20:
 # {"id":"sourceFile","fileName":"Reference2BooleanMap.java"}
     boolean getBooleanValue() -> getBooleanValue
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.r20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.v20:
 # {"id":"sourceFile","fileName":"Reference2BooleanMaps.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap EMPTY_MAP -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t20;"}
     1:1:void <clinit>():79:79 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.p20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.t20:
 # {"id":"sourceFile","fileName":"Reference2BooleanMaps.java"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$EmptyFunction.<init>():32:32 -> <init>
     1:1:void <init>():37 -> <init>
@@ -195534,11 +195553,11 @@
     1:1:java.util.Set entrySet():35 -> entrySet
     1:2:boolean equals(java.lang.Object):70:71 -> equals
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():48:48 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:int hashCode():67:67 -> hashCode
     1:1:boolean isEmpty():65:65 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():57:57 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():57:57 -> keySet
     2:2:java.util.Set keySet():35 -> keySet
     1:1:void putAll(java.util.Map):45:45 -> putAll
@@ -195546,16 +195565,16 @@
     1:1:java.lang.String toString():74:74 -> toString
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():60:60 -> values
     1:1:java.util.Collection values():35 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.q20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.u20:
 # {"id":"sourceFile","fileName":"Reference2BooleanMaps.java"}
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.key -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entries -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sU;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W6;"}
     1:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.<init>(java.lang.Object,boolean):73:74 -> <init>
     1:2:void <init>(java.lang.Object,boolean):100 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
@@ -195570,7 +195589,7 @@
     5:5:boolean equals(java.lang.Object):132 -> equals
     6:6:boolean equals(java.lang.Object):132:132 -> equals
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():111:111 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets.singleton(java.lang.Object):88:88 -> g
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():111 -> g
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():111:111 -> g
@@ -195578,7 +195597,7 @@
     1:1:boolean isEmpty():123:123 -> isEmpty
     1:1:java.util.Set keySet():94:94 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():119:119 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets.singleton(java.lang.Object):88:88 -> keySet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():119 -> keySet
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():119:119 -> keySet
@@ -195592,7 +195611,7 @@
     2:2:java.util.Collection values():94 -> values
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():121:121 -> values
     3:3:java.util.Collection values():94 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.A20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.E20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -195602,11 +195621,11 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w20;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.<init>():38:38 -> <init>
     1:1:void <init>(int,float):78 -> <init>
     1:1:void <init>():99 -> <init>
@@ -195652,14 +195671,14 @@
     6:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.equals(java.lang.Object):232:232 -> equals
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet reference2BooleanEntrySet():578:579 -> g
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():45 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:int realSize():155:155 -> hashCode
     1:1:int hashCode():787 -> hashCode
     2:10:int hashCode():788:796 -> hashCode
     1:1:boolean isEmpty():318:318 -> isEmpty
     1:1:java.util.Set keySet():45:45 -> keySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():618:619 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
     1:1:void putAll(java.util.Map):182:182 -> putAll
     2:3:void ensureCapacity(int):158:159 -> putAll
     2:3:void putAll(java.util.Map):182 -> putAll
@@ -195681,12 +195700,12 @@
     6:14:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.toString():244:252 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():637:655 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.s20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.w20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):637:637 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:boolean contains(boolean):648:648 -> b
     2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.containsValue(boolean):293:293 -> b
     2:2:boolean contains(boolean):648 -> b
@@ -195695,51 +195714,51 @@
     3:5:boolean contains(boolean):648 -> b
     1:1:void clear():652:652 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():640:640 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L6;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():640:640 -> iterator
     2:2:java.util.Iterator iterator():637 -> iterator
     1:1:int size():644:644 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.t20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.x20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w20;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):482:482 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):482 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry next():486:486 -> next
     1:1:java.lang.Object next():482 -> next
     1:2:void remove():490:491 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.u20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.y20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):588:588 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:java.lang.Object next():590:590 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.v20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.z20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):592:592 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):592 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:void clear():613:613 -> clear
     1:1:boolean contains(java.lang.Object):603:603 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():595:595 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():595:595 -> iterator
     2:2:java.util.Iterator iterator():592 -> iterator
     1:3:boolean remove(java.lang.Object):607:609 -> remove
     1:1:int size():599:599 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.w20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.A20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):344:345 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;I)V"}
     1:3:boolean equals(java.lang.Object):379:381 -> equals
     1:1:boolean getBooleanValue():354:354 -> getBooleanValue
     1:1:java.lang.Object getKey():350:350 -> getKey
@@ -195755,17 +195774,17 @@
     5:5:java.lang.Boolean setValue(java.lang.Boolean):374:374 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):341 -> setValue
     1:1:java.lang.String toString():389:389 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.x20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.B20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):502:502 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):502 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:void clear():573:573 -> clear
     1:16:boolean contains(java.lang.Object):512:527 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():504:504 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():504:504 -> iterator
     2:2:java.util.Iterator iterator():502 -> iterator
     1:7:boolean remove(java.lang.Object):533:539 -> remove
@@ -195779,19 +195798,19 @@
     23:23:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):561 -> remove
     1:1:int size():569:569 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.y20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.C20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):393:404 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):393 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:17:int nextEntry():411:427 -> a
     18:18:int nextEntry():411:411 -> a
     1:1:boolean hasNext():408:408 -> hasNext
@@ -195803,16 +195822,16 @@
     15:24:void remove():465 -> remove
     25:26:void remove():468:469 -> remove
     27:27:void remove():460:460 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.z20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.D20:
 # {"id":"sourceFile","fileName":"Reference2BooleanOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):628:628 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E20;)V"}
     1:1:java.lang.Boolean next():633:633 -> next
     1:1:java.lang.Object next():627 -> next
     1:1:boolean nextBoolean():630:630 -> q
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.D20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.H20:
 # {"id":"sourceFile","fileName":"Reference2IntArrayMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -195832,7 +195851,7 @@
     3:3:boolean containsValue(int):216:216 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():185:185 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():32 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():221:221 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():262:262 -> keySet
     1:1:java.util.Set keySet():32 -> keySet
@@ -195842,16 +195861,16 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):245:245 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():266 -> values
     2:2:java.util.Collection values():32 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.C20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.G20:
 # {"id":"sourceFile","fileName":"Reference2IntArrayMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):98:98 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):98 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H20;)V"}
     1:5:boolean contains(java.lang.Object):159:163 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():101:101 -> iterator
     2:2:java.util.Iterator iterator():98 -> iterator
     1:6:boolean remove(java.lang.Object):168:173 -> remove
@@ -195877,14 +195896,14 @@
     1:1:int size():154:154 -> size
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):32:32 -> size
     2:2:int size():154 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.B20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.F20:
 # {"id":"sourceFile","fileName":"Reference2IntArrayMap.java"}
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G20;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet):101:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G20;)V"}
     1:1:boolean hasNext():105:105 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):32:32 -> hasNext
     2:2:boolean hasNext():105 -> hasNext
@@ -195918,7 +195937,7 @@
     13:13:void remove():120 -> remove
     14:14:void remove():120:120 -> remove
     15:15:void remove():115:115 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.M20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Q20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -195931,11 +195950,11 @@
     int maxFill -> k
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet entries -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keys -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I20;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.<init>():28:28 -> <init>
     1:1:void <init>(int,float):118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
@@ -195962,7 +195981,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet reference2IntEntrySet():76:76 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():136 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():26 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     2:26:void fixPointers(int):747:771 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet reference2IntEntrySet():76:76 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():136 -> entrySet
@@ -195982,12 +196001,12 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap headMap(java.lang.Object):830:830 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):76 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():76:76 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():667:667 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1218:1219 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I30;"}
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1151:1152 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/X20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b30;"}
     1:1:java.util.Set keySet():76:76 -> keySet
     1:2:java.lang.Object lastKey():820:821 -> lastKey
     3:3:java.lang.Object lastKey():820:820 -> lastKey
@@ -196007,27 +196026,27 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):76 -> tailMap
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1252:1270 -> values
     1:19:java.util.Collection values():76 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.E20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.I20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1252:1252 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     1:1:void clear():1267:1267 -> clear
     1:1:boolean contains(int):1263:1263 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1255:1255 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1255:1255 -> iterator
     2:2:java.util.Iterator iterator():1252 -> iterator
     1:1:int size():1259:1259 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.F20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.J20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I20;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):995:995 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     1:1:void add(java.lang.Object):993:993 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):990:990 -> add
     2:2:void add(java.lang.Object):993 -> add
@@ -196039,23 +196058,23 @@
     1:1:void set(java.lang.Object):993:993 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):987:987 -> set
     2:2:void set(java.lang.Object):993 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.G20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.K20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1168:1168 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     1:1:void add(java.lang.Object):1167:1167 -> add
     1:1:java.lang.Object next():1170:1170 -> next
     1:1:java.lang.Object previous():1163:1163 -> previous
     1:1:void set(java.lang.Object):1165:1165 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.H20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.L20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1172:1172 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1172 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet.<init>():19:19 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1172 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1172 -> <init>
@@ -196068,7 +196087,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1172 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1177:1177 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1172 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():1177:1177 -> iterator
     2:2:java.util.Iterator iterator():1172 -> iterator
     1:2:java.lang.Object last():1204:1205 -> last
@@ -196079,13 +196098,13 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1172 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet tailSet(java.lang.Object):1210:1210 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1172 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.I20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.M20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):693:694 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;I)V"}
     1:3:boolean equals(java.lang.Object):728:730 -> equals
     1:1:int getIntValue():703:703 -> getIntValue
     1:1:java.lang.Object getKey():699:699 -> getKey
@@ -196101,13 +196120,13 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):723:723 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):690 -> setValue
     1:1:java.lang.String toString():738:738 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.J20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.N20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1030:1030 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1030 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     1:1:void clear():1116:1116 -> clear
     1:1:java.util.Comparator comparator():1035:1035 -> comparator
     1:16:boolean contains(java.lang.Object):1055:1070 -> contains
@@ -196119,10 +196138,10 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1039:1039 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1030 -> headSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZT;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1030 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1032:1032 -> iterator
     3:3:java.util.Iterator iterator():1030 -> iterator
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry last():1049:1050 -> last
@@ -196146,17 +196165,17 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1030:1030 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1041:1041 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1030 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.K20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.O20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     int prev -> b
     int next -> c
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):852:852 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):843 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):845:854 -> <init>
     2:11:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):843 -> <init>
     1:14:void ensureIndexKnown():887:900 -> a
@@ -196170,12 +196189,12 @@
     1:2:int previousIndex():908:909 -> previousIndex
     1:45:void remove():928:972 -> remove
     46:46:void remove():929:929 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.L20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.P20:
 # {"id":"sourceFile","fileName":"Reference2IntLinkedOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q20;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1243:1243 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q20;)V"}
     1:1:void add(java.lang.Object):1227:1227 -> add
     2:2:void add(java.lang.Integer):1238:1238 -> add
     2:2:void add(java.lang.Object):1227 -> add
@@ -196188,10 +196207,10 @@
     2:2:void set(java.lang.Integer):1235:1235 -> set
     2:2:void set(java.lang.Object):1227 -> set
     1:1:int nextInt():1245:1245 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.N20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.R20:
 # {"id":"sourceFile","fileName":"Reference2IntMap.java"}
     int getIntValue() -> getIntValue
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.W20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.a30:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     java.lang.Object[] key -> c
     int[] value -> d
@@ -196201,11 +196220,11 @@
     int maxFill -> h
     int size -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V20;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S20;"}
     1:9:void <init>(int,float):78:86 -> <init>
     1:9:void <init>():99 -> <init>
     1:17:int insert(java.lang.Object,int):189:205 -> b
@@ -196239,7 +196258,7 @@
     2:10:int hashCode():827:835 -> hashCode
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():617:618 -> i
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():45 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     1:1:boolean isEmpty():357:357 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():657:658 -> keySet
     1:2:java.util.Set keySet():45 -> keySet
@@ -196255,60 +196274,60 @@
     1:1:int size():353:353 -> size
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():676:694 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.O20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.S20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):676:676 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:void clear():691:691 -> clear
     1:1:boolean contains(int):687:687 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():679:679 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():679:679 -> iterator
     2:2:java.util.Iterator iterator():676 -> iterator
     1:1:int size():683:683 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.P20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.T20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S20;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):521:521 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):521 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry next():525:525 -> next
     1:1:java.lang.Object next():521 -> next
     1:2:void remove():529:530 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Q20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.U20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):627:627 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:java.lang.Object next():629:629 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.R20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.V20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):631:631 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):631 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:void clear():652:652 -> clear
     1:1:boolean contains(java.lang.Object):642:642 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
     2:2:java.util.Iterator iterator():631 -> iterator
     1:3:boolean remove(java.lang.Object):646:648 -> remove
     1:1:int size():638:638 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.S20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.W20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):383:384 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;I)V"}
     1:3:boolean equals(java.lang.Object):418:420 -> equals
     1:1:int getIntValue():393:393 -> getIntValue
     1:1:java.lang.Object getKey():389:389 -> getKey
@@ -196324,17 +196343,17 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):413:413 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):380 -> setValue
     1:1:java.lang.String toString():428:428 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.T20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.X20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):541:541 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):541 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:void clear():612:612 -> clear
     1:16:boolean contains(java.lang.Object):551:566 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
     2:2:java.util.Iterator iterator():541 -> iterator
     1:7:boolean remove(java.lang.Object):572:578 -> remove
@@ -196348,19 +196367,19 @@
     23:23:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):600 -> remove
     1:1:int size():608:608 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.U20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Y20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):432:443 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):432 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:17:int nextEntry():450:466 -> a
     18:18:int nextEntry():450:450 -> a
     1:1:boolean hasNext():447:447 -> hasNext
@@ -196372,18 +196391,18 @@
     15:24:void remove():504 -> remove
     25:26:void remove():507:508 -> remove
     27:27:void remove():499:499 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.V20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Z20:
 # {"id":"sourceFile","fileName":"Reference2IntOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):667:667 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a30;)V"}
     1:1:java.lang.Integer next():672:672 -> next
     1:1:java.lang.Object next():666 -> next
     1:1:int nextInt():669:669 -> t
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.X20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.b30:
 # {"id":"sourceFile","fileName":"Reference2IntSortedMap.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.g30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.k30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     java.lang.Object[] key -> b
     long[] value -> c
@@ -196393,11 +196412,11 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c30;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.<init>():36:36 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap.<init>():38 -> <init>
     1:1:void <init>(int,float):78 -> <init>
@@ -196493,60 +196512,60 @@
     13:16:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap.toString():249:252 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection values():676:694 -> values
     1:19:java.util.Collection values():45 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.Y20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.c30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):676:676 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():679:679 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OL;"}
     1:1:boolean contains(long):687:687 -> b
     1:1:void clear():691:691 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():679:679 -> iterator
     1:1:java.util.Iterator iterator():676 -> iterator
     1:1:int size():683:683 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Z20:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.d30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c30;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):521:521 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):521 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry next():525:525 -> next
     1:1:java.lang.Object next():521 -> next
     1:2:void remove():529:530 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.a30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.e30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):627:627 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:java.lang.Object next():629:629 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.b30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.f30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):631:631 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):631 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:void clear():652:652 -> clear
     1:1:boolean contains(java.lang.Object):642:642 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():634:634 -> iterator
     2:2:java.util.Iterator iterator():631 -> iterator
     1:3:boolean remove(java.lang.Object):646:648 -> remove
     1:1:int size():638:638 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.c30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.g30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):383:384 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;I)V"}
     1:3:boolean equals(java.lang.Object):418:420 -> equals
     1:1:java.lang.Object getKey():389:389 -> getKey
     1:1:java.lang.Long getValue():406:406 -> getValue
@@ -196561,17 +196580,17 @@
     5:5:java.lang.Long setValue(java.lang.Long):413:413 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):380 -> setValue
     1:1:java.lang.String toString():428:428 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.d30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.h30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):541:541 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):541 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:void clear():612:612 -> clear
     1:16:boolean contains(java.lang.Object):551:566 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():543:543 -> iterator
     2:2:java.util.Iterator iterator():541 -> iterator
     1:7:boolean remove(java.lang.Object):572:578 -> remove
@@ -196585,19 +196604,19 @@
     23:23:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):45:45 -> remove
     23:23:boolean remove(java.lang.Object):600 -> remove
     1:1:int size():608:608 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.e30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.i30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):432:443 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):432 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:17:int nextEntry():450:466 -> a
     18:18:int nextEntry():450:450 -> a
     1:1:boolean hasNext():447:447 -> hasNext
@@ -196609,16 +196628,16 @@
     15:24:void remove():504 -> remove
     25:26:void remove():507:508 -> remove
     27:27:void remove():499:499 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.f30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.j30:
 # {"id":"sourceFile","fileName":"Reference2LongOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):667:667 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k30;)V"}
     1:1:java.lang.Long next():672:672 -> next
     1:1:java.lang.Object next():666 -> next
     1:1:long nextLong():669:669 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap -> com.android.tools.r8.internal.p30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap -> com.android.tools.r8.internal.t30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
@@ -196628,11 +196647,11 @@
     int maxFill -> g
     int size -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceMap$FastEntrySet entries -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l30;"}
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2ReferenceFunction.<init>():36:36 -> <init>
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2ReferenceMap.<init>():38 -> <init>
     1:1:void <init>(int,float):77 -> <init>
@@ -196718,77 +196737,77 @@
     13:17:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2ReferenceMap.toString():219:223 -> toString
     1:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():623:641 -> values
     1:19:java.util.Collection values():44 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.h30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.l30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):623:623 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:void clear():638:638 -> clear
     1:1:boolean contains(java.lang.Object):634:634 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():626:626 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():626:626 -> iterator
     2:2:java.util.Iterator iterator():623 -> iterator
     1:1:int size():630:630 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.i30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.m30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntry entry -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l30;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):473:473 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1):473 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntry next():477:477 -> next
     1:1:java.lang.Object next():473 -> next
     1:2:void remove():481:482 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.j30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.n30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):577:577 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:java.lang.Object next():579:579 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.k30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.o30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):581:581 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1):581 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:void clear():602:602 -> clear
     1:1:boolean contains(java.lang.Object):592:592 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():584:584 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():584:584 -> iterator
     2:2:java.util.Iterator iterator():581 -> iterator
     1:3:boolean remove(java.lang.Object):596:598 -> remove
     1:1:int size():588:588 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.l30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.p30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,int):347:348 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;I)V"}
     1:3:boolean equals(java.lang.Object):368:370 -> equals
     1:1:java.lang.Object getKey():353:353 -> getKey
     1:1:java.lang.Object getValue():357:357 -> getValue
     1:1:int hashCode():374:374 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):361:362 -> setValue
     1:1:java.lang.String toString():378:378 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.m30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.q30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):493:493 -> <init>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1):493 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:void clear():562:562 -> clear
     1:15:boolean contains(java.lang.Object):503:517 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():495:495 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():495:495 -> iterator
     2:2:java.util.Iterator iterator():493 -> iterator
     1:6:boolean remove(java.lang.Object):523:528 -> remove
@@ -196802,19 +196821,19 @@
     23:23:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap.access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,int):44:44 -> remove
     23:23:boolean remove(java.lang.Object):550 -> remove
     1:1:int size():558:558 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.n30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.r30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):382:393 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$1):382 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:17:int nextEntry():400:416 -> a
     18:18:int nextEntry():400:400 -> a
     1:1:boolean hasNext():397:397 -> hasNext
@@ -196826,14 +196845,14 @@
     17:26:void remove():456 -> remove
     27:28:void remove():459:460 -> remove
     29:29:void remove():450:450 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.o30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.s30:
 # {"id":"sourceFile","fileName":"Reference2ReferenceOpenHashMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap):617:617 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
     1:1:java.lang.Object next():619:619 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.r30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.v30:
 # {"id":"sourceFile","fileName":"ReferenceArrayList.java"}
     java.lang.Object[] a -> b
     int size -> c
@@ -196844,7 +196863,7 @@
     4:4:void com.android.tools.r8.internal.ReferenceArrayList.<init>(int):0 -> <init>
     5:5:void <init>(int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.ReferenceArrayList.<init>(int):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87,"5":88},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87,"5":88},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     83:83:void <init>(int):78:78 -> <init>
     83:83:void com.android.tools.r8.internal.ReferenceArrayList.<init>(int):0 -> <init>
     84:84:void <init>(int):78:78 -> <init>
@@ -196871,12 +196890,12 @@
     3:3:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.get(int):0 -> get
     4:4:java.lang.Object get(int):0:0 -> get
     4:4:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.get(int):0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":488,"2":489,"3":490,"4":491},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":488,"2":489,"3":490,"4":491},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     245:245:java.lang.Object get(int):241:241 -> get
     245:245:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.get(int):0 -> get
     246:246:java.lang.Object get(int):0:0 -> get
     246:246:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.get(int):0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     487:487:java.lang.Object get(int):241:241 -> get
     487:487:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.get(int):0 -> get
     488:488:java.lang.Object get(int):241:241 -> get
@@ -196889,7 +196908,7 @@
     1:1:int indexOf(java.lang.Object):246:246 -> indexOf
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):384:385 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/kU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/oU;"}
     1:1:int lastIndexOf(java.lang.Object):251:251 -> lastIndexOf
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator listIterator(int):384:385 -> listIterator
     1:2:java.util.ListIterator listIterator(int):50 -> listIterator
@@ -196900,12 +196919,12 @@
     6:6:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.remove(int):0 -> remove
     7:7:java.lang.Object remove(int):0:0 -> remove
     7:7:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.remove(int):0 -> remove
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":521,"2":522,"3":523,"4":524},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":521,"2":522,"3":523,"4":524},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     263:263:java.lang.Object remove(int):256:256 -> remove
     263:263:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.remove(int):0 -> remove
     264:264:java.lang.Object remove(int):0:0 -> remove
     264:264:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.remove(int):0 -> remove
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     520:520:java.lang.Object remove(int):256:256 -> remove
     520:520:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.remove(int):0 -> remove
     521:521:java.lang.Object remove(int):256:256 -> remove
@@ -196924,12 +196943,12 @@
     4:4:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.set(int,java.lang.Object):0 -> set
     5:5:java.lang.Object set(int,java.lang.Object):0:0 -> set
     5:5:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.set(int,java.lang.Object):0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557,"4":558},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     279:279:java.lang.Object set(int,java.lang.Object):274:274 -> set
     279:279:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.set(int,java.lang.Object):0 -> set
     280:280:java.lang.Object set(int,java.lang.Object):0:0 -> set
     280:280:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.set(int,java.lang.Object):0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":559,"2":560,"3":561},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":559,"2":560,"3":561},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     554:554:java.lang.Object set(int,java.lang.Object):274:274 -> set
     554:554:java.lang.Object com.android.tools.r8.internal.ReferenceArrayList.set(int,java.lang.Object):0 -> set
     555:555:java.lang.Object set(int,java.lang.Object):274:274 -> set
@@ -196940,14 +196959,14 @@
     560:560:java.lang.Object set(int,java.lang.Object):274:274 -> set
     561:561:java.lang.Object set(int,java.lang.Object):274:274 -> set
     1:1:int size():287:287 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.q30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.u30:
 # {"id":"sourceFile","fileName":"ReferenceArrayList.java"}
     int pos -> b
     int last -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList,int):385:386 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r30;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v30;I)V"}
     1:2:void add(java.lang.Object):394:395 -> add
     1:1:boolean hasNext():387:387 -> hasNext
     1:1:boolean hasPrevious():388:388 -> hasPrevious
@@ -196959,7 +196978,7 @@
     6:6:void remove():402:402 -> remove
     1:2:void set(java.lang.Object):398:399 -> set
     3:3:void set(java.lang.Object):398:398 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.t30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.x30:
 # {"id":"sourceFile","fileName":"ReferenceArraySet.java"}
     java.lang.Object[] a -> b
     int size -> c
@@ -196968,12 +196987,12 @@
       # {"id":"com.android.tools.r8.synthesized"}
     5:5:void <init>(java.lang.Object[],int):0:0 -> <init>
     5:5:void com.android.tools.r8.internal.ReferenceArraySet.<init>(int,java.lang.Object[]):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/ri0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164},"outline":"Lcom/android/tools/r8/internal/vi0;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;"}
     82:82:void <init>(java.lang.Object[],int):77:77 -> <init>
     82:82:void com.android.tools.r8.internal.ReferenceArraySet.<init>(int,java.lang.Object[]):0 -> <init>
     83:83:void <init>(java.lang.Object[],int):0:0 -> <init>
     83:83:void com.android.tools.r8.internal.ReferenceArraySet.<init>(int,java.lang.Object[]):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Sa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":165,"2":166,"3":167},"outline":"Lcom/android/tools/r8/internal/Wa0;a(ILjava/lang/String;Ljava/lang/StringBuilder;)Ljava/lang/String;"}
     160:160:void <init>(java.lang.Object[],int):77:77 -> <init>
     160:160:void com.android.tools.r8.internal.ReferenceArraySet.<init>(int,java.lang.Object[]):0 -> <init>
     161:161:void <init>(java.lang.Object[],int):77:77 -> <init>
@@ -196995,20 +197014,20 @@
     1:1:boolean contains(java.lang.Object):107 -> contains
     1:1:boolean isEmpty():142:142 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():86:86 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():86:86 -> iterator
     2:2:java.util.Iterator iterator():25 -> iterator
     1:1:int findKey(java.lang.Object):80:80 -> remove
     1:1:boolean remove(java.lang.Object):115 -> remove
     2:5:boolean remove(java.lang.Object):117:120 -> remove
     1:1:int size():111:111 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.s30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.w30:
 # {"id":"sourceFile","fileName":"ReferenceArraySet.java"}
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x30;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):86:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x30;)V"}
     1:1:boolean hasNext():90:90 -> hasNext
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):25:25 -> hasNext
     2:2:boolean hasNext():90 -> hasNext
@@ -197029,13 +197048,13 @@
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet.access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):25:25 -> remove
     8:8:void remove():101 -> remove
     9:9:void remove():101:101 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.u30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.y30:
 # {"id":"sourceFile","fileName":"ReferenceCollection.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> R8$$REMOVED$$CLASS$$150:
 # {"id":"sourceFile","fileName":"ReferenceCollections.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.v30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.z30:
 # {"id":"sourceFile","fileName":"ReferenceCollections.java"}
     1:1:void <init>():31:31 -> <init>
     1:1:boolean addAll(java.util.Collection):52:52 -> addAll
@@ -197044,19 +197063,19 @@
     1:1:int hashCode():44:44 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():38:38 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():30 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():38:38 -> iterator
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:boolean removeAll(java.util.Collection):54:54 -> removeAll
     1:1:boolean retainAll(java.util.Collection):56:56 -> retainAll
     1:1:int size():40:40 -> size
     1:1:java.lang.Object[] toArray():35:35 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.w30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.A30:
 # {"id":"sourceFile","fileName":"ReferenceCollections.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x30;"}
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):136:138 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x30;)V"}
     1:1:boolean add(java.lang.Object):141:141 -> add
     1:1:boolean addAll(java.util.Collection):167:167 -> addAll
     1:1:void clear():159:159 -> clear
@@ -197067,7 +197086,7 @@
     1:1:boolean isEmpty():147:147 -> isEmpty
     1:1:java.util.Iterator iterator():133:133 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150:150 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet.iterator():86:86 -> iterator
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150 -> iterator
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():150:150 -> iterator
@@ -197082,10 +197101,10 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):161:161 -> toArray
     2:2:java.lang.Object[] toArray():163:163 -> toArray
     1:1:java.lang.String toString():173:173 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.x30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.B30:
 # {"id":"sourceFile","fileName":"ReferenceList.java"}
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.z30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.D30:
 # {"id":"sourceFile","fileName":"ReferenceOpenHashSet.java"}
     java.lang.Object[] key -> b
     int mask -> c
@@ -197117,7 +197136,7 @@
     2:4:int hashCode():526:528 -> hashCode
     1:1:boolean isEmpty():299:299 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():402:402 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():402:402 -> iterator
     2:2:java.util.Iterator iterator():36 -> iterator
     1:4:void rehash(int):477:480 -> j
@@ -197136,19 +197155,19 @@
     2:5:boolean remove(java.lang.Object):251 -> remove
     6:13:boolean remove(java.lang.Object):255:262 -> remove
     1:1:int size():295:295 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.y30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.C30:
 # {"id":"sourceFile","fileName":"ReferenceOpenHashSet.java"}
     int pos -> b
     int last -> c
     int c -> d
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D30;"}
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet):319:330 -> <init>
     1:12:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1):319 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D30;)V"}
     1:1:boolean hasNext():334:334 -> hasNext
     1:15:java.lang.Object next():337:351 -> next
     16:16:java.lang.Object next():337:337 -> next
@@ -197160,22 +197179,22 @@
     15:23:void remove():388 -> remove
     24:25:void remove():391:392 -> remove
     26:26:void remove():383:383 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.A30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.E30:
 # {"id":"sourceFile","fileName":"ReferenceSet.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator() -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.D30:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.H30:
 # {"id":"sourceFile","fileName":"ReferenceSets.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet EMPTY_SET -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F30;"}
     1:1:void <clinit>():45:45 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.B30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.F30:
 # {"id":"sourceFile","fileName":"ReferenceSets.java"}
     1:1:void <init>():32:32 -> <init>
     1:1:java.lang.Object clone():36:36 -> clone
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:boolean remove(java.lang.Object):34:34 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.C30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.G30:
 # {"id":"sourceFile","fileName":"ReferenceSets.java"}
     java.lang.Object element -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -197186,7 +197205,7 @@
     1:1:boolean contains(java.lang.Object):66:66 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():70:70 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():59 -> iterator
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.singleton(java.lang.Object):111:111 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():70 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():59 -> iterator
@@ -197199,20 +197218,20 @@
     1:1:boolean removeAll(java.util.Collection):76:76 -> removeAll
     1:1:boolean retainAll(java.util.Collection):78:78 -> retainAll
     1:1:int size():72:72 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.E30:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.I30:
 # {"id":"sourceFile","fileName":"ReferenceSortedSet.java"}
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.v8:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.x8:
 # {"id":"sourceFile","fileName":"CfApplicationWriter.java"}
     com.android.tools.r8.graph.DexApplication application -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/x0;"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Optional marker -> d
     java.util.function.Predicate isTypeMissing -> e
     com.android.tools.r8.cf.CfVersion MIN_VERSION_FOR_COMPILER_GENERATED_CODE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean $assertionsDisabled -> g
     1:16:void <clinit>():85:100 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker):102:108 -> <init>
@@ -197235,7 +197254,7 @@
     10:10:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
     10:10:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):537 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;Lcom/android/tools/r8/graph/u5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FO;Lcom/android/tools/r8/graph/u5;)V"}
     11:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):536:536 -> a
     12:12:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):539 -> a
@@ -197253,7 +197272,7 @@
     27:32:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):121:126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ClassFileConsumer;Lcom/android/tools/r8/utils/i;)V"}
     33:35:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):231:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/ClassFileConsumer;Lcom/android/tools/r8/internal/xJ;Ljava/util/Optional;Lcom/android/tools/r8/SourceFileEnvironment;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/ClassFileConsumer;Lcom/android/tools/r8/internal/BJ;Ljava/util/Optional;Lcom/android/tools/r8/SourceFileEnvironment;)V"}
     36:36:int com.android.tools.r8.org.objectweb.asm.ClassWriter.newConst(java.lang.Object):825:825 -> a
     36:36:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):233 -> a
     37:45:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:242 -> a
@@ -197308,11 +197327,11 @@
     107:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):279:279 -> a
     108:111:void com.android.tools.r8.synthesis.SyntheticItems.writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1231:1234 -> a
     108:111:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):279 -> a
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     112:112:void com.android.tools.r8.synthesis.SyntheticItems.writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):279 -> a
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     113:113:void com.android.tools.r8.synthesis.SyntheticItems.writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1234 -> a
     113:113:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):279 -> a
     114:116:void com.android.tools.r8.synthesis.SyntheticItems.writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1237:1239 -> a
@@ -197442,7 +197461,7 @@
     252:256:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
     252:256:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):341 -> a
     257:257:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):324:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/td;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/graph/C5;)V"}
     258:258:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):342:342 -> a
     259:265:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):355:361 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)I"}
@@ -197450,12 +197469,12 @@
     270:270:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):360:360 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)[Lcom/android/tools/r8/graph/I2;"}
     271:277:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):366:372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/db;"}
     278:286:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):371:379 -> a
     287:294:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):397:404 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/N2;"}
     295:295:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):454:454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/td;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/internal/vd;)V"}
     296:296:boolean com.android.tools.r8.graph.DexEncodedField.isDeprecated():91:91 -> a
     296:296:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):455 -> a
     297:297:com.android.tools.r8.naming.NamingLens getNamingLens():112:112 -> a
@@ -197477,11 +197496,11 @@
     315:317:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):462:464 -> a
     318:318:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):463:463 -> a
     319:319:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):543:543 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     320:320:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$5(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):545:545 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     321:322:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.jar.CfApplicationWriter$TypeAnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):563:564 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t8;Lcom/android/tools/r8/internal/u8;[Lcom/android/tools/r8/graph/r0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v8;Lcom/android/tools/r8/internal/w8;[Lcom/android/tools/r8/graph/r0;)V"}
     323:323:com.android.tools.r8.naming.NamingLens getNamingLens():112:112 -> a
     323:323:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.jar.CfApplicationWriter$TypeAnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):570 -> a
     324:329:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.jar.CfApplicationWriter$TypeAnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):570:575 -> a
@@ -197516,7 +197535,7 @@
     453:453:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):644:644 -> a
     454:457:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):638:641 -> a
     458:471:void writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):666:679 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/r0;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/FO;)V"}
     472:476:void writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):672:676 -> a
     1:1:com.android.tools.r8.naming.NamingLens getNamingLens():112:112 -> b
     1:1:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):350 -> b
@@ -197552,7 +197571,7 @@
     32:44:com.android.tools.r8.SourceFileEnvironment com.android.tools.r8.dex.ApplicationWriter.createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):518:530 -> b
     32:44:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):156 -> b
     45:48:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):158:161 -> b
-    49:49:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():588:588 -> b
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():587:587 -> b
     49:49:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161 -> b
     50:52:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):163:165 -> b
     53:53:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
@@ -197561,12 +197580,12 @@
     54:54:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     54:54:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):165 -> b
     55:71:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):165:181 -> b
-    72:72:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():592:592 -> b
+    72:72:com.android.tools.r8.GlobalSyntheticsConsumer com.android.tools.r8.utils.InternalOptions.getGlobalSyntheticsConsumer():591:591 -> b
     72:72:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):182 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     73:80:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):182:189 -> b
     81:81:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198:198 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/ClassFileConsumer;Lcom/android/tools/r8/internal/xJ;Ljava/util/Optional;Lcom/android/tools/r8/SourceFileEnvironment;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/ClassFileConsumer;Lcom/android/tools/r8/internal/BJ;Ljava/util/Optional;Lcom/android/tools/r8/SourceFileEnvironment;)V"}
     82:82:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):499:499 -> b
     82:82:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> b
     83:95:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200:212 -> b
@@ -197605,9 +197624,9 @@
     114:114:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> b
     114:114:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):205 -> b
     115:115:void lambda$writeClass$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):327:327 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/td;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/graph/C5;)V"}
     1:2:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):476:477 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/internal/xJ;Lcom/android/tools/r8/internal/td;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/internal/BJ;Lcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:com.android.tools.r8.naming.NamingLens getNamingLens():112:112 -> c
     3:3:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):478 -> c
     4:5:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):479:480 -> c
@@ -197632,24 +197651,24 @@
     38:52:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):497 -> c
     53:55:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):499:501 -> c
     56:62:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):498:504 -> c
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.v8:
 # {"id":"sourceFile","fileName":"CfApplicationWriter.java"}
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-com.android.tools.r8.jar.CfApplicationWriter$TypeAnnotationConsumer -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.jar.CfApplicationWriter$TypeAnnotationConsumer -> com.android.tools.r8.internal.w8:
 # {"id":"sourceFile","fileName":"CfApplicationWriter.java"}
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.li:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.ni:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel WARNING -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ni;"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel ERROR -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ni;"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel HIDDEN -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ni;"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $VALUES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ni;"}
     1:5:void <clinit>():86:90 -> <clinit>
     6:6:com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $values():0:0 -> <clinit>
     6:6:void <clinit>():90 -> <clinit>
@@ -197659,12 +197678,12 @@
     1:1:void <init>(java.lang.String,int):84:84 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] values():0:0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/ni;"}
 com.android.tools.r8.jetbrains.kotlin.ExceptionsKt__ExceptionsKt -> R8$$REMOVED$$CLASS$$151:
 # {"id":"sourceFile","fileName":"Exceptions.kt"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt -> R8$$REMOVED$$CLASS$$152:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.Metadata -> com.android.tools.r8.internal.FN:
+com.android.tools.r8.jetbrains.kotlin.Metadata -> com.android.tools.r8.internal.JN:
 # {"id":"sourceFile","fileName":"Metadata.kt"}
     int[] bv() -> bv
     java.lang.String[] d1() -> d1
@@ -197674,10 +197693,10 @@
     java.lang.String pn() -> pn
     int xi() -> xi
     java.lang.String xs() -> xs
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.kR:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.oR:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.JV:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.NV:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object first -> b
     java.lang.Object second -> c
@@ -197685,25 +197704,25 @@
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.jetbrains.kotlin.Result$Failure -> com.android.tools.r8.internal.W80:
+com.android.tools.r8.jetbrains.kotlin.Result$Failure -> com.android.tools.r8.internal.a90:
 # {"id":"sourceFile","fileName":"Result.kt"}
     java.lang.Throwable exception -> b
     1:2:void <init>(java.lang.Throwable):105:106 -> <init>
     1:1:boolean equals(java.lang.Object):109:109 -> equals
     1:1:int hashCode():110:110 -> hashCode
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.jetbrains.kotlin.ResultKt -> com.android.tools.r8.internal.X80:
+com.android.tools.r8.jetbrains.kotlin.ResultKt -> com.android.tools.r8.internal.b90:
 # {"id":"sourceFile","fileName":"Result.kt"}
     1:1:void throwOnFailure(java.lang.Object):132:132 -> a
-com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.kg0:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.og0:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wq;"}
     java.lang.Object _value -> c
     java.lang.Object lock -> d
     1:60:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):0:59 -> <init>
     1:60:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wq;)V"}
     1:14:java.lang.Object getValue():63:76 -> a
     15:15:java.lang.Object getValue():69:69 -> a
     1:1:boolean isInitialized():82:82 -> toString
@@ -197711,7 +197730,7 @@
     2:2:java.lang.String toString():84:84 -> toString
 com.android.tools.r8.jetbrains.kotlin.TuplesKt -> R8$$REMOVED$$CLASS$$153:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
-com.android.tools.r8.jetbrains.kotlin.UByte -> com.android.tools.r8.internal.vj0:
+com.android.tools.r8.jetbrains.kotlin.UByte -> com.android.tools.r8.internal.zj0:
 # {"id":"sourceFile","fileName":"UByte.kt"}
     byte data -> b
     1:1:void <init>(byte):17:17 -> <init>
@@ -197734,7 +197753,7 @@
     1:1:java.lang.String toString():354:354 -> toString
     2:2:java.lang.String toString-impl(byte):354:354 -> toString
     2:2:java.lang.String toString():354 -> toString
-com.android.tools.r8.jetbrains.kotlin.UInt -> com.android.tools.r8.internal.wj0:
+com.android.tools.r8.jetbrains.kotlin.UInt -> com.android.tools.r8.internal.Aj0:
 # {"id":"sourceFile","fileName":"UInt.kt"}
     int data -> b
     1:1:void <init>(int):17:17 -> <init>
@@ -197758,7 +197777,7 @@
     1:1:java.lang.String toString():376:376 -> toString
     2:2:java.lang.String toString-impl(int):376:376 -> toString
     2:2:java.lang.String toString():376 -> toString
-com.android.tools.r8.jetbrains.kotlin.ULong -> com.android.tools.r8.internal.xj0:
+com.android.tools.r8.jetbrains.kotlin.ULong -> com.android.tools.r8.internal.Bj0:
 # {"id":"sourceFile","fileName":"ULong.kt"}
     long data -> b
     1:1:void <init>(long):17:17 -> <init>
@@ -197781,13 +197800,13 @@
     2:10:java.lang.String com.android.tools.r8.jetbrains.kotlin.UnsignedKt.ulongToString(long,int):129:137 -> toString
     2:10:java.lang.String toString-impl(long):379 -> toString
     2:10:java.lang.String toString():379 -> toString
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.yj0:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.Cj0:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cj0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UShort -> com.android.tools.r8.internal.zj0:
+com.android.tools.r8.jetbrains.kotlin.UShort -> com.android.tools.r8.internal.Dj0:
 # {"id":"sourceFile","fileName":"UShort.kt"}
     short data -> b
     1:1:void <init>(short):17:17 -> <init>
@@ -197810,19 +197829,19 @@
     1:1:java.lang.String toString():355:355 -> toString
     2:2:java.lang.String toString-impl(short):355:355 -> toString
     2:2:java.lang.String toString():355 -> toString
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.Oj0:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.Sj0:
 # {"id":"sourceFile","fileName":"UninitializedPropertyAccessException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.Rj0:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.Vj0:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vj0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:java.lang.String toString():23:23 -> toString
 com.android.tools.r8.jetbrains.kotlin.UnsignedKt -> R8$$REMOVED$$CLASS$$154:
 # {"id":"sourceFile","fileName":"UnsignedJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.Em0:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.Im0:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -197974,12 +197993,12 @@
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.lang.Object[] $this_asSequence$inlined -> a
     1:1:void <init>(java.lang.Object[]):21:21 -> <init>
-    1:1:java.util.Iterator iterator():699:699 -> iterator
+    1:1:java.util.Iterator iterator():23:23 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.jvm.internal.ArrayIteratorKt.iterator(java.lang.Object[]):14:14 -> iterator
-    2:2:java.util.Iterator iterator():699 -> iterator
+    2:2:java.util.Iterator iterator():23 -> iterator
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysUtilJVM -> R8$$REMOVED$$CLASS$$157:
 # {"id":"sourceFile","fileName":"ArraysUtilJVM.java"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.je:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.le:
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sorted(java.lang.Iterable):1038:1038 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Ljava/util/List;"}
     2683:2683:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sorted(java.lang.Iterable):3720:3720 -> a
@@ -197998,7 +198017,7 @@
     9530:9530:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):1083 -> a
     9531:9531:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.sortedWith(java.lang.Iterable,java.util.Comparator):1083:1083 -> a
     9532:9532:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3509:3509 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/Wq;I)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/Yq;I)Ljava/lang/String;"}
     9533:9533:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):3510:3510 -> a
     9533:9533:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3509 -> a
     9534:9537:java.lang.Appendable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinTo(java.lang.Iterable,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):3488:3491 -> a
@@ -198014,7 +198033,7 @@
     9543:9543:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):3510:3510 -> a
     9543:9543:java.lang.String com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.joinToString$default(java.lang.Iterable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,int,java.lang.Object):3509 -> a
     9544:9544:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/re;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/te;"}
     1:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1320:1321 -> b
     3:3:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):1343:1343 -> b
     3:3:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1324 -> b
@@ -198039,36 +198058,36 @@
     15:15:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1327 -> b
     16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.optimizeReadOnlyList(java.util.List):309:309 -> b
     16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toList(java.lang.Iterable):1327 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt -> com.android.tools.r8.internal.me:
 # {"id":"sourceFile","fileName":"CollectionsJVM.kt"}
     1:1:java.util.List listOf(java.lang.Object):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Ljava/util/List;"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.le:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Ljava/util/List;"}
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.ne:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):22:22 -> a
     1:1:java.util.List listOfNotNull(java.lang.Object):131 -> a
     2:2:java.util.List listOfNotNull(java.lang.Object):131:131 -> a
     3:3:java.util.List listOf(java.lang.Object[]):78:78 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt -> com.android.tools.r8.internal.me:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt -> com.android.tools.r8.internal.oe:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     1:1:int collectionSizeOrDefault(java.lang.Iterable,int):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)I"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.pe:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsKt -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsKt -> com.android.tools.r8.internal.qe:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.re:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt -> com.android.tools.r8.internal.qe:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt -> com.android.tools.r8.internal.se:
 # {"id":"sourceFile","fileName":"MutableCollections.kt"}
 com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> R8$$REMOVED$$CLASS$$158:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$asSequence$$inlined$Sequence$1 -> com.android.tools.r8.internal.re:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$asSequence$$inlined$Sequence$1 -> com.android.tools.r8.internal.te:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.lang.Iterable $this_asSequence$inlined -> a
     1:1:void <init>(java.lang.Iterable):21:21 -> <init>
-    1:1:java.util.Iterator iterator():699:699 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.se:
+    1:1:java.util.Iterator iterator():23:23 -> iterator
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.ue:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/List;"}
@@ -198076,10 +198095,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
     1:1:java.util.Iterator invoke():1638:1638 -> a
     1:1:java.lang.Object invoke():1638 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Xm:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Zm:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zm;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:1:void add(java.lang.Object):0:0 -> add
@@ -198093,10 +198112,10 @@
     1:1:int previousIndex():20:20 -> previousIndex
     1:1:void remove():0:0 -> remove
     1:1:void set(java.lang.Object):0:0 -> set
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.an:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ym;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/an;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:1:void add(int,java.lang.Object):0:0 -> add
@@ -198128,7 +198147,7 @@
     3:3:java.util.ListIterator com.android.tools.r8.internal.EmptyList.listIterator(int):0 -> listIterator
     4:4:java.util.ListIterator listIterator(int):0:0 -> listIterator
     4:4:java.util.ListIterator com.android.tools.r8.internal.EmptyList.listIterator(int):0 -> listIterator
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":49,"2":50,"3":51,"4":52},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":49,"2":50,"3":51,"4":52},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     48:48:java.util.ListIterator listIterator(int):44:44 -> listIterator
     48:48:java.util.ListIterator com.android.tools.r8.internal.EmptyList.listIterator(int):0 -> listIterator
     49:49:java.util.ListIterator listIterator(int):44:44 -> listIterator
@@ -198145,10 +198164,10 @@
     1:1:java.lang.Object[] toArray():0:0 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):0:0 -> toArray
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.bn:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bn;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:void clear():0:0 -> clear
@@ -198169,10 +198188,10 @@
     1:1:int size():14:14 -> size
     1:1:java.lang.String toString():19:19 -> toString
     1:1:java.util.Collection values():14:14 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.en:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/en;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean add(java.lang.Object):0:0 -> add
@@ -198193,7 +198212,7 @@
     1:1:java.lang.Object[] toArray():0:0 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):0:0 -> toArray
     1:1:java.lang.String toString():19:19 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Cv:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     int index -> a
     java.lang.Object value -> b
@@ -198201,12 +198220,12 @@
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Bv:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Dv:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/se;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ue;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/se;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ue;)V"}
     1:1:java.util.Iterator iterator():25:25 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1638:1638 -> iterator
     2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1638 -> iterator
@@ -198216,7 +198235,7 @@
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1638 -> iterator
     3:3:java.util.Iterator iterator():25 -> iterator
     4:4:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Cv:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Ev:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> c
@@ -198230,7 +198249,7 @@
     1:1:void remove():0:0 -> remove
 com.android.tools.r8.jetbrains.kotlin.collections.IntIterator -> R8$$REMOVED$$CLASS$$159:
 # {"id":"sourceFile","fileName":"PrimitiveIterators.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt -> com.android.tools.r8.internal.NM:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt -> com.android.tools.r8.internal.RM:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     1:1:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.mapCapacity(int):150:150 -> a
     2:5:java.util.Map toMap(java.lang.Iterable):571:574 -> a
@@ -198268,48 +198287,48 @@
 # {"id":"sourceFile","fileName":"SetsJVM.kt"}
 com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsKt -> R8$$REMOVED$$CLASS$$162:
 # {"id":"sourceFile","fileName":"Sets.kt"}
-com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt -> com.android.tools.r8.internal.Ee:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     1:1:java.util.Comparator nullsLast(java.util.Comparator):260:260 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/Comparator;"}
     2:2:int nullsLast$lambda$4$ComparisonsKt__ComparisonsKt(java.util.Comparator,java.lang.Object,java.lang.Object):265:265 -> a
-com.android.tools.r8.jetbrains.kotlin.comparisons.NaturalOrderComparator -> com.android.tools.r8.internal.WP:
+com.android.tools.r8.jetbrains.kotlin.comparisons.NaturalOrderComparator -> com.android.tools.r8.internal.aQ:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     com.android.tools.r8.jetbrains.kotlin.comparisons.NaturalOrderComparator INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aQ;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():317:317 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):317:317 -> compare
     2:320:int compare(java.lang.Comparable,java.lang.Comparable):0:318 -> compare
     2:320:int compare(java.lang.Object,java.lang.Object):317 -> compare
     1:1:java.util.Comparator reversed():320:320 -> reversed
-com.android.tools.r8.jetbrains.kotlin.comparisons.ReverseOrderComparator -> com.android.tools.r8.internal.Q90:
+com.android.tools.r8.jetbrains.kotlin.comparisons.ReverseOrderComparator -> com.android.tools.r8.internal.U90:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     com.android.tools.r8.jetbrains.kotlin.comparisons.ReverseOrderComparator INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U90;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():323:323 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):323:323 -> compare
     2:326:int compare(java.lang.Comparable,java.lang.Comparable):0:324 -> compare
     2:326:int compare(java.lang.Object,java.lang.Object):323 -> compare
     1:1:java.util.Comparator reversed():326:326 -> reversed
-com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation -> com.android.tools.r8.internal.Zg:
 # {"id":"sourceFile","fileName":"Continuation.kt"}
     void resumeWith(java.lang.Object) -> a
     com.android.tools.r8.jetbrains.kotlin.coroutines.CoroutineContext getContext() -> getContext
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pm;"}
-com.android.tools.r8.jetbrains.kotlin.coroutines.EmptyCoroutineContext -> com.android.tools.r8.internal.Pm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rm;"}
+com.android.tools.r8.jetbrains.kotlin.coroutines.EmptyCoroutineContext -> com.android.tools.r8.internal.Rm:
 # {"id":"sourceFile","fileName":"CoroutineContextImpl.kt"}
     com.android.tools.r8.jetbrains.kotlin.coroutines.EmptyCoroutineContext INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rm;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():94:94 -> <init>
     1:1:int hashCode():103:103 -> hashCode
     1:1:java.lang.String toString():104:104 -> toString
-com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.CoroutineSingletons -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.CoroutineSingletons -> com.android.tools.r8.internal.dh:
 # {"id":"sourceFile","fileName":"Intrinsics.kt"}
     com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.CoroutineSingletons COROUTINE_SUSPENDED -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dh;"}
     1:1:void <clinit>():64:64 -> <clinit>
     2:2:com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.CoroutineSingletons[] $values():0:0 -> <clinit>
     2:2:void <clinit>():64 -> <clinit>
@@ -198319,7 +198338,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
 com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt -> R8$$REMOVED$$CLASS$$163:
 # {"id":"sourceFile","fileName":"IntrinsicsJvm.kt"}
-com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.DebugMetadata -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.DebugMetadata -> com.android.tools.r8.internal.Ph:
 # {"id":"sourceFile","fileName":"DebugMetadata.kt"}
     java.lang.String c() -> c
     java.lang.String f() -> f
@@ -198328,32 +198347,32 @@
     int v() -> v
 com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.DebugMetadataKt -> R8$$REMOVED$$CLASS$$164:
 # {"id":"sourceFile","fileName":"DebugMetadata.kt"}
-com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever -> com.android.tools.r8.internal.LO:
+com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever -> com.android.tools.r8.internal.PO:
 # {"id":"sourceFile","fileName":"DebugMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever$Cache notOnJava9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OO;"}
     com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever$Cache cache -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OO;"}
     1:1:void <clinit>():61:61 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever$Cache -> com.android.tools.r8.internal.KO:
+com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.ModuleNameRetriever$Cache -> com.android.tools.r8.internal.OO:
 # {"id":"sourceFile","fileName":"DebugMetadata.kt"}
     java.lang.reflect.Method getModuleMethod -> a
     java.lang.reflect.Method getDescriptorMethod -> b
     java.lang.reflect.Method nameMethod -> c
     1:6:void <init>(java.lang.reflect.Method,java.lang.reflect.Method,java.lang.reflect.Method):52:57 -> <init>
-com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.RestrictedSuspendLambda -> com.android.tools.r8.internal.V80:
+com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.RestrictedSuspendLambda -> com.android.tools.r8.internal.Z80:
 # {"id":"sourceFile","fileName":"ContinuationImpl.kt"}
     com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.completion -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zg;"}
     1:5:void com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.<init>(com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):14:18 -> <init>
     1:5:void com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.RestrictedContinuationImpl.<init>(com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):83 -> <init>
     1:5:void <init>(int,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):144 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zg;)V"}
     6:6:void com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.RestrictedContinuationImpl.<init>(com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):86:86 -> <init>
     6:6:void <init>(int,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):144 -> <init>
     com.android.tools.r8.internal.Continuation com.android.tools.r8.internal.RestrictedSuspendLambda.create(com.android.tools.r8.internal.SequenceBuilderIterator,com.android.tools.r8.internal.SequenceBuilderIterator) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aa0;Lcom/android/tools/r8/internal/Aa0;)Lcom/android/tools/r8/internal/Xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ea0;Lcom/android/tools/r8/internal/Ea0;)Lcom/android/tools/r8/internal/Zg;"}
     1:6:void com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(java.lang.Object):29:34 -> a
     7:7:java.lang.Object com.android.tools.r8.jetbrains.kotlin.ResultKt.createFailure(java.lang.Throwable):122:122 -> a
     7:7:void com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(java.lang.Object):37 -> a
@@ -198397,7 +198416,7 @@
     26:27:java.lang.StackTraceElement com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.getStackTraceElement():76 -> b
     26:27:java.lang.String com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.toString():68 -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.coroutines.CoroutineContext com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.RestrictedContinuationImpl.getContext():93:93 -> getContext
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rm;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation com.android.tools.r8.jetbrains.kotlin.coroutines.jvm.internal.BaseContinuationImpl.getCompletion():18:18 -> toString
     1:1:java.lang.String toString():148 -> toString
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):84:84 -> toString
@@ -198408,7 +198427,7 @@
     5:7:java.lang.String toString():149:151 -> toString
 com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt -> R8$$REMOVED$$CLASS$$165:
 # {"id":"sourceFile","fileName":"EnumEntries.kt"}
-com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesList -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesList -> com.android.tools.r8.internal.zn:
 # {"id":"sourceFile","fileName":"EnumEntries.kt"}
     java.lang.Enum[] entries -> b
     1:1:void <init>(java.lang.Enum[]):46:46 -> <init>
@@ -198433,10 +198452,10 @@
     1:1:int lastIndexOf(java.lang.Object):45:45 -> lastIndexOf
     2:82:int lastIndexOf(java.lang.Enum):0:80 -> lastIndexOf
     2:82:int lastIndexOf(java.lang.Object):45 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations -> com.android.tools.r8.internal.DW:
+com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations -> com.android.tools.r8.internal.HW:
 # {"id":"sourceFile","fileName":"PlatformImplementations.kt"}
     1:1:void <init>():13:13 -> <init>
-com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations$ReflectThrowable -> com.android.tools.r8.internal.CW:
+com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations$ReflectThrowable -> com.android.tools.r8.internal.GW:
 # {"id":"sourceFile","fileName":"PlatformImplementations.kt"}
     java.lang.reflect.Method addSuppressed -> a
     1:4:void <clinit>():22:25 -> <clinit>
@@ -198444,12 +198463,12 @@
     5:5:void <clinit>():25 -> <clinit>
     6:6:void <clinit>():25:25 -> <clinit>
     7:10:void <clinit>():24:27 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementationsKt -> com.android.tools.r8.internal.EW:
+com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementationsKt -> com.android.tools.r8.internal.IW:
 # {"id":"sourceFile","fileName":"PlatformImplementations.kt"}
     com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations IMPLEMENTATIONS -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DC;"}
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.zY:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.DY:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int mod(int,int):10:10 -> a
     2:2:int differenceModulo(int,int,int):21:21 -> a
@@ -198457,7 +198476,7 @@
     3:3:int differenceModulo(int,int,int):21:21 -> a
     3:3:int getProgressionLastElement(int,int,int):47 -> a
     4:4:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.jdk7.JDK7PlatformImplementations -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.jetbrains.kotlin.internal.jdk7.JDK7PlatformImplementations -> com.android.tools.r8.internal.CC:
 # {"id":"sourceFile","fileName":"JDK7PlatformImplementations.kt"}
     1:1:void <init>():11:11 -> <init>
     1:1:boolean sdkIsNullOrAtLeast(int):22:22 -> a
@@ -198465,23 +198484,23 @@
     2:2:void com.android.tools.r8.jetbrains.kotlin.internal.PlatformImplementations.addSuppressed(java.lang.Throwable,java.lang.Throwable):32:32 -> a
     2:2:void addSuppressed(java.lang.Throwable,java.lang.Throwable):30 -> a
     3:3:void addSuppressed(java.lang.Throwable,java.lang.Throwable):28:28 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.jdk7.JDK7PlatformImplementations$ReflectSdkVersion -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.jetbrains.kotlin.internal.jdk7.JDK7PlatformImplementations$ReflectSdkVersion -> com.android.tools.r8.internal.BC:
 # {"id":"sourceFile","fileName":"JDK7PlatformImplementations.kt"}
     java.lang.Integer sdkVersion -> a
     1:4:void <clinit>():16:19 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.internal.jdk8.JDK8PlatformImplementations -> com.android.tools.r8.internal.BC:
+com.android.tools.r8.jetbrains.kotlin.internal.jdk8.JDK8PlatformImplementations -> com.android.tools.r8.internal.DC:
 # {"id":"sourceFile","fileName":"JDK8PlatformImplementations.kt"}
     1:1:void <init>():27:27 -> <init>
-com.android.tools.r8.jetbrains.kotlin.io.CloseableKt -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.jetbrains.kotlin.io.CloseableKt -> com.android.tools.r8.internal.zd:
 # {"id":"sourceFile","fileName":"Closeable.kt"}
     1:4:void closeFinally(java.io.Closeable,java.lang.Throwable):56:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/Reader;Ljava/lang/Throwable;)V"}
     5:5:void com.android.tools.r8.jetbrains.kotlin.ExceptionsKt__ExceptionsKt.addSuppressed(java.lang.Throwable,java.lang.Throwable):71:71 -> a
     5:5:void closeFinally(java.io.Closeable,java.lang.Throwable):61 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.hD:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.nD:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
     1:8:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):59:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XD;)Ljava/lang/Class;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lE;)Ljava/lang/Class;"}
     9:15:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:68 -> a
     16:17:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:63 -> a
     18:27:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:71 -> a
@@ -198490,58 +198509,58 @@
     39:42:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:65 -> a
     43:48:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:67 -> a
     49:57:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:70 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.AI:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.EI:
 # {"id":"sourceFile","fileName":"KotlinReflectionNotSupportedError.kt"}
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Uq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Wq:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.Yq:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.Xq:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.Zq:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.Yq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.ar:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.br:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.cr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.br:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.dr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.er:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.fr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.er:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.gr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.hr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.mr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/io/Serializable;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.jr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.kr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.lr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.nr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.or:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.pr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.or:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.qr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.rr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.sr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.rr:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.tr:
 # {"id":"sourceFile","fileName":"Functions.kt"}
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ArrayIterator -> com.android.tools.r8.internal.I3:
 # {"id":"sourceFile","fileName":"ArrayIterator.kt"}
@@ -198553,10 +198572,10 @@
     1:1:void remove():0:0 -> remove
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ArrayIteratorKt -> R8$$REMOVED$$CLASS$$166:
 # {"id":"sourceFile","fileName":"ArrayIterator.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference -> com.android.tools.r8.internal.n8:
 # {"id":"sourceFile","fileName":"CallableReference.java"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable reflected -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kE;"}
     java.lang.Class owner -> c
     java.lang.String name -> d
     java.lang.String signature -> e
@@ -198564,10 +198583,10 @@
     1:6:void <init>(java.lang.Object,java.lang.Class,java.lang.String,java.lang.String,boolean):69:74 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable computeReflected() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
     1:1:java.lang.String getName():120:120 -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():111:111 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.getOrCreateKotlinPackage(java.lang.Class):51:51 -> c
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():112 -> c
     3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinPackage(java.lang.Class,java.lang.String):26:26 -> c
@@ -198575,16 +198594,16 @@
     3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():112 -> c
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():112:112 -> c
     1:1:java.lang.String getSignature():132:132 -> d
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.m8:
 # {"id":"sourceFile","fileName":"CallableReference.java"}
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m8;"}
     1:1:void <clinit>():52:52 -> <clinit>
     1:1:void <init>():51:51 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.Vb:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
     java.lang.Class getJClass() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.id:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.kd:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.lang.Class jClass -> a
     java.util.Map FUNCTION_CLASSES -> b
@@ -198611,7 +198630,7 @@
     2:2:java.lang.Class getJClass():10:10 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.he:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -198625,12 +198644,12 @@
     405:405:java.lang.Object[] toArray(java.util.Collection):26:26 -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference -> R8$$REMOVED$$CLASS$$167:
 # {"id":"sourceFile","fileName":"FunctionReference.java"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.yB:
 # {"id":"sourceFile","fileName":"Intrinsics.java"}
     1:1:void throwUninitializedPropertyAccessException(java.lang.String):0:0 -> a
     1:1:void com.android.tools.r8.internal.Intrinsics.throwUninitializedPropertyAccessException(java.lang.String):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7,"4":8,"5":9},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5,"2":6,"3":7,"4":8,"5":9},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     2:2:void throwUninitializedProperty(java.lang.String):54:54 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):58 -> a
     2:2:void com.android.tools.r8.internal.Intrinsics.throwUninitializedPropertyAccessException(java.lang.String):0 -> a
@@ -198680,7 +198699,7 @@
     17:17:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> c
     18:18:void throwParameterIsNullNPE(java.lang.String):140:140 -> c
     18:18:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> c
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.GI:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.KI:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):79:79 -> toString
@@ -198692,7 +198711,7 @@
     4:4:java.lang.String toString():11:11 -> toString
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference -> R8$$REMOVED$$CLASS$$168:
 # {"id":"sourceFile","fileName":"MutablePropertyReference.java"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1 -> com.android.tools.r8.internal.QP:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1 -> com.android.tools.r8.internal.UP:
 # {"id":"sourceFile","fileName":"MutablePropertyReference1.java"}
     boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.syntheticJavaProperty -> g
     1:3:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.<init>(java.lang.Object,java.lang.Class,java.lang.String,java.lang.String,int):31:33 -> <init>
@@ -198708,14 +198727,14 @@
     5:5:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference.<init>():13 -> <init>
     5:5:void <init>():16 -> <init>
     void com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1.set(java.lang.Object,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):36:36 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.mutableProperty1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1):108:108 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable computeReflected():31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1.get(java.lang.Object) -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.compute():47:47 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
     2:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.compute():86:89 -> e
     2:5:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.compute():47 -> e
     1:5:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.equals(java.lang.Object):65:69 -> equals
@@ -198754,15 +198773,15 @@
     6:6:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1$Setter getSetter():46 -> g
     1:1:int com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.hashCode():80:80 -> hashCode
     1:6:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.toString():85:90 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1Impl -> com.android.tools.r8.internal.RP:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1Impl -> com.android.tools.r8.internal.VP:
 # {"id":"sourceFile","fileName":"MutablePropertyReference1Impl.java"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):17:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tb;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vb;Ljava/lang/String;Ljava/lang/String;)V"}
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer,java.lang.String,java.lang.String):15:15 -> <init>
     1:1:void set(java.lang.Object,java.lang.Object):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
     1:1:java.lang.Object get(java.lang.Object):34:34 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference -> com.android.tools.r8.internal.GV:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PackageReference -> com.android.tools.r8.internal.KV:
 # {"id":"sourceFile","fileName":"PackageReference.kt"}
     java.lang.Class jClass -> a
     1:3:void <init>(java.lang.Class,java.lang.String):10:12 -> <init>
@@ -198782,1438 +198801,853 @@
     2:2:java.lang.Class getJClass():12:12 -> toString
     2:2:java.lang.String toString():25 -> toString
     3:3:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.Y30:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.c40:
 # {"id":"sourceFile","fileName":"Reflection.java"}
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g40;"}
     1:9:void <clinit>():26:34 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOrCreateKotlinPackage(java.lang.Class,java.lang.String):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;Ljava/lang/String;)Lcom/android/tools/r8/internal/KV;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinPackage(java.lang.Class,java.lang.String):26:26 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOrCreateKotlinPackage(java.lang.Class,java.lang.String):56 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;)Lcom/android/tools/r8/internal/id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Class;)Lcom/android/tools/r8/internal/kd;"}
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KClass com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.getOrCreateKotlinClass(java.lang.Class):30:30 -> a
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):60 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.c40:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.g40:
 # {"id":"sourceFile","fileName":"ReflectionFactory.java"}
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes -> com.android.tools.r8.internal.c5:
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes -> com.android.tools.r8.internal.e5:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isInline$delegate -> A
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isTailrec$delegate -> B
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExternal$delegate$1 -> C
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isSuspend$delegate -> D
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExpect$delegate$1 -> E
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasNonStableParameterNames$delegate$1 -> F
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate$3 -> G
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modality$delegate$2 -> H
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate kind$delegate$2 -> I
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isVar$delegate -> J
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isConst$delegate -> K
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isLateinit$delegate -> L
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasConstant$delegate -> M
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExternal$delegate$2 -> N
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isDelegated$delegate -> O
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExpect$delegate$2 -> P
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate$4 -> Q
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modality$delegate$3 -> R
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNotDefault$delegate -> S
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExternal$delegate$3 -> T
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isInline$delegate$1 -> U
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNullable$delegate -> V
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isSuspend$delegate$1 -> W
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isDefinitelyNonNull$delegate -> X
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isReified$delegate -> Y
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate$5 -> Z
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/QP;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNullable$delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H6;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isReified$delegate -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H6;"}
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/UP;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate declaresDefaultValue$delegate -> a0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isCrossinline$delegate -> b0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$1 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNoinline$delegate -> c0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$2 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNegated$delegate -> d0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$3 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isNullCheckPredicate$delegate -> e0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$4 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$5 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasAnnotations$delegate$6 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modality$delegate -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate kind$delegate -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isInner$delegate -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isData$delegate -> m
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExternal$delegate -> n
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isExpect$delegate -> o
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isValue$delegate -> p
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isFunInterface$delegate -> q
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasEnumEntries$delegate -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate$1 -> s
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isSecondary$delegate -> t
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasNonStableParameterNames$delegate -> u
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate kind$delegate$1 -> v
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibility$delegate$2 -> w
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modality$delegate$1 -> x
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/An;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isOperator$delegate -> y
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isInfix$delegate -> z
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    1:1:void <clinit>():29:29 -> <clinit>
     2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.mutableProperty1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1):108:108 -> <clinit>
-    2:2:void <clinit>():30 -> <clinit>
-    2:2:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    3:438:void <clinit>():41:476 -> <clinit>
-    3:438:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    439:531:void <clinit>():30:122 -> <clinit>
-    439:531:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    532:532:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind.getEntries():0:0 -> <clinit>
-    532:532:void <clinit>():123 -> <clinit>
-    532:532:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    533:533:void <clinit>():478:478 -> <clinit>
-    533:533:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    534:534:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
-    534:534:void <clinit>():479 -> <clinit>
-    534:534:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    535:536:void <clinit>():479:480 -> <clinit>
-    535:536:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    537:537:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind.getFlag$kotlin_metadata():150:150 -> <clinit>
-    537:537:void <clinit>():124 -> <clinit>
+    2:2:void <clinit>():29 -> <clinit>
+    3:426:void <clinit>():40:463 -> <clinit>
+    427:519:void <clinit>():29:121 -> <clinit>
+    520:520:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind.getEntries():0:0 -> <clinit>
+    520:520:void <clinit>():122 -> <clinit>
+    521:521:void <clinit>():468:468 -> <clinit>
+    522:522:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
+    522:522:void <clinit>():469 -> <clinit>
+    523:524:void <clinit>():469:470 -> <clinit>
+    525:525:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind.getFlag$kotlin_metadata():150:150 -> <clinit>
+    525:525:void <clinit>():123 -> <clinit>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    537:537:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    538:538:void <clinit>():480:480 -> <clinit>
-    538:538:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    539:539:void <clinit>():130:130 -> <clinit>
-    539:539:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    540:540:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    540:540:void <clinit>():130 -> <clinit>
-    540:540:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    541:547:void <clinit>():130:136 -> <clinit>
-    541:547:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    548:548:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    548:548:void <clinit>():136 -> <clinit>
-    548:548:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    549:554:void <clinit>():136:141 -> <clinit>
-    549:554:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
+    526:526:void <clinit>():470:470 -> <clinit>
+    527:537:void <clinit>():119:129 -> <clinit>
+    538:538:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    538:538:void <clinit>():129 -> <clinit>
+    539:539:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    539:539:void <clinit>():129 -> <clinit>
+    540:546:void <clinit>():129:135 -> <clinit>
+    547:547:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    547:547:void <clinit>():135 -> <clinit>
+    548:548:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    548:548:void <clinit>():135 -> <clinit>
+    549:554:void <clinit>():135:140 -> <clinit>
     555:555:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    555:555:void <clinit>():141 -> <clinit>
-    555:555:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    556:561:void <clinit>():141:146 -> <clinit>
-    556:561:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    562:562:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    562:562:void <clinit>():146 -> <clinit>
-    562:562:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    563:571:void <clinit>():146:154 -> <clinit>
-    563:571:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    572:572:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    572:572:void <clinit>():154 -> <clinit>
-    572:572:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    573:580:void <clinit>():154:161 -> <clinit>
-    573:580:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    581:581:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    581:581:void <clinit>():161 -> <clinit>
-    581:581:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    582:590:void <clinit>():161:169 -> <clinit>
-    582:590:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    591:591:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    591:591:void <clinit>():169 -> <clinit>
-    591:591:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    592:607:void <clinit>():169:184 -> <clinit>
-    592:607:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    608:608:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    608:608:void <clinit>():184 -> <clinit>
-    608:608:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    609:609:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
-    609:609:void <clinit>():184 -> <clinit>
-    609:609:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    610:610:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    610:610:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    610:610:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    610:610:void <clinit>():184 -> <clinit>
-    610:610:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    611:611:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    611:611:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    611:611:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    611:611:void <clinit>():184 -> <clinit>
-    611:611:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    612:612:void <clinit>():192:192 -> <clinit>
-    612:612:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
+    555:555:void <clinit>():140 -> <clinit>
+    556:556:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    556:556:void <clinit>():140 -> <clinit>
+    557:562:void <clinit>():140:145 -> <clinit>
+    563:563:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    563:563:void <clinit>():145 -> <clinit>
+    564:564:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    564:564:void <clinit>():145 -> <clinit>
+    565:573:void <clinit>():145:153 -> <clinit>
+    574:574:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    574:574:void <clinit>():153 -> <clinit>
+    575:575:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    575:575:void <clinit>():153 -> <clinit>
+    576:583:void <clinit>():153:160 -> <clinit>
+    584:584:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    584:584:void <clinit>():160 -> <clinit>
+    585:585:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    585:585:void <clinit>():160 -> <clinit>
+    586:594:void <clinit>():160:168 -> <clinit>
+    595:595:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    595:595:void <clinit>():168 -> <clinit>
+    596:596:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):58:58 -> <clinit>
+    596:596:void <clinit>():168 -> <clinit>
+    597:612:void <clinit>():168:183 -> <clinit>
     613:613:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    613:613:void <clinit>():192 -> <clinit>
-    613:613:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    614:614:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    614:614:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
+    613:613:void <clinit>():183 -> <clinit>
+    614:614:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62:62 -> <clinit>
+    614:614:void <clinit>():183 -> <clinit>
+    615:623:void <clinit>():183:191 -> <clinit>
+    624:624:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    624:624:void <clinit>():191 -> <clinit>
+    625:625:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62:62 -> <clinit>
+    625:625:void <clinit>():191 -> <clinit>
+    626:635:void <clinit>():191:200 -> <clinit>
+    636:636:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56:56 -> <clinit>
+    636:636:void <clinit>():200 -> <clinit>
+    637:637:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getEntries():0:0 -> <clinit>
+    637:637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56 -> <clinit>
+    637:637:void <clinit>():200 -> <clinit>
+    638:638:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):91:91 -> <clinit>
+    638:638:void <clinit>():200 -> <clinit>
+    639:639:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
+    639:639:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):92 -> <clinit>
+    639:639:void <clinit>():200 -> <clinit>
+    640:641:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):92:93 -> <clinit>
+    640:641:void <clinit>():200 -> <clinit>
+    642:642:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getFlag$kotlin_metadata():190:190 -> <clinit>
+    642:642:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56 -> <clinit>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    614:614:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    614:614:void <clinit>():192 -> <clinit>
-    614:614:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    615:615:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    615:615:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    615:615:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    615:615:void <clinit>():192 -> <clinit>
-    615:615:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    616:616:void <clinit>():201:201 -> <clinit>
-    616:616:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    617:617:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58:58 -> <clinit>
-    617:617:void <clinit>():201 -> <clinit>
-    617:617:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    618:618:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getEntries():0:0 -> <clinit>
-    618:618:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58 -> <clinit>
-    618:618:void <clinit>():201 -> <clinit>
-    618:618:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    619:619:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):85:85 -> <clinit>
-    619:619:void <clinit>():201 -> <clinit>
-    619:619:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    620:620:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
-    620:620:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):86 -> <clinit>
-    620:620:void <clinit>():201 -> <clinit>
-    620:620:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    621:622:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):86:87 -> <clinit>
-    621:622:void <clinit>():201 -> <clinit>
-    621:622:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getFlag$kotlin_metadata():190:190 -> <clinit>
-    623:623:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    623:623:void <clinit>():201 -> <clinit>
-    623:623:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    624:624:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):87:87 -> <clinit>
-    624:624:void <clinit>():201 -> <clinit>
-    624:624:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    625:640:void <clinit>():209:224 -> <clinit>
-    625:640:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    641:641:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    641:641:void <clinit>():224 -> <clinit>
-    641:641:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    642:647:void <clinit>():224:229 -> <clinit>
-    642:647:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    648:648:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    648:648:void <clinit>():229 -> <clinit>
-    648:648:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    649:654:void <clinit>():229:234 -> <clinit>
-    649:654:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    655:655:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    655:655:void <clinit>():234 -> <clinit>
-    655:655:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    656:661:void <clinit>():234:239 -> <clinit>
-    656:661:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    662:662:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    662:662:void <clinit>():239 -> <clinit>
-    662:662:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    663:668:void <clinit>():239:244 -> <clinit>
-    663:668:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
+    642:642:void <clinit>():200 -> <clinit>
+    643:643:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):93:93 -> <clinit>
+    643:643:void <clinit>():200 -> <clinit>
+    644:644:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56:56 -> <clinit>
+    644:644:void <clinit>():200 -> <clinit>
+    645:668:void <clinit>():200:223 -> <clinit>
     669:669:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    669:669:void <clinit>():244 -> <clinit>
-    669:669:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    670:675:void <clinit>():244:249 -> <clinit>
-    670:675:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    676:676:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    676:676:void <clinit>():249 -> <clinit>
-    676:676:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    677:682:void <clinit>():249:254 -> <clinit>
-    677:682:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    683:683:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    683:683:void <clinit>():254 -> <clinit>
-    683:683:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    684:692:void <clinit>():254:262 -> <clinit>
-    684:692:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
+    669:669:void <clinit>():223 -> <clinit>
+    670:670:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    670:670:void <clinit>():223 -> <clinit>
+    671:676:void <clinit>():223:228 -> <clinit>
+    677:677:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    677:677:void <clinit>():228 -> <clinit>
+    678:678:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    678:678:void <clinit>():228 -> <clinit>
+    679:684:void <clinit>():228:233 -> <clinit>
+    685:685:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    685:685:void <clinit>():233 -> <clinit>
+    686:686:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    686:686:void <clinit>():233 -> <clinit>
+    687:692:void <clinit>():233:238 -> <clinit>
     693:693:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    693:693:void <clinit>():262 -> <clinit>
-    693:693:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    694:721:void <clinit>():262:289 -> <clinit>
-    694:721:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    722:722:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58:58 -> <clinit>
-    722:722:void <clinit>():289 -> <clinit>
-    722:722:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    723:723:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getEntries():0:0 -> <clinit>
-    723:723:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58 -> <clinit>
-    723:723:void <clinit>():289 -> <clinit>
-    723:723:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    724:724:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):85:85 -> <clinit>
-    724:724:void <clinit>():289 -> <clinit>
-    724:724:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    725:725:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
-    725:725:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):86 -> <clinit>
-    725:725:void <clinit>():289 -> <clinit>
-    725:725:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    726:727:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):86:87 -> <clinit>
-    726:727:void <clinit>():289 -> <clinit>
-    726:727:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    728:728:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getFlag$kotlin_metadata():190:190 -> <clinit>
-    728:728:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):58 -> <clinit>
+    693:693:void <clinit>():238 -> <clinit>
+    694:694:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    694:694:void <clinit>():238 -> <clinit>
+    695:700:void <clinit>():238:243 -> <clinit>
+    701:701:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    701:701:void <clinit>():243 -> <clinit>
+    702:702:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    702:702:void <clinit>():243 -> <clinit>
+    703:708:void <clinit>():243:248 -> <clinit>
+    709:709:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    709:709:void <clinit>():248 -> <clinit>
+    710:710:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    710:710:void <clinit>():248 -> <clinit>
+    711:716:void <clinit>():248:253 -> <clinit>
+    717:717:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    717:717:void <clinit>():253 -> <clinit>
+    718:718:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    718:718:void <clinit>():253 -> <clinit>
+    719:727:void <clinit>():253:261 -> <clinit>
+    728:728:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    728:728:void <clinit>():261 -> <clinit>
+    729:729:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> <clinit>
+    729:729:void <clinit>():261 -> <clinit>
+    730:757:void <clinit>():261:288 -> <clinit>
+    758:758:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56:56 -> <clinit>
+    758:758:void <clinit>():288 -> <clinit>
+    759:759:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getEntries():0:0 -> <clinit>
+    759:759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56 -> <clinit>
+    759:759:void <clinit>():288 -> <clinit>
+    760:760:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):91:91 -> <clinit>
+    760:760:void <clinit>():288 -> <clinit>
+    761:761:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> <clinit>
+    761:761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):92 -> <clinit>
+    761:761:void <clinit>():288 -> <clinit>
+    762:763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):92:93 -> <clinit>
+    762:763:void <clinit>():288 -> <clinit>
+    764:764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind.getFlag$kotlin_metadata():190:190 -> <clinit>
+    764:764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56 -> <clinit>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    728:728:void <clinit>():289 -> <clinit>
-    728:728:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    729:729:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):87:87 -> <clinit>
-    729:729:void <clinit>():289 -> <clinit>
-    729:729:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    730:730:void <clinit>():296:296 -> <clinit>
-    730:730:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    731:731:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    731:731:void <clinit>():296 -> <clinit>
-    731:731:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    732:732:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66:66 -> <clinit>
-    732:732:void <clinit>():296 -> <clinit>
-    732:732:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    733:733:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    733:733:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    733:733:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    733:733:void <clinit>():296 -> <clinit>
-    733:733:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    734:734:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    734:734:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    734:734:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    734:734:void <clinit>():296 -> <clinit>
-    734:734:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    735:735:void <clinit>():302:302 -> <clinit>
-    735:735:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    736:736:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    736:736:void <clinit>():302 -> <clinit>
-    736:736:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    737:737:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    737:737:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    737:737:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    737:737:void <clinit>():302 -> <clinit>
-    737:737:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    738:738:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    738:738:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    738:738:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    738:738:void <clinit>():302 -> <clinit>
-    738:738:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    739:739:void <clinit>():308:308 -> <clinit>
-    739:739:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    740:740:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    740:740:void <clinit>():308 -> <clinit>
-    740:740:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    741:741:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    741:741:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    741:741:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    741:741:void <clinit>():308 -> <clinit>
-    741:741:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    742:742:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    742:742:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    742:742:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    742:742:void <clinit>():308 -> <clinit>
-    742:742:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    743:743:void <clinit>():313:313 -> <clinit>
-    743:743:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    744:744:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    744:744:void <clinit>():313 -> <clinit>
-    744:744:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    745:745:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    745:745:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    745:745:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    745:745:void <clinit>():313 -> <clinit>
-    745:745:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    746:746:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    746:746:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    746:746:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    746:746:void <clinit>():313 -> <clinit>
-    746:746:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    747:747:void <clinit>():318:318 -> <clinit>
-    747:747:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    748:748:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    748:748:void <clinit>():318 -> <clinit>
-    748:748:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    749:749:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    749:749:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    749:749:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    749:749:void <clinit>():318 -> <clinit>
-    749:749:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    750:750:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    750:750:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    750:750:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    750:750:void <clinit>():318 -> <clinit>
-    750:750:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    751:751:void <clinit>():341:341 -> <clinit>
-    751:751:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    752:752:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    752:752:void <clinit>():341 -> <clinit>
-    752:752:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    753:753:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    753:753:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    753:753:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    753:753:void <clinit>():341 -> <clinit>
-    753:753:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    754:754:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    754:754:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    754:754:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    754:754:void <clinit>():341 -> <clinit>
-    754:754:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    755:755:void <clinit>():346:346 -> <clinit>
-    755:755:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    756:756:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    756:756:void <clinit>():346 -> <clinit>
-    756:756:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    757:757:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    757:757:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    757:757:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    757:757:void <clinit>():346 -> <clinit>
-    757:757:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    758:758:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    758:758:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    758:758:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    758:758:void <clinit>():346 -> <clinit>
-    758:758:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    759:759:void <clinit>():354:354 -> <clinit>
-    759:759:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    760:760:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    760:760:void <clinit>():354 -> <clinit>
-    760:760:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    761:761:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    761:761:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    761:761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    761:761:void <clinit>():354 -> <clinit>
-    761:761:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    762:762:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    762:762:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    762:762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    762:762:void <clinit>():354 -> <clinit>
-    762:762:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    763:763:void <clinit>():359:359 -> <clinit>
-    763:763:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    764:764:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    764:764:void <clinit>():359 -> <clinit>
-    764:764:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    765:765:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    765:765:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    765:765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    765:765:void <clinit>():359 -> <clinit>
-    765:765:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    766:766:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    766:766:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    766:766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    766:766:void <clinit>():359 -> <clinit>
-    766:766:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    767:783:void <clinit>():369:385 -> <clinit>
-    767:783:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    784:784:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    784:784:void <clinit>():385 -> <clinit>
-    784:784:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    785:785:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
-    785:785:void <clinit>():385 -> <clinit>
-    785:785:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    786:786:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    786:786:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    786:786:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    786:786:void <clinit>():385 -> <clinit>
-    786:786:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    787:787:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    787:787:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    787:787:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    787:787:void <clinit>():385 -> <clinit>
-    787:787:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    788:788:void <clinit>():390:390 -> <clinit>
-    788:788:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    789:789:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    789:789:void <clinit>():390 -> <clinit>
-    789:789:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    790:790:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
-    790:790:void <clinit>():390 -> <clinit>
-    790:790:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    791:791:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    791:791:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    791:791:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    791:791:void <clinit>():390 -> <clinit>
-    791:791:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    792:792:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    792:792:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    792:792:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    792:792:void <clinit>():390 -> <clinit>
-    792:792:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    793:793:void <clinit>():395:395 -> <clinit>
-    793:793:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    794:794:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    794:794:void <clinit>():395 -> <clinit>
-    794:794:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    795:795:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
-    795:795:void <clinit>():395 -> <clinit>
-    795:795:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    796:796:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    796:796:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    796:796:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    796:796:void <clinit>():395 -> <clinit>
-    796:796:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    797:797:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    797:797:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    797:797:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    797:797:void <clinit>():395 -> <clinit>
-    797:797:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    798:798:void <clinit>():402:402 -> <clinit>
-    798:798:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70:70 -> <clinit>
-    799:799:void <clinit>():402 -> <clinit>
-    799:799:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    800:805:void <clinit>():402:407 -> <clinit>
-    800:805:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    806:806:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    806:806:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    806:806:void <clinit>():407 -> <clinit>
-    806:806:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    807:807:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    807:807:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    807:807:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    807:807:void <clinit>():407 -> <clinit>
-    807:807:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    808:810:void <clinit>():413:415 -> <clinit>
-    808:810:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    811:811:void <clinit>():413:413 -> <clinit>
-    811:811:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    812:812:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    812:812:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    812:812:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    812:812:void <clinit>():412 -> <clinit>
-    812:812:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    813:813:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    813:813:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    813:813:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    813:813:void <clinit>():412 -> <clinit>
-    813:813:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    814:836:void <clinit>():424:446 -> <clinit>
-    814:836:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    837:837:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    837:837:void <clinit>():446 -> <clinit>
-    837:837:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    838:838:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72:72 -> <clinit>
-    838:838:void <clinit>():446 -> <clinit>
-    838:838:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    839:839:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    839:839:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    839:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    839:839:void <clinit>():446 -> <clinit>
-    839:839:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    840:840:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    840:840:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    840:840:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    840:840:void <clinit>():446 -> <clinit>
-    840:840:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    841:841:void <clinit>():451:451 -> <clinit>
-    841:841:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    842:842:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    842:842:void <clinit>():451 -> <clinit>
-    842:842:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    843:843:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72:72 -> <clinit>
-    843:843:void <clinit>():451 -> <clinit>
-    843:843:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    844:844:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    844:844:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    844:844:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    844:844:void <clinit>():451 -> <clinit>
-    844:844:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    845:845:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    845:845:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    845:845:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    845:845:void <clinit>():451 -> <clinit>
-    845:845:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    846:846:void <clinit>():456:456 -> <clinit>
-    846:846:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    847:847:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    847:847:void <clinit>():456 -> <clinit>
-    847:847:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    848:848:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72:72 -> <clinit>
-    848:848:void <clinit>():456 -> <clinit>
-    848:848:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    849:849:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    849:849:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    849:849:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    849:849:void <clinit>():456 -> <clinit>
-    849:849:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    850:850:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    850:850:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    850:850:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    850:850:void <clinit>():456 -> <clinit>
-    850:850:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    851:851:void <clinit>():467:467 -> <clinit>
-    851:851:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    852:852:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    852:852:void <clinit>():467 -> <clinit>
-    852:852:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    853:853:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    853:853:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    853:853:void <clinit>():467 -> <clinit>
-    853:853:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    854:854:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    854:854:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    854:854:void <clinit>():467 -> <clinit>
-    854:854:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    855:855:void <clinit>():476:476 -> <clinit>
-    855:855:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    856:856:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
-    856:856:void <clinit>():476 -> <clinit>
-    856:856:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    857:857:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <clinit>
-    857:857:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    857:857:void <clinit>():476 -> <clinit>
-    857:857:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    858:858:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <clinit>
-    858:858:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    858:858:void <clinit>():476 -> <clinit>
-    858:858:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    859:859:void <clinit>():0:0 -> <clinit>
-    859:859:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":901,"2":902,"3":903,"4":904,"5":905},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    860:860:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    860:860:void <clinit>():476 -> <clinit>
-    860:860:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    861:861:void <clinit>():0:0 -> <clinit>
-    861:861:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":906,"2":907,"3":908,"4":909,"5":910},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    862:862:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    862:862:void <clinit>():467 -> <clinit>
-    862:862:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    863:863:void <clinit>():0:0 -> <clinit>
-    863:863:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":911,"2":912,"3":913,"4":914,"5":915},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    864:864:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    864:864:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    864:864:void <clinit>():456 -> <clinit>
-    864:864:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    865:865:void <clinit>():0:0 -> <clinit>
-    865:865:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":916,"2":917,"3":918,"4":919,"5":920},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    866:866:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    866:866:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    866:866:void <clinit>():451 -> <clinit>
-    866:866:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    867:867:void <clinit>():0:0 -> <clinit>
-    867:867:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":921,"2":922,"3":923,"4":924,"5":925},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    868:868:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    868:868:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    868:868:void <clinit>():446 -> <clinit>
-    868:868:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    869:869:void <clinit>():0:0 -> <clinit>
-    869:869:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":926,"2":927,"3":928,"4":929,"5":930},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    870:870:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    870:870:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    870:870:void <clinit>():412 -> <clinit>
-    870:870:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    871:871:void <clinit>():0:0 -> <clinit>
-    871:871:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":931,"2":932,"3":933,"4":934,"5":935},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    872:872:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    872:872:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    872:872:void <clinit>():407 -> <clinit>
-    872:872:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    873:873:void <clinit>():0:0 -> <clinit>
-    873:873:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":936,"2":937,"3":938,"4":939,"5":940},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    874:874:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    874:874:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    874:874:void <clinit>():395 -> <clinit>
-    874:874:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    875:875:void <clinit>():0:0 -> <clinit>
-    875:875:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":941,"2":942,"3":943,"4":944,"5":945},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    876:876:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    876:876:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    876:876:void <clinit>():390 -> <clinit>
-    876:876:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    877:877:void <clinit>():0:0 -> <clinit>
-    877:877:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":946,"2":947,"3":948,"4":949,"5":950},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    878:878:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    878:878:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    878:878:void <clinit>():385 -> <clinit>
-    878:878:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    879:879:void <clinit>():0:0 -> <clinit>
-    879:879:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":951,"2":952,"3":953,"4":954,"5":955},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    880:880:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    880:880:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    880:880:void <clinit>():359 -> <clinit>
-    880:880:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    881:881:void <clinit>():0:0 -> <clinit>
-    881:881:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":956,"2":957,"3":958,"4":959,"5":960},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    882:882:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    882:882:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    882:882:void <clinit>():354 -> <clinit>
-    882:882:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    883:883:void <clinit>():0:0 -> <clinit>
-    883:883:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":961,"2":962,"3":963,"4":964,"5":965},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    884:884:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    884:884:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    884:884:void <clinit>():346 -> <clinit>
-    884:884:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    885:885:void <clinit>():0:0 -> <clinit>
-    885:885:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":966,"2":967,"3":968,"4":969,"5":970},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    886:886:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    886:886:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    886:886:void <clinit>():341 -> <clinit>
-    886:886:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    887:887:void <clinit>():0:0 -> <clinit>
-    887:887:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":971,"2":972,"3":973,"4":974,"5":975},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    888:888:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    888:888:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    888:888:void <clinit>():318 -> <clinit>
-    888:888:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    889:889:void <clinit>():0:0 -> <clinit>
-    889:889:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":976,"2":977,"3":978,"4":979,"5":980},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    890:890:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    890:890:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    890:890:void <clinit>():313 -> <clinit>
-    890:890:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    891:891:void <clinit>():0:0 -> <clinit>
-    891:891:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":981,"2":982,"3":983,"4":984,"5":985},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    892:892:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    892:892:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    892:892:void <clinit>():308 -> <clinit>
-    892:892:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    893:893:void <clinit>():0:0 -> <clinit>
-    893:893:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":986,"2":987,"3":988,"4":989,"5":990},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    894:894:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    894:894:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    894:894:void <clinit>():302 -> <clinit>
-    894:894:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    895:895:void <clinit>():0:0 -> <clinit>
-    895:895:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":991,"2":992,"3":993,"4":994,"5":995},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    896:896:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    896:896:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    896:896:void <clinit>():296 -> <clinit>
-    896:896:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    897:897:void <clinit>():0:0 -> <clinit>
-    897:897:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":996,"2":997,"3":998,"4":999,"5":1000},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    898:898:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    898:898:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    898:898:void <clinit>():192 -> <clinit>
-    898:898:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    899:899:void <clinit>():0:0 -> <clinit>
-    899:899:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1001,"2":1002,"3":1003,"4":1004,"5":1005},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    900:900:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    900:900:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    900:900:void <clinit>():184 -> <clinit>
-    900:900:void com.android.tools.r8.internal.Attributes.<clinit>():0 -> <clinit>
-    901:901:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    901:901:void <clinit>():476 -> <clinit>
-    902:902:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    902:902:void <clinit>():476 -> <clinit>
-    903:903:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    903:903:void <clinit>():476 -> <clinit>
-    904:904:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    904:904:void <clinit>():476 -> <clinit>
-    905:905:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    905:905:void <clinit>():476 -> <clinit>
-    906:906:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    906:906:void <clinit>():467 -> <clinit>
-    907:907:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    907:907:void <clinit>():467 -> <clinit>
-    908:908:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    908:908:void <clinit>():467 -> <clinit>
-    909:909:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    909:909:void <clinit>():467 -> <clinit>
-    910:910:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    910:910:void <clinit>():467 -> <clinit>
-    911:911:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    911:911:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    911:911:void <clinit>():456 -> <clinit>
-    912:912:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    912:912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    912:912:void <clinit>():456 -> <clinit>
-    913:913:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    913:913:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    913:913:void <clinit>():456 -> <clinit>
-    914:914:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    914:914:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    914:914:void <clinit>():456 -> <clinit>
-    915:915:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    915:915:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    915:915:void <clinit>():456 -> <clinit>
-    916:916:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    916:916:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    916:916:void <clinit>():451 -> <clinit>
-    917:917:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    917:917:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    917:917:void <clinit>():451 -> <clinit>
-    918:918:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    918:918:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    918:918:void <clinit>():451 -> <clinit>
-    919:919:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    919:919:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    919:919:void <clinit>():451 -> <clinit>
-    920:920:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    920:920:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    920:920:void <clinit>():451 -> <clinit>
-    921:921:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    921:921:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    921:921:void <clinit>():446 -> <clinit>
-    922:922:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    922:922:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    922:922:void <clinit>():446 -> <clinit>
-    923:923:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    923:923:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    923:923:void <clinit>():446 -> <clinit>
-    924:924:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    924:924:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    924:924:void <clinit>():446 -> <clinit>
-    925:925:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    925:925:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):72 -> <clinit>
-    925:925:void <clinit>():446 -> <clinit>
-    926:926:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    926:926:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    926:926:void <clinit>():412 -> <clinit>
-    927:927:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    927:927:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    927:927:void <clinit>():412 -> <clinit>
-    928:928:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    928:928:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    928:928:void <clinit>():412 -> <clinit>
-    929:929:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    929:929:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    929:929:void <clinit>():412 -> <clinit>
-    930:930:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    930:930:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    930:930:void <clinit>():412 -> <clinit>
-    931:931:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    931:931:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    931:931:void <clinit>():407 -> <clinit>
-    932:932:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    932:932:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    932:932:void <clinit>():407 -> <clinit>
-    933:933:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    933:933:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    933:933:void <clinit>():407 -> <clinit>
-    934:934:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    934:934:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    934:934:void <clinit>():407 -> <clinit>
-    935:935:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    935:935:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70 -> <clinit>
-    935:935:void <clinit>():407 -> <clinit>
-    936:936:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    936:936:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    936:936:void <clinit>():395 -> <clinit>
-    937:937:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    937:937:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    937:937:void <clinit>():395 -> <clinit>
-    938:938:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    938:938:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    938:938:void <clinit>():395 -> <clinit>
-    939:939:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    939:939:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    939:939:void <clinit>():395 -> <clinit>
-    940:940:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    940:940:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    940:940:void <clinit>():395 -> <clinit>
-    941:941:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    941:941:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    941:941:void <clinit>():390 -> <clinit>
-    942:942:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    942:942:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    942:942:void <clinit>():390 -> <clinit>
-    943:943:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    943:943:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    943:943:void <clinit>():390 -> <clinit>
-    944:944:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    944:944:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    944:944:void <clinit>():390 -> <clinit>
-    945:945:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    945:945:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    945:945:void <clinit>():390 -> <clinit>
-    946:946:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    946:946:void <clinit>():385 -> <clinit>
-    947:947:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    947:947:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    947:947:void <clinit>():385 -> <clinit>
-    948:948:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    948:948:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    948:948:void <clinit>():385 -> <clinit>
-    949:949:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    949:949:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    949:949:void <clinit>():385 -> <clinit>
-    950:950:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    950:950:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68 -> <clinit>
-    950:950:void <clinit>():385 -> <clinit>
-    951:951:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    951:951:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    951:951:void <clinit>():359 -> <clinit>
-    952:952:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    952:952:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    952:952:void <clinit>():359 -> <clinit>
-    953:953:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    953:953:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    953:953:void <clinit>():359 -> <clinit>
-    954:954:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    954:954:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    954:954:void <clinit>():359 -> <clinit>
-    955:955:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    955:955:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    955:955:void <clinit>():359 -> <clinit>
-    956:956:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    956:956:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    956:956:void <clinit>():354 -> <clinit>
-    957:957:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    957:957:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    957:957:void <clinit>():354 -> <clinit>
-    958:958:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    958:958:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    958:958:void <clinit>():354 -> <clinit>
-    959:959:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    959:959:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    959:959:void <clinit>():354 -> <clinit>
-    960:960:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    960:960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    960:960:void <clinit>():354 -> <clinit>
-    961:961:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    961:961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    961:961:void <clinit>():346 -> <clinit>
-    962:962:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    962:962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    962:962:void <clinit>():346 -> <clinit>
-    963:963:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    963:963:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    963:963:void <clinit>():346 -> <clinit>
-    964:964:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    964:964:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    964:964:void <clinit>():346 -> <clinit>
-    965:965:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    965:965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    965:965:void <clinit>():346 -> <clinit>
-    966:966:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    966:966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    966:966:void <clinit>():341 -> <clinit>
-    967:967:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    967:967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    967:967:void <clinit>():341 -> <clinit>
-    968:968:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    968:968:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    968:968:void <clinit>():341 -> <clinit>
-    969:969:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    969:969:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    969:969:void <clinit>():341 -> <clinit>
-    970:970:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    970:970:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    970:970:void <clinit>():341 -> <clinit>
-    971:971:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    971:971:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    971:971:void <clinit>():318 -> <clinit>
-    972:972:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    972:972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    972:972:void <clinit>():318 -> <clinit>
-    973:973:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    973:973:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    973:973:void <clinit>():318 -> <clinit>
-    974:974:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    974:974:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    974:974:void <clinit>():318 -> <clinit>
-    975:975:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    975:975:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    975:975:void <clinit>():318 -> <clinit>
-    976:976:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    976:976:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    976:976:void <clinit>():313 -> <clinit>
-    977:977:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    977:977:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    977:977:void <clinit>():313 -> <clinit>
-    978:978:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    978:978:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    978:978:void <clinit>():313 -> <clinit>
-    979:979:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    979:979:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    979:979:void <clinit>():313 -> <clinit>
-    980:980:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    980:980:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    980:980:void <clinit>():313 -> <clinit>
-    981:981:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    981:981:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    981:981:void <clinit>():308 -> <clinit>
-    982:982:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    982:982:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    982:982:void <clinit>():308 -> <clinit>
-    983:983:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    983:983:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    983:983:void <clinit>():308 -> <clinit>
-    984:984:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    984:984:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    984:984:void <clinit>():308 -> <clinit>
-    985:985:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    985:985:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    985:985:void <clinit>():308 -> <clinit>
-    986:986:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    986:986:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    986:986:void <clinit>():302 -> <clinit>
-    987:987:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    987:987:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    987:987:void <clinit>():302 -> <clinit>
-    988:988:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    988:988:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    988:988:void <clinit>():302 -> <clinit>
-    989:989:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    989:989:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    989:989:void <clinit>():302 -> <clinit>
-    990:990:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    990:990:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    990:990:void <clinit>():302 -> <clinit>
-    991:991:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    991:991:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    991:991:void <clinit>():296 -> <clinit>
-    992:992:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    992:992:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    992:992:void <clinit>():296 -> <clinit>
-    993:993:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    993:993:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    993:993:void <clinit>():296 -> <clinit>
-    994:994:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    994:994:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    994:994:void <clinit>():296 -> <clinit>
-    995:995:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    995:995:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <clinit>
-    995:995:void <clinit>():296 -> <clinit>
-    996:996:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    996:996:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    996:996:void <clinit>():192 -> <clinit>
-    997:997:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    997:997:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    997:997:void <clinit>():192 -> <clinit>
-    998:998:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    998:998:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    998:998:void <clinit>():192 -> <clinit>
-    999:999:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    999:999:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    999:999:void <clinit>():192 -> <clinit>
-    1000:1000:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1000:1000:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1000:1000:void <clinit>():192 -> <clinit>
-    1001:1001:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1001:1001:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1001:1001:void <clinit>():184 -> <clinit>
-    1002:1002:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1002:1002:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1002:1002:void <clinit>():184 -> <clinit>
-    1003:1003:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1003:1003:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1003:1003:void <clinit>():184 -> <clinit>
-    1004:1004:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1004:1004:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1004:1004:void <clinit>():184 -> <clinit>
-    1005:1005:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <clinit>
-    1005:1005:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.constructorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <clinit>
-    1005:1005:void <clinit>():184 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.H4:
-# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
-# {"id":"com.android.tools.r8.synthesized"}
-    1:5:java.lang.String com.android.tools.r8.internal.Attributes$$ExternalSyntheticOutline0.m(java.lang.String,com.android.tools.r8.internal.FlagImpl,java.lang.String):0:4 -> a
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-      # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$10 -> com.android.tools.r8.internal.I4:
+    764:764:void <clinit>():288 -> <clinit>
+    765:765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):93:93 -> <clinit>
+    765:765:void <clinit>():288 -> <clinit>
+    766:766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.memberKindDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):56:56 -> <clinit>
+    766:766:void <clinit>():288 -> <clinit>
+    767:774:void <clinit>():288:295 -> <clinit>
+    775:775:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    775:775:void <clinit>():295 -> <clinit>
+    776:776:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    776:776:void <clinit>():295 -> <clinit>
+    777:782:void <clinit>():295:300 -> <clinit>
+    783:783:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    783:783:void <clinit>():300 -> <clinit>
+    784:784:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    784:784:void <clinit>():300 -> <clinit>
+    785:790:void <clinit>():300:305 -> <clinit>
+    791:791:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    791:791:void <clinit>():305 -> <clinit>
+    792:792:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    792:792:void <clinit>():305 -> <clinit>
+    793:816:void <clinit>():305:328 -> <clinit>
+    817:817:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    817:817:void <clinit>():328 -> <clinit>
+    818:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    818:818:void <clinit>():328 -> <clinit>
+    819:824:void <clinit>():328:333 -> <clinit>
+    825:825:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    825:825:void <clinit>():333 -> <clinit>
+    826:826:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    826:826:void <clinit>():333 -> <clinit>
+    827:835:void <clinit>():333:341 -> <clinit>
+    836:836:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    836:836:void <clinit>():341 -> <clinit>
+    837:837:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    837:837:void <clinit>():341 -> <clinit>
+    838:843:void <clinit>():341:346 -> <clinit>
+    844:844:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    844:844:void <clinit>():346 -> <clinit>
+    845:845:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <clinit>
+    845:845:void <clinit>():346 -> <clinit>
+    846:872:void <clinit>():346:372 -> <clinit>
+    873:873:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    873:873:void <clinit>():372 -> <clinit>
+    874:874:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66:66 -> <clinit>
+    874:874:void <clinit>():372 -> <clinit>
+    875:880:void <clinit>():372:377 -> <clinit>
+    881:881:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    881:881:void <clinit>():377 -> <clinit>
+    882:882:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66:66 -> <clinit>
+    882:882:void <clinit>():377 -> <clinit>
+    883:888:void <clinit>():377:382 -> <clinit>
+    889:889:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    889:889:void <clinit>():382 -> <clinit>
+    890:890:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyAccessorBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66:66 -> <clinit>
+    890:890:void <clinit>():382 -> <clinit>
+    891:898:void <clinit>():382:389 -> <clinit>
+    899:899:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
+    899:899:void <clinit>():389 -> <clinit>
+    900:905:void <clinit>():389:394 -> <clinit>
+    906:906:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
+    906:906:void <clinit>():394 -> <clinit>
+    907:915:void <clinit>():394:402 -> <clinit>
+    916:916:void <clinit>():400:400 -> <clinit>
+    917:917:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.typeBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):68:68 -> <clinit>
+    917:917:void <clinit>():399 -> <clinit>
+    918:952:void <clinit>():399:433 -> <clinit>
+    953:953:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    953:953:void <clinit>():433 -> <clinit>
+    954:954:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70:70 -> <clinit>
+    954:954:void <clinit>():433 -> <clinit>
+    955:960:void <clinit>():433:438 -> <clinit>
+    961:961:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    961:961:void <clinit>():438 -> <clinit>
+    962:962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70:70 -> <clinit>
+    962:962:void <clinit>():438 -> <clinit>
+    963:968:void <clinit>():438:443 -> <clinit>
+    969:969:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    969:969:void <clinit>():443 -> <clinit>
+    970:970:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.valueParameterBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):70:70 -> <clinit>
+    970:970:void <clinit>():443 -> <clinit>
+    971:982:void <clinit>():443:454 -> <clinit>
+    983:983:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    983:983:void <clinit>():454 -> <clinit>
+    984:995:void <clinit>():454:465 -> <clinit>
+    996:996:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <clinit>
+    996:996:void <clinit>():465 -> <clinit>
+    997:997:void <clinit>():463:463 -> <clinit>
+    1:1:boolean getDeclaresDefaultValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):433:433 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;)Z"}
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$10 -> com.android.tools.r8.internal.H4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$10 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():52:52 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags(int):374:374 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):52 -> a
+    1:1:void <init>():51:51 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):51:51 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags$kotlin_metadata(int):192:192 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):52:52 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> b
-    2:2:java.lang.Object get(java.lang.Object):52 -> b
+    1:1:java.lang.Object get(java.lang.Object):51:51 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> b
+    2:2:java.lang.Object get(java.lang.Object):51 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):52:52 -> b
-    4:4:java.lang.String getName():52:52 -> b
+    3:3:java.lang.Object get(java.lang.Object):51:51 -> b
+    4:4:java.lang.String getName():51:51 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$10.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():52:52 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$14 -> com.android.tools.r8.internal.J4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():51:51 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$14 -> com.android.tools.r8.internal.I4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$14 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():63:63 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):63:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags(int):496:496 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):63 -> a
+    1:1:void <init>():62:62 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):62:62 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags$kotlin_metadata(int):258:258 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):62 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):63:63 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> b
-    2:2:java.lang.Object get(java.lang.Object):63 -> b
+    1:1:java.lang.Object get(java.lang.Object):62:62 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> b
+    2:2:java.lang.Object get(java.lang.Object):62 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):63:63 -> b
-    4:4:java.lang.String getName():63:63 -> b
+    3:3:java.lang.Object get(java.lang.Object):62:62 -> b
+    4:4:java.lang.String getName():62:62 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$14.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():63:63 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$18 -> com.android.tools.r8.internal.K4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():62:62 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$18 -> com.android.tools.r8.internal.J4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$18 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():74:74 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):480:480 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):74 -> a
+    1:1:void <init>():73:73 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):73:73 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):243:243 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):73 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):74:74 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> b
-    2:2:java.lang.Object get(java.lang.Object):74 -> b
+    1:1:java.lang.Object get(java.lang.Object):73:73 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> b
+    2:2:java.lang.Object get(java.lang.Object):73 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):74:74 -> b
-    4:4:java.lang.String getName():74:74 -> b
+    3:3:java.lang.Object get(java.lang.Object):73:73 -> b
+    4:4:java.lang.String getName():73:73 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$18.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():74:74 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$2 -> com.android.tools.r8.internal.N4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():73:73 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$2 -> com.android.tools.r8.internal.M4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$2 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N4;"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags(int):48:48 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):30 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):30:30 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> b
-    2:2:java.lang.Object get(java.lang.Object):30 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):30:30 -> b
-    4:4:java.lang.String getName():30:30 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$2.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():30:30 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$22 -> com.android.tools.r8.internal.L4:
-# {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$22 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L4;"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():85:85 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setFlags(int):752:752 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):85 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):85:85 -> b
-    2:2:java.lang.String getName():85:85 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$22.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():85:85 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$26 -> com.android.tools.r8.internal.M4:
-# {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$26 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():96:96 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setFlags(int):665:665 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):96 -> a
+    1:1:void <init>():29:29 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):29:29 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):96:96 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags():665:665 -> b
-    2:2:java.lang.Object get(java.lang.Object):96 -> b
+    1:1:java.lang.Object get(java.lang.Object):29:29 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> b
+    2:2:java.lang.Object get(java.lang.Object):29 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):96:96 -> b
-    4:4:java.lang.String getName():96:96 -> b
+    3:3:java.lang.Object get(java.lang.Object):29:29 -> b
+    4:4:java.lang.String getName():29:29 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$2.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():29:29 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$22 -> com.android.tools.r8.internal.K4:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$22 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K4;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():84:84 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):84:84 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setFlags$kotlin_metadata(int):388:388 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):84 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):84:84 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getFlags$kotlin_metadata():388:388 -> b
+    2:2:java.lang.Object get(java.lang.Object):84 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):84:84 -> b
+    4:4:java.lang.String getName():84:84 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$22.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():84:84 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$26 -> com.android.tools.r8.internal.L4:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$26 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L4;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():95:95 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):95:95 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setFlags$kotlin_metadata(int):343:343 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):95 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):95:95 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags$kotlin_metadata():343:343 -> b
+    2:2:java.lang.Object get(java.lang.Object):95 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):95:95 -> b
+    4:4:java.lang.String getName():95:95 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$26.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():96:96 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$6 -> com.android.tools.r8.internal.O4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():95:95 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$6 -> com.android.tools.r8.internal.N4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$hasAnnotations$6 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():41:41 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags(int):320:320 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):41 -> a
+    1:1:void <init>():40:40 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):40:40 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags$kotlin_metadata(int):167:167 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):41:41 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags():320:320 -> b
-    2:2:java.lang.Object get(java.lang.Object):41 -> b
+    1:1:java.lang.Object get(java.lang.Object):40:40 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags$kotlin_metadata():167:167 -> b
+    2:2:java.lang.Object get(java.lang.Object):40 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):41:41 -> b
-    4:4:java.lang.String getName():41:41 -> b
+    3:3:java.lang.Object get(java.lang.Object):40:40 -> b
+    4:4:java.lang.String getName():40:40 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$hasAnnotations$6.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():41:41 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isReified$2 -> com.android.tools.r8.internal.P4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():40:40 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isNegated$2 -> com.android.tools.r8.internal.O4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isReified$2 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isNegated$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O4;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():454:454 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):454:454 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setFlags$kotlin_metadata(int):62:62 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):454 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):454:454 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getFlags$kotlin_metadata():62:62 -> b
+    2:2:java.lang.Object get(java.lang.Object):454 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):454:454 -> b
+    4:4:java.lang.String getName():454:454 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$isNegated$2.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():454:454 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isNullCheckPredicate$2 -> com.android.tools.r8.internal.P4:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isNullCheckPredicate$2 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():424:424 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):424:424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.setFlags(int):814:814 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):424 -> a
+    1:1:void <init>():464:464 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):464:464 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setFlags$kotlin_metadata(int):62:62 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):464 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):424:424 -> b
-    2:2:java.lang.String getName():424:424 -> b
+    1:1:java.lang.Object get(java.lang.Object):464:464 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getFlags$kotlin_metadata():62:62 -> b
+    2:2:java.lang.Object get(java.lang.Object):464 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):464:464 -> b
+    4:4:java.lang.String getName():464:464 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$isNullCheckPredicate$2.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():464:464 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isReified$2 -> com.android.tools.r8.internal.Q4:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$isReified$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q4;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():411:411 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):411:411 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.setFlags$kotlin_metadata(int):421:421 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):411 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):411:411 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getFlags$kotlin_metadata():421:421 -> b
+    2:2:java.lang.Object get(java.lang.Object):411 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):411:411 -> b
+    4:4:java.lang.String getName():411:411 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$isReified$2.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():424:424 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$11 -> com.android.tools.r8.internal.Q4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():411:411 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$11 -> com.android.tools.r8.internal.R4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$11 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():289:289 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags(int):496:496 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):289 -> a
+    1:1:void <init>():288:288 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):288:288 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags$kotlin_metadata(int):258:258 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):288 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):289:289 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> b
-    2:2:java.lang.Object get(java.lang.Object):289 -> b
+    1:1:java.lang.Object get(java.lang.Object):288:288 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> b
+    2:2:java.lang.Object get(java.lang.Object):288 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):289:289 -> b
-    4:4:java.lang.String getName():289:289 -> b
+    3:3:java.lang.Object get(java.lang.Object):288:288 -> b
+    4:4:java.lang.String getName():288:288 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$kind$11.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():289:289 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$7 -> com.android.tools.r8.internal.R4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():288:288 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$2 -> com.android.tools.r8.internal.S4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():201:201 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags(int):374:374 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):201 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):201:201 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> b
-    2:2:java.lang.Object get(java.lang.Object):201 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):201:201 -> b
-    4:4:java.lang.String getName():201:201 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$kind$7.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():201:201 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$10 -> com.android.tools.r8.internal.S4:
-# {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$10 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$2 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():282:282 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):282:282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags(int):496:496 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):282 -> a
+    1:1:void <init>():120:120 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):120:120 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):282:282 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> b
-    2:2:java.lang.Object get(java.lang.Object):282 -> b
+    1:1:java.lang.Object get(java.lang.Object):120:120 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> b
+    2:2:java.lang.Object get(java.lang.Object):120 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):282:282 -> b
-    4:4:java.lang.String getName():282:282 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$10.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):120:120 -> b
+    4:4:java.lang.String getName():120:120 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$kind$2.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():282:282 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$14 -> com.android.tools.r8.internal.T4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():120:120 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$7 -> com.android.tools.r8.internal.T4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$14 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$kind$7 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():379:379 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):379:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):480:480 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):379 -> a
+    1:1:void <init>():200:200 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):200:200 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags$kotlin_metadata(int):192:192 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):200 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):379:379 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> b
-    2:2:java.lang.Object get(java.lang.Object):379 -> b
+    1:1:java.lang.Object get(java.lang.Object):200:200 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> b
+    2:2:java.lang.Object get(java.lang.Object):200 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):379:379 -> b
-    4:4:java.lang.String getName():379:379 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$14.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):200:200 -> b
+    4:4:java.lang.String getName():200:200 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$kind$7.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():379:379 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$2 -> com.android.tools.r8.internal.U4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():200:200 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$10 -> com.android.tools.r8.internal.U4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$2 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$10 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():107:107 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags(int):48:48 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):107 -> a
+    1:1:void <init>():281:281 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):281:281 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags$kotlin_metadata(int):258:258 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):107:107 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> b
-    2:2:java.lang.Object get(java.lang.Object):107 -> b
+    1:1:java.lang.Object get(java.lang.Object):281:281 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> b
+    2:2:java.lang.Object get(java.lang.Object):281 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):107:107 -> b
-    4:4:java.lang.String getName():107:107 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$2.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):281:281 -> b
+    4:4:java.lang.String getName():281:281 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$10.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():107:107 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$6 -> com.android.tools.r8.internal.V4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():281:281 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$14 -> com.android.tools.r8.internal.V4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$6 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$14 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():219:219 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):219:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags(int):374:374 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):219 -> a
+    1:1:void <init>():366:366 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):366:366 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):243:243 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):366 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):219:219 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> b
-    2:2:java.lang.Object get(java.lang.Object):219 -> b
+    1:1:java.lang.Object get(java.lang.Object):366:366 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> b
+    2:2:java.lang.Object get(java.lang.Object):366 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):219:219 -> b
-    4:4:java.lang.String getName():219:219 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$6.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):366:366 -> b
+    4:4:java.lang.String getName():366:366 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$14.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():219:219 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$10 -> com.android.tools.r8.internal.W4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():366:366 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$2 -> com.android.tools.r8.internal.W4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$10 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$2 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():209:209 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags(int):374:374 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):209 -> a
+    1:1:void <init>():106:106 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):106:106 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):209:209 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> b
-    2:2:java.lang.Object get(java.lang.Object):209 -> b
+    1:1:java.lang.Object get(java.lang.Object):106:106 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> b
+    2:2:java.lang.Object get(java.lang.Object):106 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):209:209 -> b
-    4:4:java.lang.String getName():209:209 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$10.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):106:106 -> b
+    4:4:java.lang.String getName():106:106 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$2.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():209:209 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$14 -> com.android.tools.r8.internal.X4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():106:106 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$6 -> com.android.tools.r8.internal.X4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$14 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$modality$6 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():272:272 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags(int):496:496 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):272 -> a
+    1:1:void <init>():218:218 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):218:218 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags$kotlin_metadata(int):192:192 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):218 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):272:272 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> b
-    2:2:java.lang.Object get(java.lang.Object):272 -> b
+    1:1:java.lang.Object get(java.lang.Object):218:218 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> b
+    2:2:java.lang.Object get(java.lang.Object):218 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):272:272 -> b
-    4:4:java.lang.String getName():272:272 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$14.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):218:218 -> b
+    4:4:java.lang.String getName():218:218 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$modality$6.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():272:272 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$18 -> com.android.tools.r8.internal.Y4:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():218:218 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$10 -> com.android.tools.r8.internal.Y4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$18 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$10 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():369:369 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):369:369 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):480:480 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):369 -> a
+    1:1:void <init>():208:208 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):208:208 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags$kotlin_metadata(int):192:192 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):369:369 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> b
-    2:2:java.lang.Object get(java.lang.Object):369 -> b
+    1:1:java.lang.Object get(java.lang.Object):208:208 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> b
+    2:2:java.lang.Object get(java.lang.Object):208 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):369:369 -> b
-    4:4:java.lang.String getName():369:369 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$18.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):208:208 -> b
+    4:4:java.lang.String getName():208:208 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$10.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():369:369 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$2 -> com.android.tools.r8.internal.a5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():208:208 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$14 -> com.android.tools.r8.internal.Z4:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$2 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a5;"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():115:115 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags(int):48:48 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):115 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):115:115 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> b
-    2:2:java.lang.Object get(java.lang.Object):115 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):115:115 -> b
-    4:4:java.lang.String getName():115:115 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$2.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():115:115 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$22 -> com.android.tools.r8.internal.Z4:
-# {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$22 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$14 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z4;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():434:434 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):434:434 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setFlags(int):665:665 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):434 -> a
+    1:1:void <init>():271:271 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):271:271 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags$kotlin_metadata(int):258:258 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):434:434 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags():665:665 -> b
-    2:2:java.lang.Object get(java.lang.Object):434 -> b
+    1:1:java.lang.Object get(java.lang.Object):271:271 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> b
+    2:2:java.lang.Object get(java.lang.Object):271 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):434:434 -> b
-    4:4:java.lang.String getName():434:434 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$22.getOwner() -> c
+    3:3:java.lang.Object get(java.lang.Object):271:271 -> b
+    4:4:java.lang.String getName():271:271 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$14.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():434:434 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$6 -> com.android.tools.r8.internal.b5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():271:271 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$18 -> com.android.tools.r8.internal.a5:
 # {"id":"sourceFile","fileName":"Attributes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$6 INSTANCE -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$18 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a5;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():356:356 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):356:356 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):243:243 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):356 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):356:356 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> b
+    2:2:java.lang.Object get(java.lang.Object):356 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):356:356 -> b
+    4:4:java.lang.String getName():356:356 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$18.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():356:356 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$2 -> com.android.tools.r8.internal.c5:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c5;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():114:114 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):114:114 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):114 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):114:114 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> b
+    2:2:java.lang.Object get(java.lang.Object):114 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):114:114 -> b
+    4:4:java.lang.String getName():114:114 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$2.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():114:114 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$22 -> com.android.tools.r8.internal.b5:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$22 INSTANCE -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b5;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():179:179 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags(int):320:320 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):179 -> a
+    1:1:void <init>():421:421 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):421:421 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setFlags$kotlin_metadata(int):343:343 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):421 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):179:179 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags():320:320 -> b
-    2:2:java.lang.Object get(java.lang.Object):179 -> b
+    1:1:java.lang.Object get(java.lang.Object):421:421 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags$kotlin_metadata():343:343 -> b
+    2:2:java.lang.Object get(java.lang.Object):421 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):179:179 -> b
-    4:4:java.lang.String getName():179:179 -> b
+    3:3:java.lang.Object get(java.lang.Object):421:421 -> b
+    4:4:java.lang.String getName():421:421 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$22.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():421:421 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$6 -> com.android.tools.r8.internal.d5:
+# {"id":"sourceFile","fileName":"Attributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.Attributes$visibility$6 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d5;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():178:178 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):178:178 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags$kotlin_metadata(int):167:167 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):178 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):178:178 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags$kotlin_metadata():167:167 -> b
+    2:2:java.lang.Object get(java.lang.Object):178 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):178:178 -> b
+    4:4:java.lang.String getName():178:178 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.Attributes$visibility$6.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():179:179 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind -> com.android.tools.r8.internal.wc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():178:178 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind -> com.android.tools.r8.internal.yc:
 # {"id":"sourceFile","fileName":"Modifiers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl flag -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
     com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries $ENTRIES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
     1:31:void <clinit>():117:147 -> <clinit>
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind[] $values():0:0 -> <clinit>
     32:32:void <clinit>():147 -> <clinit>
@@ -200224,48 +199658,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
 com.android.tools.r8.jetbrains.kotlin.metadata.ClassNameKt -> R8$$REMOVED$$CLASS$$169:
 # {"id":"sourceFile","fileName":"ClassName.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.Flag -> com.android.tools.r8.internal.Xp:
-# {"id":"sourceFile","fileName":"Flag.kt"}
-    int offset -> a
-    int bitWidth -> b
-    int value -> c
-    1:1:void <clinit>():77:77 -> <clinit>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):55:55 -> <clinit>
-    2:2:void <clinit>():77 -> <clinit>
-    3:69:void <clinit>():85:151 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField,int):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lq;I)V"}
-    2:2:void <init>(int,int,int):48:48 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField,int):52 -> <init>
-    1:1:boolean invoke(int):63:63 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Xp$a:
-# {"id":"sourceFile","fileName":"Flag.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.Flag DECLARES_DEFAULT_VALUE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xp;"}
-    1:1:void <clinit>():573:573 -> <clinit>
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.Flag.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):55:55 -> <clinit>
-    2:2:void <clinit>():573 -> <clinit>
-    3:10:void <clinit>():573:580 -> <clinit>
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.Flag.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):55:55 -> <clinit>
-    11:11:void <clinit>():580 -> <clinit>
-    12:12:void <clinit>():587:587 -> <clinit>
-    13:13:void com.android.tools.r8.jetbrains.kotlin.metadata.Flag.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):55:55 -> <clinit>
-    13:13:void <clinit>():587 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.jetbrains.kotlin.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.zv:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:12:void <init>(java.lang.String,java.lang.Throwable):0:11 -> <init>
     1:12:void <init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):11 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     13:13:void <init>(java.lang.String,java.lang.Throwable):11:11 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Throwable;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation -> com.android.tools.r8.internal.fH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation -> com.android.tools.r8.internal.pH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.lang.String className -> a
     java.util.Map arguments -> b
     1:1:void <init>(java.lang.String,java.util.Map):19:19 -> <init>
     1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> a
     1:1:java.lang.CharSequence toString$lambda$0(com.android.tools.r8.jetbrains.kotlin.Pair):39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JV;)Ljava/lang/CharSequence;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NV;)Ljava/lang/CharSequence;"}
     2:2:java.lang.CharSequence toString$lambda$0(com.android.tools.r8.jetbrains.kotlin.Pair):39:39 -> a
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> a
     3:3:java.lang.CharSequence toString$lambda$0(com.android.tools.r8.jetbrains.kotlin.Pair):39 -> a
@@ -200283,34 +199690,34 @@
     11:15:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt.toList(java.util.Map):63:67 -> toString
     11:15:java.lang.String toString():39 -> toString
     16:17:java.lang.String toString():39:40 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.iH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.sH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     1:1:void <init>():47:47 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     java.lang.String toString() -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.gH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.qH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation annotation -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pH;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):134:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pH;)V"}
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():135:135 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue -> com.android.tools.r8.internal.hH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue -> com.android.tools.r8.internal.rH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.lang.String className -> a
     int arrayDimensionCount -> b
     java.lang.String stringRepresentation -> c
-    1:11:void <init>(java.lang.String,int):202:212 -> <init>
+    1:11:void <init>(java.lang.String,int):186:196 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    12:12:void <init>(java.lang.String,int):207:207 -> <init>
-    13:13:void <init>(java.lang.String,int):204:204 -> <init>
+    12:12:void <init>(java.lang.String,int):191:191 -> <init>
+    13:13:void <init>(java.lang.String,int):188:188 -> <init>
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-    1:1:java.lang.String toString():215:215 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.iH$a:
+    1:1:java.lang.String toString():199:199 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.sH$a:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.util.List elements -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -200320,7 +199727,7 @@
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.jH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.tH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):92:92 -> <init>
@@ -200328,7 +199735,7 @@
     1:1:java.lang.Object getValue():92 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.kH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.uH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):78:78 -> <init>
@@ -200336,7 +199743,7 @@
     1:1:java.lang.Object getValue():78 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.lH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.vH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     char value -> a
     1:1:void <init>(char):80:80 -> <init>
@@ -200344,7 +199751,7 @@
     1:1:java.lang.Object getValue():80 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.mH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.wH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     double value -> a
     1:1:void <init>(double):90:90 -> <init>
@@ -200352,7 +199759,7 @@
     1:1:java.lang.Object getValue():90 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.nH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.xH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
@@ -200360,7 +199767,7 @@
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():116:116 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.oH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.yH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     float value -> a
     1:1:void <init>(float):88:88 -> <init>
@@ -200368,7 +199775,7 @@
     1:1:java.lang.Object getValue():88 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.pH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.zH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     int value -> a
     1:1:void <init>(int):84:84 -> <init>
@@ -200376,16 +199783,14 @@
     1:1:java.lang.Object getValue():84 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.AH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.lang.String className -> a
-    1:1:void <init>(java.lang.String,int):172:172 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
-    2:2:void <init>(java.lang.String,int):167:167 -> <init>
+    1:1:void <init>(java.lang.String):162:162 -> <init>
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-    1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.rH:
+    1:1:java.lang.String toString():163:163 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.BH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     1:1:void <init>():62:62 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
@@ -200395,7 +199800,7 @@
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$StringValue.getValue():104:104 -> toString
     2:2:java.lang.String toString():71 -> toString
     3:3:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.sH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.CH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     long value -> a
     1:1:void <init>(long):86:86 -> <init>
@@ -200403,7 +199808,7 @@
     1:1:java.lang.Object getValue():86 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.tH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.DH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     short value -> a
     1:1:void <init>(short):82:82 -> <init>
@@ -200411,7 +199816,7 @@
     1:1:java.lang.Object getValue():82 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.uH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.EH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):104:104 -> <init>
@@ -200419,7 +199824,7 @@
     1:1:java.lang.Object getValue():104 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.vH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.FH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):95:95 -> <init>
@@ -200431,7 +199836,7 @@
     2:2:java.lang.Object getValue():95 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.wH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.GH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     int value -> a
     1:1:void <init>(int):99:99 -> <init>
@@ -200443,7 +199848,7 @@
     2:2:java.lang.Object getValue():99 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.xH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.HH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     long value -> a
     1:1:void <init>(long):101:101 -> <init>
@@ -200455,7 +199860,7 @@
     2:2:java.lang.Object getValue():101 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.yH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.IH:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     short value -> a
     1:1:void <init>(short):97:97 -> <init>
@@ -200467,7 +199872,7 @@
     2:2:java.lang.Object getValue():97 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClass -> com.android.tools.r8.internal.zH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmClass -> com.android.tools.r8.internal.JH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int flags -> a
     java.lang.String name -> b
@@ -200492,88 +199897,80 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.lang.String inlineClassUnderlyingPropertyName -> m
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType inlineClassUnderlyingType -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     java.util.List contextReceiverTypes -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List versionRequirements -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List extensions -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor):66:66 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):66 -> <init>
-    1:1:void <init>():44 -> <init>
-    2:71:void <init>():59:128 -> <init>
-    72:72:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    72:72:void <init>():128 -> <init>
-    73:75:void <init>():1304:1306 -> <init>
-    76:76:void <init>():128:128 -> <init>
-    1254:1254:void <init>():1306:1306 -> <init>
-    1255:1255:void <init>():128:128 -> <init>
-    1:1:void setFlags(int):48:48 -> a
-    2:2:java.util.List getFunctions():69:69 -> a
-    3:3:void setInlineClassUnderlyingPropertyName(java.lang.String):109:109 -> a
-    4:4:void setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    1:1:void setName(java.lang.String):54:54 -> b
-    2:2:java.util.List getProperties():74:74 -> b
-    1:1:java.util.List getTypeAliases():79:79 -> c
-    1:1:java.lang.String getCompanionObject():89:89 -> d
-    1:1:java.util.List getConstructors():84:84 -> e
-    1:1:java.util.List getContextReceiverTypes():119:119 -> f
+    1:81:void <init>():43:123 -> <init>
+    82:82:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    82:82:void <init>():123 -> <init>
+    83:85:void <init>():690:692 -> <init>
+    86:655:void <init>():123:692 -> <init>
+    656:656:void <init>():123:123 -> <init>
+    1:1:java.util.List getFunctions():64:64 -> a
+    2:2:void setInlineClassUnderlyingPropertyName(java.lang.String):104:104 -> a
+    3:3:void setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):109:109 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:void setName(java.lang.String):49:49 -> b
+    2:2:java.util.List getProperties():69:69 -> b
+    1:1:java.util.List getTypeAliases():74:74 -> c
+    1:1:java.lang.String getCompanionObject():84:84 -> d
+    1:1:java.util.List getConstructors():79:79 -> e
+    1:1:java.util.List getContextReceiverTypes():114:114 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-    1:1:java.util.List getEnumEntries():99:99 -> g
-    1:1:int getFlags():48:48 -> h
-    1:1:java.lang.String getInlineClassUnderlyingPropertyName():109:109 -> i
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getInlineClassUnderlyingType():114:114 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:java.lang.String getName():54:54 -> k
-    1:1:java.util.List getNestedClasses():94:94 -> l
-    1:1:java.util.List getSealedSubclasses():104:104 -> m
-    1:1:java.util.List getSupertypes():64:64 -> n
-    1:1:java.util.List getTypeParameters():59:59 -> o
-    1:1:java.util.List getVersionRequirements():125:125 -> p
+    1:1:java.util.List getEnumEntries():94:94 -> g
+    1:1:java.lang.String getInlineClassUnderlyingPropertyName():104:104 -> h
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getInlineClassUnderlyingType():109:109 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    1:1:java.lang.String getName():49:49 -> j
+    1:1:java.util.List getNestedClasses():89:89 -> k
+    1:1:java.util.List getSealedSubclasses():99:99 -> l
+    1:1:java.util.List getSupertypes():59:59 -> m
+    1:1:java.util.List getTypeParameters():54:54 -> n
+    1:1:java.util.List getVersionRequirements():120:120 -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.BH:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor -> R8$$REMOVED$$CLASS$$170:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier -> com.android.tools.r8.internal.DH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier -> com.android.tools.r8.internal.LH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
-    1:1:void <init>():1214:1214 -> <init>
+    1:1:void <init>():539:539 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$Class -> com.android.tools.r8.internal.CH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$Class -> com.android.tools.r8.internal.LH$a:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     java.lang.String name -> a
-    1:1:void <init>(java.lang.String):1220:1220 -> <init>
+    1:1:void <init>(java.lang.String):545:545 -> <init>
+    1:1:java.lang.String getName():545:545 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.DH$a:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.LH$b:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     java.lang.String name -> a
-    1:1:void <init>(java.lang.String):1235:1235 -> <init>
+    1:1:void <init>(java.lang.String):560:560 -> <init>
+    1:1:java.lang.String getName():560:560 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.DH$b:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.LH$c:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int id -> a
-    1:1:void <init>(int):1227:1227 -> <init>
-    1:1:int getId():1227:1227 -> a
+    1:1:void <init>(int):552:552 -> <init>
+    1:1:int getId():552:552 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue -> com.android.tools.r8.internal.EH:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue -> com.android.tools.r8.internal.MH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     java.lang.Object value -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Boolean;"}
-    1:1:void <init>(java.lang.Object):1292:1292 -> <init>
+    1:1:void <init>(java.lang.Object):102:102 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Boolean;)V"}
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor -> com.android.tools.r8.internal.FH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor -> com.android.tools.r8.internal.NH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int flags -> a
     java.util.List valueParameters -> b
@@ -200582,375 +199979,155 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List extensions -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorVisitor):252:252 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):252 -> <init>
-    1:1:void <init>(int):322 -> <init>
-    2:18:void <init>(int):320:336 -> <init>
-    19:19:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    19:19:void <init>(int):336 -> <init>
-    20:22:void <init>(int):1304:1306 -> <init>
-    23:993:void <init>(int):336:1306 -> <init>
-    994:994:void <init>(int):336:336 -> <init>
-    1:1:int getFlags():320:320 -> a
-    1:1:java.util.List getValueParameters():328:328 -> b
-    1:1:java.util.List getVersionRequirements():333:333 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.HH:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorVisitor -> R8$$REMOVED$$CLASS$$171:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmContract -> com.android.tools.r8.internal.IH:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
+    1:15:void <init>(int):167:181 -> <init>
+    16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    16:16:void <init>(int):181 -> <init>
+    17:19:void <init>(int):690:692 -> <init>
+    20:531:void <init>(int):181:692 -> <init>
+    532:532:void <init>(int):181:181 -> <init>
+    1:1:java.util.List getValueParameters():173:173 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.KmContract -> com.android.tools.r8.internal.PH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     java.util.List effects -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):756:756 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):756 -> <init>
-    1:1:void <init>():1055 -> <init>
-    2:2:void <init>():1059:1059 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor -> R8$$REMOVED$$CLASS$$172:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.JH:
+    1:6:void <init>():16:21 -> <init>
+com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.QH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     java.util.List getFunctions() -> a
     java.util.List getProperties() -> b
     java.util.List getTypeAliases() -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.KH:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainerVisitor):18:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect -> com.android.tools.r8.internal.LH:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect -> com.android.tools.r8.internal.RH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind invocationKind -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
     java.util.List constructorArguments -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression conclusion -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MH;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):787:787 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):787 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):1092 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OH;Lcom/android/tools/r8/internal/NH;)V"}
-    2:9:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):1090:1097 -> <init>
-    1:1:void setConclusion(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):1102:1102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MH;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression -> com.android.tools.r8.internal.MH:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SH;"}
+    1:9:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):35:43 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UH;Lcom/android/tools/r8/internal/TH;)V"}
+    1:1:void setConclusion(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):48:48 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SH;)V"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression -> com.android.tools.r8.internal.SH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     int flags -> a
     java.lang.Integer parameterIndex -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue constantValue -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType isInstanceType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     java.util.List andArguments -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List orArguments -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):821:821 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):821 -> <init>
-    1:1:void <init>():1136 -> <init>
-    2:30:void <init>():1141:1169 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue getConstantValue():1152:1152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EH;"}
-    2:2:void setInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1157:1157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    3:3:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1201:1201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MH;)V"}
-    4:5:void visit(int,java.lang.Integer):1173:1174 -> a
-    4:5:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1201 -> a
-    6:6:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1202:1202 -> a
-    7:7:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue.getValue():1292:1292 -> a
-    7:7:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1202 -> a
-    8:8:void visitConstantValue(java.lang.Object):1179:1179 -> a
-    8:8:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1202 -> a
-    9:9:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1203:1203 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitIsInstanceType(int):1184:1184 -> a
-    10:10:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1203 -> a
-    11:113:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1203:1305 -> a
-    114:114:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitAndArgument():1188:1188 -> a
-    114:114:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1204 -> a
-    115:115:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    115:115:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitAndArgument():1188 -> a
-    115:115:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1204 -> a
-    1410:1410:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    1410:1410:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitAndArgument():1188 -> a
-    1410:1410:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1204 -> a
-    1411:1514:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1204:1307 -> a
-    1515:1515:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitOrArgument():1192:1192 -> a
-    1515:1515:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1205 -> a
-    1516:1516:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    1516:1516:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitOrArgument():1192 -> a
-    1516:1516:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1205 -> a
-    2811:2811:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    2811:2811:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor visitOrArgument():1192 -> a
-    2811:2811:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1205 -> a
-    2812:2812:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor):1205:1205 -> a
-    1:1:int getFlags():1140:1140 -> b
-    1:1:java.lang.Integer getParameterIndex():1147:1147 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor -> R8$$REMOVED$$CLASS$$173:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.NH:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+    1:31:void <init>():60:90 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue getConstantValue():73:73 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MH;"}
+    2:2:void setInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78:78 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:java.lang.Integer getParameterIndex():68:68 -> b
+com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.TH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind AT_MOST_ONCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind EXACTLY_ONCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind[] $VALUES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/NH;"}
-    1:11:void <clinit>():935:945 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/TH;"}
+    1:11:void <clinit>():147:157 -> <clinit>
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind[] $values():0:0 -> <clinit>
-    12:12:void <clinit>():945 -> <clinit>
-    13:13:void <clinit>():945:945 -> <clinit>
+    12:12:void <clinit>():157 -> <clinit>
+    13:13:void <clinit>():157:157 -> <clinit>
     14:14:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt.enumEntries(java.lang.Enum[]):43:43 -> <clinit>
-    14:14:void <clinit>():945 -> <clinit>
-    1:1:void <init>(java.lang.String,int):930:930 -> <init>
+    14:14:void <clinit>():157 -> <clinit>
+    1:1:void <init>(java.lang.String,int):142:142 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind[] values():946:946 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/NH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType -> com.android.tools.r8.internal.OH:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind[] values():158:158 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/TH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType -> com.android.tools.r8.internal.UH:
+# {"id":"sourceFile","fileName":"Contracts.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType RETURNS_CONSTANT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType CALLS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType RETURNS_NOT_NULL -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType[] $VALUES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/OH;"}
-    1:16:void <clinit>():906:921 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/UH;"}
+    1:16:void <clinit>():118:133 -> <clinit>
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType[] $values():0:0 -> <clinit>
-    17:17:void <clinit>():921 -> <clinit>
-    18:18:void <clinit>():921:921 -> <clinit>
+    17:17:void <clinit>():133 -> <clinit>
+    18:18:void <clinit>():133:133 -> <clinit>
     19:19:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt.enumEntries(java.lang.Enum[]):43:43 -> <clinit>
-    19:19:void <clinit>():921 -> <clinit>
-    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    19:19:void <clinit>():133 -> <clinit>
+    1:1:void <init>(java.lang.String,int):111:111 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType[] values():922:922 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/OH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor -> R8$$REMOVED$$CLASS$$174:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType -> com.android.tools.r8.internal.QH:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/id;"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/id;)V"}
-    1:1:boolean equals(java.lang.Object):35:35 -> equals
-    1:1:int hashCode():38:38 -> hashCode
-    2:2:int com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.hashCode():94:94 -> hashCode
-    2:2:int hashCode():38 -> hashCode
-    1:1:java.lang.String toString():41:41 -> toString
-    2:31:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):0:29 -> toString
-    2:31:java.lang.String toString():41 -> toString
-    32:32:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.RH:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType() -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.SH:
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType[] values():134:134 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/UH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.XH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     java.lang.String typeFlexibilityId -> b
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):1266:1266 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():1266:1266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:java.lang.String getTypeFlexibilityId():1266:1266 -> b
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):591:591 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():591:591 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    1:1:java.lang.String getTypeFlexibilityId():591:591 -> b
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction -> com.android.tools.r8.internal.TH:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction -> com.android.tools.r8.internal.YH:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
-    int flags -> b
-    java.lang.String name -> c
-    java.util.List typeParameters -> d
+    int flags -> a
+    java.lang.String name -> b
+    java.util.List typeParameters -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType receiverParameterType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    java.util.List contextReceiverTypes -> f
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType receiverParameterType -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    java.util.List contextReceiverTypes -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    java.util.List valueParameters -> g
+    java.util.List valueParameters -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType returnType -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    java.util.List versionRequirements -> i
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType returnType -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    java.util.List versionRequirements -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmContract contract -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IH;"}
-    java.util.List extensions -> k
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmContract contract -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PH;"}
+    java.util.List extensions -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void <init>(int,java.lang.String):376:376 -> <init>
-    2:46:void <init>(int,java.lang.String):374:418 -> <init>
-    47:47:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    47:47:void <init>(int,java.lang.String):418 -> <init>
-    48:50:void <init>(int,java.lang.String):1304:1306 -> <init>
-    51:939:void <init>(int,java.lang.String):418:1306 -> <init>
-    940:940:void <init>(int,java.lang.String):418:418 -> <init>
-    1:1:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):388:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:void setContract(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):414:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IH;)V"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):422:422 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/lI;"}
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):422 -> a
-    1299:1299:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    1299:1299:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):422 -> a
-    1300:1300:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):431:431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    1301:1301:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    1301:1301:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):431 -> a
-    2596:2596:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    2596:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):431 -> a
-    2597:2597:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):435:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/qI;"}
-    2598:2598:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    2598:2598:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):435 -> a
-    3893:3893:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    3893:3893:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):435 -> a
-    3894:3894:com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor visitContract():448:448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IH;"}
-    3895:3895:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):452:452 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/VH;"}
-    3896:4743:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):462:1309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WH;)V"}
-    4744:5593:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):462:1311 -> a
-    5594:6443:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):464:1313 -> a
-    6444:6444:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):465:465 -> a
-    6445:6445:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    6445:6445:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):465 -> a
-    6446:7296:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):465:1315 -> a
-    7297:7298:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):467:468 -> a
-    7299:7531:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072:1304 -> a
-    7299:7531:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    7532:7532:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():1090:1090 -> a
-    7532:7532:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    7532:7532:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    7533:7533:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():1091:1091 -> a
-    7533:7533:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    7533:7533:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    7534:7534:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072:1072 -> a
-    7534:7534:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    7535:7535:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.visitEffect(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):1063:1063 -> a
-    7535:7535:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    7535:7535:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    7536:7536:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    7536:7536:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.visitEffect(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):1063 -> a
-    7536:7536:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    7536:7536:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    8831:8831:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    8831:8831:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.visitEffect(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind):1063 -> a
-    8831:8831:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    8831:8831:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    8832:9018:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1119:1305 -> a
-    8832:9018:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    8832:9018:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    9019:9019:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.visitConstructorArgument():1106:1106 -> a
-    9019:9019:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1119 -> a
-    9019:9019:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    9019:9019:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    9020:9020:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    9020:9020:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.visitConstructorArgument():1106 -> a
-    9020:9020:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1119 -> a
-    9020:9020:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    9020:9020:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    10315:10315:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    10315:10315:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.visitConstructorArgument():1106 -> a
-    10315:10315:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1119 -> a
-    10315:10315:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    10315:10315:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    10316:10317:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1119:1120 -> a
-    10316:10317:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    10316:10317:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    10318:10318:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.visitConclusionOfConditionalEffect():1110:1110 -> a
-    10318:10318:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1120 -> a
-    10318:10318:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    10318:10318:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    10319:10319:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectVisitor):1120:1120 -> a
-    10319:10319:void com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor):1072 -> a
-    10319:10319:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):468 -> a
-    10320:11168:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469:1317 -> a
-    11169:11169:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469:469 -> a
-    11170:11170:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFunctionExtensionVisitor.getType():131:131 -> a
-    11170:11170:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469 -> a
-    11171:11171:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469:469 -> a
-    11172:11175:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionExtensionVisitor):104:107 -> a
-    11172:11175:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):91 -> a
-    11172:11175:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469 -> a
-    11176:11176:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionExtensionVisitor):104:104 -> a
-    11176:11176:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):91 -> a
-    11176:11176:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):469 -> a
-    11177:11177:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):470:470 -> a
-    1:1:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):404:404 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReceiverParameterType(int):426:426 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):439:439 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    2:2:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):404:404 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):439 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():443:443 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uI;"}
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():443 -> c
-    1299:1299:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> c
-    1299:1299:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():443 -> c
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract getContract():414:414 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IH;"}
-    1:1:int getFlags():374:374 -> e
-    1:1:java.lang.String getName():375:375 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReceiverParameterType():388:388 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReturnType():404:404 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:java.util.List getTypeParameters():383:383 -> i
-    1:1:java.util.List getValueParameters():399:399 -> j
-    1:1:java.util.List getVersionRequirements():409:409 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.VH:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.WH:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
-    1:1:void com.android.tools.r8.internal.KmFunctionVisitor.<init>():0:0 -> <init>
-      # {"id":"com.android.tools.r8.synthesized"}
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor):292:292 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):292 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):303:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/lI;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):320:320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):329:329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/qI;"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmContractVisitor visitContract():350:350 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IH;"}
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):358:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/VH;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReceiverParameterType(int):311:311 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    2:2:void visitEnd():364:364 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):337:337 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():343:343 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda -> com.android.tools.r8.internal.XH:
+    1:43:void <init>(int,java.lang.String):192:234 -> <init>
+    44:44:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    44:44:void <init>(int,java.lang.String):234 -> <init>
+    45:47:void <init>(int,java.lang.String):690:692 -> <init>
+    48:506:void <init>(int,java.lang.String):234:692 -> <init>
+    507:507:void <init>(int,java.lang.String):234:234 -> <init>
+    1:1:java.lang.String getName():192:192 -> a
+    2:2:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):204:204 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    3:3:void setContract(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):230:230 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PH;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReceiverParameterType():204:204 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    2:2:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):220:220 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReturnType():220:220 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    1:1:java.util.List getTypeParameters():199:199 -> d
+    1:1:java.util.List getValueParameters():215:215 -> e
+com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda -> com.android.tools.r8.internal.aI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction function -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmLambdaVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambdaVisitor):227:227 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmLambdaVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):227 -> <init>
-    1:1:void <init>():290 -> <init>
-    1:1:void setFunction(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmLambdaVisitor -> R8$$REMOVED$$CLASS$$175:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage -> com.android.tools.r8.internal.YH:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YH;"}
+    1:1:void <init>():154:154 -> <init>
+    1:1:void setFunction(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):158:158 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)V"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage -> com.android.tools.r8.internal.cI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     java.util.List functions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -200960,711 +200137,330 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List extensions -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageVisitor):200:200 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):199 -> <init>
-    1:1:void <init>():236 -> <init>
-    2:15:void <init>():240:253 -> <init>
-    16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    16:16:void <init>():253 -> <init>
-    17:19:void <init>():1304:1306 -> <init>
-    20:20:void <init>():253:253 -> <init>
-    1073:1073:void <init>():1306:1306 -> <init>
-    1074:1074:void <init>():253:253 -> <init>
-    1:1:java.util.List getFunctions():240:240 -> a
-    1:1:java.util.List getProperties():245:245 -> b
-    1:1:java.util.List getTypeAliases():250:250 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.aI:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageVisitor -> R8$$REMOVED$$CLASS$$176:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty -> com.android.tools.r8.internal.bI:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
-    int flags -> b
-    java.lang.String name -> c
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes getter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes setter -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cI;"}
-    int setterFlags -> f
-    java.util.List typeParameters -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType receiverParameterType -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    java.util.List contextReceiverTypes -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter setterParameter -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType returnType -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    java.util.List versionRequirements -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    java.util.List extensions -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/QP;"}
-    1:1:void <clinit>():505:505 -> <clinit>
-    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.mutableProperty1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1):108:108 -> <clinit>
-    2:2:void <clinit>():505 -> <clinit>
-    3:3:void <clinit>():506:506 -> <clinit>
-    1:1:void <init>(int,java.lang.String,int,int):500:500 -> <init>
-    1:1:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.synthesized"}
-    2:11:void <init>(int,java.lang.String,int,int):496:505 -> <init>
-    2:11:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    12:12:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <init>
-    12:12:void <init>(int,java.lang.String,int,int):505 -> <init>
-    12:12:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66:66 -> <init>
-    13:13:void <init>(int,java.lang.String,int,int):505 -> <init>
-    13:13:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    14:14:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <init>
-    14:14:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    14:14:void <init>(int,java.lang.String,int,int):505 -> <init>
-    14:14:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    15:15:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <init>
-    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    15:15:void <init>(int,java.lang.String,int,int):505 -> <init>
-    15:15:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    16:16:void <init>(int,java.lang.String,int,int):506:506 -> <init>
-    16:16:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <init>
-    17:17:void <init>(int,java.lang.String,int,int):506 -> <init>
-    17:17:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    18:18:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <init>
-    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    18:18:void <init>(int,java.lang.String,int,int):506 -> <init>
-    18:18:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    19:19:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <init>
-    19:19:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    19:19:void <init>(int,java.lang.String,int,int):506 -> <init>
-    19:19:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    20:20:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getOffset$kotlin_metadata():10:10 -> <init>
-    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):39 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    20:20:void <init>(int,java.lang.String,int,int):506 -> <init>
-    20:20:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    21:21:void <init>(int,java.lang.String,int,int):514:514 -> <init>
-    21:21:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    22:22:void set_hasGetter(boolean):506:506 -> <init>
-    22:22:void <init>(int,java.lang.String,int,int):514 -> <init>
-    22:22:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    23:69:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,boolean):0:46 -> <init>
-    23:69:void set_hasGetter(boolean):506 -> <init>
-    23:69:void <init>(int,java.lang.String,int,int):514 -> <init>
-    23:69:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    70:70:void <init>(int,java.lang.String,int,int):514:514 -> <init>
-    70:70:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    71:71:boolean get_hasSetter():505:505 -> <init>
-    71:71:void <init>(int,java.lang.String,int,int):524 -> <init>
-    71:71:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    72:114:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):0:42 -> <init>
-    72:114:boolean get_hasSetter():505 -> <init>
-    72:114:void <init>(int,java.lang.String,int,int):524 -> <init>
-    72:114:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    115:115:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.invoke(int):20:20 -> <init>
-    115:115:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):42 -> <init>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:115:boolean get_hasSetter():505 -> <init>
-    115:115:void <init>(int,java.lang.String,int,int):524 -> <init>
-    115:115:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    116:116:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.invoke(int):20:20 -> <init>
-    116:116:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):42 -> <init>
-    116:116:boolean get_hasSetter():505 -> <init>
-    116:116:void <init>(int,java.lang.String,int,int):524 -> <init>
-    116:116:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    117:198:void <init>(int,java.lang.String,int,int):524:605 -> <init>
-    117:198:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    199:199:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    199:199:void <init>(int,java.lang.String,int,int):605 -> <init>
-    199:199:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    200:202:void <init>(int,java.lang.String,int,int):1305:1307 -> <init>
-    200:202:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    203:905:void <init>(int,java.lang.String,int,int):605:1307 -> <init>
-    203:905:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    906:906:void <init>(int,java.lang.String,int,int):605:605 -> <init>
-    906:906:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    907:907:void <init>(int,java.lang.String,int,int):0:0 -> <init>
-    907:907:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":911,"2":912,"3":913,"4":914,"5":915},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    908:908:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    908:908:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    908:908:void <init>(int,java.lang.String,int,int):506 -> <init>
-    908:908:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    909:909:void <init>(int,java.lang.String,int,int):0:0 -> <init>
-    909:909:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":916,"2":917,"3":918,"4":919,"5":920},"outline":"Lcom/android/tools/r8/internal/H4;a(Ljava/lang/String;Lcom/android/tools/r8/internal/iq;Ljava/lang/String;)Ljava/lang/String;"}
-    910:910:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    910:910:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    910:910:void <init>(int,java.lang.String,int,int):505 -> <init>
-    910:910:void com.android.tools.r8.internal.KmProperty.<init>(int,int,int,java.lang.String):0 -> <init>
-    911:911:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    911:911:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    911:911:void <init>(int,java.lang.String,int,int):506 -> <init>
-    912:912:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    912:912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    912:912:void <init>(int,java.lang.String,int,int):506 -> <init>
-    913:913:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    913:913:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    913:913:void <init>(int,java.lang.String,int,int):506 -> <init>
-    914:914:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    914:914:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    914:914:void <init>(int,java.lang.String,int,int):506 -> <init>
-    915:915:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    915:915:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    915:915:void <init>(int,java.lang.String,int,int):506 -> <init>
-    916:916:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    916:916:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    916:916:void <init>(int,java.lang.String,int,int):505 -> <init>
-    917:917:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    917:917:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    917:917:void <init>(int,java.lang.String,int,int):505 -> <init>
-    918:918:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    918:918:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    918:918:void <init>(int,java.lang.String,int,int):505 -> <init>
-    919:919:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    919:919:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    919:919:void <init>(int,java.lang.String,int,int):505 -> <init>
-    920:920:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    920:920:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):66 -> <init>
-    920:920:void <init>(int,java.lang.String,int,int):505 -> <init>
-    1:1:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):573:573 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:void setSetterParameter(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):592:592 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qI;)V"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):609:609 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/lI;"}
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):609 -> a
-    1299:1299:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    1299:1299:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):609 -> a
-    1300:1300:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):618:618 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    1301:1301:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    1301:1301:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):618 -> a
-    2596:2596:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    2596:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):618 -> a
-    2597:2597:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):622:622 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/qI;"}
-    2598:2598:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):634:634 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/eI;"}
-    2599:3264:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):644:1309 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)V"}
-    3265:3932:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):644:1311 -> a
-    3933:3934:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):646:647 -> a
-    3935:3935:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    3935:3935:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):647 -> a
-    3936:4602:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):647:1313 -> a
-    4603:5269:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):649:1315 -> a
-    5270:5270:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):650:650 -> a
-    5271:5271:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPropertyExtensionVisitor.getType():178:178 -> a
-    5271:5271:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):650 -> a
-    5272:5272:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):650:650 -> a
-    5273:5277:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyExtensionVisitor):140:144 -> a
-    5273:5277:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):111 -> a
-    5273:5277:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):650 -> a
-    5278:5278:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyExtensionVisitor):140:140 -> a
-    5278:5278:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):111 -> a
-    5278:5278:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):650 -> a
-    5279:5279:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):651:651 -> a
-    1:1:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):597:597 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReceiverParameterType(int):613:613 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():630:630 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uI;"}
-    4:4:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():630 -> b
-    1299:1299:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> b
-    1299:1299:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():630 -> b
-    1:1:java.util.List getExtensions$kotlin_metadata():604:604 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):626:626 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    3:3:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):597:597 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):626 -> c
-    1:1:int getFlags():496:496 -> d
-    1:1:int getGetterFlags():538:538 -> e
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> e
-    2:2:int getGetterFlags():538 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.String getName():497:497 -> f
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReceiverParameterType():573:573 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReturnType():597:597 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:int getSetterFlags():559:559 -> i
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> i
-    2:2:int getSetterFlags():559 -> i
-    3:3:int getSetterFlags():559:559 -> i
-    1:1:java.util.List getVersionRequirements():602:602 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes -> com.android.tools.r8.internal.cI:
+    1:18:void <init>():131:148 -> <init>
+    19:19:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    19:19:void <init>():148 -> <init>
+    20:22:void <init>():690:692 -> <init>
+    23:567:void <init>():148:692 -> <init>
+    568:568:void <init>():148:148 -> <init>
+    1:1:java.util.List getFunctions():135:135 -> a
+    1:1:java.util.List getProperties():140:140 -> b
+    1:1:java.util.List getTypeAliases():145:145 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty -> com.android.tools.r8.internal.fI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int flags -> a
-    1:1:void <init>(int):480:480 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.eI:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.fI:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fI;"}
-    1:1:void com.android.tools.r8.internal.KmPropertyVisitor.<init>():0:0 -> <init>
-      # {"id":"com.android.tools.r8.synthesized"}
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor):376:376 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):376 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):387:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/lI;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitContextReceiverType(int):404:404 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor visitSetterParameter(int,java.lang.String):413:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/qI;"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):435:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/eI;"}
-    5:5:void visitEnd():441:441 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReceiverParameterType(int):395:395 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor visitVersionRequirement():427:427 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitReturnType(int):421:421 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmType -> com.android.tools.r8.internal.gI:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
-    int flags -> b
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier classifier -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DH;"}
-    java.util.List arguments -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType abbreviatedType -> e
+    java.lang.String name -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate _hasSetter$delegate -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes getter -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType outerType -> f
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes setter -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SH;"}
-    java.util.List extensions -> h
+    java.util.List typeParameters -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void <init>(int):863:863 -> <init>
-    2:48:void <init>(int):862:908 -> <init>
-    49:49:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    49:49:void <init>(int):908 -> <init>
-    50:52:void <init>(int):1304:1306 -> <init>
-    53:451:void <init>(int):908:1306 -> <init>
-    452:452:void <init>(int):908:908 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier getClassifier():870:870 -> a
-    1:1:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):958 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;)V"}
-    2:2:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):959:959 -> a
-    3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$Class.getName():1220:1220 -> a
-    3:3:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):959 -> a
-    4:6:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):959:961 -> a
-    7:7:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeAlias.getName():1235:1235 -> a
-    7:7:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):961 -> a
-    8:356:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):961:1309 -> a
-    357:357:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):964:964 -> a
-    358:358:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component1():0:0 -> a
-    358:358:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):966 -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType receiverParameterType -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    java.util.List contextReceiverTypes -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter setterParameter -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType returnType -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    java.util.List versionRequirements -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    java.util.List extensions -> l
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> m
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/UP;"}
+    1:1:void <clinit>():266:266 -> <clinit>
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.mutableProperty1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1):108:108 -> <clinit>
+    2:2:void <clinit>():266 -> <clinit>
+    3:3:void <clinit>():267:267 -> <clinit>
+    1:10:void <init>(int,java.lang.String,int,int):257:266 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILjava/lang/String;)V"}
+    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> <init>
+    11:11:void <init>(int,java.lang.String,int,int):266 -> <init>
+    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64:64 -> <init>
+    12:12:void <init>(int,java.lang.String,int,int):266 -> <init>
+    13:14:void <init>(int,java.lang.String,int,int):266:267 -> <init>
+    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField) -> <init>
+    15:15:void <init>(int,java.lang.String,int,int):267 -> <init>
+    16:16:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <init>
+    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    359:359:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component2():0:0 -> a
-    359:359:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):966 -> a
-    360:360:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):969:969 -> a
-    361:704:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):968:1311 -> a
-    705:705:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975:975 -> a
-    706:706:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeExtensionVisitor.getType():336:336 -> a
-    706:706:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    707:707:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975:975 -> a
-    708:709:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):188:189 -> a
-    708:709:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    708:709:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    710:710:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.visit(boolean):180:180 -> a
-    710:710:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):189 -> a
-    710:710:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    710:710:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    711:716:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):190:195 -> a
-    711:716:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    711:716:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    717:901:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.visitAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):0:184 -> a
-    717:901:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):190 -> a
-    717:901:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    717:901:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    902:902:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):191:191 -> a
-    902:902:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    902:902:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    903:903:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor):188:188 -> a
-    903:903:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):175 -> a
-    903:903:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):975 -> a
-    904:904:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):976:976 -> a
-    905:905:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):958:958 -> a
-    906:906:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier getClassifier():870:870 -> a
-    906:906:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):958 -> a
-    907:907:void setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):886:886 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    908:908:void setFlexibleTypeUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound):905:905 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SH;)V"}
-    909:909:void visitClass(java.lang.String):912:912 -> a
-    910:910:void setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):870:870 -> a
-    910:910:void visitClass(java.lang.String):912 -> a
-    911:911:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):927:927 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/pI;"}
-    912:912:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitAbbreviatedType(int):936:936 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    913:913:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):944:944 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/pI;"}
-    914:914:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):948:948 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/kI;"}
-    1:1:void setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):898:898 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:void visitTypeAlias(java.lang.String):917:917 -> b
-    3:3:void setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):870:870 -> b
-    3:3:void visitTypeAlias(java.lang.String):917 -> b
-    4:4:void visitStarProjection():931:931 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitOuterType(int):940:940 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getAbbreviatedType():886:886 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    2:2:void visitTypeParameter(int):922:922 -> c
-    3:3:void setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):870:870 -> c
-    3:3:void visitTypeParameter(int):922 -> c
-    1:1:java.util.List getArguments():875:875 -> d
-    1:1:int getFlags():862:862 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():905:905 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SH;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getOuterType():898:898 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias -> com.android.tools.r8.internal.hI:
+    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <init>
+    16:16:void <init>(int,java.lang.String,int,int):267 -> <init>
+    17:17:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <init>
+    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <init>
+    17:17:void <init>(int,java.lang.String,int,int):267 -> <init>
+    18:18:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getOffset$kotlin_metadata():10:10 -> <init>
+    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):37 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <init>
+    18:18:void <init>(int,java.lang.String,int,int):267 -> <init>
+    19:19:void <init>(int,java.lang.String,int,int):275:275 -> <init>
+    20:20:void set_hasGetter(boolean):267:267 -> <init>
+    20:20:void <init>(int,java.lang.String,int,int):275 -> <init>
+    21:65:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,boolean):0:44 -> <init>
+    21:65:void set_hasGetter(boolean):267 -> <init>
+    21:65:void <init>(int,java.lang.String,int,int):275 -> <init>
+    66:66:void <init>(int,java.lang.String,int,int):275:275 -> <init>
+    67:67:boolean get_hasSetter():266:266 -> <init>
+    67:67:void <init>(int,java.lang.String,int,int):285 -> <init>
+    68:114:void <init>(int,java.lang.String,int,int):285:331 -> <init>
+    115:115:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    115:115:void <init>(int,java.lang.String,int,int):331 -> <init>
+    116:118:void <init>(int,java.lang.String,int,int):691:693 -> <init>
+    119:481:void <init>(int,java.lang.String,int,int):331:693 -> <init>
+    482:482:void <init>(int,java.lang.String,int,int):331:331 -> <init>
+    483:483:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36:36 -> <init>
+    483:483:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt.propertyBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):64 -> <init>
+    483:483:void <init>(int,java.lang.String,int,int):267 -> <init>
+    1:1:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):299:299 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    2:2:void setSetterParameter(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):318:318 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;)V"}
+    3:3:java.util.List getExtensions$kotlin_metadata():330:330 -> a
+    1:1:java.lang.String getName():259:259 -> b
+    2:2:void setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):323:323 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReceiverParameterType():299:299 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getReturnType():323:323 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes -> com.android.tools.r8.internal.gI:
+# {"id":"sourceFile","fileName":"Nodes.kt"}
+    int flags -> a
+    1:1:void <init>(int):243:243 -> <init>
+    1:1:void <init>():244 -> <init>
+    2:2:void <init>(int):243:243 -> <init>
+com.android.tools.r8.jetbrains.kotlin.metadata.KmType -> com.android.tools.r8.internal.iI:
+# {"id":"sourceFile","fileName":"Nodes.kt"}
+    int flags -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier classifier -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LH;"}
+    java.util.List arguments -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType abbreviatedType -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType outerType -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XH;"}
+    java.util.List extensions -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    1:48:void <init>(int):444:491 -> <init>
+    49:49:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    49:49:void <init>(int):491 -> <init>
+    50:52:void <init>(int):690:692 -> <init>
+    53:254:void <init>(int):491:692 -> <init>
+    255:255:void <init>(int):491:491 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getAbbreviatedType():469:469 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    2:2:void setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):469:469 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    3:3:void setFlexibleTypeUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound):488:488 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XH;)V"}
+    1:1:java.util.List getArguments():458:458 -> b
+    2:2:void setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):481:481 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier getClassifier():453:453 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LH;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():488:488 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XH;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getOuterType():481:481 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias -> com.android.tools.r8.internal.jI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int flags -> a
     java.lang.String name -> b
     java.util.List typeParameters -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType underlyingType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType expandedType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     java.util.List annotations -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List versionRequirements -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAliasVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAliasVisitor):453:453 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAliasVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):453 -> <init>
-    1:1:void <init>(int,java.lang.String):667 -> <init>
-    2:35:void <init>(int,java.lang.String):665:698 -> <init>
+    1:35:void <init>(int,java.lang.String):342:376 -> <init>
     36:36:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    36:36:void <init>(int,java.lang.String):698 -> <init>
-    37:46:void <init>(int,java.lang.String):1304:1313 -> <init>
-    47:47:void <init>(int,java.lang.String):1312:1312 -> <init>
-    48:48:void <init>(int,java.lang.String):698:698 -> <init>
-    1:1:void setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):685:685 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    2:2:java.util.List getAnnotations():690:690 -> a
-    1:1:int getFlags():665:665 -> b
-    2:2:void setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):679:679 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    1:1:java.lang.String getName():666:666 -> c
-    1:1:java.util.List getTypeParameters():674:674 -> d
-    1:1:java.util.List getVersionRequirements():695:695 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAliasVisitor -> R8$$REMOVED$$CLASS$$177:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.kI:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter -> com.android.tools.r8.internal.lI:
+    36:36:void <init>(int,java.lang.String):376 -> <init>
+    37:46:void <init>(int,java.lang.String):690:699 -> <init>
+    47:47:void <init>(int,java.lang.String):698:698 -> <init>
+    48:48:void <init>(int,java.lang.String):376:376 -> <init>
+    1:1:void setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):363:363 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    2:2:java.util.List getAnnotations():368:368 -> a
+    1:1:java.lang.String getName():344:344 -> b
+    2:2:void setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):357:357 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:java.util.List getTypeParameters():352:352 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter -> com.android.tools.r8.internal.mI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor.delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lI;"}
-    int flags -> b
-    java.lang.String name -> c
-    int id -> d
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance variance -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
-    java.util.List upperBounds -> f
+    int flags -> a
+    java.lang.String name -> b
+    int id -> c
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance variance -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
+    java.util.List upperBounds -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    java.util.List extensions -> g
+    java.util.List extensions -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):562:562 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):562 -> <init>
-    1:1:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):821 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/sI;)V"}
-    2:19:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):814:831 -> <init>
-    20:20:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    20:20:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):831 -> <init>
-    21:23:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):1304:1306 -> <init>
-    24:499:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):831:1306 -> <init>
-    500:500:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):831:831 -> <init>
-    1:1:int getFlags():814:814 -> a
-    2:462:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848:1308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lI;)V"}
-    463:463:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848:848 -> a
-    464:464:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitUpperBound(int):835:835 -> a
-    464:464:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848 -> a
-    465:465:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):0:0 -> a
-    465:465:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitUpperBound(int):835 -> a
-    465:465:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848 -> a
-    1760:1760:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):1295:1295 -> a
-    1760:1760:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitUpperBound(int):835 -> a
-    1760:1760:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848 -> a
-    1761:2224:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):848:1311 -> a
-    2225:2225:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849:849 -> a
-    2226:2226:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeParameterExtensionVisitor.getType():299:299 -> a
-    2226:2226:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    2227:3066:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> a
-    2227:3066:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3067:3067:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849:849 -> a
-    3068:3094:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor):169:195 -> a
-    3068:3094:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):161 -> a
-    3068:3094:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3095:3095:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor):170:170 -> a
-    3095:3095:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):161 -> a
-    3095:3095:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3096:3261:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.visitAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):0:165 -> a
-    3096:3261:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor):170 -> a
-    3096:3261:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):161 -> a
-    3096:3261:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3262:3262:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor):171:171 -> a
-    3262:3262:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):161 -> a
-    3262:3262:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3263:3263:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor):169:169 -> a
-    3263:3263:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionVisitor):161 -> a
-    3263:3263:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):849 -> a
-    3264:3264:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor):850:850 -> a
-    1:1:int getId():819:819 -> b
-    1:1:java.lang.String getName():818:818 -> c
-    1:1:java.util.List getUpperBounds():828:828 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance getVariance():820:820 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sI;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor.visitEnd():583:583 -> f
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.nI:
-# {"id":"sourceFile","fileName":"Extensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterVisitor -> R8$$REMOVED$$CLASS$$178:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+    1:16:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):420:435 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ILcom/android/tools/r8/internal/rI;)V"}
+    17:17:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    17:17:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):435 -> <init>
+    18:20:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):690:692 -> <init>
+    21:278:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):435:692 -> <init>
+    279:279:void <init>(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):435:435 -> <init>
+    1:1:int getId():423:423 -> a
+    1:1:java.lang.String getName():422:422 -> b
+    1:1:java.util.List getUpperBounds():432:432 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance getVariance():424:424 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rI;"}
 com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection -> com.android.tools.r8.internal.oI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance variance -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmType type -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection STAR -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oI;"}
-    1:1:void <clinit>():1255:1255 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1245:1245 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sI;Lcom/android/tools/r8/internal/gI;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():1245:1245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance getVariance():1245:1245 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sI;"}
+    1:1:void <clinit>():580:580 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):570:570 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rI;Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():570:570 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance getVariance():570:570 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rI;"}
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor -> com.android.tools.r8.internal.pI:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pI;"}
-    1:1:void com.android.tools.r8.internal.KmTypeVisitor.<init>():0:0 -> <init>
-      # {"id":"com.android.tools.r8.synthesized"}
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor):600:600 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):600 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1:1:void visitClass(java.lang.String):607:607 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):637:637 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/sI;)Lcom/android/tools/r8/internal/pI;"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitAbbreviatedType(int):659:659 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):685:685 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/pI;"}
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):693:693 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/kI;"}
-    6:6:void visitEnd():699:699 -> a
-    1:1:void visitTypeAlias(java.lang.String):617:617 -> b
-    2:2:void visitStarProjection():644:644 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitOuterType(int):674:674 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/pI;"}
-    1:1:void visitTypeParameter(int):626:626 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter -> com.android.tools.r8.internal.qI:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter -> com.android.tools.r8.internal.pI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor.delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qI;"}
-    int flags -> b
-    java.lang.String name -> c
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType type -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmType varargElementType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gI;"}
-    java.util.List extensions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):522:522 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):522 -> <init>
-    1:1:void <init>(int,java.lang.String):757 -> <init>
-    2:23:void <init>(int,java.lang.String):752:773 -> <init>
-    24:24:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    24:24:void <init>(int,java.lang.String):773 -> <init>
-    25:34:void <init>(int,java.lang.String):1304:1313 -> <init>
-    35:35:void <init>(int,java.lang.String):1312:1312 -> <init>
-    36:36:void <init>(int,java.lang.String):773:773 -> <init>
-    1:1:int getFlags():752:752 -> a
-    2:2:void setType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):765:765 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    3:3:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):794:794 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qI;)V"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitType(int):777:777 -> a
-    4:4:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):794 -> a
-    5:5:void setType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):765:765 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitType(int):777 -> a
-    5:5:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):794 -> a
-    6:7:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):794:795 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor visitVarargElementType(int):781:781 -> a
-    8:8:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):795 -> a
-    9:532:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):795:1318 -> a
-    533:1054:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):797:1318 -> a
-    1055:1577:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor):796:1318 -> a
-    1:1:java.lang.String getName():756:756 -> b
-    2:2:void setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):770:770 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():765:765 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getVarargElementType():770:770 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gI;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor.visitEnd():551:551 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameterVisitor -> R8$$REMOVED$$CLASS$$179:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance -> com.android.tools.r8.internal.sI:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+    int flags -> a
+    java.lang.String name -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType type -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType varargElementType -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
+    1:20:void <init>(int,java.lang.String):387:406 -> <init>
+    21:21:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
+    21:21:void <init>(int,java.lang.String):406 -> <init>
+    22:31:void <init>(int,java.lang.String):690:699 -> <init>
+    32:32:void <init>(int,java.lang.String):698:698 -> <init>
+    33:33:void <init>(int,java.lang.String):406:406 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getType():398:398 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    2:2:void setType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):398:398 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType getVarargElementType():403:403 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
+    2:2:void setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):403:403 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)V"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance -> com.android.tools.r8.internal.rI:
+# {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance INVARIANT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance IN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance OUT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
-    1:11:void <clinit>():880:890 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
+    1:11:void <clinit>():606:616 -> <clinit>
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance[] $values():0:0 -> <clinit>
-    12:12:void <clinit>():890 -> <clinit>
+    12:12:void <clinit>():616 -> <clinit>
     13:13:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt.enumEntries(java.lang.Enum[]):43:43 -> <clinit>
-    13:13:void <clinit>():890 -> <clinit>
-    1:1:void <init>(java.lang.String,int):876:876 -> <init>
+    13:13:void <clinit>():616 -> <clinit>
+    1:1:void <init>(java.lang.String,int):602:602 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion -> com.android.tools.r8.internal.sI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     int major -> a
     int minor -> b
     int patch -> c
-    1:1:void <init>(int,int,int):1275:1275 -> <init>
+    1:1:void <init>(int,int,int):626:626 -> <init>
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-    1:1:java.lang.String toString():1280:1280 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement -> com.android.tools.r8.internal.uI:
+    1:1:java.lang.String toString():631:631 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement -> com.android.tools.r8.internal.tI:
 # {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind kind -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wI;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel level -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel level -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uI;"}
     java.lang.Integer errorCode -> c
     java.lang.String message -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion version -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tI;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):712:712 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):712 -> <init>
-    1:1:void <init>():987 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():991:991 -> a
-    1:1:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uI;)V"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():996:996 -> a
-    2:2:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    3:3:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033:1033 -> a
-    4:4:void setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind):991:991 -> a
-    4:4:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):1015 -> a
-    4:4:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    5:5:void setLevel(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel):996:996 -> a
-    5:5:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):1016 -> a
-    5:5:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    6:7:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String):1017:1018 -> a
-    6:7:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    8:8:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034:1034 -> a
-    9:9:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.getMajor():1275:1275 -> a
-    9:9:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034 -> a
-    10:10:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034:1034 -> a
-    11:11:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.getMinor():1275:1275 -> a
-    11:11:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034 -> a
-    12:12:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034:1034 -> a
-    13:13:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.getPatch():1275:1275 -> a
-    13:13:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034 -> a
-    14:14:void visitVersion(int,int,int):1023:1023 -> a
-    14:14:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034 -> a
-    15:15:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion):1011:1011 -> a
-    15:15:void visitVersion(int,int,int):1023 -> a
-    15:15:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1034 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():996:996 -> a
-    16:16:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():991:991 -> a
-    17:17:void accept(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor):1033 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion getVersion():1011:1011 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tI;"}
-    1:1:java.lang.String toString():1043:1043 -> toString
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():991:991 -> toString
-    2:2:java.lang.String toString():1043 -> toString
-    3:3:java.lang.String toString():1043:1043 -> toString
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():996:996 -> toString
-    4:4:java.lang.String toString():1043 -> toString
-    5:5:java.lang.String toString():1043:1043 -> toString
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():996:996 -> toString
-    6:6:java.lang.String toString():1043 -> toString
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():991:991 -> toString
-    7:7:java.lang.String toString():1043 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.vI:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
+    1:1:void <init>():500:500 -> <init>
+    1:1:java.lang.String toString():531:531 -> toString
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():504:504 -> toString
+    2:2:java.lang.String toString():531 -> toString
+    3:3:java.lang.String toString():531:531 -> toString
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():509:509 -> toString
+    4:4:java.lang.String toString():531 -> toString
+    5:5:java.lang.String toString():531:531 -> toString
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion getVersion():524:524 -> toString
+    6:6:java.lang.String toString():531 -> toString
+    7:7:java.lang.String toString():531:531 -> toString
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion getVersion():524:524 -> toString
+    8:8:java.lang.String toString():531 -> toString
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel getLevel():509:509 -> toString
+    9:9:java.lang.String toString():531 -> toString
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind getKind():504:504 -> toString
+    10:10:java.lang.String toString():531 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.uI:
+# {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel WARNING -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel ERROR -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel HIDDEN -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel[] $VALUES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/vI;"}
-    1:11:void <clinit>():955:965 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uI;"}
+    1:11:void <clinit>():641:651 -> <clinit>
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel[] $values():0:0 -> <clinit>
-    12:12:void <clinit>():965 -> <clinit>
-    13:13:void <clinit>():965:965 -> <clinit>
+    12:12:void <clinit>():651 -> <clinit>
+    13:13:void <clinit>():651:651 -> <clinit>
     14:14:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt.enumEntries(java.lang.Enum[]):43:43 -> <clinit>
-    14:14:void <clinit>():965 -> <clinit>
-    1:1:void <init>(java.lang.String,int):951:951 -> <init>
+    14:14:void <clinit>():651 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel[] values():966:966 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/vI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.wI:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel[] values():652:652 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/uI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.vI:
+# {"id":"sourceFile","fileName":"Nodes.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind API_VERSION -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind UNKNOWN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/wI;"}
-    1:26:void <clinit>():975:1000 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/vI;"}
+    1:26:void <clinit>():661:686 -> <clinit>
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind[] $values():0:0 -> <clinit>
-    27:27:void <clinit>():1000 -> <clinit>
-    28:28:void <clinit>():1000:1000 -> <clinit>
+    27:27:void <clinit>():686 -> <clinit>
+    28:28:void <clinit>():686:686 -> <clinit>
     29:29:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.enums.EnumEntriesKt.enumEntries(java.lang.Enum[]):43:43 -> <clinit>
-    29:29:void <clinit>():1000 -> <clinit>
-    1:1:void <init>(java.lang.String,int):971:971 -> <init>
+    29:29:void <clinit>():686 -> <clinit>
+    1:1:void <init>(java.lang.String,int):657:657 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind[] values():1002:1002 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/wI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVisitor -> R8$$REMOVED$$CLASS$$180:
-# {"id":"sourceFile","fileName":"Visitors.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind -> com.android.tools.r8.internal.YM:
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind[] values():688:688 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/vI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind -> com.android.tools.r8.internal.cN:
 # {"id":"sourceFile","fileName":"Modifiers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl flag -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
     com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries $ENTRIES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
     1:25:void <clinit>():163:187 -> <clinit>
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind[] $values():0:0 -> <clinit>
     26:26:void <clinit>():187 -> <clinit>
@@ -201673,12 +200469,12 @@
     28:28:void <clinit>():187:187 -> <clinit>
     1:32:void <init>(java.lang.String,int,int):159:190 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.Modality -> com.android.tools.r8.internal.EO:
+com.android.tools.r8.jetbrains.kotlin.metadata.Modality -> com.android.tools.r8.internal.IO:
 # {"id":"sourceFile","fileName":"Modifiers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl flag -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
     com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries $ENTRIES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
     1:19:void <clinit>():86:104 -> <clinit>
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.Modality[] $values():0:0 -> <clinit>
     20:20:void <clinit>():104 -> <clinit>
@@ -201687,14 +200483,12 @@
     22:22:void <clinit>():104:104 -> <clinit>
     1:26:void <init>(java.lang.String,int,int):82:107 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.NodesKt -> R8$$REMOVED$$CLASS$$181:
-# {"id":"sourceFile","fileName":"Nodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.Visibility -> com.android.tools.r8.internal.Zl0:
+com.android.tools.r8.jetbrains.kotlin.metadata.Visibility -> com.android.tools.r8.internal.dm0:
 # {"id":"sourceFile","fileName":"Modifiers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl flag -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
     com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries $ENTRIES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
     1:44:void <clinit>():28:71 -> <clinit>
     45:45:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility[] $values():0:0 -> <clinit>
     45:45:void <clinit>():71 -> <clinit>
@@ -201703,616 +200497,597 @@
     47:47:void <clinit>():71:71 -> <clinit>
     1:51:void <init>(java.lang.String,int,int):24:74 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate -> com.android.tools.r8.internal.J6:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 flags -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UP;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl flag -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iq;"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):34:34 -> <init>
-    1:1:void com.android.tools.r8.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.internal.MutablePropertyReference1,com.android.tools.r8.internal.FlagImpl):0 -> <init>
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QP;Lcom/android/tools/r8/internal/iq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
+    int mask -> c
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):32:32 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UP;Lcom/android/tools/r8/internal/kq;)V"}
     2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void com.android.tools.r8.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.internal.MutablePropertyReference1,com.android.tools.r8.internal.FlagImpl):0 -> <init>
     3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> <init>
-    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> <init>
+    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.internal.MutablePropertyReference1,com.android.tools.r8.internal.FlagImpl):0 -> <init>
-    4:4:void com.android.tools.r8.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.internal.MutablePropertyReference1,com.android.tools.r8.internal.FlagImpl):0:0 -> <init>
-    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> <init>
-    5:5:void com.android.tools.r8.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.internal.MutablePropertyReference1,com.android.tools.r8.internal.FlagImpl):0 -> <init>
-    1:1:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/QP;)Z"}
+    4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getOffset$kotlin_metadata():10:10 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):37 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):37:37 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):36:36 -> <init>
+    1:1:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):40:40 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/UP;)Z"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.invoke(int):20:20 -> a
-    2:2:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):42 -> a
+    2:2:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.invoke(int):20:20 -> a
-    3:3:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):42 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter -> com.android.tools.r8.internal.ud:
+    3:3:boolean getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):40 -> a
+    4:5:void setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,boolean):43:44 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/UP;Z)V"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter -> com.android.tools.r8.internal.wd:
 # {"id":"sourceFile","fileName":"Writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder t -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext c -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zm0;"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):299:299 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;)V"}
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):299:300 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):299 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm0;"}
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):298:298 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gE;)V"}
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):298:299 -> <init>
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):298 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.create():10232:10232 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.access$8700():10219 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.newBuilder():10209 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):300 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):299 -> <init>
-    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):300:301 -> <init>
-    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):299 -> <init>
-    1:1:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> a
-    1:1:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)V"}
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):299 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):298 -> <init>
+    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):299:300 -> <init>
+    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):298 -> <init>
+    1:1:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> a
+    1:1:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):303 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getDefaultInstance():8617:8617 -> a
-    2:2:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304 -> a
+    2:2:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):303 -> a
     3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFlags():9165:9165 -> a
-    3:3:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304 -> a
+    3:3:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):303 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):305:305 -> a
+    4:4:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304:304 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFlags(int):10772:10772 -> a
-    5:5:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):305 -> a
+    5:5:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFlags(int):10772:10773 -> a
-    6:7:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):305 -> a
-    8:8:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):307:307 -> a
-    9:41:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:32 -> a
-    9:41:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):307 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10818:10818 -> a
-    42:42:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):307 -> a
+    6:7:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):304 -> a
+    8:8:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):306:306 -> a
+    9:40:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:31 -> a
+    9:40:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):306 -> a
+    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10818:10818 -> a
+    41:41:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):306 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10818:10819 -> a
-    43:44:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):307 -> a
-    45:126:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309:390 -> a
-    127:127:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309:309 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):1:1 -> a
-    128:128:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
-    129:130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
-    129:130:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
-    131:131:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):390:390 -> a
-    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
-    132:132:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
-    133:133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
-    133:133:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
-    134:136:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureTypeParameterIsMutable():10868:10870 -> a
-    134:136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeParameter(java.lang.Iterable):10965 -> a
-    134:136:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
+    42:43:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setFqName(int):10818:10819 -> a
+    42:43:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):306 -> a
+    44:125:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308:389 -> a
+    126:126:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308:308 -> a
+    127:127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):1:1 -> a
+    127:127:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
+    128:129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
+    128:129:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
+    130:130:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):389:389 -> a
+    131:131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    131:131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
+    131:131:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
+    132:132:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
+    133:135:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureTypeParameterIsMutable():10868:10870 -> a
+    133:135:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeParameter(java.lang.Iterable):10965 -> a
+    133:135:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeParameter(java.lang.Iterable):10966:10966 -> a
-    137:137:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
-    138:222:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:394 -> a
-    223:223:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:310 -> a
-    224:224:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
-    224:224:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
-    225:309:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:394 -> a
-    310:312:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSupertypeIsMutable():10993:10995 -> a
-    310:312:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSupertype(java.lang.Iterable):11090 -> a
-    310:312:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeParameter(java.lang.Iterable):10966:10966 -> a
+    136:136:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):308 -> a
+    137:221:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309:393 -> a
+    222:222:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309:309 -> a
+    223:223:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
+    223:223:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
+    224:308:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309:393 -> a
+    309:311:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSupertypeIsMutable():10993:10995 -> a
+    309:311:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSupertype(java.lang.Iterable):11090 -> a
+    309:311:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    313:313:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSupertype(java.lang.Iterable):11091:11091 -> a
-    313:313:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
-    314:401:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311:398 -> a
-    402:402:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311:311 -> a
-    403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):108:108 -> a
+    312:312:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSupertype(java.lang.Iterable):11091:11091 -> a
+    312:312:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):309 -> a
+    313:400:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:397 -> a
+    401:401:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:310 -> a
+    402:402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):107:107 -> a
+    402:402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    402:402:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14990:14990 -> a
+    403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.access$13300():14977 -> a
+    403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.newBuilder():14967 -> a
+    403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):107 -> a
     403:403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    403:403:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    404:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14990:14990 -> a
-    404:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.access$13300():14977 -> a
-    404:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.newBuilder():14967 -> a
-    404:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):108 -> a
-    404:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    404:404:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    405:692:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110:397 -> a
-    405:692:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    405:692:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    693:693:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111:111 -> a
-    693:693:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    693:693:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    694:695:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
-    694:695:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111 -> a
-    694:695:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    694:695:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    696:698:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.ensureValueParameterIsMutable():15169:15171 -> a
-    696:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):15223 -> a
-    696:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111 -> a
-    696:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    696:698:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):15224:15224 -> a
-    699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111 -> a
+    403:403:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    404:691:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):109:396 -> a
+    404:691:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    404:691:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    692:692:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110:110 -> a
+    692:692:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    692:692:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    693:694:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
+    693:694:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110 -> a
+    693:694:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    693:694:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    695:697:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.ensureValueParameterIsMutable():15169:15171 -> a
+    695:697:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):15223 -> a
+    695:697:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110 -> a
+    695:697:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    695:697:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    698:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):15224:15224 -> a
+    698:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110 -> a
+    698:698:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    698:698:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
+    699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110 -> a
     699:699:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    699:699:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
-    700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111 -> a
+    699:699:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
+    700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):110 -> a
     700:700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    700:700:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    701:701:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
-    701:701:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):111 -> a
+    700:700:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    701:701:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():178:178 -> a
+    701:701:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):112 -> a
     701:701:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    701:701:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    702:702:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():333:333 -> a
-    702:702:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):113 -> a
-    702:702:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    702:702:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    703:712:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):399:408 -> a
-    703:712:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    703:712:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    713:713:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):407:407 -> a
-    713:713:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    713:713:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    714:1008:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):113:407 -> a
-    714:1008:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    714:1008:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1009:1011:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.ensureVersionRequirementIsMutable():15293:15295 -> a
-    1009:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addAllVersionRequirement(java.lang.Iterable):15365 -> a
-    1009:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):113 -> a
-    1009:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1009:1011:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1012:1012:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addAllVersionRequirement(java.lang.Iterable):15366:15366 -> a
+    701:701:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    702:711:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):398:407 -> a
+    702:711:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    702:711:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    712:712:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):406:406 -> a
+    712:712:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    712:712:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    713:1007:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):112:406 -> a
+    713:1007:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    713:1007:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1008:1010:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.ensureVersionRequirementIsMutable():15293:15295 -> a
+    1008:1010:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addAllVersionRequirement(java.lang.Iterable):15365 -> a
+    1008:1010:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):112 -> a
+    1008:1010:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    1008:1010:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1011:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.addAllVersionRequirement(java.lang.Iterable):15366:15366 -> a
+    1011:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):112 -> a
+    1011:1011:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    1011:1011:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1012:1012:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
     1012:1012:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):113 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1012:1012:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1012:1012:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1013:1013:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    1013:1013:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1012:1012:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1013:1013:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):411:411 -> a
     1013:1013:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1013:1013:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1014:1014:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):412:412 -> a
+    1013:1013:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1014:1014:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):114:114 -> a
     1014:1014:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1014:1014:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1015:1015:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):115:115 -> a
+    1014:1014:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1015:1015:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags$kotlin_metadata():167:167 -> a
+    1015:1015:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):116 -> a
     1015:1015:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1015:1015:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1016:1016:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags():320:320 -> a
-    1016:1016:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):117 -> a
+    1015:1015:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1016:1016:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstance():14628:14628 -> a
+    1016:1016:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):116 -> a
     1016:1016:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1016:1016:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1017:1017:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstance():14628:14628 -> a
-    1017:1017:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):117 -> a
+    1016:1016:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1017:1017:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getFlags():14762:14762 -> a
+    1017:1017:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):116 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1017:1017:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1017:1017:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1018:1018:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getFlags():14762:14762 -> a
-    1018:1018:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):117 -> a
+    1017:1017:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1018:1019:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.setFlags(int):15144:15145 -> a
+    1018:1019:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):117 -> a
+    1018:1019:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
+    1018:1019:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1020:1021:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15013:15014 -> a
+    1020:1021:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1022:1022:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):397:397 -> a
+    1023:1023:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1023:1023:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15015 -> a
+    1023:1023:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1024:1024:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15015:15015 -> a
+    1024:1024:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1025:1027:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureConstructorIsMutable():11441:11443 -> a
+    1025:1027:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllConstructor(java.lang.Iterable):11538 -> a
+    1025:1027:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1028:1028:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllConstructor(java.lang.Iterable):11539:11539 -> a
+    1028:1028:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310 -> a
+    1029:1029:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311:311 -> a
+    1030:1030:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFunctions():64:64 -> a
+    1030:1030:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1031:1033:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):399:401 -> a
+    1034:1034:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311:311 -> a
+    1035:1036:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16505:16506 -> a
+    1035:1036:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1037:1037:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):401:401 -> a
+    1038:1038:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1038:1038:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507 -> a
+    1038:1038:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507:16507 -> a
+    1039:1039:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1040:1042:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureFunctionIsMutable():11566:11568 -> a
+    1040:1042:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllFunction(java.lang.Iterable):11663 -> a
+    1040:1042:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1043:1043:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllFunction(java.lang.Iterable):11664:11664 -> a
+    1043:1043:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1044:1044:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312:312 -> a
+    1045:1045:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getProperties():69:69 -> a
+    1045:1045:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+    1046:1048:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):403:405 -> a
+    1049:1049:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312:312 -> a
+    1050:1051:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
+    1050:1051:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+    1052:1052:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):405:405 -> a
+    1053:1053:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1053:1053:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
+    1053:1053:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+    1054:1054:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
+    1054:1054:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+    1055:1057:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensurePropertyIsMutable():11691:11693 -> a
+    1055:1057:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllProperty(java.lang.Iterable):11788 -> a
+    1055:1057:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1058:1058:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllProperty(java.lang.Iterable):11789:11789 -> a
+    1058:1058:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
+    1059:1059:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313:313 -> a
+    1060:1060:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getTypeAliases():74:74 -> a
+    1060:1060:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+    1061:1063:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):407:409 -> a
+    1064:1064:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313:313 -> a
+    1065:1066:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21687:21688 -> a
+    1065:1066:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+    1067:1067:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):409:409 -> a
+    1068:1068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1068:1068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689 -> a
+    1068:1068:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+    1069:1069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689:21689 -> a
+    1069:1069:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+    1070:1072:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureTypeAliasIsMutable():11816:11818 -> a
+    1070:1072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeAlias(java.lang.Iterable):11913 -> a
+    1070:1072:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1073:1073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeAlias(java.lang.Iterable):11914:11914 -> a
+    1073:1073:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
+    1074:1074:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):315:315 -> a
+    1075:1075:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    1075:1075:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):315 -> a
+    1076:1076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10850:10850 -> a
+    1076:1076:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):315 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1018:1018:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1018:1018:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1019:1020:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.setFlags(int):15144:15145 -> a
-    1019:1020:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):118 -> a
-    1019:1020:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):1 -> a
-    1019:1020:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1021:1022:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15013:15014 -> a
-    1021:1022:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1023:1023:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):398:398 -> a
-    1024:1024:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1024:1024:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15015 -> a
-    1024:1024:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1025:1025:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():15015:15015 -> a
-    1025:1025:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1026:1028:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureConstructorIsMutable():11441:11443 -> a
-    1026:1028:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllConstructor(java.lang.Iterable):11538 -> a
-    1026:1028:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
+    1077:1078:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10850:10851 -> a
+    1077:1078:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):315 -> a
+    1079:1175:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316:412 -> a
+    1176:1176:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316:316 -> a
+    1177:1205:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    1177:1205:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
+    1206:1208:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureNestedClassNameIsMutable():11183:11185 -> a
+    1206:1208:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addNestedClassName(int):11221 -> a
+    1206:1208:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1029:1029:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllConstructor(java.lang.Iterable):11539:11539 -> a
-    1029:1029:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):311 -> a
-    1030:1030:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312:312 -> a
-    1031:1031:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFunctions():69:69 -> a
-    1031:1031:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-    1032:1034:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):400:402 -> a
-    1035:1035:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312:312 -> a
-    1036:1037:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16505:16506 -> a
-    1036:1037:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-    1038:1038:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):402:402 -> a
-    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507 -> a
-    1039:1039:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-    1040:1040:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507:16507 -> a
-    1040:1040:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-    1041:1043:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureFunctionIsMutable():11566:11568 -> a
-    1041:1043:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllFunction(java.lang.Iterable):11663 -> a
-    1041:1043:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1044:1044:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllFunction(java.lang.Iterable):11664:11664 -> a
-    1044:1044:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):312 -> a
-    1045:1045:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313:313 -> a
-    1046:1046:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getProperties():74:74 -> a
-    1046:1046:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-    1047:1049:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):404:406 -> a
-    1050:1050:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313:313 -> a
-    1051:1052:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
-    1051:1052:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-    1053:1053:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):406:406 -> a
-    1054:1054:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1054:1054:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
-    1054:1054:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-    1055:1055:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
-    1055:1055:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-    1056:1058:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensurePropertyIsMutable():11691:11693 -> a
-    1056:1058:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllProperty(java.lang.Iterable):11788 -> a
-    1056:1058:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1059:1059:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllProperty(java.lang.Iterable):11789:11789 -> a
-    1059:1059:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):313 -> a
-    1060:1060:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314:314 -> a
-    1061:1061:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getTypeAliases():79:79 -> a
-    1061:1061:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-    1062:1064:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):408:410 -> a
-    1065:1065:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314:314 -> a
-    1066:1067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21687:21688 -> a
-    1066:1067:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-    1068:1068:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):410:410 -> a
-    1069:1069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1069:1069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689 -> a
-    1069:1069:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-    1070:1070:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689:21689 -> a
-    1070:1070:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-    1071:1073:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureTypeAliasIsMutable():11816:11818 -> a
-    1071:1073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeAlias(java.lang.Iterable):11913 -> a
-    1071:1073:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1074:1074:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllTypeAlias(java.lang.Iterable):11914:11914 -> a
-    1074:1074:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):314 -> a
-    1075:1075:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316:316 -> a
-    1076:1076:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    1076:1076:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
-    1077:1077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10850:10850 -> a
-    1077:1077:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1078:1079:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setCompanionObjectName(int):10850:10851 -> a
-    1078:1079:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
-    1080:1176:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):317:413 -> a
-    1177:1177:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):317:317 -> a
-    1178:1207:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    1178:1207:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):317 -> a
-    1208:1210:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureNestedClassNameIsMutable():11183:11185 -> a
-    1208:1210:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addNestedClassName(int):11221 -> a
-    1208:1210:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):317 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1211:1211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addNestedClassName(int):11222:11222 -> a
-    1211:1211:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):317 -> a
-    1212:1308:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319:415 -> a
+    1209:1209:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addNestedClassName(int):11222:11222 -> a
+    1209:1209:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):316 -> a
+    1210:1306:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):318:414 -> a
+    1307:1307:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319:319 -> a
+    1308:1308:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():22723:22723 -> a
+    1308:1308:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.access$20400():22710 -> a
+    1308:1308:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():22700 -> a
+    1308:1308:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
     1309:1309:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320:320 -> a
-    1310:1310:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():22723:22723 -> a
-    1310:1310:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.access$20400():22710 -> a
-    1310:1310:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.newBuilder():22700 -> a
-    1310:1310:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1311:1311:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):321:321 -> a
-    1312:1341:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    1312:1341:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):321 -> a
-    1342:1343:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.setName(int):22816:22817 -> a
-    1342:1343:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):321 -> a
-    1344:1346:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureEnumEntryIsMutable():11941:11943 -> a
-    1344:1346:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12018 -> a
-    1344:1346:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
+    1310:1338:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    1310:1338:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
+    1339:1340:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.setName(int):22816:22817 -> a
+    1339:1340:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
+    1341:1343:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureEnumEntryIsMutable():11941:11943 -> a
+    1341:1343:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12018 -> a
+    1341:1343:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1347:1347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019:12019 -> a
-    1347:1347:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1348:1354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22750:22756 -> a
-    1348:1354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
-    1348:1354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1348:1354:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1355:1355:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.access$20602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry,int):22492:22492 -> a
-    1355:1355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22756 -> a
-    1355:1355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
-    1355:1355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1355:1355:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1356:1356:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.access$20702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry,int):22492:22492 -> a
-    1356:1356:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22757 -> a
-    1356:1356:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
+    1344:1344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019:12019 -> a
+    1344:1344:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1345:1351:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22750:22756 -> a
+    1345:1351:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
+    1345:1351:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
+    1345:1351:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1352:1352:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.access$20602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry,int):22492:22492 -> a
+    1352:1352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22756 -> a
+    1352:1352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
+    1352:1352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
+    1352:1352:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1353:1353:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.access$20702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry,int):22492:22492 -> a
+    1353:1353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.buildPartial():22757 -> a
+    1353:1353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22742 -> a
+    1353:1353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
+    1353:1353:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1354:1354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22743:22743 -> a
+    1354:1354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
+    1354:1354:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1355:1355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019:12019 -> a
+    1355:1355:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1356:1356:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1356:1356:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22744 -> a
     1356:1356:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1356:1356:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1357:1357:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22743:22743 -> a
+    1356:1356:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1357:1357:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22744:22744 -> a
     1357:1357:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1357:1357:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1358:1358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019:12019 -> a
-    1358:1358:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1359:1359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1359:1359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22744 -> a
-    1359:1359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1359:1359:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1360:1360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():22744:22744 -> a
-    1360:1360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addEnumEntry(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):12019 -> a
-    1360:1360:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):320 -> a
-    1361:1455:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325:419 -> a
-    1456:1456:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325:325 -> a
-    1457:1489:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:32 -> a
-    1457:1489:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325 -> a
-    1490:1584:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325:419 -> a
-    1585:1587:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSealedSubclassFqNameIsMutable():12065:12067 -> a
-    1585:1587:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSealedSubclassFqName(java.lang.Iterable):12113 -> a
-    1585:1587:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325 -> a
+    1357:1357:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):319 -> a
+    1358:1452:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324:418 -> a
+    1453:1453:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324:324 -> a
+    1454:1485:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:31 -> a
+    1454:1485:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324 -> a
+    1486:1580:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324:418 -> a
+    1581:1583:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureSealedSubclassFqNameIsMutable():12065:12067 -> a
+    1581:1583:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSealedSubclassFqName(java.lang.Iterable):12113 -> a
+    1581:1583:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1588:1588:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSealedSubclassFqName(java.lang.Iterable):12114:12114 -> a
-    1588:1588:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):325 -> a
-    1589:1589:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingPropertyName():109:109 -> a
-    1589:1589:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
-    1590:1590:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327:327 -> a
-    1591:1591:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
+    1584:1584:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllSealedSubclassFqName(java.lang.Iterable):12114:12114 -> a
+    1584:1584:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324 -> a
+    1585:1585:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingPropertyName():104:104 -> a
+    1585:1585:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326 -> a
+    1586:1586:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326:326 -> a
+    1587:1587:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    1587:1587:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326 -> a
+    1588:1588:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingPropertyName(int):12146:12146 -> a
+    1588:1588:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1589:1590:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingPropertyName(int):12146:12147 -> a
+    1589:1590:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326 -> a
+    1591:1591:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():109:109 -> a
     1591:1591:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
-    1592:1592:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingPropertyName(int):12146:12146 -> a
-    1592:1592:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1593:1594:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingPropertyName(int):12146:12147 -> a
-    1593:1594:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
-    1595:1595:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():114:114 -> a
-    1595:1595:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328 -> a
-    1596:1596:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328:328 -> a
-    1597:1597:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
-    1597:1597:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328 -> a
-    1598:1598:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328:328 -> a
-    1599:1601:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):12181:12183 -> a
-    1599:1601:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328 -> a
-    1602:1602:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331:331 -> a
-    1603:1603:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():119:119 -> a
-    1603:1603:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331 -> a
-    1604:1606:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):421:423 -> a
-    1607:1607:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331:331 -> a
-    1608:1608:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
-    1608:1608:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331 -> a
-    1609:1701:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331:423 -> a
-    1702:1704:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureContextReceiverTypeIsMutable():11250:11252 -> a
-    1702:1704:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllContextReceiverType(java.lang.Iterable):11347 -> a
-    1702:1704:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331 -> a
+    1592:1592:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327:327 -> a
+    1593:1593:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
+    1593:1593:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
+    1594:1594:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327:327 -> a
+    1595:1597:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):12181:12183 -> a
+    1595:1597:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):327 -> a
+    1598:1598:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330:330 -> a
+    1599:1599:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():114:114 -> a
+    1599:1599:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330 -> a
+    1600:1602:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):420:422 -> a
+    1603:1603:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330:330 -> a
+    1604:1604:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1:1 -> a
+    1604:1604:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330 -> a
+    1605:1697:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330:422 -> a
+    1698:1700:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureContextReceiverTypeIsMutable():11250:11252 -> a
+    1698:1700:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllContextReceiverType(java.lang.Iterable):11347 -> a
+    1698:1700:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1705:1705:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllContextReceiverType(java.lang.Iterable):11348:11348 -> a
-    1705:1705:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):331 -> a
-    1706:1706:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333:333 -> a
-    1707:1707:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getVersionRequirements():125:125 -> a
-    1707:1707:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333 -> a
-    1708:1717:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):425:434 -> a
-    1718:1718:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):433:433 -> a
-    1719:1719:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333:333 -> a
-    1720:1720:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):1:1 -> a
-    1720:1720:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333 -> a
-    1721:1721:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):433:433 -> a
-    1722:1724:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureVersionRequirementIsMutable():12572:12574 -> a
-    1722:1724:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllVersionRequirement(java.lang.Iterable):12644 -> a
-    1722:1724:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333 -> a
+    1701:1701:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllContextReceiverType(java.lang.Iterable):11348:11348 -> a
+    1701:1701:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):330 -> a
+    1702:1702:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332:332 -> a
+    1703:1703:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getVersionRequirements():120:120 -> a
+    1703:1703:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332 -> a
+    1704:1713:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):424:433 -> a
+    1714:1714:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):432:432 -> a
+    1715:1715:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332:332 -> a
+    1716:1716:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):1:1 -> a
+    1716:1716:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332 -> a
+    1717:1717:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):432:432 -> a
+    1718:1720:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.ensureVersionRequirementIsMutable():12572:12574 -> a
+    1718:1720:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllVersionRequirement(java.lang.Iterable):12644 -> a
+    1718:1720:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1725:1725:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllVersionRequirement(java.lang.Iterable):12645:12645 -> a
-    1725:1725:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333 -> a
-    1726:1726:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):335:335 -> a
-    1727:1727:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    1727:1727:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):335 -> a
+    1721:1721:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.addAllVersionRequirement(java.lang.Iterable):12645:12645 -> a
+    1721:1721:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):332 -> a
+    1722:1722:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):334:334 -> a
+    1723:1723:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    1723:1723:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):334 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1728:1728:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):438:438 -> a
-    1729:1731:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):335:337 -> a
-    1732:1732:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():24:24 -> a
-    1732:1732:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):337 -> a
+    1724:1724:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):437:437 -> a
+    1725:1727:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):334:336 -> a
+    1728:1728:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():23:23 -> a
+    1728:1728:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1733:1734:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):337:338 -> a
-    1735:1737:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12684:12686 -> a
-    1735:1737:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):338 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt -> com.android.tools.r8.internal.fq:
+    1729:1730:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):336:337 -> a
+    1731:1733:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12684:12686 -> a
+    1731:1733:void writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):337 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate -> com.android.tools.r8.internal.An:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60:60 -> a
-    1:1:void com.android.tools.r8.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> a
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iq;)V"}
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> a
+    com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 flags -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UP;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField protoSet -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mq;"}
+    com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries entries -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zn;"}
+    java.util.List flagValues -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries,java.util.List):16:20 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UP;Lcom/android/tools/r8/internal/mq;Lcom/android/tools/r8/internal/zn;Ljava/util/ArrayList;)V"}
+    1:1:java.lang.Enum getValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty):24:24 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/UP;)Ljava/lang/Enum;"}
+    2:2:void setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,java.lang.Enum):27:27 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/UP;Ljava/lang/Enum;)V"}
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.plus$kotlin_metadata(int):18:18 -> a
+    3:3:void setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,java.lang.Enum):27 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60 -> a
-    2:2:void com.android.tools.r8.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> a
-    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> a
-    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60 -> a
-    3:3:void com.android.tools.r8.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> a
-    4:4:void com.android.tools.r8.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.internal.FlagImpl):0:0 -> a
-    5:5:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate classBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):60 -> a
-    5:5:void com.android.tools.r8.internal.FlagDelegatesImplKt.classBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):74:74 -> a
-    6:6:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0 -> a
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QP;)V"}
-    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):74 -> a
-    7:7:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0 -> a
-    8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata():10:10 -> a
-    8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):74 -> a
-    8:8:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0 -> a
-    9:9:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> a
-    9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):74 -> a
-    9:9:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0 -> a
-    10:10:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0:0 -> a
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):74 -> a
-    11:11:void com.android.tools.r8.internal.FlagDelegatesImplKt.annotationsOn(com.android.tools.r8.internal.MutablePropertyReference1):0 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):55:55 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QP;)V"}
+    4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.plus$kotlin_metadata(int):18:18 -> a
+    4:4:void setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,java.lang.Enum):27 -> a
+    5:5:void setValue(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.reflect.KProperty,java.lang.Enum):27:27 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt -> com.android.tools.r8.internal.hq:
+# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):72:72 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UP;)Lcom/android/tools/r8/internal/J6;"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):15:15 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):72 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate annotationsOn(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):72:72 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):53:53 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UP;)Lcom/android/tools/r8/internal/An;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.Modality.getEntries():0:0 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):55 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):81:81 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):53 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):87:87 -> b
     4:4:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):82 -> b
-    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):82:83 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):88 -> b
+    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):88:89 -> b
     7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.Modality.getFlag$kotlin_metadata():107:107 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):55 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):53 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):83:83 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62:62 -> b
-    9:9:void com.android.tools.r8.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> b
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iq;)V"}
-    10:10:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getBitWidth$kotlin_metadata() -> b
-    10:10:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62 -> b
-    10:10:void com.android.tools.r8.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> b
-    11:11:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl.getValue$kotlin_metadata():10:10 -> b
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62 -> b
-    11:11:void com.android.tools.r8.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> b
-    12:12:void com.android.tools.r8.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.internal.FlagImpl):0:0 -> b
-    13:13:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate.<init>(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1,com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):38:38 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate functionBooleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl):62 -> b
-    13:13:void com.android.tools.r8.internal.FlagDelegatesImplKt.functionBooleanFlag(com.android.tools.r8.internal.FlagImpl):0 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):52:52 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QP;)V"}
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):89:89 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate modalityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):53:53 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):50:50 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UP;)Lcom/android/tools/r8/internal/An;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.enums.EnumEntries com.android.tools.r8.jetbrains.kotlin.metadata.Visibility.getEntries():0:0 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):52 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):77:77 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):50 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):83:83 -> c
     4:4:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.AbstractList.iterator():25:25 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):78 -> c
-    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):78:79 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):84 -> c
+    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):84:85 -> c
     7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl com.android.tools.r8.jetbrains.kotlin.metadata.Visibility.getFlag$kotlin_metadata():74:74 -> c
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):52 -> c
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):50 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):79:79 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$classBooleanFlag$1 -> com.android.tools.r8.internal.Yp:
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):85:85 -> c
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.EnumFlagDelegate visibilityDelegate(com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1):50:50 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$classBooleanFlag$1 -> com.android.tools.r8.internal.aq:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$classBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aq;"}
     1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():60:60 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags(int):48:48 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):60 -> a
+    1:1:void <init>():58:58 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):58:58 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):60:60 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> b
-    2:2:java.lang.Object get(java.lang.Object):60 -> b
+    1:1:java.lang.Object get(java.lang.Object):58:58 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags$kotlin_metadata():44:44 -> b
+    2:2:java.lang.Object get(java.lang.Object):58 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):60:60 -> b
-    4:4:java.lang.String getName():60:60 -> b
+    3:3:java.lang.Object get(java.lang.Object):58:58 -> b
+    4:4:java.lang.String getName():58:58 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$classBooleanFlag$1.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():60:60 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$constructorBooleanFlag$1 -> com.android.tools.r8.internal.Zp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():58:58 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$constructorBooleanFlag$1 -> com.android.tools.r8.internal.bq:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():64:64 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags(int):320:320 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):64 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):64:64 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags():320:320 -> b
-    2:2:java.lang.Object get(java.lang.Object):64 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):64:64 -> b
-    4:4:java.lang.String getName():64:64 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$constructorBooleanFlag$1.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():64:64 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$functionBooleanFlag$1 -> com.android.tools.r8.internal.aq:
-# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$constructorBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bq;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():62:62 -> <init>
     1:1:void set(java.lang.Object,java.lang.Object):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags(int):374:374 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.setFlags$kotlin_metadata(int):167:167 -> a
     2:2:void set(java.lang.Object,java.lang.Object):62 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.Object get(java.lang.Object):62:62 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags$kotlin_metadata():167:167 -> b
     2:2:java.lang.Object get(java.lang.Object):62 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object get(java.lang.Object):62:62 -> b
     4:4:java.lang.String getName():62:62 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$constructorBooleanFlag$1.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():62:62 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$functionBooleanFlag$1 -> com.android.tools.r8.internal.cq:
+# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$functionBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cq;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():60:60 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):60:60 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setFlags$kotlin_metadata(int):192:192 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):60 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):60:60 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> b
+    2:2:java.lang.Object get(java.lang.Object):60 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):60:60 -> b
+    4:4:java.lang.String getName():60:60 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$functionBooleanFlag$1.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():62:62 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyAccessorBooleanFlag$1 -> com.android.tools.r8.internal.bq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():60:60 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyAccessorBooleanFlag$1 -> com.android.tools.r8.internal.dq:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():68:68 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):480:480 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):68 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):68:68 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> b
-    2:2:java.lang.Object get(java.lang.Object):68 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Object get(java.lang.Object):68:68 -> b
-    4:4:java.lang.String getName():68:68 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$propertyAccessorBooleanFlag$1.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():68:68 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyBooleanFlag$1 -> com.android.tools.r8.internal.cq:
-# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyBooleanFlag$1 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cq;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyAccessorBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dq;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():66:66 -> <init>
     1:1:void set(java.lang.Object,java.lang.Object):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags(int):496:496 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.setFlags$kotlin_metadata(int):243:243 -> a
     2:2:void set(java.lang.Object,java.lang.Object):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.Object get(java.lang.Object):66:66 -> b
-    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> b
     2:2:java.lang.Object get(java.lang.Object):66 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object get(java.lang.Object):66:66 -> b
     4:4:java.lang.String getName():66:66 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$propertyAccessorBooleanFlag$1.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():66:66 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyBooleanFlag$1 -> com.android.tools.r8.internal.eq:
+# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$propertyBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eq;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():64:64 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):64:64 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setFlags$kotlin_metadata(int):258:258 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):64 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):64:64 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> b
+    2:2:java.lang.Object get(java.lang.Object):64 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):64:64 -> b
+    4:4:java.lang.String getName():64:64 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$propertyBooleanFlag$1.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():66:66 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$typeBooleanFlag$1 -> com.android.tools.r8.internal.dq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():64:64 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$typeBooleanFlag$1 -> com.android.tools.r8.internal.fq:
 # {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$typeBooleanFlag$1 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fq;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():68:68 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):68:68 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setFlags$kotlin_metadata(int):445:445 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):68 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:java.lang.Object get(java.lang.Object):68:68 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmType.getFlags$kotlin_metadata():445:445 -> b
+    2:2:java.lang.Object get(java.lang.Object):68 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.lang.Object get(java.lang.Object):68:68 -> b
+    4:4:java.lang.String getName():68:68 -> b
+    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$typeBooleanFlag$1.getOwner() -> c
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():68:68 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$valueParameterBooleanFlag$1 -> com.android.tools.r8.internal.gq:
+# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$valueParameterBooleanFlag$1 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gq;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():70:70 -> <init>
     1:1:void set(java.lang.Object,java.lang.Object):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setFlags(int):862:862 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setFlags$kotlin_metadata(int):388:388 -> a
     2:2:void set(java.lang.Object,java.lang.Object):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.Object get(java.lang.Object):70:70 -> b
-    2:2:java.lang.String getName():70:70 -> b
-    com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$typeBooleanFlag$1.getOwner() -> c
-      # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():70:70 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagDelegatesImplKt$valueParameterBooleanFlag$1 -> com.android.tools.r8.internal.eq:
-# {"id":"sourceFile","fileName":"FlagDelegatesImpl.kt"}
-    int $r8$clinit -> h
-      # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():72:72 -> <init>
-    1:1:void set(java.lang.Object,java.lang.Object):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Ljava/lang/Integer;)V"}
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setFlags(int):752:752 -> a
-    2:2:void set(java.lang.Object,java.lang.Object):72 -> a
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getFlags$kotlin_metadata():388:388 -> b
+    2:2:java.lang.Object get(java.lang.Object):70 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:java.lang.Object get(java.lang.Object):72:72 -> b
-    2:2:java.lang.String getName():72:72 -> b
+    3:3:java.lang.Object get(java.lang.Object):70:70 -> b
+    4:4:java.lang.String getName():70:70 -> b
     com.android.tools.r8.internal.KDeclarationContainer com.android.tools.r8.internal.FlagDelegatesImplKt$valueParameterBooleanFlag$1.getOwner() -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YD;"}
-    1:1:java.lang.String getSignature():72:72 -> d
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl -> com.android.tools.r8.internal.iq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():70:70 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl -> com.android.tools.r8.internal.kq:
 # {"id":"sourceFile","fileName":"FlagImpl.kt"}
     int offset -> a
     int bitWidth -> b
@@ -202320,138 +201095,139 @@
     1:1:void <init>(int,int,int):10:10 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField,int):12:12 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lq;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nq;I)V"}
     3:3:void <init>(int,int,int):10:10 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField,int):12 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter -> R8$$REMOVED$$CLASS$$182:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter -> R8$$REMOVED$$CLASS$$170:
 # {"id":"sourceFile","fileName":"Writers.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter -> com.android.tools.r8.internal.HV:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter -> com.android.tools.r8.internal.LV:
 # {"id":"sourceFile","fileName":"Writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder t -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext c -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zm0;"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):343:343 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;)V"}
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):343:344 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):343 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm0;"}
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):342:342 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gE;)V"}
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):342:343 -> <init>
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):342 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.create():13264:13264 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.access$11600():13251 -> <init>
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.newBuilder():13241 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):344 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):343 -> <init>
-    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):344:345 -> <init>
-    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):343 -> <init>
-    1:1:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)V"}
-    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getFunctions():240:240 -> a
-    2:2:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
-    3:5:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):388:390 -> a
-    6:6:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348:348 -> a
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):343 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):342 -> <init>
+    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):343:344 -> <init>
+    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):342 -> <init>
+    1:1:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347:347 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;)V"}
+    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getFunctions():135:135 -> a
+    2:2:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
+    3:5:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):387:389 -> a
+    6:6:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347:347 -> a
     7:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16505:16506 -> a
-    7:8:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
-    9:9:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):390:390 -> a
+    7:8:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
+    9:9:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):389:389 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507 -> a
-    10:10:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    10:10:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507:16507 -> a
-    11:11:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    11:11:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
     12:14:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.ensureFunctionIsMutable():13427:13429 -> a
     12:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllFunction(java.lang.Iterable):13524 -> a
-    12:14:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    12:14:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllFunction(java.lang.Iterable):13525:13525 -> a
-    15:15:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
-    16:16:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349:349 -> a
-    17:17:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getProperties():245:245 -> a
-    17:17:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
-    18:20:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):392:394 -> a
-    21:21:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349:349 -> a
+    15:15:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):347 -> a
+    16:16:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348:348 -> a
+    17:17:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getProperties():140:140 -> a
+    17:17:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    18:20:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):391:393 -> a
+    21:21:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348:348 -> a
     22:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
-    22:23:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
-    24:24:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):394:394 -> a
+    22:23:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    24:24:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):393:393 -> a
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
-    25:25:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    25:25:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
-    26:26:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    26:26:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
     27:29:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.ensurePropertyIsMutable():13552:13554 -> a
     27:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllProperty(java.lang.Iterable):13649 -> a
-    27:29:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    27:29:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllProperty(java.lang.Iterable):13650:13650 -> a
-    30:30:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
-    31:31:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350:350 -> a
-    32:32:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getTypeAliases():250:250 -> a
-    32:32:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
-    33:35:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):396:398 -> a
-    36:36:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350:350 -> a
+    30:30:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):348 -> a
+    31:31:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349:349 -> a
+    32:32:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getTypeAliases():145:145 -> a
+    32:32:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    33:35:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):395:397 -> a
+    36:36:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349:349 -> a
     37:38:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21687:21688 -> a
-    37:38:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
-    39:39:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):398:398 -> a
+    37:38:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    39:39:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):397:397 -> a
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689 -> a
-    40:40:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
+    40:40:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():21689:21689 -> a
-    41:41:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
+    41:41:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
     42:44:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.ensureTypeAliasIsMutable():13677:13679 -> a
     42:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllTypeAlias(java.lang.Iterable):13774 -> a
-    42:44:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
+    42:44:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     45:45:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.addAllTypeAlias(java.lang.Iterable):13775:13775 -> a
-    45:45:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
-    46:46:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):351:351 -> a
-    47:47:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    47:47:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):351 -> a
+    45:45:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):349 -> a
+    46:46:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350:350 -> a
+    47:47:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    47:47:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:48:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):400:400 -> a
-    49:50:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):351:352 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():24:24 -> a
-    51:51:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):352 -> a
+    48:48:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):399:399 -> a
+    49:50:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):350:351 -> a
+    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():23:23 -> a
+    51:51:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):351 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:53:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):352:353 -> a
+    52:53:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):351:352 -> a
     54:56:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):13879:13881 -> a
-    54:56:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):353 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext -> com.android.tools.r8.internal.v10:
+    54:56:void writePackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):352 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext -> com.android.tools.r8.internal.z10:
 # {"id":"sourceFile","fileName":"Readers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver strings -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable types -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oj0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable versionRequirements -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cl0;"}
     boolean ignoreUnknownVersionRequirements -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext parent -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z10;"}
     java.util.List contextExtensions -> f
     java.util.Map typeParameterNameToId -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     java.util.List extensions -> h
-    1:11:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):23:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wD;Lcom/android/tools/r8/internal/kj0;Lcom/android/tools/r8/internal/yl0;ZLcom/android/tools/r8/internal/v10;Ljava/util/List;)V"}
+    1:11:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):21:31 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KD;Lcom/android/tools/r8/internal/oj0;Lcom/android/tools/r8/internal/Cl0;ZLcom/android/tools/r8/internal/z10;Ljava/util/List;)V"}
     12:12:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):33 -> <init>
-    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):33:33 -> <init>
-    14:14:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):29:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wD;Lcom/android/tools/r8/internal/kj0;Lcom/android/tools/r8/internal/yl0;ZLjava/util/List;I)V"}
-    15:15:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):23:23 -> <init>
-    1:1:java.lang.Integer getTypeParameterId$kotlin_metadata(int):42:42 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):45:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/v10;"}
+    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):31 -> <init>
+    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List):31:31 -> <init>
+    14:14:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):27:27 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KD;Lcom/android/tools/r8/internal/oj0;Lcom/android/tools/r8/internal/Cl0;ZLjava/util/List;I)V"}
+    15:15:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):21:21 -> <init>
+    1:1:java.lang.Integer getTypeParameterId$kotlin_metadata(int):40:40 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):43:45 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/z10;"}
     5:5:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getName():7494:7494 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):47 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):45 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):47:47 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):45:45 -> a
     7:7:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getId():7479:7479 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):47 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):47:47 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadUtilsKt -> com.android.tools.r8.internal.x10:
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):45 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext withTypeParameters$kotlin_metadata(java.util.List):45:45 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadUtilsKt -> com.android.tools.r8.internal.B10:
 # {"id":"sourceFile","fileName":"ReadUtils.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZY;Lcom/android/tools/r8/internal/wD;)Lcom/android/tools/r8/internal/iH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dZ;Lcom/android/tools/r8/internal/KD;)Lcom/android/tools/r8/internal/sH;"}
     2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getFlags():2803:2803 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):27 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):27:27 -> a
+    3:3:java.lang.Boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.get(int):278:278 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):27 -> a
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getType():2593:2593 -> a
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):28 -> a
     5:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):28:33 -> a
@@ -202499,951 +201275,936 @@
     104:104:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):47:47 -> a
     105:105:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getArrayDimensionCount():2780:2780 -> a
     105:105:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):48 -> a
-    106:106:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):49:49 -> a
-    107:280:void com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue.<init>(java.lang.String):0:173 -> a
-    107:280:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):49 -> a
-    281:281:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):51:51 -> a
-    282:282:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
-    283:283:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getStringValue():2653:2653 -> a
-    283:283:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46 -> a
-    284:284:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
-    285:285:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
-    286:286:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    286:286:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45 -> a
-    287:287:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
-    288:288:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
-    289:289:double com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getDoubleValue():2638:2638 -> a
-    289:289:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44 -> a
-    290:290:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
-    291:291:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
-    292:292:float com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getFloatValue():2623:2623 -> a
-    292:292:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43 -> a
-    293:293:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
-    294:294:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
-    295:295:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    295:295:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39 -> a
-    296:299:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39:42 -> a
-    300:300:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    300:300:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):42 -> a
-    301:301:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
-    302:302:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    303:303:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    303:303:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41 -> a
-    304:304:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
-    305:305:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
-    306:306:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    306:306:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40 -> a
-    307:307:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
-    308:308:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
-    309:309:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
-    309:309:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38 -> a
-    310:310:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
-    311:311:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getQualifiedClassName(int):59:59 -> a
-    311:311:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wD;I)Ljava/lang/String;"}
-    312:312:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.isLocalClassName(int):62:62 -> a
-    312:312:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):62 -> a
-    313:313:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):62:62 -> a
-    314:314:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.getId():4171:4171 -> a
-    314:314:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cZ;Lcom/android/tools/r8/internal/wD;)Lcom/android/tools/r8/internal/fH;"}
-    315:315:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):18:18 -> a
-    316:316:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.getArgumentList():4180:4180 -> a
-    316:316:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):19 -> a
-    317:372:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):19:74 -> a
-    373:373:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):73:73 -> a
-    374:374:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.getValue():3819:3819 -> a
-    374:374:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):20 -> a
+    106:108:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):49:51 -> a
+    109:109:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
+    110:110:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getStringValue():2653:2653 -> a
+    110:110:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46 -> a
+    111:111:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):46:46 -> a
+    112:112:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
+    113:113:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    113:113:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45 -> a
+    114:114:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):45:45 -> a
+    115:115:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
+    116:116:double com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getDoubleValue():2638:2638 -> a
+    116:116:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44 -> a
+    117:117:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):44:44 -> a
+    118:118:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
+    119:119:float com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getFloatValue():2623:2623 -> a
+    119:119:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43 -> a
+    120:120:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):43:43 -> a
+    121:121:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39:39 -> a
+    122:122:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    122:122:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39 -> a
+    123:126:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):39:42 -> a
+    127:127:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    127:127:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):42 -> a
+    128:128:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):42:42 -> a
+    129:129:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
+    130:130:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    130:130:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41 -> a
+    131:131:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):41:41 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
+    133:133:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    133:133:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40 -> a
+    134:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):40:40 -> a
+    135:135:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
+    136:136:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getIntValue():2608:2608 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument readAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):38:38 -> a
+    138:138:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getQualifiedClassName(int):59:59 -> a
+    138:138:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):61 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KD;I)Ljava/lang/String;"}
+    139:139:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.isLocalClassName(int):62:62 -> a
+    139:139:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):62 -> a
+    140:140:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,int):62:62 -> a
+    141:141:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.getId():4171:4171 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):18 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gZ;Lcom/android/tools/r8/internal/KD;)Lcom/android/tools/r8/internal/pH;"}
+    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):18:18 -> a
+    143:143:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.getArgumentList():4180:4180 -> a
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):19 -> a
+    144:199:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):19:74 -> a
+    200:200:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):73:73 -> a
+    201:201:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.getValue():3819:3819 -> a
+    201:201:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    375:375:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):20:20 -> a
-    376:376:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.getNameId():3804:3804 -> a
-    376:376:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21 -> a
-    377:377:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21:21 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
-    378:378:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21 -> a
-    379:379:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):73:73 -> a
-    380:380:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):23:23 -> a
-    381:381:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):17:17 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.w10:
+    202:202:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):20:20 -> a
+    203:203:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.getNameId():3804:3804 -> a
+    203:203:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21 -> a
+    204:204:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21:21 -> a
+    205:205:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
+    205:205:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):21 -> a
+    206:206:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):73:73 -> a
+    207:207:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):23:23 -> a
+    208:208:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation readAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):17:17 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.A10:
 # {"id":"sourceFile","fileName":"ReadUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type.values():2416:2416 -> <clinit>
     1:1:void <clinit>():0 -> <clinit>
     2:2:void <clinit>():0:0 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt -> com.android.tools.r8.internal.z10:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt -> com.android.tools.r8.internal.D10:
 # {"id":"sourceFile","fileName":"Readers.kt"}
-    1:299:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157:455 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/v10;)V"}
-    300:598:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157:455 -> a
-    599:899:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):158:458 -> a
-    900:1200:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):158:458 -> a
-    1201:1503:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159:461 -> a
-    1504:1504:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222:222 -> a
-    1504:1504:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    1:299:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):155:453 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/z10;)V"}
+    300:598:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):155:453 -> a
+    599:899:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):156:456 -> a
+    900:1200:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):156:456 -> a
+    1201:1503:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157:459 -> a
+    1504:1504:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220:220 -> a
+    1504:1504:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     1505:1505:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getFlags():21244:21244 -> a
-    1505:1505:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222 -> a
+    1505:1505:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1505:1505:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    1505:1505:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     1506:1506:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getName():21259:21259 -> a
-    1506:1506:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222 -> a
-    1506:1506:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1507:1507:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    1507:1507:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222 -> a
+    1506:1506:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220 -> a
+    1506:1506:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1507:1507:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    1507:1507:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1507:1507:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1508:1508:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    1508:1508:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222 -> a
-    1508:1508:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1509:1509:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222:222 -> a
-    1509:1509:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    1507:1507:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1508:1508:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    1508:1508:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220 -> a
+    1508:1508:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1509:1509:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):220:220 -> a
+    1509:1509:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     1510:1510:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameterList():21268:21268 -> a
-    1510:1510:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):224 -> a
-    1510:1510:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1511:1511:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):224:224 -> a
-    1511:1511:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    1510:1510:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222 -> a
+    1510:1510:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1511:1511:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):222:222 -> a
+    1511:1511:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     1512:1512:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getTypeParameterList():21268:21268 -> a
-    1512:1512:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
-    1512:1512:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1513:1784:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226:497 -> a
-    1513:1784:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    1785:2056:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226:497 -> a
-    1785:2056:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2057:2057:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    2057:2057:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2057:2057:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    1512:1512:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):224 -> a
+    1512:1512:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1513:1784:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):224:495 -> a
+    1513:1784:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    1785:2056:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):224:495 -> a
+    1785:2056:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2057:2057:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    2057:2057:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2057:2057:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2058:2058:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    2058:2058:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2058:2058:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2058:2058:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2058:2058:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2059:2059:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.hasUnderlyingType():21303:21303 -> a
     2059:2059:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):100 -> a
-    2059:2059:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2059:2059:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2059:2059:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2059:2059:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2060:2060:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getUnderlyingType():21309:21309 -> a
     2060:2060:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):100 -> a
-    2060:2060:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2060:2060:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2060:2060:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2060:2060:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2061:2061:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):100:100 -> a
-    2061:2061:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2061:2061:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2061:2061:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2061:2061:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2062:2062:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getUnderlyingTypeId():21324:21324 -> a
     2062:2062:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101 -> a
-    2062:2062:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2062:2062:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2062:2062:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2062:2062:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2063:2063:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     2063:2063:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101 -> a
-    2063:2063:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2063:2063:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2064:2064:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227:227 -> a
-    2064:2064:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2065:2065:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):679:679 -> a
-    2065:2065:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2065:2065:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2066:2066:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    2066:2066:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2066:2066:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2063:2063:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2063:2063:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2064:2064:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225:225 -> a
+    2064:2064:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2065:2065:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):357:357 -> a
+    2065:2065:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2065:2065:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2066:2066:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    2066:2066:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2066:2066:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2067:2067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    2067:2067:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2067:2067:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2067:2067:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2067:2067:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2068:2068:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.hasExpandedType():21333:21333 -> a
     2068:2068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):106 -> a
-    2068:2068:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2068:2068:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2068:2068:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2068:2068:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2069:2069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getExpandedType():21339:21339 -> a
     2069:2069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):106 -> a
-    2069:2069:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2069:2069:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2069:2069:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2069:2069:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2070:2070:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):106:106 -> a
-    2070:2070:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2070:2070:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2070:2070:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2070:2070:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2071:2071:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getExpandedTypeId():21354:21354 -> a
     2071:2071:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):107 -> a
-    2071:2071:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2071:2071:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2071:2071:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2071:2071:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2072:2072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     2072:2072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):107 -> a
-    2072:2072:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2072:2072:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2073:2073:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228:228 -> a
-    2073:2073:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2074:2074:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):685:685 -> a
-    2074:2074:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2074:2074:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2072:2072:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2072:2072:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2073:2073:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226:226 -> a
+    2073:2073:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2074:2074:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):363:363 -> a
+    2074:2074:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2074:2074:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2075:2075:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getAnnotationList():21363:21363 -> a
-    2075:2075:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229 -> a
-    2075:2075:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2076:2347:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229:500 -> a
-    2076:2347:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229:229 -> a
-    2348:2348:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229 -> a
-    2349:2349:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2350:2621:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229:500 -> a
-    2350:2621:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2075:2075:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
+    2075:2075:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2076:2347:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227:498 -> a
+    2076:2347:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227:227 -> a
+    2348:2348:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
+    2349:2349:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2350:2621:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227:498 -> a
+    2350:2621:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2622:2622:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getVersionRequirementList():21403:21403 -> a
-    2622:2622:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231 -> a
-    2622:2622:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2623:2623:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231:231 -> a
-    2623:2623:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2624:2624:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():695:695 -> a
-    2624:2624:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231 -> a
-    2624:2624:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2625:2626:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):502:503 -> a
-    2625:2626:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2627:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231:503 -> a
-    2627:2899:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2900:2900:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):233 -> a
-    2900:2900:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2901:2901:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):505:505 -> a
-    2901:2901:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2902:2902:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):233:233 -> a
-    2902:2902:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2903:2903:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):461:461 -> a
+    2622:2622:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229 -> a
+    2622:2622:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2623:2623:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229:229 -> a
+    2623:2623:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2624:2624:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():373:373 -> a
+    2624:2624:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229 -> a
+    2624:2624:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2625:2626:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):500:501 -> a
+    2625:2626:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2627:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):229:501 -> a
+    2627:2899:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2900:2900:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231 -> a
+    2900:2900:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2901:2901:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):503:503 -> a
+    2901:2901:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2902:2902:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):231:231 -> a
+    2902:2902:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2903:2903:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):459:459 -> a
     2904:2905:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.expandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):107:108 -> a
-    2904:2905:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):228 -> a
-    2904:2905:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
+    2904:2905:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):226 -> a
+    2904:2905:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
     2906:2907:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.underlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101:102 -> a
-    2906:2907:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):227 -> a
-    2906:2907:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):159 -> a
-    2908:2908:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BZ;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/TH;"}
+    2906:2907:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias toKmTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):225 -> a
+    2906:2907:void visitDeclarations(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.List,java.util.List,java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):157 -> a
+    2908:2908:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179:179 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FZ;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/YH;"}
     2909:2909:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getFlags():15877:15877 -> a
-    2909:2909:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181 -> a
+    2909:2909:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2910:2910:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getName():15907:15907 -> a
-    2910:2910:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181 -> a
-    2911:2911:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    2911:2911:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181 -> a
+    2910:2910:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179 -> a
+    2911:2911:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    2911:2911:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2912:2912:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    2912:2912:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181 -> a
-    2913:2913:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):181:181 -> a
+    2912:2912:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    2912:2912:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179 -> a
+    2913:2913:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):179:179 -> a
     2914:2914:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getTypeParameterList():15946:15946 -> a
-    2914:2914:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):182 -> a
-    2915:2915:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):182:182 -> a
+    2914:2914:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):180 -> a
+    2915:2915:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):180:180 -> a
     2916:2916:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getTypeParameterList():15946:15946 -> a
-    2916:2916:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
-    2917:3205:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184:472 -> a
-    3206:3494:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184:472 -> a
-    3495:3495:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    3495:3495:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    2916:2916:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):182 -> a
+    2917:3205:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):182:470 -> a
+    3206:3494:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):182:470 -> a
+    3495:3495:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    3495:3495:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
     3496:3496:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    3496:3496:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    3496:3496:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
     3497:3497:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReceiverType():15981:15981 -> a
     3497:3497:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
-    3497:3497:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    3497:3497:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
     3498:3498:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverType():15987:15987 -> a
     3498:3498:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
-    3498:3498:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    3498:3498:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
     3499:3499:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverTypeId():16002:16002 -> a
     3499:3499:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
-    3499:3499:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    3499:3499:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
     3500:3500:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     3500:3500:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
-    3500:3500:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
-    3501:3501:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185:185 -> a
-    3502:3502:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):388:388 -> a
-    3502:3502:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
-    3503:3503:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    3503:3503:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3500:3500:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
+    3501:3501:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183:183 -> a
+    3502:3502:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):204:204 -> a
+    3502:3502:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):183 -> a
+    3503:3503:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    3503:3503:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3504:3504:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    3504:3504:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3504:3504:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3505:3505:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getContextReceiverTypeList():16011:16011 -> a
     3505:3505:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121 -> a
-    3505:3505:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3505:3505:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3506:3506:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121:121 -> a
-    3506:3506:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3506:3506:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3507:3507:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getContextReceiverTypeIdList():16047:16047 -> a
     3507:3507:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121 -> a
-    3507:3507:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3507:3507:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3508:3528:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121:141 -> a
-    3508:3528:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3508:3528:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3529:3529:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121:121 -> a
-    3529:3529:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3529:3529:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3530:3530:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     3530:3530:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):121 -> a
-    3530:3530:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    3530:3530:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
     3531:3531:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):141:141 -> a
-    3531:3531:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
-    3532:3532:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():393:393 -> a
-    3532:3532:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
-    3533:3534:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):474:475 -> a
-    3535:3824:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186:475 -> a
+    3531:3531:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
+    3532:3532:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():209:209 -> a
+    3532:3532:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184 -> a
+    3533:3534:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):472:473 -> a
+    3535:3824:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):184:473 -> a
     3825:3825:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getValueParameterList():16069:16069 -> a
-    3825:3825:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):187 -> a
-    3826:4117:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):187:478 -> a
-    4118:4409:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):187:478 -> a
-    4410:4410:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    4410:4410:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    3825:3825:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185 -> a
+    3826:4117:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185:476 -> a
+    4118:4409:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):185:476 -> a
+    4410:4410:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    4410:4410:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4411:4411:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    4411:4411:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4411:4411:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4412:4412:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReturnType():15916:15916 -> a
     4412:4412:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
-    4412:4412:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4412:4412:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4413:4413:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnType():15922:15922 -> a
     4413:4413:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
-    4413:4413:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4413:4413:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4414:4414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48:48 -> a
-    4414:4414:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4414:4414:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4415:4415:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnTypeId():15937:15937 -> a
     4415:4415:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
-    4415:4415:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4415:4415:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4416:4416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     4416:4416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
-    4416:4416:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
-    4417:4417:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188:188 -> a
-    4418:4418:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):404:404 -> a
-    4418:4418:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
+    4416:4416:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    4417:4417:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186:186 -> a
+    4418:4418:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):220:220 -> a
+    4418:4418:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
     4419:4419:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasContract():16153:16153 -> a
-    4419:4419:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):191 -> a
+    4419:4419:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):189 -> a
     4420:4420:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getContract():16159:16159 -> a
-    4420:4420:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4421:4421:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192:192 -> a
-    4422:4422:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):339:339 -> a
-    4422:4422:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4420:4420:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4421:4421:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190:190 -> a
+    4422:4422:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):337:337 -> a
+    4422:4422:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4423:4423:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.getEffectList():25444:25444 -> a
-    4423:4423:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):340 -> a
+    4423:4423:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):338 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4423:4423:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4424:4424:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):340:340 -> a
-    4424:4424:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4423:4423:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4424:4424:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):338:338 -> a
+    4424:4424:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4425:4425:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.hasEffectType():26176:26176 -> a
-    4425:4425:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):341 -> a
-    4425:4425:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4425:4425:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):339 -> a
+    4425:4425:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4426:4426:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.getEffectType():26182:26182 -> a
-    4426:4426:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):343 -> a
-    4426:4426:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4427:4430:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):343:346 -> a
-    4427:4430:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4431:4433:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):343:345 -> a
-    4431:4433:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4434:4434:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):344:344 -> a
-    4434:4434:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4426:4426:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):341 -> a
+    4426:4426:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4427:4430:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):341:344 -> a
+    4427:4430:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4431:4433:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):341:343 -> a
+    4431:4433:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4434:4434:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):342:342 -> a
+    4434:4434:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4435:4435:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.hasKind():26251:26251 -> a
-    4435:4435:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):349 -> a
-    4435:4435:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4435:4435:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):347 -> a
+    4435:4435:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4436:4436:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.getKind():26257:26257 -> a
-    4436:4436:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):349 -> a
-    4436:4436:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4437:4440:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):349:352 -> a
-    4437:4440:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4441:4443:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):349:351 -> a
-    4441:4443:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4444:4444:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):350:350 -> a
-    4444:4444:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4445:4445:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):349:349 -> a
-    4445:4445:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4446:4446:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():1059:1059 -> a
-    4446:4446:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4446:4446:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):363:363 -> a
-    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4436:4436:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):347 -> a
+    4436:4436:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4437:4440:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):347:350 -> a
+    4437:4440:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4441:4443:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):347:349 -> a
+    4441:4443:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4444:4444:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):348:348 -> a
+    4444:4444:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4445:4445:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):347:347 -> a
+    4445:4445:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4446:4446:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():21:21 -> a
+    4446:4446:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4446:4446:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):361:361 -> a
+    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4447:4447:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4448:4448:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.getEffectConstructorArgumentList():26191:26191 -> a
-    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):364 -> a
+    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):362 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):364:364 -> a
-    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4450:4450:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():1097:1097 -> a
-    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):364 -> a
-    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):516:517 -> a
-    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):364:517 -> a
-    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4448:4448:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):362:362 -> a
+    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4449:4449:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4450:4450:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():43:43 -> a
+    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):362 -> a
+    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4450:4450:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):514:515 -> a
+    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4451:4452:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):362:515 -> a
+    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4453:4606:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4607:4607:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.hasConclusionOfConditionalEffect():26231:26231 -> a
-    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):366 -> a
-    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):364 -> a
+    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4607:4607:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.getConclusionOfConditionalEffect():26242:26242 -> a
-    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):367 -> a
-    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):367:367 -> a
-    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4610:4610:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.setConclusion(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):1102:1102 -> a
-    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):367 -> a
-    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355 -> a
-    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4611:4611:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):355:355 -> a
-    4611:4611:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4612:4612:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):343:343 -> a
-    4612:4612:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
-    4613:4613:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setContract(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):414:414 -> a
-    4613:4613:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):192 -> a
+    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):365 -> a
+    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):365:365 -> a
+    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4609:4609:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4610:4610:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.setConclusion(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):48:48 -> a
+    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect toKmEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):365 -> a
+    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353 -> a
+    4610:4610:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4611:4611:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):353:353 -> a
+    4611:4611:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4612:4612:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract toKmContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):341:341 -> a
+    4612:4612:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
+    4613:4613:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.setContract(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):230:230 -> a
+    4613:4613:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):190 -> a
     4614:4614:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getVersionRequirementList():16124:16124 -> a
-    4614:4614:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195 -> a
-    4615:4615:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195:195 -> a
-    4616:4616:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():409:409 -> a
-    4616:4616:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195 -> a
-    4617:4618:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):480:481 -> a
-    4619:4905:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195:481 -> a
-    4906:4906:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    4906:4906:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):197 -> a
-    4907:4907:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):483:483 -> a
-    4908:4908:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):197:197 -> a
+    4614:4614:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):193 -> a
+    4615:4615:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):193:193 -> a
+    4616:4616:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():225:225 -> a
+    4616:4616:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):193 -> a
+    4617:4618:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):478:479 -> a
+    4619:4905:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):193:479 -> a
+    4906:4906:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    4906:4906:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195 -> a
+    4907:4907:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):481:481 -> a
+    4908:4908:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):195:195 -> a
     4909:4910:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49:50 -> a
-    4909:4910:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):188 -> a
-    4911:4911:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JZ;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/bI;"}
+    4909:4910:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction toKmFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):186 -> a
+    4911:4911:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202:202 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NZ;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/fI;"}
     4912:4912:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getFlags():18235:18235 -> a
-    4912:4912:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4912:4912:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4913:4913:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getName():18265:18265 -> a
-    4913:4913:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
-    4914:4914:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    4914:4914:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4913:4913:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
+    4914:4914:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    4914:4914:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4915:4915:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasGetterFlags():18454:18454 -> a
-    4915:4915:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):405 -> a
-    4915:4915:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4915:4915:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):403 -> a
+    4915:4915:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4916:4916:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getGetterFlags():18472:18472 -> a
-    4916:4916:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):405 -> a
-    4916:4916:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4916:4916:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):403 -> a
+    4916:4916:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4917:4917:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getFlags():18235:18235 -> a
-    4917:4917:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):405 -> a
-    4917:4917:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
-    4918:4918:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):405:405 -> a
-    4918:4918:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4917:4917:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):403 -> a
+    4917:4917:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
+    4918:4918:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):403:403 -> a
+    4918:4918:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4919:4919:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasSetterFlags():18481:18481 -> a
-    4919:4919:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):408 -> a
-    4919:4919:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4919:4919:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):406 -> a
+    4919:4919:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4920:4920:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getSetterFlags():18487:18487 -> a
-    4920:4920:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):408 -> a
-    4920:4920:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
+    4920:4920:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):406 -> a
+    4920:4920:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
     4921:4921:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getFlags():18235:18235 -> a
-    4921:4921:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):408 -> a
-    4921:4921:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
-    4922:4922:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):408:408 -> a
-    4922:4922:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204 -> a
-    4923:4923:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):204:204 -> a
+    4921:4921:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):406 -> a
+    4921:4921:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
+    4922:4922:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):406:406 -> a
+    4922:4922:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202 -> a
+    4923:4923:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):202:202 -> a
     4924:4924:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getTypeParameterList():18304:18304 -> a
-    4924:4924:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205 -> a
-    4925:4925:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205:205 -> a
+    4924:4924:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):203 -> a
+    4925:4925:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):203:203 -> a
     4926:4926:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getTypeParameterList():18304:18304 -> a
-    4926:4926:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
-    4927:4927:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207:207 -> a
-    4928:4928:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():568:568 -> a
-    4928:4928:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
-    4929:4930:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):485:486 -> a
-    4931:5210:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207:486 -> a
-    5211:5211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5211:5211:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
+    4926:4926:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205 -> a
+    4927:4927:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205:205 -> a
+    4928:4928:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():294:294 -> a
+    4928:4928:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205 -> a
+    4929:4930:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):483:484 -> a
+    4931:5210:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):205:484 -> a
+    5211:5211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5211:5211:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
     5212:5212:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5212:5212:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
+    5212:5212:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
     5213:5213:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasReceiverType():18339:18339 -> a
     5213:5213:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> a
-    5213:5213:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
+    5213:5213:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
     5214:5214:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverType():18345:18345 -> a
     5214:5214:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> a
-    5214:5214:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
+    5214:5214:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
     5215:5215:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverTypeId():18360:18360 -> a
     5215:5215:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> a
-    5215:5215:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
+    5215:5215:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
     5216:5216:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5216:5216:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> a
-    5216:5216:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
-    5217:5217:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208:208 -> a
-    5218:5218:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):573:573 -> a
-    5218:5218:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
-    5219:5219:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5219:5219:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5216:5216:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
+    5217:5217:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206:206 -> a
+    5218:5218:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setReceiverParameterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):299:299 -> a
+    5218:5218:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):206 -> a
+    5219:5219:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5219:5219:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5220:5220:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5220:5220:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5220:5220:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5221:5221:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getContextReceiverTypeList():18369:18369 -> a
     5221:5221:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124 -> a
-    5221:5221:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5221:5221:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5222:5222:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124:124 -> a
-    5222:5222:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5222:5222:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5223:5223:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getContextReceiverTypeIdList():18405:18405 -> a
     5223:5223:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124 -> a
-    5223:5223:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5223:5223:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5224:5245:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124:145 -> a
-    5224:5245:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5224:5245:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5246:5246:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124:124 -> a
-    5246:5246:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5246:5246:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5247:5247:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5247:5247:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):124 -> a
-    5247:5247:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5247:5247:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
     5248:5248:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):145:145 -> a
-    5248:5248:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
-    5249:5249:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():578:578 -> a
-    5249:5249:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
-    5250:5251:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):488:489 -> a
-    5252:5532:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209:489 -> a
+    5248:5248:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
+    5249:5249:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():304:304 -> a
+    5249:5249:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207 -> a
+    5250:5251:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):486:487 -> a
+    5252:5532:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):207:487 -> a
     5533:5533:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasSetterValueParameter():18427:18427 -> a
-    5533:5533:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):210 -> a
+    5533:5533:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):208 -> a
     5534:5534:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getSetterValueParameter():18433:18433 -> a
-    5534:5534:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211 -> a
-    5535:5535:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211:211 -> a
-    5536:5536:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setSetterParameter(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):592:592 -> a
-    5536:5536:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211 -> a
-    5537:5537:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5537:5537:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):213 -> a
-    5538:5538:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):213:213 -> a
-    5539:5539:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):597:597 -> a
-    5539:5539:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):213 -> a
+    5534:5534:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5535:5535:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209:209 -> a
+    5536:5536:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setSetterParameter(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):318:318 -> a
+    5536:5536:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):209 -> a
+    5537:5537:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5537:5537:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211 -> a
+    5538:5538:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211:211 -> a
+    5539:5539:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):323:323 -> a
+    5539:5539:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):211 -> a
     5540:5540:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getVersionRequirementList():18501:18501 -> a
-    5540:5540:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214 -> a
-    5541:5541:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214:214 -> a
-    5542:5542:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():602:602 -> a
-    5542:5542:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214 -> a
-    5543:5544:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):491:492 -> a
-    5545:5823:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214:492 -> a
-    5824:5824:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    5824:5824:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):216 -> a
-    5825:5825:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):494:494 -> a
-    5826:5826:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):216:216 -> a
-    5827:5827:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n00;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/qI;"}
+    5540:5540:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):212 -> a
+    5541:5541:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):212:212 -> a
+    5542:5542:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():328:328 -> a
+    5542:5542:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):212 -> a
+    5543:5544:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):489:490 -> a
+    5545:5823:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):212:490 -> a
+    5824:5824:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    5824:5824:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214 -> a
+    5825:5825:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):492:492 -> a
+    5826:5826:com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty toKmProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):214:214 -> a
+    5827:5827:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237:237 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r00;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/pI;"}
     5828:5828:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getFlags():20236:20236 -> a
-    5828:5828:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239 -> a
+    5828:5828:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5829:5829:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getName():20251:20251 -> a
-    5829:5829:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239 -> a
-    5830:5830:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    5830:5830:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239 -> a
+    5829:5829:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237 -> a
+    5830:5830:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    5830:5830:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5831:5831:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    5831:5831:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239 -> a
-    5832:5832:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):239:239 -> a
-    5833:5833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5833:5833:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
-    5834:5834:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240:240 -> a
-    5835:5835:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):765:765 -> a
-    5835:5835:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
-    5836:5836:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5836:5836:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5831:5831:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    5831:5831:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237 -> a
+    5832:5832:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):237:237 -> a
+    5833:5833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5833:5833:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):238 -> a
+    5834:5834:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):238:238 -> a
+    5835:5835:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):398:398 -> a
+    5835:5835:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):238 -> a
+    5836:5836:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5836:5836:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
     5837:5837:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5837:5837:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5837:5837:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
     5838:5838:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.hasVarargElementType():20290:20290 -> a
     5838:5838:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    5838:5838:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5838:5838:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
     5839:5839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getVarargElementType():20296:20296 -> a
     5839:5839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    5839:5839:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5839:5839:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
     5840:5840:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getVarargElementTypeId():20311:20311 -> a
     5840:5840:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):83 -> a
-    5840:5840:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5840:5840:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
     5841:5841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5841:5841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.varargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):83 -> a
-    5841:5841:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
-    5842:5842:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242:242 -> a
-    5843:5843:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):770:770 -> a
-    5843:5843:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
-    5844:5844:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    5844:5844:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):244 -> a
-    5845:5845:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):507:507 -> a
-    5846:5846:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):244:244 -> a
-    5847:5847:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267:267 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a00;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/gI;"}
+    5841:5841:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
+    5842:5842:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240:240 -> a
+    5843:5843:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):403:403 -> a
+    5843:5843:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):240 -> a
+    5844:5844:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    5844:5844:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242 -> a
+    5845:5845:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):505:505 -> a
+    5846:5846:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter toKmValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):242:242 -> a
+    5847:5847:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):265:265 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e00;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/iI;"}
     5848:5848:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getNullable():5716:5716 -> a
-    5848:5848:int getTypeFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):398 -> a
+    5848:5848:int getTypeFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):396 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5848:5848:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
+    5848:5848:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):265 -> a
     5849:5849:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlags():5950:5950 -> a
-    5849:5849:int getTypeFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):399 -> a
-    5849:5849:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
-    5850:5850:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267:267 -> a
+    5849:5849:int getTypeFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):397 -> a
+    5849:5849:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):265 -> a
+    5850:5850:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):265:265 -> a
     5851:5851:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasClassName():5780:5780 -> a
-    5851:5851:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269 -> a
-    5852:5852:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269:269 -> a
+    5851:5851:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
+    5852:5852:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267:267 -> a
     5853:5853:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getClassName():5786:5786 -> a
-    5853:5853:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269 -> a
-    5854:5854:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> a
-    5854:5854:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269 -> a
+    5853:5853:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
+    5854:5854:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> a
+    5854:5854:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5855:5855:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> a
-    5855:5855:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269 -> a
-    5856:5857:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269:270 -> a
+    5855:5855:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> a
+    5855:5855:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267 -> a
+    5856:5857:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):267:268 -> a
     5858:5858:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getTypeAliasName():5857:5857 -> a
-    5858:5858:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):270 -> a
-    5859:5859:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> a
-    5859:5859:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):270 -> a
+    5858:5858:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):268 -> a
+    5859:5859:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> a
+    5859:5859:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5860:5860:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> a
-    5860:5860:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):270 -> a
-    5861:5862:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):270:271 -> a
+    5860:5860:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> a
+    5860:5860:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):268 -> a
+    5861:5862:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):268:269 -> a
     5863:5863:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getTypeParameter():5809:5809 -> a
-    5863:5863:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):271 -> a
-    5864:5864:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):271:271 -> a
+    5863:5863:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269 -> a
+    5864:5864:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):269:269 -> a
     5865:5865:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getTypeParameterName():5832:5832 -> a
-    5865:5865:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):273 -> a
-    5866:5868:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):273:275 -> a
-    5869:5869:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):870:870 -> a
-    5869:5869:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):268 -> a
+    5865:5865:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):271 -> a
+    5866:5868:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):271:273 -> a
+    5869:5869:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    5869:5869:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):266 -> a
     5870:5870:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getArgumentList():5675:5675 -> a
-    5870:5870:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):280 -> a
-    5871:5871:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):280:280 -> a
+    5870:5870:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):278 -> a
+    5871:5871:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):278:278 -> a
     5872:5872:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.getProjection():5227:5227 -> a
-    5872:5872:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):281 -> a
+    5872:5872:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5873:5876:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):281:284 -> a
-    5877:5877:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):283:283 -> a
-    5878:5878:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):282:282 -> a
-    5879:5879:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5879:5879:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
+    5873:5876:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):279:282 -> a
+    5877:5877:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):281:281 -> a
+    5878:5878:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):280:280 -> a
+    5879:5879:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5879:5879:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5880:5880:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5880:5880:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
+    5880:5880:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
     5881:5881:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.hasType():5240:5240 -> a
     5881:5881:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):33 -> a
-    5881:5881:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
+    5881:5881:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
     5882:5882:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.getType():5250:5250 -> a
     5882:5882:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):33 -> a
-    5882:5882:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
+    5882:5882:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
     5883:5883:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.getTypeId():5265:5265 -> a
     5883:5883:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):34 -> a
-    5883:5883:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
+    5883:5883:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
     5884:5884:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5884:5884:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):34 -> a
-    5884:5884:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289 -> a
-    5885:5885:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):291:291 -> a
-    5886:5889:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):290:293 -> a
-    5890:5890:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):281:281 -> a
-    5891:5891:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5891:5891:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
+    5884:5884:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):287 -> a
+    5885:5885:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):289:289 -> a
+    5886:5889:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):288:291 -> a
+    5890:5890:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):279:279 -> a
+    5891:5891:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5891:5891:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5892:5892:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5892:5892:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
+    5892:5892:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
     5893:5893:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasAbbreviatedType():5904:5904 -> a
     5893:5893:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):94 -> a
-    5893:5893:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
+    5893:5893:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
     5894:5894:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getAbbreviatedType():5910:5910 -> a
     5894:5894:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):94 -> a
-    5894:5894:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
+    5894:5894:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
     5895:5895:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getAbbreviatedTypeId():5925:5925 -> a
     5895:5895:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):95 -> a
-    5895:5895:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
+    5895:5895:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
     5896:5896:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5896:5896:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.abbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):95 -> a
-    5896:5896:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
-    5897:5897:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297:297 -> a
-    5898:5898:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):886:886 -> a
-    5898:5898:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):297 -> a
-    5899:5899:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5899:5899:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5896:5896:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
+    5897:5897:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295:295 -> a
+    5898:5898:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):469:469 -> a
+    5898:5898:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):295 -> a
+    5899:5899:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5899:5899:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
     5900:5900:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5900:5900:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5900:5900:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
     5901:5901:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasOuterType():5870:5870 -> a
     5901:5901:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):88 -> a
-    5901:5901:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5901:5901:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
     5902:5902:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getOuterType():5880:5880 -> a
     5902:5902:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):88 -> a
-    5902:5902:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5902:5902:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
     5903:5903:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getOuterTypeId():5895:5895 -> a
     5903:5903:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):89 -> a
-    5903:5903:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5903:5903:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
     5904:5904:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5904:5904:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.outerType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):89 -> a
-    5904:5904:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
-    5905:5905:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298:298 -> a
-    5906:5906:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):898:898 -> a
-    5906:5906:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
-    5907:5907:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    5907:5907:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
+    5904:5904:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
+    5905:5905:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296:296 -> a
+    5906:5906:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):481:481 -> a
+    5906:5906:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):296 -> a
+    5907:5907:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    5907:5907:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
     5908:5908:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    5908:5908:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
+    5908:5908:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
     5909:5909:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasFlexibleUpperBound():5750:5750 -> a
     5909:5909:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):39 -> a
-    5909:5909:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
+    5909:5909:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
     5910:5910:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlexibleUpperBound():5756:5756 -> a
     5910:5910:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):39 -> a
-    5910:5910:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
+    5910:5910:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
     5911:5911:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlexibleUpperBoundId():5771:5771 -> a
     5911:5911:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):40 -> a
-    5911:5911:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
+    5911:5911:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
     5912:5912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     5912:5912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.flexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):40 -> a
-    5912:5912:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
-    5913:5914:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300:301 -> a
+    5912:5912:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5913:5914:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298:299 -> a
     5915:5915:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasFlexibleTypeCapabilitiesId():5730:5730 -> a
-    5915:5915:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):301 -> a
+    5915:5915:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):299 -> a
     5916:5916:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlexibleTypeCapabilitiesId():5741:5741 -> a
-    5916:5916:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):301 -> a
-    5917:5917:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    5917:5917:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):301 -> a
-    5918:5918:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):301:301 -> a
-    5919:5919:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setFlexibleTypeUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound):905:905 -> a
-    5919:5919:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):300 -> a
-    5920:5920:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    5920:5920:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):304 -> a
-    5921:5921:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):514:514 -> a
-    5922:5922:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):304:304 -> a
-    5923:5923:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):274:274 -> a
+    5916:5916:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):299 -> a
+    5917:5917:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    5917:5917:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):299 -> a
+    5918:5918:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):299:299 -> a
+    5919:5919:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setFlexibleTypeUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound):488:488 -> a
+    5919:5919:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):298 -> a
+    5920:5920:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    5920:5920:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):302 -> a
+    5921:5921:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):512:512 -> a
+    5922:5922:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):302:302 -> a
+    5923:5923:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):272:272 -> a
     5924:5924:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getTypeParameterName():5832:5832 -> a
-    5924:5924:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):274 -> a
-    5925:5925:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    5925:5925:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):274 -> a
-    5926:5929:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):274:277 -> a
-    5930:5930:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):310:310 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/uI;"}
-    5931:5931:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    5931:5931:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5924:5924:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):272 -> a
+    5925:5925:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    5925:5925:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):272 -> a
+    5926:5929:com.android.tools.r8.jetbrains.kotlin.metadata.KmType toKmType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):272:275 -> a
+    5930:5930:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):308:308 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/tI;"}
+    5931:5931:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    5931:5931:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5932:5932:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getVersionRequirements$kotlin_metadata():26:26 -> a
-    5932:5932:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5932:5932:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getVersionRequirements$kotlin_metadata():24:24 -> a
+    5932:5932:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5933:5933:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):0:0 -> a
-    5933:5933:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5933:5933:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5934:5934:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable.get(int):12:12 -> a
     5934:5934:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):98 -> a
-    5934:5934:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5934:5934:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5935:5935:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):316:316 -> a
     5935:5935:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable.get(int):12 -> a
     5935:5935:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):98 -> a
-    5935:5935:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5935:5935:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5936:5936:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable.get(int):12:12 -> a
     5936:5936:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):98 -> a
-    5936:5936:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5936:5936:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5937:5937:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.hasVersion():23226:23226 -> a
     5937:5937:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):101 -> a
-    5937:5937:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5937:5937:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5938:5938:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getVersion():23238:23238 -> a
     5938:5938:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):101 -> a
-    5938:5938:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5938:5938:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5939:5939:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):101:101 -> a
-    5939:5939:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5939:5939:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5940:5940:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.hasVersionFull():23252:23252 -> a
     5940:5940:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):102 -> a
-    5940:5940:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5940:5940:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5941:5941:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getVersionFull():23263:23263 -> a
     5941:5941:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):102 -> a
-    5941:5941:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5941:5941:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5942:5942:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):102:102 -> a
-    5942:5942:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5942:5942:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5943:5946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:68 -> a
     5943:5946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    5943:5946:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5943:5946:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5947:5955:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):65:73 -> a
     5947:5955:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    5947:5955:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5947:5955:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5956:5961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion.decode(java.lang.Integer,java.lang.Integer):70:75 -> a
     5956:5961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):100 -> a
-    5956:5961:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5956:5961:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5962:5962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getLevel():23286:23286 -> a
     5962:5962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):105 -> a
-    5962:5962:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5962:5962:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5963:5966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):105:108 -> a
-    5963:5966:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5963:5966:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5967:5969:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):105:107 -> a
-    5967:5969:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5967:5969:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5970:5970:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):106:106 -> a
-    5970:5970:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5970:5970:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5971:5971:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.hasErrorCode():23299:23299 -> a
     5971:5971:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):111 -> a
-    5971:5971:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5971:5971:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5972:5972:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getErrorCode():23309:23309 -> a
     5972:5972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):111 -> a
-    5972:5972:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5972:5972:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5973:5973:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):111:111 -> a
-    5973:5973:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5973:5973:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5974:5974:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.hasMessage():23322:23322 -> a
     5974:5974:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):113 -> a
-    5974:5974:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5974:5974:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5975:5975:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getMessage():23332:23332 -> a
     5975:5975:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):113 -> a
-    5975:5975:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5975:5975:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5976:5978:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):113:115 -> a
-    5976:5978:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5976:5978:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5979:5979:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getVersionKind():23357:23357 -> a
     5979:5979:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):115 -> a
-    5979:5979:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
+    5979:5979:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
     5980:5980:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion.create(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable):115:115 -> a
-    5980:5980:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):311 -> a
-    5981:5981:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getIgnoreUnknownVersionRequirements$kotlin_metadata():27:27 -> a
-    5981:5981:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):312 -> a
-    5982:5982:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):312:312 -> a
+    5980:5980:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):309 -> a
+    5981:5981:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getIgnoreUnknownVersionRequirements$kotlin_metadata():25:25 -> a
+    5981:5981:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):310 -> a
+    5982:5982:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):310:310 -> a
     5983:5983:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement.getKind():26:26 -> a
-    5983:5983:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):314 -> a
-    5984:5987:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):314:317 -> a
-    5988:5990:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):314:316 -> a
-    5991:5994:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):315:318 -> a
+    5983:5983:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):312 -> a
+    5984:5987:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):312:315 -> a
+    5988:5990:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):312:314 -> a
+    5991:5994:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):313:316 -> a
     5995:5995:com.android.tools.r8.jetbrains.kotlin.DeprecationLevel com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement.getLevel():27:27 -> a
-    5995:5995:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):321 -> a
-    5996:5998:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):321:323 -> a
-    5999:6001:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):322:324 -> a
-    6002:6002:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind):991:991 -> a
-    6002:6002:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):327 -> a
-    6003:6003:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setLevel(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel):996:996 -> a
-    6003:6003:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):328 -> a
+    5995:5995:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):319 -> a
+    5996:5998:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):319:321 -> a
+    5999:6001:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):320:322 -> a
+    6002:6002:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind):504:504 -> a
+    6002:6002:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):325 -> a
+    6003:6003:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setLevel(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel):509:509 -> a
+    6003:6003:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):326 -> a
     6004:6004:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement.getErrorCode():28:28 -> a
-    6004:6004:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):329 -> a
-    6005:6005:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setErrorCode(java.lang.Integer):1001:1001 -> a
-    6005:6005:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):329 -> a
+    6004:6004:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):327 -> a
+    6005:6005:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setErrorCode(java.lang.Integer):514:514 -> a
+    6005:6005:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):327 -> a
     6006:6006:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement.getMessage():29:29 -> a
-    6006:6006:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
-    6007:6007:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setMessage(java.lang.String):1006:1006 -> a
-    6007:6007:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
+    6006:6006:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):328 -> a
+    6007:6007:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setMessage(java.lang.String):519:519 -> a
+    6007:6007:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):328 -> a
     6008:6008:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement.getVersion():25:25 -> a
-    6008:6008:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):332 -> a
-    6009:6009:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):332:332 -> a
+    6008:6008:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
+    6009:6009:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330:330 -> a
     6010:6010:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.component1():0:0 -> a
-    6010:6010:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):332 -> a
+    6010:6010:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
     6011:6011:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.component2():0:0 -> a
-    6011:6011:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):332 -> a
+    6011:6011:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
     6012:6012:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.component3():0:0 -> a
-    6012:6012:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):332 -> a
-    6013:6013:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):333:333 -> a
-    6014:6014:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion):1011:1011 -> a
-    6014:6014:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):333 -> a
-    6015:6015:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):375:375 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yZ;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/MH;"}
+    6012:6012:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):330 -> a
+    6013:6013:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):331:331 -> a
+    6014:6014:void com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion):524:524 -> a
+    6014:6014:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement readVersionRequirement(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):331 -> a
+    6015:6015:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):373:373 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CZ;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/SH;"}
     6016:6016:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getFlags():27212:27212 -> a
-    6016:6016:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):376 -> a
+    6016:6016:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6017:6017:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setFlags(int):1140:1140 -> a
-    6017:6017:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):376 -> a
+    6017:6017:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setFlags$kotlin_metadata(int):62:62 -> a
+    6017:6017:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):374 -> a
     6018:6018:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.hasValueParameterReference():27226:27226 -> a
-    6018:6018:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):377 -> a
+    6018:6018:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):375 -> a
     6019:6019:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getValueParameterReference():27237:27237 -> a
-    6019:6019:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):377 -> a
-    6020:6020:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):377:377 -> a
-    6021:6021:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setParameterIndex(java.lang.Integer):1147:1147 -> a
-    6021:6021:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):377 -> a
+    6019:6019:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):375 -> a
+    6020:6020:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):375:375 -> a
+    6021:6021:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setParameterIndex(java.lang.Integer):68:68 -> a
+    6021:6021:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):375 -> a
     6022:6022:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.hasConstantValue():27246:27246 -> a
-    6022:6022:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):379 -> a
-    6023:6023:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):380:380 -> a
+    6022:6022:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):377 -> a
+    6023:6023:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):378:378 -> a
     6024:6024:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getConstantValue():27252:27252 -> a
-    6024:6024:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):381 -> a
-    6025:6027:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):381:383 -> a
-    6028:6028:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):382:382 -> a
-    6029:6029:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):380:380 -> a
-    6030:6030:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue):1152:1152 -> a
-    6030:6030:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):380 -> a
-    6031:6031:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):381:381 -> a
-    6032:6032:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    6032:6032:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6024:6024:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):379 -> a
+    6025:6027:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):379:381 -> a
+    6028:6028:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):380:380 -> a
+    6029:6029:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):378:378 -> a
+    6030:6030:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue):73:73 -> a
+    6030:6030:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):378 -> a
+    6031:6031:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):379:379 -> a
+    6032:6032:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    6032:6032:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6033:6033:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    6033:6033:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6033:6033:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
     6034:6034:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.hasIsInstanceType():27266:27266 -> a
     6034:6034:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):112 -> a
-    6034:6034:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6034:6034:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
     6035:6035:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getIsInstanceType():27277:27277 -> a
     6035:6035:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):112 -> a
-    6035:6035:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6035:6035:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
     6036:6036:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getIsInstanceTypeId():27292:27292 -> a
     6036:6036:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):113 -> a
-    6036:6036:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6036:6036:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
     6037:6037:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     6037:6037:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.isInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):113 -> a
-    6037:6037:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
-    6038:6038:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389:389 -> a
-    6039:6039:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):1157:1157 -> a
-    6039:6039:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6037:6037:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
+    6038:6038:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387:387 -> a
+    6039:6039:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78:78 -> a
+    6039:6039:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):387 -> a
     6040:6040:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getAndArgumentList():27307:27307 -> a
-    6040:6040:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):391 -> a
-    6041:6041:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):391:391 -> a
-    6042:6042:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():1163:1163 -> a
-    6042:6042:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):391 -> a
-    6043:6044:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):519:520 -> a
-    6045:6174:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):391:520 -> a
+    6040:6040:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6041:6041:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389:389 -> a
+    6042:6042:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():84:84 -> a
+    6042:6042:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389 -> a
+    6043:6044:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):517:518 -> a
+    6045:6174:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):389:518 -> a
     6175:6175:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getOrArgumentList():27372:27372 -> a
-    6175:6175:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):392 -> a
-    6176:6176:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):392:392 -> a
-    6177:6177:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():1169:1169 -> a
-    6177:6177:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):392 -> a
-    6178:6179:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):522:523 -> a
-    6180:6311:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):392:523 -> a
-    6312:6312:int getDefaultPropertyAccessorFlags(int):411:411 -> a
-    6313:6313:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):309:309 -> a
-    6313:6313:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):289 -> a
-    6313:6313:int getDefaultPropertyAccessorFlags(int):411 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6314:6317:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):310:313 -> a
-    6314:6317:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):289 -> a
-    6314:6317:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6318:6318:int getDefaultPropertyAccessorFlags(int):411:411 -> a
-    6319:6319:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):309:309 -> a
-    6319:6319:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):289 -> a
-    6319:6319:int getDefaultPropertyAccessorFlags(int):411 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6320:6323:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):310:313 -> a
-    6320:6323:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):289 -> a
-    6320:6323:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6324:6324:int getDefaultPropertyAccessorFlags(int):411:411 -> a
-    6325:6325:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.toFlags(java.lang.Boolean):283:283 -> a
-    6325:6325:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):202 -> a
-    6325:6325:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6326:6326:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality.getNumber():60:60 -> a
-    6326:6326:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322 -> a
-    6326:6326:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
-    6326:6326:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):203 -> a
-    6326:6326:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6327:6327:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322:322 -> a
-    6327:6327:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
-    6327:6327:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):203 -> a
-    6327:6327:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6328:6328:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility.getNumber():158:158 -> a
-    6328:6328:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322 -> a
-    6328:6328:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
-    6328:6328:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204 -> a
-    6328:6328:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6329:6329:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322:322 -> a
-    6329:6329:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
-    6329:6329:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204 -> a
-    6329:6329:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6330:6333:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204:207 -> a
-    6330:6333:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6334:6334:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-    6334:6334:int getDefaultPropertyAccessorFlags(int):411 -> a
-    6335:6335:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getVariance():7524:7524 -> a
-    6335:6335:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):252 -> a
+    6175:6175:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):390 -> a
+    6176:6176:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):390:390 -> a
+    6177:6177:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():90:90 -> a
+    6177:6177:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):390 -> a
+    6178:6179:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):520:521 -> a
+    6180:6311:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression toKmEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):390:521 -> a
+    6312:6312:int getDefaultPropertyAccessorFlags(int):409:409 -> a
+    6313:6313:java.lang.Boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.get(int):278:278 -> a
+    6313:6313:int getDefaultPropertyAccessorFlags(int):409 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h00;Lcom/android/tools/r8/internal/v10;)Lcom/android/tools/r8/internal/lI;"}
-    6336:6339:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):252:255 -> a
-    6340:6342:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):252:254 -> a
-    6343:6347:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):253:257 -> a
-    6348:6348:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getReified():7509:7509 -> a
-    6348:6348:int getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):402 -> a
+    6314:6314:int getDefaultPropertyAccessorFlags(int):409:409 -> a
+    6315:6315:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.toFlags(java.lang.Boolean):283:283 -> a
+    6315:6315:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):202 -> a
+    6315:6315:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6316:6316:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality.getNumber():60:60 -> a
+    6316:6316:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322 -> a
+    6316:6316:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
+    6316:6316:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):203 -> a
+    6316:6316:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6317:6317:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322:322 -> a
+    6317:6317:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
+    6317:6317:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):203 -> a
+    6317:6317:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6318:6318:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility.getNumber():158:158 -> a
+    6318:6318:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322 -> a
+    6318:6318:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
+    6318:6318:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204 -> a
+    6318:6318:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6319:6319:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite):322:322 -> a
+    6319:6319:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.toFlags(java.lang.Object):289 -> a
+    6319:6319:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204 -> a
+    6319:6319:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6320:6323:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):204:207 -> a
+    6320:6323:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6324:6324:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags.getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
+    6324:6324:int getDefaultPropertyAccessorFlags(int):409 -> a
+    6325:6325:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getVariance():7524:7524 -> a
+    6325:6325:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l00;Lcom/android/tools/r8/internal/z10;)Lcom/android/tools/r8/internal/mI;"}
+    6326:6329:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):250:253 -> a
+    6330:6332:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):250:252 -> a
+    6333:6337:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):251:255 -> a
+    6338:6338:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getReified():7509:7509 -> a
+    6338:6338:int getTypeParameterFlags(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):400 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6338:6338:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255 -> a
+    6339:6339:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getName():7494:7494 -> a
+    6339:6339:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255 -> a
+    6340:6340:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    6340:6340:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6341:6341:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    6341:6341:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255 -> a
+    6342:6342:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getId():7479:7479 -> a
+    6342:6342:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255 -> a
+    6343:6343:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):255:255 -> a
+    6344:6344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    6344:6344:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6345:6345:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
+    6345:6345:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6346:6346:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getUpperBoundList():7533:7533 -> a
+    6346:6346:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
+    6346:6346:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6347:6347:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:45 -> a
+    6347:6347:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6348:6348:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getUpperBoundIdList():7569:7569 -> a
+    6348:6348:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
     6348:6348:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
-    6349:6349:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getName():7494:7494 -> a
-    6349:6349:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
-    6350:6350:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    6350:6350:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6351:6351:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    6351:6351:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
-    6352:6352:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getId():7479:7479 -> a
-    6352:6352:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
-    6353:6353:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257:257 -> a
-    6354:6354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    6354:6354:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6355:6355:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> a
-    6355:6355:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6356:6356:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getUpperBoundList():7533:7533 -> a
-    6356:6356:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
-    6356:6356:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6357:6357:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:45 -> a
-    6357:6357:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6358:6358:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getUpperBoundIdList():7569:7569 -> a
-    6358:6358:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
-    6358:6358:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6359:6447:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:133 -> a
-    6359:6447:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6448:6448:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:45 -> a
-    6448:6448:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6449:6449:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
-    6449:6449:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
-    6449:6449:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6450:6450:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):133:133 -> a
-    6450:6450:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
-    6451:6702:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259:510 -> a
-    6703:6954:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259:510 -> a
-    6955:6955:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    6955:6955:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):261 -> a
-    6956:6956:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):512:512 -> a
-    6957:6957:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):261:261 -> a
-    6958:6958:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):252:252 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt$WhenMappings -> com.android.tools.r8.internal.y10:
+    6349:6437:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:133 -> a
+    6349:6437:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6438:6438:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45:45 -> a
+    6438:6438:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6439:6439:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
+    6439:6439:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):45 -> a
+    6439:6439:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6440:6440:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.upperBounds(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):133:133 -> a
+    6440:6440:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257 -> a
+    6441:6692:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257:508 -> a
+    6693:6944:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):257:508 -> a
+    6945:6945:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
+    6945:6945:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259 -> a
+    6946:6946:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):510:510 -> a
+    6947:6947:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):259:259 -> a
+    6948:6948:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter toKmTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):250:250 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt$WhenMappings -> com.android.tools.r8.internal.C10:
 # {"id":"sourceFile","fileName":"Readers.kt"}
     int[] $EnumSwitchMapping$2 -> a
     int[] $EnumSwitchMapping$3 -> b
@@ -203465,22 +202226,22 @@
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue.values():27127:27127 -> <clinit>
     11:11:void <clinit>():0 -> <clinit>
     12:12:void <clinit>():0:0 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext -> com.android.tools.r8.internal.zm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext -> com.android.tools.r8.internal.Dm0:
 # {"id":"sourceFile","fileName":"Writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable strings -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gE;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WP;"}
     java.util.List extensions -> c
-    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):23:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;Ljava/util/List;)V"}
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):22:25 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gE;Ljava/util/List;)V"}
     5:5:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion.getINSTANCES$kotlin_metadata():85:85 -> <init>
-    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):26 -> <init>
-    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):26:26 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteUtilsKt -> com.android.tools.r8.internal.Am0:
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):25 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List):25:25 -> <init>
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteUtilsKt -> com.android.tools.r8.internal.Em0:
 # {"id":"sourceFile","fileName":"WriteUtils.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fH;Lcom/android/tools/r8/internal/SD;)Lcom/android/tools/r8/internal/bZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pH;Lcom/android/tools/r8/internal/gE;)Lcom/android/tools/r8/internal/fZ;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.create():4348:4348 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.access$4200():4334 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.newBuilder():4324 -> a
@@ -203524,7 +202285,7 @@
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.build():3060:3060 -> a
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):19 -> a
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;Lcom/android/tools/r8/internal/SD;)Lcom/android/tools/r8/internal/XY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sH;Lcom/android/tools/r8/internal/gE;)Lcom/android/tools/r8/internal/bZ;"}
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.create():3019:3019 -> a
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.access$2100():3005 -> a
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.newBuilder():2995 -> a
@@ -203638,7 +202399,7 @@
     150:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type):3238:3239 -> a
     150:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):84 -> a
     152:152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):85:85 -> a
-    153:153:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue.getClassName():167:167 -> a
+    153:153:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue.getClassName():162:162 -> a
     153:153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):85 -> a
     154:154:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):85:85 -> a
     155:156:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.setClassId(int):3416:3417 -> a
@@ -203647,12 +202408,12 @@
     159:160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type):3238:3239 -> a
     159:160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):88 -> a
     161:161:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):89:89 -> a
-    162:162:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue.getClassName():202:202 -> a
+    162:162:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue.getClassName():186:186 -> a
     162:162:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):89 -> a
     163:163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):89:89 -> a
     164:165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.setClassId(int):3416:3417 -> a
     164:165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):89 -> a
-    166:166:int com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue.getArrayDimensionCount():202:202 -> a
+    166:166:int com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayKClassValue.getArrayDimensionCount():186:186 -> a
     166:166:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):90 -> a
     167:168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.setArrayDimensionCount(int):3705:3706 -> a
     167:168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):90 -> a
@@ -203710,912 +202471,923 @@
     211:211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder writeAnnotationArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):26:26 -> a
     212:212:boolean com.android.tools.r8.jetbrains.kotlin.metadata.ClassNameKt.isLocalClassName(java.lang.String):26:26 -> a
     212:212:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.lang.String):111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;Ljava/lang/String;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gE;Ljava/lang/String;)I"}
     213:215:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.lang.String):112:114 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt -> com.android.tools.r8.internal.Cm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt -> com.android.tools.r8.internal.Gm0:
 # {"id":"sourceFile","fileName":"Writers.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/lI;)Lcom/android/tools/r8/internal/f00;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):35:35 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/mI;)Lcom/android/tools/r8/internal/j00;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.create():7782:7782 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.access$7600():7769 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.newBuilder():7759 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):36 -> a
-    3:354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):37:388 -> a
-    355:355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):38:38 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):35 -> a
+    3:354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):36:387 -> a
+    355:355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):37:37 -> a
     356:358:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.ensureUpperBoundIsMutable():8067:8069 -> a
     356:358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.addUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):8121 -> a
-    356:358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):38 -> a
+    356:358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):37 -> a
     359:359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.addUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):8122:8122 -> a
-    359:359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):38 -> a
-    360:360:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    360:360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):40 -> a
+    359:359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):37 -> a
+    360:360:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    360:360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    361:361:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):390:390 -> a
-    362:364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):41:43 -> a
-    365:394:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    365:394:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):43 -> a
-    395:396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setName(int):7982:7983 -> a
-    395:396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):43 -> a
-    397:397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):44:44 -> a
-    398:399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setId(int):7950:7951 -> a
-    398:399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):44 -> a
-    400:400:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isReified(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):424:424 -> a
-    400:400:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):45 -> a
+    361:361:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):389:389 -> a
+    362:364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):40:42 -> a
+    365:393:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    365:393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):42 -> a
+    394:395:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setName(int):7982:7983 -> a
+    394:395:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):42 -> a
+    396:396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):43:43 -> a
+    397:398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setId(int):7950:7951 -> a
+    397:398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):43 -> a
+    399:399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):44:44 -> a
+    400:400:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isReified(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):411:411 -> a
+    400:400:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):44 -> a
     401:401:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getDefaultInstance():7272:7272 -> a
-    401:401:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):46 -> a
+    401:401:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):45 -> a
     402:402:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getReified():7509:7509 -> a
-    402:402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):46 -> a
+    402:402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):45 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     403:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setReified(boolean):8014:8015 -> a
-    403:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):47 -> a
-    405:406:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):49:50 -> a
+    403:404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):46 -> a
+    405:406:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):48:49 -> a
     407:408:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setVariance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance):8049:8050 -> a
-    407:408:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):50 -> a
-    409:410:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):51:52 -> a
+    407:408:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):49 -> a
+    409:410:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):50:51 -> a
     411:412:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.setVariance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance):8049:8050 -> a
-    411:412:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):52 -> a
-    413:413:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/gI;)Lcom/android/tools/r8/internal/ZZ;"}
+    411:412:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder writeTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):51 -> a
+    413:413:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):76:76 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/internal/d00;"}
     414:414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.create():6210:6210 -> a
     414:414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.access$5700():6197 -> a
     414:414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.newBuilder():6187 -> a
-    414:414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):77 -> a
-    415:415:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier com.android.tools.r8.jetbrains.kotlin.metadata.KmType.getClassifier():870:870 -> a
-    415:415:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78 -> a
+    414:414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):76 -> a
+    415:416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):77:78 -> a
+    417:448:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:31 -> a
+    417:448:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78 -> a
+    449:450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setClassName(int):6753:6754 -> a
+    449:450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78 -> a
+    451:451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79:79 -> a
+    452:483:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:31 -> a
+    452:483:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79 -> a
+    484:485:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setTypeAliasName(int):6896:6897 -> a
+    484:485:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79 -> a
+    486:486:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80:80 -> a
+    487:488:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setTypeParameter(int):6797:6798 -> a
+    487:488:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80 -> a
+    489:798:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):82:391 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):57:57 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5411:5411 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.access$5000():5397 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.newBuilder():5387 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):57 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    801:802:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):58:59 -> a
+    801:802:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    803:804:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5526:5527 -> a
+    803:804:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):59 -> a
+    803:804:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    805:805:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component1():0:0 -> a
+    805:805:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    416:416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79:79 -> a
-    417:417:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$Class.getName():1220:1220 -> a
-    417:417:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79 -> a
-    418:418:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79:79 -> a
-    419:451:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:32 -> a
-    419:451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79 -> a
-    452:453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setClassName(int):6753:6754 -> a
-    452:453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):79 -> a
-    454:454:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80:80 -> a
-    455:455:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeAlias.getName():1235:1235 -> a
-    455:455:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80 -> a
-    456:456:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80:80 -> a
-    457:489:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getClassName$kotlin_metadata(java.lang.String):0:32 -> a
-    457:489:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80 -> a
-    490:491:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setTypeAliasName(int):6896:6897 -> a
-    490:491:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):80 -> a
-    492:492:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):81:81 -> a
-    493:494:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setTypeParameter(int):6797:6798 -> a
-    493:494:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):81 -> a
-    495:804:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83:392 -> a
-    805:805:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):58:58 -> a
-    805:805:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5411:5411 -> a
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.access$5000():5397 -> a
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.newBuilder():5387 -> a
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):58 -> a
-    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    807:808:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):59:60 -> a
-    807:808:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
+    805:805:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component2():0:0 -> a
+    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):61 -> a
+    806:806:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    807:808:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):64:65 -> a
+    807:808:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
     809:810:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5526:5527 -> a
-    809:810:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):60 -> a
-    809:810:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    811:811:com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component1():0:0 -> a
-    811:811:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):62 -> a
+    809:810:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):65 -> a
+    809:810:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    811:812:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):66:67 -> a
+    811:812:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5526:5527 -> a
+    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):67 -> a
+    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    815:815:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):69:69 -> a
+    815:815:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    816:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):5573:5575 -> a
+    816:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):69 -> a
+    816:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    819:821:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.ensureArgumentIsMutable():6438:6440 -> a
+    819:821:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6515 -> a
+    819:821:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    822:822:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516:6516 -> a
+    822:822:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    823:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5434:5435 -> a
+    823:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
+    823:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    825:825:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516:6516 -> a
+    825:825:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    826:826:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    826:826:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5436 -> a
+    826:826:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
+    826:826:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    827:827:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5436:5436 -> a
+    827:827:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
+    827:827:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    828:828:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):63:63 -> a
+    828:828:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):83 -> a
+    829:829:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):86:86 -> a
+    830:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):7052:7054 -> a
+    830:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):86 -> a
+    833:833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):87:87 -> a
+    834:836:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6948:6950 -> a
+    834:836:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):87 -> a
+    837:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):88:90 -> a
+    840:840:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    840:840:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):90 -> a
+    841:842:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlexibleTypeCapabilitiesId(int):6624:6625 -> a
+    841:842:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):90 -> a
+    843:843:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):91:91 -> a
+    844:846:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6664:6666 -> a
+    844:846:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):91 -> a
+    847:847:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    847:847:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    811:811:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    812:812:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection.component2():0:0 -> a
-    812:812:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):62 -> a
-    812:812:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):65:66 -> a
-    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    815:816:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5526:5527 -> a
-    815:816:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):66 -> a
-    815:816:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    817:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):67:68 -> a
-    817:818:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    819:820:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5526:5527 -> a
-    819:820:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):68 -> a
-    819:820:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    821:821:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):70:70 -> a
-    821:821:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    822:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):5573:5575 -> a
-    822:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):70 -> a
-    822:824:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    825:827:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.ensureArgumentIsMutable():6438:6440 -> a
-    825:827:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6515 -> a
-    825:827:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    828:828:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516:6516 -> a
-    828:828:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    829:830:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5434:5435 -> a
-    829:830:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
-    829:830:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    831:831:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516:6516 -> a
-    831:831:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    832:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    832:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5436 -> a
-    832:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
-    832:832:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    833:833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.build():5436:5436 -> a
-    833:833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.addArgument(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder):6516 -> a
-    833:833:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder writeTypeProjection(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):64:64 -> a
-    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):84 -> a
-    835:835:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):87:87 -> a
-    836:838:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setAbbreviatedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):7052:7054 -> a
-    836:838:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):87 -> a
-    839:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):88:88 -> a
-    840:842:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setOuterType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6948:6950 -> a
-    840:842:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):88 -> a
-    843:845:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):89:91 -> a
-    846:846:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    846:846:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):91 -> a
-    847:848:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlexibleTypeCapabilitiesId(int):6624:6625 -> a
-    847:848:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):91 -> a
-    849:849:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):92:92 -> a
-    850:852:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlexibleUpperBound(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6664:6666 -> a
-    850:852:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):92 -> a
-    853:853:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    853:853:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):95 -> a
+    848:848:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):394:394 -> a
+    849:851:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):94:96 -> a
+    852:852:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullable(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):389:389 -> a
+    852:852:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):96 -> a
+    853:854:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setNullable(boolean):6577:6578 -> a
+    853:854:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):97 -> a
+    855:855:int com.android.tools.r8.jetbrains.kotlin.metadata.KmType.getFlags$kotlin_metadata():445:445 -> a
+    855:855:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):99 -> a
+    856:856:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> a
+    856:856:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):100 -> a
+    857:857:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlags():5950:5950 -> a
+    857:857:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    854:854:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):395:395 -> a
-    855:855:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):95:95 -> a
-    856:856:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullable(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):402:402 -> a
-    856:856:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):97 -> a
-    857:858:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setNullable(boolean):6577:6578 -> a
-    857:858:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):98 -> a
-    859:859:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):100:100 -> a
-    860:860:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> a
-    860:860:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101 -> a
-    861:861:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getFlags():5950:5950 -> a
-    861:861:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    862:863:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlags(int):7156:7157 -> a
-    862:863:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):102 -> a
-    864:864:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78:78 -> a
-    865:865:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier com.android.tools.r8.jetbrains.kotlin.metadata.KmType.getClassifier():870:870 -> a
-    865:865:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):78 -> a
-    866:866:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124:124 -> a
-    866:866:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/TH;)Lcom/android/tools/r8/internal/AZ;"}
-    867:867:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.create():16460:16460 -> a
-    867:867:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.access$14100():16447 -> a
-    867:867:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.newBuilder():16437 -> a
-    867:867:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
-    867:867:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    868:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125:416 -> a
-    868:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1160:1160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125:125 -> a
+    858:859:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.setFlags(int):7156:7157 -> a
+    858:859:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101 -> a
+    860:860:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder writeType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):77:77 -> a
+    861:861:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):123:123 -> a
+    861:861:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/YH;)Lcom/android/tools/r8/internal/EZ;"}
+    862:862:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.create():16460:16460 -> a
+    862:862:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.access$14100():16447 -> a
+    862:862:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.newBuilder():16437 -> a
+    862:862:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):123 -> a
+    862:862:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    863:1154:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124:415 -> a
+    863:1154:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1155:1155:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124:124 -> a
+    1155:1155:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1156:1157:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
+    1156:1157:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
+    1156:1157:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1158:1158:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):415:415 -> a
+    1158:1158:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1159:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1159:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
+    1159:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
+    1159:1159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1160:1160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
+    1160:1160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
     1160:1160:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1161:1162:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
-    1161:1162:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125 -> a
-    1161:1162:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1163:1163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):416:416 -> a
-    1163:1163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
-    1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125 -> a
+    1161:1163:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureTypeParameterIsMutable():16990:16992 -> a
+    1161:1163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllTypeParameter(java.lang.Iterable):17087 -> a
+    1161:1163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
+    1161:1163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllTypeParameter(java.lang.Iterable):17088:17088 -> a
+    1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):124 -> a
     1164:1164:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1165:1165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
-    1165:1165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125 -> a
+    1165:1165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125:125 -> a
     1165:1165:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1166:1168:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureTypeParameterIsMutable():16990:16992 -> a
-    1166:1168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllTypeParameter(java.lang.Iterable):17087 -> a
+    1166:1168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setReceiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):17132:17134 -> a
     1166:1168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125 -> a
     1166:1168:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1169:1169:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllTypeParameter(java.lang.Iterable):17088:17088 -> a
-    1169:1169:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):125 -> a
+    1169:1169:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():209:209 -> a
+    1169:1169:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):128 -> a
     1169:1169:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1170:1170:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):126:126 -> a
-    1170:1170:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1171:1173:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setReceiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):17132:17134 -> a
-    1171:1173:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):126 -> a
-    1171:1173:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1174:1174:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():393:393 -> a
-    1174:1174:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
-    1174:1174:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1175:1177:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):418:420 -> a
-    1175:1177:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1178:1469:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129:420 -> a
-    1178:1469:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1470:1472:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureContextReceiverTypeIsMutable():17207:17209 -> a
-    1470:1472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllContextReceiverType(java.lang.Iterable):17304 -> a
-    1470:1472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
-    1470:1472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1473:1473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllContextReceiverType(java.lang.Iterable):17305:17305 -> a
-    1473:1473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
-    1473:1473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1474:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130:424 -> a
-    1474:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1769:1769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130:130 -> a
+    1170:1172:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):417:419 -> a
+    1170:1172:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1173:1464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):128:419 -> a
+    1173:1464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1465:1467:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureContextReceiverTypeIsMutable():17207:17209 -> a
+    1465:1467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllContextReceiverType(java.lang.Iterable):17304 -> a
+    1465:1467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):128 -> a
+    1465:1467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1468:1468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllContextReceiverType(java.lang.Iterable):17305:17305 -> a
+    1468:1468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):128 -> a
+    1468:1468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1469:1763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129:423 -> a
+    1469:1763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1764:1764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129:129 -> a
+    1764:1764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1765:1766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
+    1765:1766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
+    1765:1766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1767:1767:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):423:423 -> a
+    1767:1767:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1768:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1768:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
+    1768:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
+    1768:1768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1769:1769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
+    1769:1769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
     1769:1769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1770:1771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
-    1770:1771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130 -> a
-    1770:1771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1772:1772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):424:424 -> a
-    1772:1772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
-    1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130 -> a
+    1770:1772:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureValueParameterIsMutable():17398:17400 -> a
+    1770:1772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllValueParameter(java.lang.Iterable):17495 -> a
+    1770:1772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
+    1770:1772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllValueParameter(java.lang.Iterable):17496:17496 -> a
+    1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):129 -> a
     1773:1773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1774:1774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
-    1774:1774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130 -> a
+    1774:1774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130:130 -> a
     1774:1774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1775:1777:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureValueParameterIsMutable():17398:17400 -> a
-    1775:1777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllValueParameter(java.lang.Iterable):17495 -> a
+    1775:1777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):16915:16917 -> a
     1775:1777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130 -> a
     1775:1777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1778:1778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllValueParameter(java.lang.Iterable):17496:17496 -> a
-    1778:1778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):130 -> a
+    1778:1778:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():225:225 -> a
+    1778:1778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131 -> a
     1778:1778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1779:1779:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131:131 -> a
-    1779:1779:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1780:1782:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):16915:16917 -> a
-    1780:1782:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131 -> a
-    1780:1782:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1783:1783:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():409:409 -> a
-    1783:1783:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):132 -> a
-    1783:1783:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1784:1793:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):426:435 -> a
-    1784:1793:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1794:1794:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):434:434 -> a
-    1794:1794:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    1795:2097:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):132:434 -> a
-    1795:2097:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2098:2100:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureVersionRequirementIsMutable():17582:17584 -> a
-    2098:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllVersionRequirement(java.lang.Iterable):17654 -> a
-    2098:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):132 -> a
-    2098:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2101:2101:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllVersionRequirement(java.lang.Iterable):17655:17655 -> a
-    2101:2101:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):132 -> a
-    2101:2101:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2102:2102:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContract():414:414 -> a
-    2102:2102:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2102:2102:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2103:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):247:247 -> a
-    2103:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2103:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():25600:25600 -> a
-    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.access$23500():25586 -> a
-    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.newBuilder():25576 -> a
-    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):247 -> a
-    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    1779:1788:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):425:434 -> a
+    1779:1788:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1789:1789:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):433:433 -> a
+    1789:1789:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    1790:2092:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131:433 -> a
+    1790:2092:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2093:2095:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.ensureVersionRequirementIsMutable():17582:17584 -> a
+    2093:2095:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllVersionRequirement(java.lang.Iterable):17654 -> a
+    2093:2095:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131 -> a
+    2093:2095:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2096:2096:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.addAllVersionRequirement(java.lang.Iterable):17655:17655 -> a
+    2096:2096:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):131 -> a
+    2096:2096:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2097:2097:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContract():230:230 -> a
+    2097:2097:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2097:2097:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2098:2098:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):246:246 -> a
+    2098:2098:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2098:2098:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():25600:25600 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.access$23500():25586 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.newBuilder():25576 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):246 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2099:2099:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2100:2100:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():21:21 -> a
+    2100:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2100:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2100:2100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2101:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):486:488 -> a
+    2101:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2101:2103:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):256:256 -> a
+    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2104:2104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2105:2105:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():1059:1059 -> a
-    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():26417:26417 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.access$24000():26403 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.newBuilder():26393 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):256 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2105:2105:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2106:2108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):487:489 -> a
-    2106:2108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2106:2108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2109:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):257:257 -> a
-    2109:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2109:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2109:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():26417:26417 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.access$24000():26403 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.newBuilder():26393 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):257 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2110:2110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2111:2111:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():1097:1097 -> a
-    2111:2111:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259 -> a
+    2106:2106:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():43:43 -> a
+    2106:2106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2111:2111:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2111:2111:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2111:2111:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2112:2114:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):491:493 -> a
-    2112:2114:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2112:2114:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2112:2114:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2115:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259:493 -> a
-    2115:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2115:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2115:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2350:2352:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.ensureEffectConstructorArgumentIsMutable():26573:26575 -> a
-    2350:2352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.addAllEffectConstructorArgument(java.lang.Iterable):26670 -> a
-    2350:2352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259 -> a
-    2350:2352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2350:2352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2350:2352:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2353:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.addAllEffectConstructorArgument(java.lang.Iterable):26671:26671 -> a
-    2353:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259 -> a
-    2353:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2353:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2353:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():1102:1102 -> a
-    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):260 -> a
-    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2106:2106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2106:2106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2106:2106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2107:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):490:492 -> a
+    2107:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2107:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2107:2109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2110:2344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):258:492 -> a
+    2110:2344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2110:2344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2110:2344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2345:2347:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.ensureEffectConstructorArgumentIsMutable():26573:26575 -> a
+    2345:2347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.addAllEffectConstructorArgument(java.lang.Iterable):26670 -> a
+    2345:2347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):258 -> a
+    2345:2347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2345:2347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2345:2347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.addAllEffectConstructorArgument(java.lang.Iterable):26671:26671 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):258 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2348:2348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():48:48 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2349:2349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2350:2350:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259:259 -> a
+    2350:2350:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2350:2350:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2350:2350:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2351:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):26730:26732 -> a
+    2351:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):259 -> a
+    2351:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2351:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2351:2353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():36:36 -> a
+    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):261 -> a
+    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2354:2354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2355:2355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):260:260 -> a
-    2355:2355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2355:2355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2355:2355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2356:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setConclusionOfConditionalEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):26730:26732 -> a
-    2356:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):260 -> a
-    2356:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2356:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2356:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2359:2359:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():1090:1090 -> a
-    2359:2359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):262 -> a
-    2359:2359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2359:2359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2359:2359:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2360:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):262:265 -> a
-    2360:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2360:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2360:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2355:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):261:264 -> a
+    2355:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2355:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2355:2358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2359:2360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setEffectType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):26555:26556 -> a
+    2359:2360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):264 -> a
+    2359:2360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2359:2360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2359:2360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2361:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):261:263 -> a
+    2361:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2361:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2361:2363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
     2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setEffectType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):26555:26556 -> a
-    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):265 -> a
-    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):263 -> a
+    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2364:2365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2366:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):262:264 -> a
-    2366:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2366:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2366:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2369:2370:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setEffectType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):26555:26556 -> a
-    2369:2370:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):264 -> a
-    2369:2370:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2369:2370:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2369:2370:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2371:2371:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):263:263 -> a
-    2371:2371:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2371:2371:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2371:2371:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2372:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setEffectType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):26555:26556 -> a
-    2372:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):263 -> a
-    2372:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2372:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2372:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2374:2374:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():1091:1091 -> a
-    2374:2374:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):267 -> a
-    2374:2374:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2374:2374:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2374:2374:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2375:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):267:270 -> a
-    2375:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2375:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2375:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2366:2366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):262:262 -> a
+    2366:2366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2366:2366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2366:2366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2367:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setEffectType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):26555:26556 -> a
+    2367:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):262 -> a
+    2367:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2367:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2367:2368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2369:2369:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():37:37 -> a
+    2369:2369:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):266 -> a
+    2369:2369:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2369:2369:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2369:2369:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2370:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):266:269 -> a
+    2370:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2370:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2370:2373:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2374:2375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):26805:26806 -> a
+    2374:2375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):269 -> a
+    2374:2375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2374:2375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2374:2375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2376:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):266:268 -> a
+    2376:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2376:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2376:2378:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
     2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):26805:26806 -> a
-    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):270 -> a
-    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):268 -> a
+    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2379:2380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2381:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):267:269 -> a
-    2381:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2381:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2381:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):26805:26806 -> a
-    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):269 -> a
-    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2381:2381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):267:267 -> a
+    2381:2381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2381:2381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2381:2381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2382:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):26805:26806 -> a
+    2382:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):267 -> a
+    2382:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2382:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2382:2383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26442:26443 -> a
+    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):272 -> a
+    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2384:2385:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):268:268 -> a
-    2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):488:488 -> a
+    2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2386:2386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2387:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind):26805:26806 -> a
-    2387:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):268 -> a
-    2387:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2387:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2387:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2389:2390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26442:26443 -> a
-    2389:2390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):273 -> a
-    2389:2390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2389:2390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2389:2390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2391:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):489:489 -> a
-    2391:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2391:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26444 -> a
-    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):273 -> a
-    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26444 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):272 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2387:2387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2388:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26444:26444 -> a
+    2388:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):272 -> a
+    2388:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2388:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2388:2388:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2389:2391:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.ensureEffectIsMutable():25686:25688 -> a
+    2389:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.addAllEffect(java.lang.Iterable):25783 -> a
+    2389:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2389:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2389:2391:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.addAllEffect(java.lang.Iterable):25784:25784 -> a
+    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):248 -> a
+    2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
     2392:2392:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2393:2393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.build():26444:26444 -> a
-    2393:2393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect writeEffect(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):273 -> a
-    2393:2393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2393:2393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2393:2393:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2394:2396:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.ensureEffectIsMutable():25686:25688 -> a
-    2394:2396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.addAllEffect(java.lang.Iterable):25783 -> a
-    2394:2396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2394:2396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2394:2396:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2397:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.addAllEffect(java.lang.Iterable):25784:25784 -> a
-    2397:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
-    2397:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2397:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2398:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25619:25620 -> a
-    2398:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):250 -> a
-    2398:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2398:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2400:2402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):17694:17696 -> a
-    2400:2402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2400:2402:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2403:2403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2403:2403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25621 -> a
-    2403:2403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):250 -> a
-    2403:2403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2403:2403:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2404:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25621:25621 -> a
-    2404:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):250 -> a
-    2404:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):135 -> a
-    2404:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2405:2405:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    2405:2405:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):137 -> a
-    2405:2405:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2406:2406:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):439:439 -> a
-    2406:2406:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2407:2409:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):137:139 -> a
-    2407:2409:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2410:2439:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    2410:2439:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):139 -> a
-    2410:2439:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2440:2441:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setName(int):16880:16881 -> a
-    2440:2441:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):139 -> a
-    2440:2441:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2442:2442:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> a
-    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):140 -> a
-    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2443:2443:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstance():15609:15609 -> a
-    2443:2443:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):140 -> a
-    2443:2443:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2444:2444:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getFlags():15877:15877 -> a
-    2444:2444:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):140 -> a
+    2393:2394:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25619:25620 -> a
+    2393:2394:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
+    2393:2394:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2393:2394:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2395:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):17694:17696 -> a
+    2395:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2395:2397:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2398:2398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    2398:2398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25621 -> a
+    2398:2398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
+    2398:2398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2398:2398:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2399:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():25621:25621 -> a
+    2399:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract writeContract(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):249 -> a
+    2399:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):134 -> a
+    2399:2399:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2400:2400:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    2400:2400:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):136 -> a
+    2400:2400:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2401:2401:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):438:438 -> a
+    2401:2401:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2402:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):136:138 -> a
+    2402:2404:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2405:2433:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    2405:2433:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):138 -> a
+    2405:2433:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2434:2435:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setName(int):16880:16881 -> a
+    2434:2435:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):138 -> a
+    2434:2435:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2436:2436:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags$kotlin_metadata():192:192 -> a
+    2436:2436:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):139 -> a
+    2436:2436:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2437:2437:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstance():15609:15609 -> a
+    2437:2437:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):139 -> a
+    2437:2437:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2438:2438:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getFlags():15877:15877 -> a
+    2438:2438:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):139 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2444:2444:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2445:2446:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setFlags(int):16801:16802 -> a
-    2445:2446:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):141 -> a
-    2445:2446:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
-    2447:2447:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/internal/IZ;"}
-    2448:2448:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.create():18810:18810 -> a
-    2448:2448:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.access$16000():18797 -> a
-    2448:2448:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.newBuilder():18787 -> a
-    2448:2448:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):148 -> a
-    2449:2449:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():568:568 -> a
-    2449:2449:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
-    2450:2450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):441:441 -> a
-    2451:2451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151:151 -> a
-    2452:2453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
-    2452:2453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151 -> a
-    2454:2456:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureTypeParameterIsMutable():19324:19326 -> a
-    2454:2456:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):19378 -> a
-    2454:2456:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151 -> a
-    2457:2457:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):19379:19379 -> a
-    2457:2457:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151 -> a
-    2458:2458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2458:2458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
-    2458:2458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151 -> a
-    2459:2459:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
-    2459:2459:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):151 -> a
-    2460:2460:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):153:153 -> a
-    2461:2463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setReceiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):19466:19468 -> a
-    2461:2463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):153 -> a
-    2464:2464:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():578:578 -> a
-    2464:2464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
-    2465:2467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):443:445 -> a
-    2468:2757:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156:445 -> a
-    2758:2760:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureContextReceiverTypeIsMutable():19541:19543 -> a
-    2758:2760:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllContextReceiverType(java.lang.Iterable):19638 -> a
-    2758:2760:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
-    2761:2761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllContextReceiverType(java.lang.Iterable):19639:19639 -> a
-    2761:2761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
-    2762:2762:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():592:592 -> a
-    2762:2762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157 -> a
-    2763:2763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157:157 -> a
-    2764:2765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
-    2764:2765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157 -> a
-    2766:2768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):19749:19751 -> a
+    2438:2438:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2439:2440:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.setFlags(int):16801:16802 -> a
+    2439:2440:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):140 -> a
+    2439:2440:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder access$writeFunction(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):1 -> a
+    2441:2441:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):147:147 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/fI;)Lcom/android/tools/r8/internal/MZ;"}
+    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.create():18810:18810 -> a
+    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.access$16000():18797 -> a
+    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.newBuilder():18787 -> a
+    2442:2442:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):147 -> a
+    2443:2443:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():294:294 -> a
+    2443:2443:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):149 -> a
+    2444:2444:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):440:440 -> a
+    2445:2445:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150:150 -> a
+    2446:2447:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
+    2446:2447:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
+    2448:2450:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureTypeParameterIsMutable():19324:19326 -> a
+    2448:2450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):19378 -> a
+    2448:2450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
+    2451:2451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addTypeParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):19379:19379 -> a
+    2451:2451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
+    2452:2452:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    2452:2452:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
+    2452:2452:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
+    2453:2453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
+    2453:2453:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):150 -> a
+    2454:2454:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):152:152 -> a
+    2455:2457:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setReceiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):19466:19468 -> a
+    2455:2457:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):152 -> a
+    2458:2458:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():304:304 -> a
+    2458:2458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):155 -> a
+    2459:2461:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):442:444 -> a
+    2462:2751:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):155:444 -> a
+    2752:2754:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureContextReceiverTypeIsMutable():19541:19543 -> a
+    2752:2754:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllContextReceiverType(java.lang.Iterable):19638 -> a
+    2752:2754:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):155 -> a
+    2755:2755:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllContextReceiverType(java.lang.Iterable):19639:19639 -> a
+    2755:2755:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):155 -> a
+    2756:2756:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():318:318 -> a
+    2756:2756:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
+    2757:2757:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156:156 -> a
+    2758:2759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20528:20529 -> a
+    2758:2759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
+    2760:2762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):19749:19751 -> a
+    2760:2762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
+    2763:2763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    2763:2763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
+    2763:2763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
+    2764:2764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
+    2764:2764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):156 -> a
+    2765:2765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157:157 -> a
+    2766:2768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):19249:19251 -> a
     2766:2768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157 -> a
-    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530 -> a
-    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157 -> a
-    2770:2770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():20530:20530 -> a
-    2770:2770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):157 -> a
-    2771:2771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158:158 -> a
-    2772:2774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setReturnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):19249:19251 -> a
-    2772:2774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158 -> a
-    2775:2775:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():602:602 -> a
-    2775:2775:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):159 -> a
-    2776:2785:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):447:456 -> a
-    2786:2786:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):455:455 -> a
-    2787:3083:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):159:455 -> a
-    3084:3086:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureVersionRequirementIsMutable():19903:19905 -> a
-    3084:3086:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllVersionRequirement(java.lang.Iterable):19975 -> a
-    3084:3086:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):159 -> a
-    3087:3087:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllVersionRequirement(java.lang.Iterable):19976:19976 -> a
-    3087:3087:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):159 -> a
-    3088:3088:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    3088:3088:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):161 -> a
-    3089:3089:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):460:460 -> a
-    3090:3092:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):161:163 -> a
-    3093:3122:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3093:3122:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):163 -> a
-    3123:3124:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setName(int):19214:19215 -> a
-    3123:3124:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):163 -> a
-    3125:3125:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> a
-    3125:3125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):164 -> a
-    3126:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> a
-    3126:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):164 -> a
-    3127:3127:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getFlags():18235:18235 -> a
-    3127:3127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):164 -> a
+    2769:2769:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():328:328 -> a
+    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158 -> a
+    2770:2779:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):446:455 -> a
+    2780:2780:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):454:454 -> a
+    2781:3077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158:454 -> a
+    3078:3080:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.ensureVersionRequirementIsMutable():19903:19905 -> a
+    3078:3080:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllVersionRequirement(java.lang.Iterable):19975 -> a
+    3078:3080:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158 -> a
+    3081:3081:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.addAllVersionRequirement(java.lang.Iterable):19976:19976 -> a
+    3081:3081:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):158 -> a
+    3082:3082:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    3082:3082:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):160 -> a
+    3083:3083:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):459:459 -> a
+    3084:3086:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):160:162 -> a
+    3087:3115:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    3087:3115:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):162 -> a
+    3116:3117:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setName(int):19214:19215 -> a
+    3116:3117:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):162 -> a
+    3118:3118:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags$kotlin_metadata():258:258 -> a
+    3118:3118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):163 -> a
+    3119:3119:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> a
+    3119:3119:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):163 -> a
+    3120:3120:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getFlags():18235:18235 -> a
+    3120:3120:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3128:3129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setFlags(int):19134:19135 -> a
-    3128:3129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):165 -> a
-    3130:3130:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():514:514 -> a
-    3130:3130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
-    3131:3131:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> a
-    3131:3131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
+    3121:3122:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setFlags(int):19134:19135 -> a
+    3121:3122:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):164 -> a
+    3123:3123:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    3123:3123:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):167 -> a
+    3124:3124:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> a
+    3124:3124:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3132:3133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setGetterFlags(int):19842:19843 -> a
-    3132:3133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
-    3134:3134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetter():524:524 -> a
-    3134:3134:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):169 -> a
-    3135:3135:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> a
-    3135:3135:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):169 -> a
-    3136:3137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterFlags(int):19886:19887 -> a
-    3136:3137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):169 -> a
-    3138:3138:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/qI;)Lcom/android/tools/r8/internal/m00;"}
-    3139:3139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():20499:20499 -> a
-    3139:3139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.access$17900():20486 -> a
-    3139:3139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder():20476 -> a
-    3139:3139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):176 -> a
-    3140:3140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):177:177 -> a
-    3141:3143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):20748:20750 -> a
-    3141:3143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):177 -> a
-    3144:3144:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):178:178 -> a
-    3145:3147:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):20840:20842 -> a
-    3145:3147:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):178 -> a
-    3148:3148:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    3148:3148:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):179 -> a
-    3149:3149:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):462:462 -> a
-    3150:3151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):179:180 -> a
-    3152:3152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstance():20096:20096 -> a
-    3152:3152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):180 -> a
-    3153:3153:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getFlags():20236:20236 -> a
-    3153:3153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):180 -> a
+    3125:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setGetterFlags(int):19842:19843 -> a
+    3125:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):167 -> a
+    3127:3127:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetter():285:285 -> a
+    3127:3127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
+    3128:3128:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():243:243 -> a
+    3128:3128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
+    3129:3130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.setSetterFlags(int):19886:19887 -> a
+    3129:3130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder writeProperty(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):168 -> a
+    3131:3131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):175:175 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/pI;)Lcom/android/tools/r8/internal/q00;"}
+    3132:3132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():20499:20499 -> a
+    3132:3132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.access$17900():20486 -> a
+    3132:3132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder():20476 -> a
+    3132:3132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):175 -> a
+    3133:3133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):176:176 -> a
+    3134:3136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):20748:20750 -> a
+    3134:3136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):176 -> a
+    3137:3137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):177:177 -> a
+    3138:3140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setVarargElementType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):20840:20842 -> a
+    3138:3140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):177 -> a
+    3141:3141:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    3141:3141:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):178 -> a
+    3142:3142:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):461:461 -> a
+    3143:3143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):178:178 -> a
+    3144:3144:int com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getFlags$kotlin_metadata():388:388 -> a
+    3144:3144:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):179 -> a
+    3145:3145:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstance():20096:20096 -> a
+    3145:3145:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):179 -> a
+    3146:3146:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getFlags():20236:20236 -> a
+    3146:3146:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3154:3154:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):181:181 -> a
-    3155:3156:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setFlags(int):20674:20675 -> a
-    3155:3156:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):181 -> a
-    3157:3157:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    3157:3157:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):183 -> a
-    3158:3187:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3158:3187:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):183 -> a
-    3188:3189:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setName(int):20713:20714 -> a
-    3188:3189:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):183 -> a
-    3190:3190:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190:190 -> a
-    3190:3190:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/hI;)Lcom/android/tools/r8/internal/c00;"}
-    3191:3191:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():21652:21652 -> a
-    3191:3191:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.access$19000():21639 -> a
-    3191:3191:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():21629 -> a
-    3191:3191:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
-    3191:3191:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3192:3467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191:466 -> a
-    3192:3467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3468:3468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191:191 -> a
+    3147:3148:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setFlags(int):20674:20675 -> a
+    3147:3148:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):180 -> a
+    3149:3149:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():389:389 -> a
+    3149:3149:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):182 -> a
+    3150:3178:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    3150:3178:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):182 -> a
+    3179:3180:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.setName(int):20713:20714 -> a
+    3179:3180:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder writeValueParameter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):182 -> a
+    3181:3181:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):189:189 -> a
+    3181:3181:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/jI;)Lcom/android/tools/r8/internal/g00;"}
+    3182:3182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():21652:21652 -> a
+    3182:3182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.access$19000():21639 -> a
+    3182:3182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.newBuilder():21629 -> a
+    3182:3182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):189 -> a
+    3182:3182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3183:3458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190:465 -> a
+    3183:3458:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3459:3459:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190:190 -> a
+    3459:3459:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3460:3461:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
+    3460:3461:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
+    3460:3461:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3462:3462:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):465:465 -> a
+    3462:3462:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3463:3463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    3463:3463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
+    3463:3463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
+    3463:3463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3464:3464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
+    3464:3464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
+    3464:3464:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3465:3467:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureTypeParameterIsMutable():21939:21941 -> a
+    3465:3467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllTypeParameter(java.lang.Iterable):22036 -> a
+    3465:3467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
+    3465:3467:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3468:3468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllTypeParameter(java.lang.Iterable):22037:22037 -> a
+    3468:3468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):190 -> a
     3468:3468:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3469:3470:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7811:7812 -> a
-    3469:3470:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
-    3469:3470:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3471:3471:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):466:466 -> a
-    3471:3471:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3472:3472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3472:3472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813 -> a
-    3472:3472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
-    3472:3472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3473:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.build():7813:7813 -> a
-    3473:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
-    3473:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3474:3476:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureTypeParameterIsMutable():21939:21941 -> a
-    3474:3476:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllTypeParameter(java.lang.Iterable):22036 -> a
-    3474:3476:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
-    3474:3476:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3477:3477:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllTypeParameter(java.lang.Iterable):22037:22037 -> a
-    3477:3477:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
-    3477:3477:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3478:3478:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getUnderlyingType():679:679 -> a
-    3478:3478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
-    3478:3478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3479:3479:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192:192 -> a
-    3479:3479:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3480:3482:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):22081:22083 -> a
-    3480:3482:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
-    3480:3482:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3483:3483:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getExpandedType():685:685 -> a
-    3483:3483:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
-    3483:3483:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3484:3484:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193:193 -> a
-    3484:3484:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3485:3487:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):22173:22175 -> a
-    3485:3487:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
-    3485:3487:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3488:3764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194:470 -> a
-    3488:3764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3765:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():23:23 -> a
-    3765:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3765:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3766:3766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194:194 -> a
+    3469:3469:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getUnderlyingType():357:357 -> a
+    3469:3469:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
+    3469:3469:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3470:3470:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191:191 -> a
+    3470:3470:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3471:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):22081:22083 -> a
+    3471:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
+    3471:3473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3474:3474:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getExpandedType():363:363 -> a
+    3474:3474:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
+    3474:3474:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3475:3475:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192:192 -> a
+    3475:3475:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3476:3478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setExpandedType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):22173:22175 -> a
+    3476:3478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
+    3476:3478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3479:3755:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193:469 -> a
+    3479:3755:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3756:3756:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():22:22 -> a
+    3756:3756:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
+    3756:3756:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3757:3757:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193:193 -> a
+    3757:3757:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3758:3759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
+    3758:3759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
+    3758:3759:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3760:3760:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):469:469 -> a
+    3760:3760:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3761:3761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    3761:3761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
+    3761:3761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
+    3761:3761:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3762:3762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
+    3762:3762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
+    3762:3762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3763:3765:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureAnnotationIsMutable():22248:22250 -> a
+    3763:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllAnnotation(java.lang.Iterable):22345 -> a
+    3763:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
+    3763:3765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3766:3766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllAnnotation(java.lang.Iterable):22346:22346 -> a
+    3766:3766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
     3766:3766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3767:3768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
-    3767:3768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3767:3768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3769:3769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):470:470 -> a
-    3769:3769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3770:3770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3770:3770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
-    3770:3770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3770:3770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3771:3771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
-    3771:3771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3771:3771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3772:3774:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureAnnotationIsMutable():22248:22250 -> a
-    3772:3774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllAnnotation(java.lang.Iterable):22345 -> a
-    3772:3774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3772:3774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3775:3775:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllAnnotation(java.lang.Iterable):22346:22346 -> a
-    3775:3775:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
-    3775:3775:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3776:3776:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():695:695 -> a
-    3776:3776:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195 -> a
-    3776:3776:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3777:3786:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):472:481 -> a
-    3777:3786:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3787:3787:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):480:480 -> a
-    3787:3787:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    3788:4073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195:480 -> a
-    3788:4073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4074:4076:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureVersionRequirementIsMutable():22372:22374 -> a
-    4074:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllVersionRequirement(java.lang.Iterable):22444 -> a
-    4074:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195 -> a
-    4074:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4077:4077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllVersionRequirement(java.lang.Iterable):22445:22445 -> a
-    4077:4077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195 -> a
+    3767:3767:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():373:373 -> a
+    3767:3767:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
+    3767:3767:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3768:3777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):471:480 -> a
+    3768:3777:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3778:3778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):479:479 -> a
+    3778:3778:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    3779:4064:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194:479 -> a
+    3779:4064:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4065:4067:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.ensureVersionRequirementIsMutable():22372:22374 -> a
+    4065:4067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllVersionRequirement(java.lang.Iterable):22444 -> a
+    4065:4067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
+    4065:4067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4068:4068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.addAllVersionRequirement(java.lang.Iterable):22445:22445 -> a
+    4068:4068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):194 -> a
+    4068:4068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4069:4069:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():25:25 -> a
+    4069:4069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195 -> a
+    4069:4069:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4070:4070:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):484:484 -> a
+    4070:4070:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4071:4071:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):195:195 -> a
+    4071:4071:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4072:4072:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags$kotlin_metadata():343:343 -> a
+    4072:4072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):197 -> a
+    4072:4072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4073:4073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstance():21062:21062 -> a
+    4073:4073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):197 -> a
+    4073:4073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4074:4074:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getFlags():21244:21244 -> a
+    4074:4074:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):197 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4074:4074:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4075:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setFlags(int):21884:21885 -> a
+    4075:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):198 -> a
+    4075:4076:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4077:4077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):200:200 -> a
     4077:4077:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4078:4078:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getExtensions$kotlin_metadata():26:26 -> a
-    4078:4078:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):196 -> a
-    4078:4078:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4079:4079:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):485:485 -> a
-    4079:4079:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4080:4080:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):196:196 -> a
-    4080:4080:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4081:4081:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags():665:665 -> a
-    4081:4081:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):198 -> a
-    4081:4081:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4082:4082:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstance():21062:21062 -> a
-    4082:4082:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):198 -> a
-    4082:4082:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4083:4083:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getFlags():21244:21244 -> a
-    4083:4083:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):198 -> a
+    4078:4106:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    4078:4106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):200 -> a
+    4078:4106:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4107:4108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setName(int):21921:21922 -> a
+    4107:4108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):200 -> a
+    4107:4108:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4109:4109:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getExpandedType():363:363 -> a
+    4109:4109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
+    4109:4109:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4110:4110:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getUnderlyingType():357:357 -> a
+    4110:4110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):191 -> a
+    4110:4110:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
+    4111:4111:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):237:237 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t00;I)Lcom/android/tools/r8/internal/Vj0;"}
+    4112:4113:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersion(int):23672:23673 -> a
+    4112:4113:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):237 -> a
+    4114:4114:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):237:237 -> a
+    4115:4115:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):277:277 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/SH;)Lcom/android/tools/r8/internal/CZ;"}
+    4116:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():27617:27617 -> a
+    4116:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.access$24900():27603 -> a
+    4116:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.newBuilder():27588 -> a
+    4116:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):277 -> a
+    4117:4117:int com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getFlags$kotlin_metadata():62:62 -> a
+    4117:4117:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4083:4083:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4084:4085:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setFlags(int):21884:21885 -> a
-    4084:4085:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):199 -> a
-    4084:4085:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4086:4086:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):201:201 -> a
-    4086:4086:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4087:4116:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    4087:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):201 -> a
-    4087:4116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4117:4118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.setName(int):21921:21922 -> a
-    4117:4118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):201 -> a
-    4117:4118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4119:4119:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getExpandedType():685:685 -> a
-    4119:4119:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):193 -> a
-    4119:4119:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4120:4120:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getUnderlyingType():679:679 -> a
-    4120:4120:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):192 -> a
-    4120:4120:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):1 -> a
-    4121:4121:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238:238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p00;I)Lcom/android/tools/r8/internal/Rj0;"}
-    4122:4123:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersion(int):23672:23673 -> a
-    4122:4123:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238 -> a
-    4124:4124:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$30(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238:238 -> a
-    4125:4125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):278:278 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/MH;)Lcom/android/tools/r8/internal/yZ;"}
-    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():27617:27617 -> a
-    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.access$24900():27603 -> a
-    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.newBuilder():27588 -> a
-    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):278 -> a
-    4127:4127:int com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getFlags():1140:1140 -> a
-    4127:4127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):280 -> a
+    4118:4118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getDefaultInstance():26995:26995 -> a
+    4118:4118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):279 -> a
+    4119:4119:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getFlags():27212:27212 -> a
+    4119:4119:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4128:4128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getDefaultInstance():26995:26995 -> a
-    4128:4128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):280 -> a
-    4129:4129:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getFlags():27212:27212 -> a
-    4129:4129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):280 -> a
+    4120:4121:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setFlags(int):27808:27809 -> a
+    4120:4121:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):280 -> a
+    4122:4122:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getParameterIndex():68:68 -> a
+    4122:4122:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):282 -> a
+    4123:4123:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):282:282 -> a
+    4124:4125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setValueParameterReference(int):27860:27861 -> a
+    4124:4125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):282 -> a
+    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getConstantValue():73:73 -> a
+    4126:4126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):283 -> a
+    4127:4127:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue.getValue():102:102 -> a
+    4127:4127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):285 -> a
+    4128:4128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):286:286 -> a
+    4129:4130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
+    4129:4130:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):286 -> a
+    4131:4131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):287:287 -> a
+    4132:4133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
+    4132:4133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):287 -> a
+    4134:4134:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):288:288 -> a
+    4135:4136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
+    4135:4136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):288 -> a
+    4137:4137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):289:289 -> a
+    4138:4138:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():78:78 -> a
+    4138:4138:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):292 -> a
+    4139:4139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):292:292 -> a
+    4140:4142:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setIsInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):27950:27952 -> a
+    4140:4142:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):292 -> a
+    4143:4143:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():84:84 -> a
+    4143:4143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293 -> a
+    4144:4146:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):494:496 -> a
+    4147:4350:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293:496 -> a
+    4351:4353:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.ensureAndArgumentIsMutable():28040:28042 -> a
+    4351:4353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllAndArgument(java.lang.Iterable):28197 -> a
+    4351:4353:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293 -> a
+    4354:4354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllAndArgument(java.lang.Iterable):28198:28198 -> a
+    4354:4354:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293 -> a
+    4355:4355:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():90:90 -> a
+    4355:4355:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
+    4356:4358:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):498:500 -> a
+    4359:4565:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294:500 -> a
+    4566:4568:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.ensureOrArgumentIsMutable():28237:28239 -> a
+    4566:4568:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllOrArgument(java.lang.Iterable):28394 -> a
+    4566:4568:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
+    4569:4569:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllOrArgument(java.lang.Iterable):28395:28395 -> a
+    4569:4569:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
+    4570:4571:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27648:27649 -> a
+    4570:4571:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
+    4572:4572:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    4572:4572:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27650 -> a
+    4572:4572:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
+    4573:4573:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27650:27650 -> a
+    4573:4573:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
+    4574:4574:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getKind():504:504 -> a
+    4574:4574:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):205 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4130:4131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setFlags(int):27808:27809 -> a
-    4130:4131:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):281 -> a
-    4132:4132:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getParameterIndex():1147:1147 -> a
-    4132:4132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):283 -> a
-    4133:4133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):283:283 -> a
-    4134:4135:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setValueParameterReference(int):27860:27861 -> a
-    4134:4135:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):283 -> a
-    4136:4136:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getConstantValue():1152:1152 -> a
-    4136:4136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):284 -> a
-    4137:4137:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue.getValue():1292:1292 -> a
-    4137:4137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):286 -> a
-    4138:4138:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):287:287 -> a
-    4139:4140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
-    4139:4140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):287 -> a
-    4141:4141:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):288:288 -> a
-    4142:4143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
-    4142:4143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):288 -> a
-    4144:4144:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):289:289 -> a
-    4145:4146:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue):27900:27901 -> a
-    4145:4146:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):289 -> a
-    4147:4147:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):290:290 -> a
-    4148:4148:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():1157:1157 -> a
-    4148:4148:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293 -> a
-    4149:4149:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293:293 -> a
-    4150:4152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.setIsInstanceType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):27950:27952 -> a
-    4150:4152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):293 -> a
-    4153:4153:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():1163:1163 -> a
-    4153:4153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
-    4154:4156:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):495:497 -> a
-    4157:4360:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294:497 -> a
-    4361:4363:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.ensureAndArgumentIsMutable():28040:28042 -> a
-    4361:4363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllAndArgument(java.lang.Iterable):28197 -> a
-    4361:4363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
-    4364:4364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllAndArgument(java.lang.Iterable):28198:28198 -> a
-    4364:4364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):294 -> a
-    4365:4365:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():1169:1169 -> a
-    4365:4365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
-    4366:4368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):499:501 -> a
-    4369:4575:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295:501 -> a
-    4576:4578:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.ensureOrArgumentIsMutable():28237:28239 -> a
-    4576:4578:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllOrArgument(java.lang.Iterable):28394 -> a
-    4576:4578:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
-    4579:4579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.addAllOrArgument(java.lang.Iterable):28395:28395 -> a
-    4579:4579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):295 -> a
-    4580:4581:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27648:27649 -> a
-    4580:4581:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):296 -> a
-    4582:4582:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    4582:4582:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27650 -> a
-    4582:4582:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):296 -> a
-    4583:4583:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():27650:27650 -> a
-    4583:4583:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression writeEffectExpression(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):296 -> a
-    4584:4584:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getKind():991:991 -> a
-    4584:4584:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):206 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm0;Lcom/android/tools/r8/internal/tI;)Ljava/lang/Integer;"}
+    4575:4575:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getLevel():509:509 -> a
+    4575:4575:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):206 -> a
+    4576:4576:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getErrorCode():514:514 -> a
+    4576:4576:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):207 -> a
+    4577:4577:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getMessage():519:519 -> a
+    4577:4577:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):208 -> a
+    4578:4578:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):209:209 -> a
+    4579:4579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():23521:23521 -> a
+    4579:4579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.access$21000():23507 -> a
+    4579:4579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():23497 -> a
+    4579:4579:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):209 -> a
+    4580:4583:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):210:213 -> a
+    4584:4584:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):212:212 -> a
+    4585:4585:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):211:211 -> a
+    4586:4586:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getDefaultInstance():22972:22972 -> a
+    4586:4586:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():23546 -> a
+    4586:4586:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):216 -> a
+    4587:4587:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getVersionKind():23357:23357 -> a
+    4587:4587:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm0;Lcom/android/tools/r8/internal/uI;)Ljava/lang/Integer;"}
-    4585:4585:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getLevel():996:996 -> a
-    4585:4585:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):207 -> a
-    4586:4586:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getErrorCode():1001:1001 -> a
-    4586:4586:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):208 -> a
-    4587:4587:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getMessage():1006:1006 -> a
-    4587:4587:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):209 -> a
-    4588:4588:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):210:210 -> a
-    4589:4589:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():23521:23521 -> a
-    4589:4589:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.access$21000():23507 -> a
-    4589:4589:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.newBuilder():23497 -> a
-    4589:4589:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):210 -> a
-    4590:4593:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):211:214 -> a
-    4594:4594:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):213:213 -> a
-    4595:4595:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):212:212 -> a
-    4596:4596:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getDefaultInstance():22972:22972 -> a
-    4596:4596:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.getDefaultInstanceForType():23546 -> a
-    4596:4596:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):217 -> a
-    4597:4597:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getVersionKind():23357:23357 -> a
-    4597:4597:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):217 -> a
+    4588:4589:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):23927:23928 -> a
+    4588:4589:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):217 -> a
+    4590:4593:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):219:222 -> a
+    4594:4596:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):219:221 -> a
+    4597:4597:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):220:220 -> a
+    4598:4598:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getLevel():23286:23286 -> a
+    4598:4598:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):224 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4598:4599:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionKind(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind):23927:23928 -> a
-    4598:4599:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):218 -> a
-    4600:4603:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):220:223 -> a
-    4604:4606:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):220:222 -> a
-    4607:4607:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):221:221 -> a
-    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getLevel():23286:23286 -> a
-    4608:4608:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):225 -> a
+    4599:4600:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setLevel(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):23777:23778 -> a
+    4599:4600:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):225 -> a
+    4601:4601:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):228:228 -> a
+    4602:4603:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setErrorCode(int):23825:23826 -> a
+    4602:4603:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):228 -> a
+    4604:4604:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):231:231 -> a
+    4605:4605:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    4605:4605:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):231 -> a
+    4606:4607:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setMessage(int):23873:23874 -> a
+    4606:4607:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):231 -> a
+    4608:4608:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getVersion():524:524 -> a
+    4608:4608:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):234 -> a
+    4609:4609:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component1():0:0 -> a
+    4609:4609:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):234 -> a
+    4610:4610:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component2():0:0 -> a
+    4610:4610:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):234 -> a
+    4611:4611:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component3():0:0 -> a
+    4611:4611:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):234 -> a
+    4612:4612:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):236:236 -> a
+    4613:4652:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:39 -> a
+    4613:4652:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):236 -> a
+    4653:4653:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
+    4653:4653:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):39 -> a
+    4653:4653:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):236 -> a
+    4654:4654:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):46:46 -> a
+    4654:4654:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):236 -> a
+    4655:4655:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):43:43 -> a
+    4655:4655:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):236 -> a
+    4656:4656:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():23:23 -> a
+    4656:4656:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4609:4610:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setLevel(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level):23777:23778 -> a
-    4609:4610:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):226 -> a
-    4611:4611:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):229:229 -> a
-    4612:4613:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setErrorCode(int):23825:23826 -> a
-    4612:4613:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):229 -> a
-    4614:4614:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):232:232 -> a
-    4615:4615:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    4615:4615:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):232 -> a
-    4616:4617:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setMessage(int):23873:23874 -> a
-    4616:4617:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):232 -> a
-    4618:4618:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):235:235 -> a
-    4619:4619:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component1():0:0 -> a
-    4619:4619:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):235 -> a
-    4620:4620:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component2():0:0 -> a
-    4620:4620:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):235 -> a
-    4621:4621:int com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion.component3():0:0 -> a
-    4621:4621:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):235 -> a
-    4622:4622:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):237:237 -> a
-    4623:4662:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:39 -> a
-    4623:4662:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):237 -> a
-    4663:4663:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
-    4663:4663:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):39 -> a
-    4663:4663:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):237 -> a
-    4664:4664:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):46:46 -> a
-    4664:4664:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):237 -> a
-    4665:4665:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version.encode(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):43:43 -> a
-    4665:4665:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):237 -> a
-    4666:4666:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getVersionRequirements$kotlin_metadata():24:24 -> a
-    4666:4666:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):242 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4667:4667:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):242:242 -> a
-    4668:4668:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.get(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):35:35 -> a
-    4668:4668:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):242 -> a
-    4669:4670:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner.intern(java.lang.Object):26:27 -> a
-    4669:4670:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.get(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):35 -> a
-    4669:4670:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):242 -> a
-    4671:4671:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):242:242 -> a
-    4672:4672:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getLevel():996:996 -> a
-    4672:4672:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):207 -> a
-    4673:4673:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getKind():991:991 -> a
-    4673:4673:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):206 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):239:239 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p00;I)Lcom/android/tools/r8/internal/Rj0;"}
+    4657:4657:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):241:241 -> a
+    4658:4658:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.get(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):35:35 -> a
+    4658:4658:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):241 -> a
+    4659:4660:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner.intern(java.lang.Object):26:27 -> a
+    4659:4660:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.get(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):35 -> a
+    4659:4660:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):241 -> a
+    4661:4661:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):241:241 -> a
+    4662:4662:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getVersion():524:524 -> a
+    4662:4662:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):234 -> a
+    4663:4663:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementLevel com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getLevel():509:509 -> a
+    4663:4663:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):206 -> a
+    4664:4664:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirementVersionKind com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getKind():504:504 -> a
+    4664:4664:java.lang.Integer writeVersionRequirement(com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):205 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238:238 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t00;I)Lcom/android/tools/r8/internal/Vj0;"}
     2:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.setVersionFull(int):23725:23726 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):239 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):239:239 -> b
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt$WhenMappings -> com.android.tools.r8.internal.Bm0:
+    2:3:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlin.Unit writeVersionRequirement$lambda$31(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder,int):238:238 -> b
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.WritersKt$WhenMappings -> com.android.tools.r8.internal.Fm0:
 # {"id":"sourceFile","fileName":"Writers.kt"}
     int[] $EnumSwitchMapping$3 -> a
     1:1:void <clinit>():0:0 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.Do:
-# {"id":"sourceFile","fileName":"ExtensionUtils.kt"}
-    1:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtension singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):12:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/QH;)Lcom/android/tools/r8/internal/PH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension -> com.android.tools.r8.internal.AH:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt -> com.android.tools.r8.internal.Ao:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension -> com.android.tools.r8.internal.GH:
+    1:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtension singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):84:92 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/WH;)Lcom/android/tools/r8/internal/VH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension -> com.android.tools.r8.internal.KH:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtension -> com.android.tools.r8.internal.PH:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension -> com.android.tools.r8.internal.OH:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension -> com.android.tools.r8.internal.UH:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtension -> com.android.tools.r8.internal.VH:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension -> com.android.tools.r8.internal.ZH:
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType() -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType -> com.android.tools.r8.internal.WH:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPropertyExtension -> com.android.tools.r8.internal.dI:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kd;"}
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):20:20 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kd;)V"}
+    1:1:boolean equals(java.lang.Object):22:22 -> equals
+    1:1:int hashCode():25:25 -> hashCode
+    2:2:int com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.hashCode():94:94 -> hashCode
+    2:2:int hashCode():25 -> hashCode
+    1:1:java.lang.String toString():28:28 -> toString
+    2:31:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):0:29 -> toString
+    2:31:java.lang.String toString():28 -> toString
+    32:32:java.lang.String toString():28:28 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension -> com.android.tools.r8.internal.ZH:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.iI:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension -> com.android.tools.r8.internal.dI:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension -> com.android.tools.r8.internal.jI:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPropertyExtension -> com.android.tools.r8.internal.hI:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.mI:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.kI:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.rI:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension -> com.android.tools.r8.internal.lI:
 # {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions -> com.android.tools.r8.internal.KN:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.nI:
+# {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.qI:
+# {"id":"sourceFile","fileName":"ExtensionNodes.kt"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions -> com.android.tools.r8.internal.ON:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion Companion -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NN;"}
     1:1:void <clinit>():0:0 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.JN:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.NN:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.MetadataExtensions$Companion $$INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NN;"}
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/og0;"}
     1:1:void <clinit>():85:85 -> <clinit>
     2:2:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):21:21 -> <clinit>
     2:2:void <clinit>():85 -> <clinit>
     3:3:void <clinit>():85:85 -> <clinit>
     1:1:void <init>():84:84 -> <init>
     1:3:java.util.List INSTANCES_delegate$lambda$1():86:88 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.cZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.gZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int id_ -> d
     java.util.List argument_ -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XY;"}
     1:1:void <clinit>():1956:1956 -> <clinit>
     2652:2652:void <clinit>():4607:4607 -> <clinit>
     2653:2653:void initFields():4210:4210 -> <clinit>
@@ -204625,7 +203397,7 @@
     2654:2654:void <clinit>():4608 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):1881:1881 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1875 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fZ;)V"}
     2333:2365:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):4213:4245 -> <init>
     2333:2365:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1875 -> <init>
     2366:2366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
@@ -204640,7 +203412,7 @@
     4730:4730:void <init>(boolean):1884:1884 -> <init>
     4731:4731:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1899:1899 -> <init>
     4731:4731:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1875 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     7045:7077:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4213:4245 -> <init>
     7045:7077:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1875 -> <init>
     7078:7079:void initFields():4210:4211 -> <init>
@@ -204692,7 +203464,7 @@
     5:10:boolean isInitialized():4224:4229 -> a
     11:11:boolean isInitialized():4220:4220 -> a
     12:14:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):4235:4237 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     15:15:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):4237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -204705,38 +203477,38 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4324 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilderForType():4325 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():1875 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.create():4348:4348 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.access$4200():4334 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4324 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation):4327 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():1875 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation):4327:4327 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():1875 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.TY:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.XY:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():1957:1957 -> <init>
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1957:1957 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1962:1962 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/cZ;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.aZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/gZ;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.eZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dZ;"}
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
     1:1:void <clinit>():2079:2079 -> <clinit>
     2073:2073:void <clinit>():4151:4151 -> <clinit>
     2074:2074:void initFields():3823:3823 -> <clinit>
@@ -204748,7 +203520,7 @@
     2076:2076:void <clinit>():4152 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2002:2002 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1996 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZY;)V"}
     1825:1859:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):3826:3860 -> <init>
     1825:1859:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1996 -> <init>
     1860:1860:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
@@ -204763,7 +203535,7 @@
     3718:3718:void <init>(boolean):2005:2005 -> <init>
     3719:3719:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2020:2020 -> <init>
     3719:3719:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1996 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     5525:5559:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3826:3860 -> <init>
     5525:5559:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):1996 -> <init>
     5560:5560:void initFields():3823:3823 -> <init>
@@ -204834,7 +203606,7 @@
     9:9:boolean isInitialized():3837:3837 -> a
     10:10:boolean isInitialized():3833:3833 -> a
     11:13:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):3850:3852 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     14:14:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     14:14:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):3852 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -204847,36 +203619,36 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilderForType():3940 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():1996 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.create():3963:3963 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.access$3600():3949 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument):3942 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder toBuilder():3944 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():1996 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument):3942:3942 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder toBuilder():3944 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():1996 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.UY:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.YY:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.VY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.ZY:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dZ;"}
     1:1:void <init>():3956:3956 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getDefaultInstance():2270:2270 -> <init>
     2:2:void <init>():4087 -> <init>
     3:3:void <init>():4087:4087 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.getDefaultInstance():2009:2009 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument):4008 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aZ;)Lcom/android/tools/r8/internal/VY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eZ;)Lcom/android/tools/r8/internal/ZY;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.hasNameId():3798:3798 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument):4009 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -204910,10 +203682,10 @@
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument):4015 -> a
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):3949:3949 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     22:22:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4042:4042 -> a
     22:22:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3949 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     23:23:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4042 -> a
@@ -204939,7 +203711,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder clone():3976:3976 -> clone
     2:2:java.lang.Object clone():3949 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:3998 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/eZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.access$3802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3998 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():4002:4002 -> e
@@ -204947,13 +203719,13 @@
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():4002 -> e
     11:11:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument.access$4002(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument,int):1996:1996 -> e
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():4003 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.ZY:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.dZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     long intValue_ -> e
     float floatValue_ -> f
     double doubleValue_ -> g
@@ -204961,16 +203733,16 @@
     int classId_ -> i
     int enumValueId_ -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation annotation_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gZ;"}
     java.util.List arrayElement_ -> l
     int arrayDimensionCount_ -> m
     int flags_ -> n
     byte memoizedIsInitialized -> o
     int memoizedSerializedSize -> p
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aZ;"}
     1:1:void <clinit>():2398:2398 -> <clinit>
     1387:1387:void <clinit>():3784:3784 -> <clinit>
     1388:1394:void initFields():2807:2813 -> <clinit>
@@ -204982,7 +203754,7 @@
     1396:1399:void <clinit>():3785 -> <clinit>
     1:618:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2263:2880 -> <init>
     1:618:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):2257 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bZ;)V"}
     619:619:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     619:619:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2264 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -204994,7 +203766,7 @@
     1236:1236:void <init>(boolean):2266:2266 -> <init>
     1237:1836:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2281:2880 -> <init>
     1237:1836:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):2257 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1837:1843:void initFields():2807:2813 -> <init>
     1837:1843:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2282 -> <init>
     1837:1843:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):2257 -> <init>
@@ -205122,7 +203894,7 @@
     7:7:boolean isInitialized():2832 -> a
     8:13:boolean isInitialized():2832:2837 -> a
     14:16:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2843:2845 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     17:17:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type.getNumber():2526:2526 -> a
     17:17:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2845 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -205202,28 +203974,28 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2995 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilderForType():2996 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2257 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.create():3019:3019 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.access$2100():3005 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder():2995 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2998 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder toBuilder():3000 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2257 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):2998:2998 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder toBuilder():3000 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2257 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.WY:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.aZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.XY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.bZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     long intValue_ -> e
     float floatValue_ -> f
     double doubleValue_ -> g
@@ -205231,7 +204003,7 @@
     int classId_ -> i
     int enumValueId_ -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation annotation_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gZ;"}
     java.util.List arrayElement_ -> l
     int arrayDimensionCount_ -> m
     int flags_ -> n
@@ -205241,7 +204013,7 @@
     191:252:void <init>():3467:3528 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.getDefaultInstance():2270:2270 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):3119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZY;)Lcom/android/tools/r8/internal/XY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dZ;)Lcom/android/tools/r8/internal/bZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.hasType():2581:2581 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):3120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -205324,10 +204096,10 @@
     60:60:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     60:60:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value):3160 -> a
     61:61:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):3005:3005 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     62:62:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3187:3187 -> a
     62:62:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3005 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     63:63:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     63:63:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
     63:63:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3187 -> a
@@ -205355,7 +204127,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder clone():3050:3050 -> clone
     2:2:java.lang.Object clone():3005 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3072 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dZ;"}
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.access$2302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type):2257:2257 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3072 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3076:3076 -> e
@@ -205390,44 +204162,44 @@
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3113 -> e
     32:32:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value.access$3402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value,int):2257:2257 -> e
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3114 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.YY:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.cZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type CHAR -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type SHORT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type INT -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type LONG -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type FLOAT -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type DOUBLE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BOOLEAN -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type STRING -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type CLASS -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type ENUM -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type ANNOTATION -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type ARRAY -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/cZ;"}
     1:49:void <clinit>():2421:2469 -> <clinit>
     50:50:void <clinit>():2416:2416 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):2561:2562 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():2526:2526 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2542:2542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/YY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/cZ;"}
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2541:2541 -> a
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2540:2540 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2539:2539 -> a
@@ -205440,7 +204212,7 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> a
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.bZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.fZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     int id_ -> d
@@ -205448,7 +204220,7 @@
     1:139:void <init>():4341:4479 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.getDefaultInstance():1888:1888 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation):4394 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cZ;)Lcom/android/tools/r8/internal/bZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gZ;)Lcom/android/tools/r8/internal/fZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.hasId():4165:4165 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation):4395 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -205476,10 +204248,10 @@
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation):4408 -> a
     22:22:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):4334:4334 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4433:4433 -> a
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4334 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     24:24:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1957:1957 -> a
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4433 -> a
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4334 -> a
@@ -205504,7 +204276,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder clone():4361:4361 -> clone
     2:2:java.lang.Object clone():4334 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4383 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.access$4402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4383 -> e
     9:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4385:4388 -> e
@@ -205512,7 +204284,7 @@
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4388 -> e
     14:14:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation.access$4602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation,int):1875:1875 -> e
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4389 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.gZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.kZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     java.util.List multiFieldValueClassUnderlyingName_ -> A
     int multiFieldValueClassUnderlyingNameMemoizedSerializedSize -> B
@@ -205520,18 +204292,18 @@
     java.util.List multiFieldValueClassUnderlyingTypeId_ -> D
     int multiFieldValueClassUnderlyingTypeIdMemoizedSerializedSize -> E
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     java.util.List versionRequirement_ -> G
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z00;"}
     byte memoizedIsInitialized -> I
     int memoizedSerializedSize -> J
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class defaultInstance -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     int fqName_ -> f
@@ -205554,13 +204326,13 @@
     int sealedSubclassFqNameMemoizedSerializedSize -> w
     int inlineClassUnderlyingPropertyName_ -> x
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type inlineClassUnderlyingType_ -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int inlineClassUnderlyingTypeId_ -> z
     1:1:void <clinit>():9000:9000 -> <clinit>
     3729:3730:void <clinit>():12728:12729 -> <clinit>
     1:1367:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8610:9976 -> <init>
     1:1367:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):8603 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iZ;)V"}
     1368:1368:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     1368:1368:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):8611 -> <init>
     1368:1368:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):8603 -> <init>
@@ -205570,7 +204342,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2734:2734:void <init>(boolean):8613:8613 -> <init>
     2735:4083:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):8628:9976 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     4084:4386:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):8629:8931 -> <init>
     4387:4396:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):8909:8918 -> <init>
     4397:4400:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):8902:8905 -> <init>
@@ -205676,7 +204448,7 @@
     45:54:boolean isInitialized():9857:9866 -> a
     55:55:boolean isInitialized():9793:9793 -> a
     56:56:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):9872:9872 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     57:57:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     57:57:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):9875 -> a
     58:59:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):9876:9877 -> a
@@ -205795,14 +204567,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():10209 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilderForType():10210 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():8603 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.create():10232:10232 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.access$8700():10219 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder():10209 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class):10212 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder toBuilder():10214 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():8603 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class):10212:10212 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder toBuilder():10214 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():8603 -> e
@@ -205816,22 +204588,22 @@
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getDefaultInstance():23992:23992 -> h
     26:26:void initFields():9784 -> h
     27:27:void initFields():9784:9784 -> h
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.dZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.hZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():9001:9001 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):9006:9006 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):9001 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
     2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):8603:8603 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):9006 -> a
     2:2:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):9001 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.eZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.iZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     java.util.List versionRequirement_ -> B
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z00;"}
     int bitField0_ -> e
     int flags_ -> f
     int fqName_ -> g
@@ -205850,7 +204622,7 @@
     java.util.List sealedSubclassFqName_ -> t
     int inlineClassUnderlyingPropertyName_ -> u
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type inlineClassUnderlyingType_ -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int inlineClassUnderlyingTypeId_ -> w
     java.util.List multiFieldValueClassUnderlyingName_ -> x
     java.util.List multiFieldValueClassUnderlyingType_ -> y
@@ -205867,7 +204639,7 @@
     2188:2188:void <init>():12664:12664 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getDefaultInstance():8617:8617 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class):10425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gZ;)Lcom/android/tools/r8/internal/eZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kZ;)Lcom/android/tools/r8/internal/iZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasFlags():9145:9145 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class):10426 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206136,10 +204908,10 @@
     247:247:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     247:247:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class):10611 -> a
     248:248:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):10219:10219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     249:255:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10700:10706 -> a
     249:255:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     256:256:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException.getUnfinishedMessage():66:66 -> a
     256:256:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10702 -> a
     256:256:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10219 -> a
@@ -206161,9 +204933,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getDefaultInstance():8617:8617 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():10293 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():10219 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class buildPartial():10305:10311 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.access$8902(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,int):8603:8603 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class buildPartial():10311 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class buildPartial():10315:10315 -> e
@@ -206237,20 +205009,20 @@
     117:117:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class buildPartial():10419 -> e
     118:118:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.access$11302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,int):8603:8603 -> e
     118:118:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class buildPartial():10420 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.jZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Kind[] $VALUES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/fZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/jZ;"}
     1:25:void <clinit>():9027:9051 -> <clinit>
     26:26:void <clinit>():9018:9018 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):9117:9118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():9088:9088 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.jZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.nZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     java.util.List valueParameter_ -> f
@@ -206258,15 +205030,15 @@
     byte memoizedIsInitialized -> h
     int memoizedSerializedSize -> i
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lZ;"}
     1:670:void <clinit>():14720:15389 -> <clinit>
     671:673:void initFields():14835:14837 -> <clinit>
     671:673:void <clinit>():15390 -> <clinit>
     1:258:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14621:14878 -> <init>
     1:258:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):14614 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mZ;)V"}
     259:259:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     259:259:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):14622 -> <init>
     259:259:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):14614 -> <init>
@@ -206277,7 +205049,7 @@
     516:516:void <init>(boolean):14624:14624 -> <init>
     517:756:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14639:14878 -> <init>
     517:756:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):14614 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     757:759:void initFields():14835:14837 -> <init>
     757:759:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14640 -> <init>
     757:759:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):14614 -> <init>
@@ -206344,7 +205116,7 @@
     3:3:boolean isInitialized():14846 -> a
     4:13:boolean isInitialized():14846:14855 -> a
     14:14:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):14861:14861 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     15:15:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):14864 -> a
     16:17:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):14865:14866 -> a
@@ -206374,24 +205146,24 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14967 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilderForType():14968 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():14614 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14990:14990 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder.access$13300():14977 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14967 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor):14970 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder toBuilder():14972 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():14614 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor):14970:14970 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder toBuilder():14972 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():14614 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.hZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.lZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():14721:14721 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14726:14726 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14721 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.iZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.mZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int flags_ -> f
@@ -206400,7 +205172,7 @@
     1:309:void <init>():14983:15291 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstance():14628:14628 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor):15043 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jZ;)Lcom/android/tools/r8/internal/iZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nZ;)Lcom/android/tools/r8/internal/mZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.hasFlags():14749:14749 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor):15044 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206440,10 +205212,10 @@
     37:37:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     37:37:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor):15068 -> a
     38:38:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):14977:14977 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     39:39:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15093:15093 -> a
     39:39:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14977 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14726:14726 -> a
     40:40:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14721 -> a
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15093 -> a
@@ -206471,9 +205243,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstance():14628:14628 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstanceForType():15009 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():14977 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():15021:15027 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.access$13502(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,int):14614:14614 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():15027 -> e
     9:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():15029:15032 -> e
@@ -206484,23 +205256,23 @@
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():15037 -> e
     20:20:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.access$13802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,int):14614:14614 -> e
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():15038 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.mZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.qZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     java.util.List effect_ -> c
     byte memoizedIsInitialized -> d
     int memoizedSerializedSize -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oZ;"}
     1:390:void <clinit>():25423:25812 -> <clinit>
     391:391:void initFields():25474:25474 -> <clinit>
     391:391:void <clinit>():25813 -> <clinit>
     1:149:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):25353:25501 -> <init>
     1:149:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25347 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pZ;)V"}
     150:150:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     150:150:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):25354 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206512,7 +205284,7 @@
     298:298:void <init>(boolean):25356:25356 -> <init>
     299:429:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25371:25501 -> <init>
     299:429:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25347 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     430:430:void initFields():25474:25474 -> <init>
     430:430:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25372 -> <init>
     430:430:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25347 -> <init>
@@ -206552,38 +205324,38 @@
     3:3:boolean isInitialized():25483 -> a
     4:9:boolean isInitialized():25483:25488 -> a
     10:14:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):25494:25498 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:10:int getSerializedSize():25503:25512 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():25600:25600 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.access$23500():25586 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():25576 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilderForType():25577 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():25347 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():25600:25600 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder.access$23500():25586 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():25576 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25579 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():25581 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():25347 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25579:25579 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():25581 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():25347 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.kZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.oZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():25424:25424 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25429:25429 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.lZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.pZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     java.util.List effect_ -> d
     1:92:void <init>():25593:25684 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.getDefaultInstance():25360:25360 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25638 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mZ;)Lcom/android/tools/r8/internal/lZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qZ;)Lcom/android/tools/r8/internal/pZ;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.access$23700(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25347:25347 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25639 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25639:25640 -> a
@@ -206604,10 +205376,10 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract):25649 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):25586:25586 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25670:25670 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25586 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25429:25429 -> a
     20:20:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25424 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25670 -> a
@@ -206633,27 +205405,27 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract$Builder clone():25611:25611 -> clone
     2:2:java.lang.Object clone():25586 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract buildPartial():25627:25633 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qZ;"}
     8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.access$23702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract,java.util.List):25347:25347 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract buildPartial():25633 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.rZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.vZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tZ;"}
     java.util.List effectConstructorArgument_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind kind_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
     byte memoizedIsInitialized -> h
     int memoizedSerializedSize -> i
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect defaultInstance -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rZ;"}
     1:835:void <clinit>():25990:26824 -> <clinit>
     836:837:void initFields():26261:26262 -> <clinit>
     836:837:void <clinit>():26825 -> <clinit>
@@ -206664,7 +205436,7 @@
     839:840:void <clinit>():26825 -> <clinit>
     1:424:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):25883:26306 -> <init>
     1:424:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25877 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sZ;)V"}
     425:425:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     425:425:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):25884 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206676,7 +205448,7 @@
     848:848:void <init>(boolean):25886:25886 -> <init>
     849:1254:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25901:26306 -> <init>
     849:1254:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25877 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1255:1256:void initFields():26261:26262 -> <init>
     1255:1256:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25902 -> <init>
     1255:1256:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):25877 -> <init>
@@ -206771,7 +205543,7 @@
     7:7:boolean isInitialized():26279 -> a
     8:13:boolean isInitialized():26279:26284 -> a
     14:16:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):26290:26292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     17:17:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType.getNumber():26072:26072 -> a
     17:17:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):26292 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206798,40 +205570,40 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():26393 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilderForType():26394 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():25877 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():26417:26417 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder.access$24000():26403 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():26393 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect):26396 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder toBuilder():26398 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():25877 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect):26396:26396 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder toBuilder():26398 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():25877 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.nZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.rZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():25991:25991 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25996:25996 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25991 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.oZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.sZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tZ;"}
     java.util.List effectConstructorArgument_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind kind_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
     1:162:void <init>():26410:26571 -> <init>
     163:163:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getDefaultInstance():26995:26995 -> <init>
     163:163:void <init>():26695 -> <init>
     164:254:void <init>():26695:26785 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.getDefaultInstance():25890:25890 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect):26475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rZ;)Lcom/android/tools/r8/internal/oZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vZ;)Lcom/android/tools/r8/internal/sZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.hasEffectType():26176:26176 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect):26476 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -206885,10 +205657,10 @@
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect):26495 -> a
     42:42:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):26403:26403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     43:43:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):26522:26522 -> a
     43:43:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):26403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     44:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25996:25996 -> a
     44:44:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):25991 -> a
     44:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):26522 -> a
@@ -206914,7 +205686,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$Builder clone():26434:26434 -> clone
     2:2:java.lang.Object clone():26403 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect buildPartial():26450:26456 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vZ;"}
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.access$24202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType):25877:25877 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect buildPartial():26456 -> e
     9:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect buildPartial():26458:26461 -> e
@@ -206928,57 +205700,57 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect buildPartial():26469 -> e
     18:18:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect.access$24602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect,int):25877:25877 -> e
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect buildPartial():26470 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.pZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.tZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_CONSTANT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/pZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/tZ;"}
     1:18:void <clinit>():26025:26042 -> <clinit>
     19:19:void <clinit>():26016:26016 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):26097:26098 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():26072:26072 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.qZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.uZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_LEAST_ONCE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/qZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uZ;"}
     1:9:void <clinit>():26112:26120 -> <clinit>
     10:10:void <clinit>():26107:26107 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):26162:26163 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():26137:26137 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.uZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.yZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int name_ -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wZ;"}
     1:273:void <clinit>():22563:22835 -> <clinit>
     274:274:void initFields():22595:22595 -> <clinit>
     274:274:void <clinit>():22836 -> <clinit>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:126:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):22499:22624 -> <init>
     1:126:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22492 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xZ;)V"}
     127:127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     127:127:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):22500 -> <init>
     127:127:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22492 -> <init>
@@ -206989,7 +205761,7 @@
     252:252:void <init>(boolean):22502:22502 -> <init>
     253:360:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22517:22624 -> <init>
     253:360:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22492 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     361:361:void initFields():22595:22595 -> <init>
     361:361:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22518 -> <init>
     361:361:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22492 -> <init>
@@ -207032,7 +205804,7 @@
     414:414:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22492 -> <init>
     1:9:boolean isInitialized():22599:22607 -> a
     10:10:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):22613:22613 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     11:11:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):22616 -> a
     12:13:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):22617:22618 -> a
@@ -207051,31 +205823,31 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():22700 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilderForType():22701 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():22492 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():22723:22723 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.access$20400():22710 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():22700 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry):22703 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder toBuilder():22705 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():22492 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry):22703:22703 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder toBuilder():22705 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():22492 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.sZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.wZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():22564:22564 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22569:22569 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22564 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.tZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.xZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int name_ -> f
     1:1:void <init>():22716:22716 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.getDefaultInstance():22506:22506 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry):22762 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uZ;)Lcom/android/tools/r8/internal/tZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yZ;)Lcom/android/tools/r8/internal/xZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.hasName():22585:22585 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry):22763 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -207092,10 +205864,10 @@
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry):22767 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):22710:22710 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22786:22786 -> a
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22710 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22569:22569 -> a
     13:13:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22564 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22786 -> a
@@ -207145,27 +205917,27 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.getDefaultInstance():22506:22506 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstanceForType():22738 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():22710 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.yZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.CZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int flags_ -> d
     int valueParameterReference_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int isInstanceTypeId_ -> h
     java.util.List andArgument_ -> i
     java.util.List orArgument_ -> j
     byte memoizedIsInitialized -> k
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression defaultInstance -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zZ;"}
     1:1:void <clinit>():27109:27109 -> <clinit>
     1327:1327:void <clinit>():28435:28435 -> <clinit>
     1328:1330:void initFields():27426:27428 -> <clinit>
@@ -207177,7 +205949,7 @@
     1332:1335:void <clinit>():28436 -> <clinit>
     1:502:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):26988:27489 -> <init>
     1:502:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):26982 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AZ;)V"}
     503:503:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     503:503:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):26989 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -207189,7 +205961,7 @@
     1004:1004:void <init>(boolean):26991:26991 -> <init>
     1005:1488:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27006:27489 -> <init>
     1005:1488:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):26982 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1489:1491:void initFields():27426:27428 -> <init>
     1489:1491:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27007 -> <init>
     1489:1491:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):26982 -> <init>
@@ -207290,7 +206062,7 @@
     11:11:boolean isInitialized():27453 -> a
     12:17:boolean isInitialized():27453:27458 -> a
     18:20:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):27464:27466 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     21:21:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):27466 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -207325,32 +206097,32 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():27588 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilderForType():27589 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():26982 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():27617:27617 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder.access$24900():27603 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():27588 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):27591 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():27593 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():26982 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):27591:27591 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():27593 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():26982 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.vZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.zZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():27110:27110 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27115:27115 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.wZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.AZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     int flags_ -> d
     int valueParameterReference_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int isInstanceTypeId_ -> h
     java.util.List andArgument_ -> i
     java.util.List orArgument_ -> j
@@ -207360,7 +206132,7 @@
     273:593:void <init>():27915:28235 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.getDefaultInstance():26995:26995 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):27694 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yZ;)Lcom/android/tools/r8/internal/wZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CZ;)Lcom/android/tools/r8/internal/AZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.hasFlags():27201:27201 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):27695 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -207425,10 +206197,10 @@
     55:55:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     55:55:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression):27730 -> a
     56:56:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):27603:27603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     57:57:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27763:27763 -> a
     57:57:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27603 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     58:58:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27115:27115 -> a
     58:58:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27110 -> a
     58:58:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):27763 -> a
@@ -207454,7 +206226,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$Builder clone():27640:27640 -> clone
     2:2:java.lang.Object clone():27603 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression buildPartial():27656:27662 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.access$25102(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,int):26982:26982 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression buildPartial():27662 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression buildPartial():27666:27666 -> e
@@ -207477,57 +206249,57 @@
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression buildPartial():27688 -> e
     28:28:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression.access$25802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression,int):26982:26982 -> e
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression buildPartial():27689 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.xZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.BZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/xZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/BZ;"}
     1:9:void <clinit>():27132:27140 -> <clinit>
     10:10:void <clinit>():27127:27127 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):27182:27183 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():27157:27157 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.BZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.FZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     int oldFlags_ -> f
     int name_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int returnTypeId_ -> i
     java.util.List typeParameter_ -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type receiverType_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int receiverTypeId_ -> l
     java.util.List contextReceiverType_ -> m
     java.util.List contextReceiverTypeId_ -> n
     int contextReceiverTypeIdMemoizedSerializedSize -> o
     java.util.List valueParameter_ -> p
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     java.util.List versionRequirement_ -> r
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract contract_ -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
     byte memoizedIsInitialized -> t
     int memoizedSerializedSize -> u
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DZ;"}
     1:1:void <clinit>():15819:15819 -> <clinit>
     1920:1921:void <clinit>():17738:17739 -> <clinit>
     1:693:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):15602:16294 -> <init>
     1:693:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):15595 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EZ;)V"}
     694:694:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     694:694:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):15603 -> <init>
     694:694:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):15595 -> <init>
@@ -207538,7 +206310,7 @@
     1386:1386:void <init>(boolean):15605:15605 -> <init>
     1387:2061:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15620:16294 -> <init>
     1387:2061:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):15595 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     2062:2062:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15621:15621 -> <init>
     2062:2062:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):15595 -> <init>
     2063:2063:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$Output com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString.newOutput():751:751 -> <init>
@@ -207720,7 +206492,7 @@
     28:37:boolean isInitialized():16225:16234 -> a
     38:38:boolean isInitialized():16185:16185 -> a
     39:39:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):16240:16240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     40:40:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):16243 -> a
     41:42:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):16244:16245 -> a
@@ -207785,14 +206557,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():16437 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilderForType():16438 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():15595 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.create():16460:16460 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.access$14100():16447 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder():16437 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function):16440 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder toBuilder():16442 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():15595 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function):16440:16440 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder toBuilder():16442 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():15595 -> e
@@ -207806,33 +206578,33 @@
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract.getDefaultInstance():25360:25360 -> h
     16:16:void initFields():16176 -> h
     17:17:void initFields():16176:16176 -> h
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.zZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.DZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():15820:15820 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15825:15825 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15820 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.AZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.EZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int flags_ -> f
     int oldFlags_ -> g
     int name_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int returnTypeId_ -> j
     java.util.List typeParameter_ -> k
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type receiverType_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int receiverTypeId_ -> m
     java.util.List contextReceiverType_ -> n
     java.util.List contextReceiverTypeId_ -> o
     java.util.List valueParameter_ -> p
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     java.util.List versionRequirement_ -> r
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Contract contract_ -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qZ;"}
     1:379:void <init>():16453:16831 -> <init>
     380:380:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> <init>
     380:380:void <init>():16895 -> <init>
@@ -207845,7 +206617,7 @@
     946:946:void <init>():17674:17674 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstance():15609:15609 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function):16582 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BZ;)Lcom/android/tools/r8/internal/AZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FZ;)Lcom/android/tools/r8/internal/EZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasFlags():15856:15856 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function):16583 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -207993,10 +206765,10 @@
     125:125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     125:125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function):16661 -> a
     126:126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):16447:16447 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     127:127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16726:16726 -> a
     127:127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16447 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     128:128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15825:15825 -> a
     128:128:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):15820 -> a
     128:128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16726 -> a
@@ -208024,9 +206796,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getDefaultInstance():15609:15609 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function getDefaultInstanceForType():16501 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():16447 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function buildPartial():16513:16519 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.access$14302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,int):15595:15595 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function buildPartial():16519 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function buildPartial():16523:16523 -> e
@@ -208070,44 +206842,44 @@
     53:53:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function buildPartial():16576 -> e
     54:54:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.access$15702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,int):15595:15595 -> e
     54:54:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function buildPartial():16577 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.CZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.GZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/CZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/GZ;"}
     1:13:void <clinit>():205:217 -> <clinit>
     14:14:void <clinit>():196:196 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):268:269 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():242:242 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.DZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.HZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Modality[] $VALUES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/DZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/HZ;"}
     1:13:void <clinit>():23:35 -> <clinit>
     14:14:void <clinit>() -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):86:87 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():60:60 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.GZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.KZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     java.util.List function_ -> e
     java.util.List property_ -> f
     java.util.List typeAlias_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z00;"}
     byte memoizedIsInitialized -> j
     int memoizedSerializedSize -> k
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IZ;"}
     1:996:void <clinit>():12928:13923 -> <clinit>
     997:999:void initFields():13080:13082 -> <clinit>
     997:999:void <clinit>():13924 -> <clinit>
@@ -208123,7 +206895,7 @@
     1003:1003:void <clinit>():13924 -> <clinit>
     1:340:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):12810:13149 -> <init>
     1:340:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):12803 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JZ;)V"}
     341:341:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     341:341:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):12811 -> <init>
     341:341:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):12803 -> <init>
@@ -208134,7 +206906,7 @@
     680:680:void <init>(boolean):12813:12813 -> <init>
     681:1002:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12828:13149 -> <init>
     681:1002:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):12803 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1003:1005:void initFields():13080:13082 -> <init>
     1003:1005:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12829 -> <init>
     1003:1005:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):12803 -> <init>
@@ -208232,7 +207004,7 @@
     15:15:boolean isInitialized():13111 -> a
     16:25:boolean isInitialized():13111:13120 -> a
     26:26:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):13126:13126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     27:27:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):13129 -> a
     28:44:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):13130:13146 -> a
@@ -208245,33 +207017,33 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():13241 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilderForType():13242 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():12803 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.create():13264:13264 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.access$11600():13251 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():13241 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13244 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder toBuilder():13246 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():12803 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13244:13244 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder toBuilder():13246 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():12803 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.EZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.IZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():12929:12929 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12934:12934 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12929 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.FZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.JZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     java.util.List function_ -> f
     java.util.List property_ -> g
     java.util.List typeAlias_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z00;"}
     1:419:void <init>():13257:13675 -> <init>
     420:420:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.getDefaultInstance():13983:13983 -> <init>
     420:420:void <init>():13799 -> <init>
@@ -208281,7 +207053,7 @@
     423:423:void <init>():13859:13859 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getDefaultInstance():12817:12817 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GZ;)Lcom/android/tools/r8/internal/FZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KZ;)Lcom/android/tools/r8/internal/JZ;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.access$11800(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):12803:12803 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13331 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13331:13332 -> a
@@ -208358,10 +207130,10 @@
     64:64:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package):13368 -> a
     65:65:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):13251:13251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     66:66:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13411:13411 -> a
     66:66:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     67:67:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12934:12934 -> a
     67:67:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):12929 -> a
     67:67:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13411 -> a
@@ -208389,9 +207161,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getDefaultInstance():12817:12817 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():13287 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():13251 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package buildPartial():13299:13306 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KZ;"}
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.access$11802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,java.util.List):12803:12803 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package buildPartial():13306 -> e
     10:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package buildPartial():13307:13311 -> e
@@ -208408,40 +207180,40 @@
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package buildPartial():13324 -> e
     26:26:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.access$12302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,int):12803:12803 -> e
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package buildPartial():13325 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.JZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.NZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     int oldFlags_ -> f
     int name_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int returnTypeId_ -> i
     java.util.List typeParameter_ -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type receiverType_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int receiverTypeId_ -> l
     java.util.List contextReceiverType_ -> m
     java.util.List contextReceiverTypeId_ -> n
     int contextReceiverTypeIdMemoizedSerializedSize -> o
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
     int getterFlags_ -> q
     int setterFlags_ -> r
     java.util.List versionRequirement_ -> s
     byte memoizedIsInitialized -> t
     int memoizedSerializedSize -> u
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property defaultInstance -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LZ;"}
     1:1:void <clinit>():18175:18175 -> <clinit>
     1825:1826:void <clinit>():19999:20000 -> <clinit>
     1:673:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):17972:18644 -> <init>
     1:673:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):17965 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MZ;)V"}
     674:674:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     674:674:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):17973 -> <init>
     674:674:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):17965 -> <init>
@@ -208452,7 +207224,7 @@
     1346:1346:void <init>(boolean):17975:17975 -> <init>
     1347:2001:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):17990:18644 -> <init>
     1347:2001:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):17965 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     2002:2002:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):17991:17991 -> <init>
     2002:2002:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):17965 -> <init>
     2003:2003:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$Output com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString.newOutput():751:751 -> <init>
@@ -208629,7 +207401,7 @@
     20:29:boolean isInitialized():18575:18584 -> a
     30:30:boolean isInitialized():18547:18547 -> a
     31:31:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):18590:18590 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     32:32:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):18593 -> a
     33:34:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):18594:18595 -> a
@@ -208706,14 +207478,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():18787 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilderForType():18788 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():17965 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.create():18810:18810 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.access$16000():18797 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder():18787 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):18790 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder toBuilder():18792 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():17965 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):18790:18790 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder toBuilder():18792 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():17965 -> e
@@ -208724,29 +207496,29 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstance():20096:20096 -> h
     12:12:void initFields():18535 -> h
     13:16:void initFields():18535:18538 -> h
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.HZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.LZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():18176:18176 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):18181:18181 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):18176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.IZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.MZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int flags_ -> f
     int oldFlags_ -> g
     int name_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int returnTypeId_ -> j
     java.util.List typeParameter_ -> k
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type receiverType_ -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int receiverTypeId_ -> m
     java.util.List contextReceiverType_ -> n
     java.util.List contextReceiverTypeId_ -> o
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
     int getterFlags_ -> q
     int setterFlags_ -> r
     java.util.List versionRequirement_ -> s
@@ -208759,7 +207531,7 @@
     801:973:void <init>():19729:19901 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):18931 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JZ;)Lcom/android/tools/r8/internal/IZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NZ;)Lcom/android/tools/r8/internal/MZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasFlags():18213:18213 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):18932 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -208893,10 +207665,10 @@
     113:113:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     113:113:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property):19003 -> a
     114:114:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):18797:18797 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     115:115:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):19056:19056 -> a
     115:115:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):18797 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     116:116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):18181:18181 -> a
     116:116:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):18176 -> a
     116:116:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):19056 -> a
@@ -208924,9 +207696,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property getDefaultInstanceForType():18851 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():18797 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property buildPartial():18863:18869 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.access$16202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,int):17965:17965 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property buildPartial():18869 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property buildPartial():18873:18873 -> e
@@ -208970,24 +207742,24 @@
     49:49:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property buildPartial():18925 -> e
     50:50:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.access$17602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,int):17965:17965 -> e
     50:50:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property buildPartial():18926 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable -> com.android.tools.r8.internal.UZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     java.util.List qualifiedName_ -> c
     byte memoizedIsInitialized -> d
     int memoizedSerializedSize -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable defaultInstance -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
     1:1:void <clinit>():826:826 -> <clinit>
     1013:1013:void <clinit>():1838:1838 -> <clinit>
     1014:1014:void initFields():1500:1500 -> <clinit>
     1014:1014:void <clinit>():1839 -> <clinit>
     1:772:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):756:1527 -> <init>
     1:772:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):750 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PZ;)V"}
     773:773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     773:773:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):757 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -208999,7 +207771,7 @@
     1544:1544:void <init>(boolean):759:759 -> <init>
     1545:2298:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):774:1527 -> <init>
     1545:2298:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):750 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     2299:2299:void initFields():1500:1500 -> <init>
     2299:2299:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):775 -> <init>
     2299:2299:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):750 -> <init>
@@ -209039,38 +207811,38 @@
     3:3:boolean isInitialized():1509 -> a
     4:9:boolean isInitialized():1509:1514 -> a
     10:14:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1520:1524 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:10:int getSerializedSize():1529:1538 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder.create():1626:1626 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder.access$1400():1612 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder newBuilder():1602 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder newBuilderForType():1603 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():750 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder.create():1626:1626 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder.access$1400():1612 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder newBuilder():1602 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1605 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder toBuilder():1607 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():750 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1605:1605 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder toBuilder():1607 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():750 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$1 -> com.android.tools.r8.internal.KZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$1 -> com.android.tools.r8.internal.OZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():827:827 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):832:832 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):827 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder -> com.android.tools.r8.internal.LZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder -> com.android.tools.r8.internal.PZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     java.util.List qualifiedName_ -> d
     1:92:void <init>():1619:1710 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable.getDefaultInstance():763:763 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1664 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QZ;)Lcom/android/tools/r8/internal/LZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UZ;)Lcom/android/tools/r8/internal/PZ;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable.access$1600(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):750:750 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1665 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1665:1666 -> a
@@ -209091,10 +207863,10 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable):1675 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):1612:1612 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1696:1696 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1612 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):832:832 -> a
     20:20:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):827 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1696 -> a
@@ -209120,30 +207892,30 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$Builder clone():1637:1637 -> clone
     2:2:java.lang.Object clone():1612 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable buildPartial():1653:1659 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UZ;"}
     8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable.access$1602(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable,java.util.List):750:750 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable buildPartial():1659 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName -> com.android.tools.r8.internal.PZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName -> com.android.tools.r8.internal.TZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int parentQualifiedName_ -> d
     int shortName_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind kind_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SZ;"}
     byte memoizedIsInitialized -> g
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName defaultInstance -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QZ;"}
     1:488:void <clinit>():970:1457 -> <clinit>
     489:491:void initFields():1105:1107 -> <clinit>
     489:491:void <clinit>():1458 -> <clinit>
     1:250:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):889:1138 -> <init>
     1:250:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):883 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RZ;)V"}
     251:251:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     251:251:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):890 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209155,7 +207927,7 @@
     500:500:void <init>(boolean):892:892 -> <init>
     501:732:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):907:1138 -> <init>
     501:732:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):883 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     733:735:void initFields():1105:1107 -> <init>
     733:735:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):908 -> <init>
     733:735:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):883 -> <init>
@@ -209220,7 +207992,7 @@
     3:3:boolean isInitialized():1119:1119 -> a
     4:4:boolean isInitialized():1116:1116 -> a
     5:7:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1125:1127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     8:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209249,34 +208021,34 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder newBuilder():1221 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder newBuilderForType():1222 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():883 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder.create():1245:1245 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder.access$700():1231 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder newBuilder():1221 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName):1224 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder toBuilder():1226 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():883 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName):1224:1224 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder toBuilder():1226 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():883 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$1 -> com.android.tools.r8.internal.MZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$1 -> com.android.tools.r8.internal.QZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():971:971 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):976:976 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):971 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder -> com.android.tools.r8.internal.NZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder -> com.android.tools.r8.internal.RZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     int parentQualifiedName_ -> d
     int shortName_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind kind_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SZ;"}
     1:181:void <init>():1238:1418 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName.getDefaultInstance():896:896 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName):1296 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PZ;)Lcom/android/tools/r8/internal/NZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TZ;)Lcom/android/tools/r8/internal/RZ;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName.hasParentQualifiedName():1057:1057 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName):1297 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209300,10 +208072,10 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName):1306 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):1231:1231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1325:1325 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1231 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):976:976 -> a
     20:20:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):971 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1325 -> a
@@ -209329,7 +208101,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Builder clone():1260:1260 -> clone
     2:2:java.lang.Object clone():1231 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName buildPartial():1276:1282 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TZ;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName.access$902(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName,int):883:883 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName buildPartial():1282 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName buildPartial():1286:1286 -> e
@@ -209340,37 +208112,37 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName buildPartial():1290 -> e
     13:13:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName.access$1202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName,int):883:883 -> e
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName buildPartial():1291 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind -> com.android.tools.r8.internal.OZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind -> com.android.tools.r8.internal.SZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind CLASS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind PACKAGE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable$QualifiedName$Kind LOCAL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SZ;"}
     1:9:void <clinit>():993:1001 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):1043:1044 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():1018:1018 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable -> com.android.tools.r8.internal.TZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable -> com.android.tools.r8.internal.XZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList string_ -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     byte memoizedIsInitialized -> d
     int memoizedSerializedSize -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable defaultInstance -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VZ;"}
     1:345:void <clinit>():378:722 -> <clinit>
     346:346:void initFields():423:423 -> <clinit>
     346:346:void <clinit>():723 -> <clinit>
     1:138:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):307:444 -> <init>
     1:138:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):301 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WZ;)V"}
     139:139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     139:139:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):308 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209382,7 +208154,7 @@
     276:276:void <init>(boolean):310:310 -> <init>
     277:396:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):325:444 -> <init>
     277:396:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):301 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     397:397:void initFields():423:423 -> <init>
     397:397:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):326 -> <init>
     397:397:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):301 -> <init>
@@ -209417,7 +208189,7 @@
     448:448:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):301 -> <init>
     1:5:boolean isInitialized():427:431 -> a
     6:10:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):437:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:9:int getSerializedSize():446:454 -> c
     10:10:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.computeBytesSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):883:883 -> c
     10:10:int getSerializedSize():454 -> c
@@ -209429,32 +208201,32 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder newBuilder():524 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder newBuilderForType():525 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():301 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder.create():548:548 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder.access$100():534 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder newBuilder():524 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):527 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder toBuilder():529 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():301 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):527:527 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder toBuilder():529 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():301 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$1 -> com.android.tools.r8.internal.RZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$1 -> com.android.tools.r8.internal.VZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():379:379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):384:384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder -> com.android.tools.r8.internal.SZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder -> com.android.tools.r8.internal.WZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList string_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     1:85:void <init>():541:625 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable.getDefaultInstance():314:314 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):586 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TZ;)Lcom/android/tools/r8/internal/SZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XZ;)Lcom/android/tools/r8/internal/WZ;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable.access$300(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):301:301 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):587 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):587:588 -> a
@@ -209475,10 +208247,10 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable):597 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):534:534 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):612:612 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):534 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):384:384 -> a
     20:20:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):379 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):612 -> a
@@ -209504,42 +208276,42 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable$Builder clone():559:559 -> clone
     2:2:java.lang.Object clone():534 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable buildPartial():575:581 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XZ;"}
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable.access$302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList):301:301 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable buildPartial():581 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.a00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.e00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     java.util.List argument_ -> e
     boolean nullable_ -> f
     int flexibleTypeCapabilitiesId_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type flexibleUpperBound_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int flexibleUpperBoundId_ -> i
     int className_ -> j
     int typeParameter_ -> k
     int typeParameterName_ -> l
     int typeAliasName_ -> m
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type outerType_ -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int outerTypeId_ -> o
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type abbreviatedType_ -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int abbreviatedTypeId_ -> q
     int flags_ -> r
     byte memoizedIsInitialized -> s
     int memoizedSerializedSize -> t
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type defaultInstance -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YZ;"}
     1:1:void <clinit>():4973:4973 -> <clinit>
     2208:2209:void <clinit>():7180:7181 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):4814:4814 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):4807 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d00;)V"}
     1156:1246:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):5969:6059 -> <init>
     1156:1246:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):4807 -> <init>
     1247:1247:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
@@ -209553,7 +208325,7 @@
     2492:2492:void <init>(boolean):4817:4817 -> <init>
     2493:2493:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4832:4832 -> <init>
     2493:2493:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):4807 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     3630:3720:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5969:6059 -> <init>
     3630:3720:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):4807 -> <init>
     3721:3721:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4833:4833 -> <init>
@@ -209703,7 +208475,7 @@
     15:15:boolean isInitialized():5994 -> a
     16:25:boolean isInitialized():5994:6003 -> a
     26:26:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):6009:6009 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     27:27:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):6012 -> a
     28:29:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):6013:6014 -> a
@@ -209772,7 +208544,7 @@
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder.access$5700():6197 -> a
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6187 -> a
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a00;)Lcom/android/tools/r8/internal/ZZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e00;)Lcom/android/tools/r8/internal/d00;"}
     83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6190:6190 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():4825:4825 -> b
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():4807 -> b
@@ -209786,37 +208558,37 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilder():6187 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder newBuilderForType():6188 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():4807 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():4807:4807 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:3:void initFields():5954:5956 -> h
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type getDefaultInstance():4821:4821 -> h
     4:4:void initFields():5957 -> h
     5:15:void initFields():5957:5967 -> h
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder toBuilder():6192:6192 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZZ;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.UZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d00;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.YZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():4974:4974 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4979:4979 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4974 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.YZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.c00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int typeId_ -> f
     byte memoizedIsInitialized -> g
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZZ;"}
     1:537:void <clinit>():5125:5661 -> <clinit>
     538:538:void initFields():5269:5269 -> <clinit>
     538:538:void <clinit>():5662 -> <clinit>
@@ -209827,7 +208599,7 @@
     540:541:void <clinit>():5662 -> <clinit>
     1:269:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):5036:5304 -> <init>
     1:269:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):5030 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WZ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a00;)V"}
     270:270:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     270:270:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):5037 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209839,7 +208611,7 @@
     538:538:void <init>(boolean):5039:5039 -> <init>
     539:789:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5054:5304 -> <init>
     539:789:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):5030 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     790:790:void initFields():5269:5269 -> <init>
     790:790:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5055 -> <init>
     790:790:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):5030 -> <init>
@@ -209915,7 +208687,7 @@
     3:3:boolean isInitialized():5280 -> a
     4:9:boolean isInitialized():5280:5285 -> a
     10:12:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):5291:5293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     13:13:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection.getNumber():5181:5181 -> a
     13:13:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):5293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -209938,30 +208710,30 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5387 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilderForType():5388 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():5030 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5411:5411 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.access$5000():5397 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5387 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument):5390 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder toBuilder():5392 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():5030 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument):5390:5390 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder toBuilder():5392 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():5030 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.VZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.ZZ:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():5126:5126 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5131:5131 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.WZ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.a00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int typeId_ -> f
     1:103:void <init>():5404:5506 -> <init>
     104:104:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> <init>
@@ -209969,7 +208741,7 @@
     105:105:void <init>():5541:5541 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.getDefaultInstance():5043:5043 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument):5462 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YZ;)Lcom/android/tools/r8/internal/WZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c00;)Lcom/android/tools/r8/internal/a00;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.hasProjection():5221:5221 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument):5463 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -210002,10 +208774,10 @@
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument):5472 -> a
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):5397:5397 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5493:5493 -> a
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5397 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5131:5131 -> a
     28:28:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5126 -> a
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):5493 -> a
@@ -210031,7 +208803,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder clone():5426:5426 -> clone
     2:2:java.lang.Object clone():5397 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5442:5448 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c00;"}
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.access$5202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection):5030:5030 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5448 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5452:5452 -> e
@@ -210042,42 +208814,42 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5456 -> e
     13:13:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument.access$5502(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument,int):5030:5030 -> e
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5457 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.XZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.b00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection[] $VALUES -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/XZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/b00;"}
     1:13:void <clinit>():5148:5160 -> <clinit>
     14:14:void <clinit>():5143:5143 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):5207:5208 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():5181:5181 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.ZZ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.d00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     java.util.List argument_ -> f
     boolean nullable_ -> g
     int flexibleTypeCapabilitiesId_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type flexibleUpperBound_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int flexibleUpperBoundId_ -> j
     int className_ -> k
     int typeParameter_ -> l
     int typeParameterName_ -> m
     int typeAliasName_ -> n
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type outerType_ -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int outerTypeId_ -> p
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type abbreviatedType_ -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int abbreviatedTypeId_ -> r
     int flags_ -> s
     1:234:void <init>():6203:6436 -> <init>
@@ -210086,7 +208858,7 @@
     236:624:void <init>():6644:7032 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6328 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a00;)Lcom/android/tools/r8/internal/ZZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e00;)Lcom/android/tools/r8/internal/d00;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.access$5900(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):4807:4807 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6329 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6329:6330 -> a
@@ -210168,10 +208940,10 @@
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type):6379 -> a
     83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):6197:6197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):6422:6422 -> a
     84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):6197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     85:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4979:4979 -> a
     85:85:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):4974 -> a
     85:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):6422 -> a
@@ -210193,14 +208965,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type getDefaultInstanceForType():6251 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():6197 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type build():6255:6256 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e00;"}
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> e
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type build():6257 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type build():6257:6257 -> e
     1:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type buildPartial():6263:6270 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/e00;"}
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.access$5902(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,java.util.List):4807:4807 -> f
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type buildPartial():6270 -> f
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type buildPartial():6274:6274 -> f
@@ -210244,28 +209016,28 @@
     35:35:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type buildPartial():6322 -> f
     36:36:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.access$7302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,int):4807:4807 -> f
     36:36:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type buildPartial():6323 -> f
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.d00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.h00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     int name_ -> f
     java.util.List typeParameter_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int underlyingTypeId_ -> i
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int expandedTypeId_ -> k
     java.util.List annotation_ -> l
     java.util.List versionRequirement_ -> m
     byte memoizedIsInitialized -> n
     int memoizedSerializedSize -> o
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias defaultInstance -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f00;"}
     1:1:void <clinit>():21206:21206 -> <clinit>
     1263:1263:void <clinit>():22468:22468 -> <clinit>
     1264:1266:void initFields():21427:21429 -> <clinit>
@@ -210277,7 +209049,7 @@
     1268:1273:void <clinit>():22469 -> <clinit>
     1:462:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):21055:21516 -> <init>
     1:462:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):21048 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g00;)V"}
     463:463:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     463:463:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):21056 -> <init>
     463:463:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):21048 -> <init>
@@ -210288,7 +209060,7 @@
     924:924:void <init>(boolean):21058:21058 -> <init>
     925:1368:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21073:21516 -> <init>
     925:1368:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):21048 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1369:1371:void initFields():21427:21429 -> <init>
     1369:1371:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21074 -> <init>
     1369:1371:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):21048 -> <init>
@@ -210417,7 +209189,7 @@
     17:26:boolean isInitialized():21466:21475 -> a
     27:27:boolean isInitialized():21444:21444 -> a
     28:28:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):21481:21481 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     29:29:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):21484 -> a
     30:31:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):21485:21486 -> a
@@ -210465,34 +209237,34 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():21629 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilderForType():21630 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():21048 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():21652:21652 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.access$19000():21639 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder():21629 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias):21632 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder toBuilder():21634 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():21048 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias):21632:21632 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder toBuilder():21634 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():21048 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.b00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.f00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():21207:21207 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21212:21212 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.c00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.g00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int flags_ -> f
     int name_ -> g
     java.util.List typeParameter_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int underlyingTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int expandedTypeId_ -> l
     java.util.List annotation_ -> m
     java.util.List versionRequirement_ -> n
@@ -210502,7 +209274,7 @@
     295:604:void <init>():22061:22370 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstance():21062:21062 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias):21742 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d00;)Lcom/android/tools/r8/internal/c00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h00;)Lcom/android/tools/r8/internal/g00;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.hasFlags():21233:21233 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias):21743 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -210590,10 +209362,10 @@
     79:79:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     79:79:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias):21792 -> a
     80:80:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):21639:21639 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21839:21839 -> a
     81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21639 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21212:21212 -> a
     82:82:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21207 -> a
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):21839 -> a
@@ -210621,9 +209393,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.getDefaultInstance():21062:21062 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstanceForType():21683 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():21639 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():21695:21701 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h00;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.access$19202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,int):21048:21048 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():21701 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():21705:21705 -> e
@@ -210652,31 +209424,31 @@
     35:35:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():21736 -> e
     36:36:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias.access$20102(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias,int):21048:21048 -> e
     36:36:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():21737 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.h00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.l00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int id_ -> e
     int name_ -> f
     boolean reified_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
     java.util.List upperBound_ -> i
     java.util.List upperBoundId_ -> j
     int upperBoundIdMemoizedSerializedSize -> k
     byte memoizedIsInitialized -> l
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter defaultInstance -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i00;"}
     1:874:void <clinit>():7386:8259 -> <clinit>
     875:880:void initFields():7586:7591 -> <clinit>
     875:880:void <clinit>():8260 -> <clinit>
     1:389:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):7265:7653 -> <init>
     1:389:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):7258 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j00;)V"}
     390:390:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     390:390:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):7266 -> <init>
     390:390:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):7258 -> <init>
@@ -210687,7 +209459,7 @@
     778:778:void <init>(boolean):7268:7268 -> <init>
     779:1149:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7283:7653 -> <init>
     779:1149:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):7258 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1150:1155:void initFields():7586:7591 -> <init>
     1150:1155:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7284 -> <init>
     1150:1155:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):7258 -> <init>
@@ -210786,7 +209558,7 @@
     15:15:boolean isInitialized():7604:7604 -> a
     16:16:boolean isInitialized():7600:7600 -> a
     17:17:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):7623:7623 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     18:18:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):7626 -> a
     19:20:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):7627:7628 -> a
@@ -210842,37 +209614,37 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7759 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilderForType():7760 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():7258 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.create():7782:7782 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.access$7600():7769 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7759 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):7762 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder toBuilder():7764 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():7258 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):7762:7762 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder toBuilder():7764 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():7258 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.e00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.i00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():7387:7387 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7392:7392 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.f00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.j00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int id_ -> f
     int name_ -> g
     boolean reified_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
     java.util.List upperBound_ -> j
     java.util.List upperBoundId_ -> k
     1:415:void <init>():7775:8189 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getDefaultInstance():7272:7272 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):7853 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h00;)Lcom/android/tools/r8/internal/f00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l00;)Lcom/android/tools/r8/internal/j00;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.hasId():7473:7473 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):7854 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -210924,10 +209696,10 @@
     48:48:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     48:48:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter):7887 -> a
     49:49:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):7769:7769 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     50:50:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7920:7920 -> a
     50:50:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7769 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7392:7392 -> a
     51:51:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7387 -> a
     51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):7920 -> a
@@ -210955,9 +209727,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.getDefaultInstance():7272:7272 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstanceForType():7807 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():7769 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7819:7825 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l00;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.access$7802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7258:7258 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7825 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7829:7829 -> e
@@ -210977,41 +209749,41 @@
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7847 -> e
     26:26:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter.access$8402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,int):7258:7258 -> e
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7848 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.g00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.k00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/g00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/k00;"}
     1:9:void <clinit>():7409:7417 -> <clinit>
     10:10:void <clinit>():7404:7404 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):7459:7460 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():7434:7434 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.k00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.o00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     java.util.List type_ -> d
     int firstNullable_ -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m00;"}
     1:487:void <clinit>():14051:14537 -> <clinit>
     488:489:void initFields():14128:14129 -> <clinit>
     488:489:void <clinit>():14538 -> <clinit>
     1:184:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):13976:14159 -> <init>
     1:184:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):13970 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n00;)V"}
     185:185:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     185:185:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):13977 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211023,7 +209795,7 @@
     368:368:void <init>(boolean):13979:13979 -> <init>
     369:534:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13994:14159 -> <init>
     369:534:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):13970 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     535:536:void initFields():14128:14129 -> <init>
     535:536:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13995 -> <init>
     535:536:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):13970 -> <init>
@@ -211070,7 +209842,7 @@
     3:3:boolean isInitialized():14138 -> a
     4:9:boolean isInitialized():14138:14143 -> a
     10:15:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):14149:14154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     16:16:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):14154 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211081,7 +209853,7 @@
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.access$12600():14248 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder():14238 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k00;)Lcom/android/tools/r8/internal/j00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o00;)Lcom/android/tools/r8/internal/n00;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14241:14241 -> a
     1:14:int getSerializedSize():14161:14174 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():14262:14262 -> d
@@ -211089,19 +209861,19 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder():14238 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilderForType():14239 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():13970 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():14243:14243 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():13970 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():14243:14243 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j00;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.i00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n00;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.m00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():14052:14052 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14057:14057 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14052 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.j00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.n00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     java.util.List type_ -> d
@@ -211109,7 +209881,7 @@
     1:227:void <init>():14255:14481 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.getDefaultInstance():13983:13983 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k00;)Lcom/android/tools/r8/internal/j00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o00;)Lcom/android/tools/r8/internal/n00;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.access$12800(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):13970:13970 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14309 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14309:14310 -> a
@@ -211136,10 +209908,10 @@
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):14322 -> a
     22:22:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):14248:14248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14343:14343 -> a
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14057:14057 -> a
     24:24:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14052 -> a
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):14343 -> a
@@ -211165,7 +209937,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable$Builder clone():14275:14275 -> clone
     2:2:java.lang.Object clone():14248 -> clone
     1:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():14291:14298 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o00;"}
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.access$12802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable,java.util.List):13970:13970 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():14298 -> e
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():14302:14302 -> e
@@ -211173,25 +209945,25 @@
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():14302 -> e
     12:12:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.access$13002(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable,int):13970:13970 -> e
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():14303 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.n00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.r00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> d
     int flags_ -> e
     int name_ -> f
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int typeId_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int varargElementTypeId_ -> j
     byte memoizedIsInitialized -> k
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p00;"}
     1:723:void <clinit>():20194:20916 -> <clinit>
     724:725:void initFields():20315:20316 -> <clinit>
     724:725:void <clinit>():20917 -> <clinit>
@@ -211202,7 +209974,7 @@
     727:730:void <clinit>():20917 -> <clinit>
     1:292:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20089:20380 -> <init>
     1:292:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):20082 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/q00;)V"}
     293:293:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     293:293:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):20090 -> <init>
     293:293:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):20082 -> <init>
@@ -211213,7 +209985,7 @@
     584:584:void <init>(boolean):20092:20092 -> <init>
     585:858:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20107:20380 -> <init>
     585:858:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):20082 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     859:860:void initFields():20315:20316 -> <init>
     859:860:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20108 -> <init>
     859:860:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):20082 -> <init>
@@ -211309,7 +210081,7 @@
     8:17:boolean isInitialized():20339:20348 -> a
     18:18:boolean isInitialized():20329:20329 -> a
     19:19:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):20354:20354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.newExtensionWriter():308:308 -> a
     20:20:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):20357 -> a
     21:22:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):20358:20359 -> a
@@ -211346,33 +210118,33 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():20476 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilderForType():20477 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():20082 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():20499:20499 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.access$17900():20486 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():20476 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):20479 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():20481 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():20082 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):20479:20479 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():20481 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():20082 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.l00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.p00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():20195:20195 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20200:20200 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.m00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.q00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> e
     int flags_ -> f
     int name_ -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int typeId_ -> i
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e00;"}
     int varargElementTypeId_ -> k
     1:1:void <init>():20492:20492 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getDefaultInstance():4821:4821 -> <init>
@@ -211380,7 +210152,7 @@
     3:95:void <init>():20728:20820 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstance():20096:20096 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):20568 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n00;)Lcom/android/tools/r8/internal/m00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r00;)Lcom/android/tools/r8/internal/q00;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.hasFlags():20223:20223 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):20569 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211431,10 +210203,10 @@
     39:39:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     39:39:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter):20588 -> a
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):20486:20486 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20623:20623 -> a
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20486 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     42:42:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20200:20200 -> a
     42:42:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20195 -> a
     42:42:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):20623 -> a
@@ -211462,9 +210234,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getDefaultInstance():20096:20096 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstanceForType():20524 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():20486 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():20536:20542 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r00;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.access$18102(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,int):20082:20082 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():20542 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():20546:20546 -> e
@@ -211484,31 +210256,31 @@
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():20562 -> e
     19:19:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.access$18702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,int):20082:20082 -> e
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():20563 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.s00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.w00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int version_ -> d
     int versionFull_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u00;"}
     int errorCode_ -> g
     int message_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind versionKind_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     byte memoizedIsInitialized -> j
     int memoizedSerializedSize -> k
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement defaultInstance -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s00;"}
     1:884:void <clinit>():23068:23951 -> <clinit>
     885:890:void initFields():23361:23366 -> <clinit>
     885:890:void <clinit>():23952 -> <clinit>
     1:438:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):22965:23402 -> <init>
     1:438:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22959 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t00;)V"}
     439:439:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     439:439:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):22966 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211520,7 +210292,7 @@
     876:876:void <init>(boolean):22968:22968 -> <init>
     877:1296:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22983:23402 -> <init>
     877:1296:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22959 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     1297:1302:void initFields():23361:23366 -> <init>
     1297:1302:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):22984 -> <init>
     1297:1302:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22959 -> <init>
@@ -211609,7 +210381,7 @@
     1410:1410:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):22959 -> <init>
     1:5:boolean isInitialized():23370:23374 -> a
     6:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):23380:23382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     9:9:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):23382 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211660,38 +210432,38 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():23497 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilderForType():23498 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():22959 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():23521:23521 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.access$21000():23507 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():23497 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement):23500 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder toBuilder():23502 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():22959 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement):23500:23500 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder toBuilder():23502 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():22959 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.o00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.s00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():23069:23069 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23074:23074 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23069 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.p00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.t00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     int version_ -> d
     int versionFull_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u00;"}
     int errorCode_ -> g
     int message_ -> h
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind versionKind_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     1:379:void <init>():23514:23892 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.getDefaultInstance():22972:22972 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement):23590 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s00;)Lcom/android/tools/r8/internal/p00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w00;)Lcom/android/tools/r8/internal/t00;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.hasVersion():23226:23226 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement):23591 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211729,10 +210501,10 @@
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement):23609 -> a
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):23507:23507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23624:23624 -> a
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23074:23074 -> a
     32:32:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23069 -> a
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):23624 -> a
@@ -211758,7 +210530,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder clone():23542:23542 -> clone
     2:2:java.lang.Object clone():23507 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():23558:23564 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/s00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/w00;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.access$21202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):22959:22959 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():23564 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():23568:23568 -> e
@@ -211778,52 +210550,52 @@
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():23584 -> e
     19:19:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement.access$21802(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement,int):22959:22959 -> e
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():23585 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.q00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.u00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u00;"}
     1:9:void <clinit>():23091:23099 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):23141:23142 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():23116:23116 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.r00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.v00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/v00;"}
     1:9:void <clinit>():23156:23164 -> <clinit>
     10:10:void <clinit>():23151:23151 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):23206:23207 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():23181:23181 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.v00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.z00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     java.util.List requirement_ -> c
     byte memoizedIsInitialized -> d
     int memoizedSerializedSize -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable defaultInstance -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z00;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x00;"}
     1:378:void <clinit>():24055:24432 -> <clinit>
     379:379:void initFields():24106:24106 -> <clinit>
     379:379:void <clinit>():24433 -> <clinit>
     1:143:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):23985:24127 -> <init>
     1:143:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):23979 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y00;)V"}
     144:144:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     144:144:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):23986 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -211835,7 +210607,7 @@
     286:286:void <init>(boolean):23988:23988 -> <init>
     287:411:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24003:24127 -> <init>
     287:411:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):23979 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     412:412:void initFields():24106:24106 -> <init>
     412:412:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24004 -> <init>
     412:412:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):23979 -> <init>
@@ -211870,21 +210642,21 @@
     461:461:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$1):23979 -> <init>
     1:5:boolean isInitialized():24110:24114 -> a
     6:10:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):24120:24124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:10:int getSerializedSize():24129:24138 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.create():24226:24226 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.access$22100():24212 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():24202 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilderForType():24203 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():23979 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.create():24226:24226 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.access$22100():24212 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():24202 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24205 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():24207 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():23979 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24205:24205 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():24207 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():23979 -> e
@@ -211893,23 +210665,23 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():24202 -> f
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24205 -> f
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():24207 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y00;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24205:24205 -> f
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():24207 -> f
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.t00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.x00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     1:1:void <init>():24056:24056 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24061:24061 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24056 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.u00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.y00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int bitField0_ -> c
     java.util.List requirement_ -> d
     1:86:void <init>():24219:24304 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getDefaultInstance():23992:23992 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v00;)Lcom/android/tools/r8/internal/u00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z00;)Lcom/android/tools/r8/internal/y00;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.access$22300(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):23979:23979 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24265 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24265:24266 -> a
@@ -211930,10 +210702,10 @@
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):24275 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):24212:24212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24290:24290 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24061:24061 -> a
     20:20:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24056 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):24290 -> a
@@ -211959,20 +210731,20 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder clone():24237:24237 -> clone
     2:2:java.lang.Object clone():24212 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():24253:24259 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z00;"}
     8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.access$22302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable,java.util.List):23979:23979 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():24259 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.w00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.A00:
 # {"id":"sourceFile","fileName":"ProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Visibility[] $VALUES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/w00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/A00;"}
     1:21:void <clinit>():105:125 -> <clinit>
     22:22:void <clinit>():96:96 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():158:158 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.g6:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     int[] numbers -> a
     int major -> b
@@ -212006,90 +210778,90 @@
     1:1:java.lang.String toString():73 -> toString
     2:6:java.lang.String toString():102:106 -> toString
     7:7:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.mq:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.oq:
 # {"id":"sourceFile","fileName":"Flags.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CONST -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_LATEINIT -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_CONSTANT -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_PROPERTY -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_DELEGATED -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXPECT_PROPERTY -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> G
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOINLINE -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_ACCESSOR -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE_ACCESSOR -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NEGATED -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NULL_CHECK_PREDICATE -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_UNSIGNED -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DEFINITELY_NOT_NULL_TYPE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_ANNOTATIONS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField VISIBILITY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField MODALITY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField CLASS_KIND -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INNER -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_DATA -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_CLASS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXPECT_CLASS -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_VALUE_CLASS -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_FUN_INTERFACE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_ENUM_ENTRIES -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_SECONDARY -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CONSTRUCTOR_WITH_NON_STABLE_PARAMETER_NAMES -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField MEMBER_KIND -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_OPERATOR -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INFIX -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_INLINE -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_TAILREC -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXTERNAL_FUNCTION -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_SUSPEND -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_EXPECT_FUNCTION -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_FUNCTION_WITH_NON_STABLE_PARAMETER_NAMES -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_VAR -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_GETTER -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_SETTER -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField):253:253 -> <clinit>
     1:1:void <clinit>():18 -> <clinit>
     2:2:void <clinit>():18:18 -> <clinit>
@@ -212222,34 +210994,35 @@
     92:92:void <clinit>():86 -> <clinit>
     93:93:void <clinit>():86:86 -> <clinit>
     1:1:void $$$reportNull$$$0(int):0:0 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.lq:
 # {"id":"sourceFile","fileName":"Flags.java"}
     1:1:void <init>(int):272:272 -> <init>
-    1:1:java.lang.Boolean get(int):278:278 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.mq:
 # {"id":"sourceFile","fileName":"Flags.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite[] values -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/OA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/QA;"}
     1:1:int bitWidth(java.lang.Object[]):298:298 -> <init>
     1:1:void <init>(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite[]):293 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/OA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/QA;)V"}
     2:3:void <init>(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite[]):293:294 -> <init>
     4:4:int bitWidth(java.lang.Object[]):303:303 -> <init>
     4:4:void <init>(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite[]):293 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.lq:
+    1:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite get(int):309:313 -> a
+    1:5:java.lang.Object get(int):289 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.nq:
 # {"id":"sourceFile","fileName":"Flags.java"}
     int offset -> a
     int bitWidth -> b
     1:3:void <init>(int,int):259:261 -> <init>
     1:3:void <init>(int,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$1):237 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.x00:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.B00:
 # {"id":"sourceFile","fileName":"ProtoBufUtil.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
     1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181 -> a
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.hasExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> a
     1:1:java.lang.Object getExtensionOrNull(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;Lcom/android/tools/r8/internal/Cr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;Lcom/android/tools/r8/internal/Er;)Ljava/lang/Object;"}
     2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> a
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.hasExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> a
     2:2:java.lang.Object getExtensionOrNull(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12 -> a
@@ -212269,11 +211042,11 @@
     8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):184:184 -> a
     8:8:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.hasExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):194 -> a
     8:8:java.lang.Object getExtensionOrNull(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.e10:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.i10:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasReturnType():18274:18274 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JZ;Lcom/android/tools/r8/internal/kj0;)Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NZ;Lcom/android/tools/r8/internal/oj0;)Lcom/android/tools/r8/internal/e00;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReturnType():18280:18280 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):62 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):62:62 -> a
@@ -212284,7 +211057,7 @@
     6:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):63:64 -> a
     8:8:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.hasType():20260:20260 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n00;Lcom/android/tools/r8/internal/kj0;)Lcom/android/tools/r8/internal/a00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r00;Lcom/android/tools/r8/internal/oj0;)Lcom/android/tools/r8/internal/e00;"}
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter.getType():20266:20266 -> a
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):76 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):76:76 -> a
@@ -212293,11 +211066,11 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77 -> a
     13:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type type(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77:78 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.kj0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.oj0:
 # {"id":"sourceFile","fileName":"TypeTable.kt"}
     java.util.List types -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o00;)V"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.getTypeList():14073:14073 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):23 -> <init>
     3:3:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable.hasFirstNullable():14113:14113 -> <init>
@@ -212314,72 +211087,72 @@
     37:37:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt.throwIndexOverflow():480:480 -> <init>
     37:37:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):40 -> <init>
     38:38:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.xl0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.Bl0:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v00;"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel level -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/li;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ni;"}
     java.lang.Integer errorCode -> d
     java.lang.String message -> e
     1:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind,com.android.tools.r8.jetbrains.kotlin.DeprecationLevel,java.lang.Integer,java.lang.String):24:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wl0;Lcom/android/tools/r8/internal/r00;Lcom/android/tools/r8/internal/li;Ljava/lang/Integer;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Al0;Lcom/android/tools/r8/internal/v00;Lcom/android/tools/r8/internal/ni;Ljava/lang/Integer;Ljava/lang/String;)V"}
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> R8$$REMOVED$$CLASS$$183:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> R8$$REMOVED$$CLASS$$171:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.wl0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.Al0:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int major -> a
     int minor -> b
     int patch -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(int,int,int):31:31 -> <init>
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String asString():33:33 -> toString
     1:1:java.lang.String toString():50 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> R8$$REMOVED$$CLASS$$184:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> R8$$REMOVED$$CLASS$$172:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.yl0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.Cl0:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cl0;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(java.util.List):11:11 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2:2:void <init>(java.util.List):11:11 -> <init>
     2:2:void <init>(java.util.List,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> R8$$REMOVED$$CLASS$$185:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> R8$$REMOVED$$CLASS$$173:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionSpecificBehaviorKt -> R8$$REMOVED$$CLASS$$186:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionSpecificBehaviorKt -> R8$$REMOVED$$CLASS$$174:
 # {"id":"sourceFile","fileName":"versionSpecificBehavior.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module -> com.android.tools.r8.internal.GD:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     java.util.List packageParts_ -> d
     java.util.List metadataParts_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList jvmPackageName_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable stringTable_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable qualifiedNameTable_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UZ;"}
     java.util.List annotation_ -> i
     java.util.List optionalAnnotationClass_ -> j
     byte memoizedIsInitialized -> k
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module defaultInstance -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
     1:1:void <clinit>():335:335 -> <clinit>
     1720:1720:void <clinit>():2054:2054 -> <clinit>
     1721:1723:void initFields():666:668 -> <clinit>
@@ -212396,7 +211169,7 @@
     1727:1729:void <clinit>():2055 -> <clinit>
     1:548:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):194:741 -> <init>
     1:548:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):188 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FD;)V"}
     549:549:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     549:549:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):195 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -212408,7 +211181,7 @@
     1096:1096:void <init>(boolean):197:197 -> <init>
     1097:1626:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):212:741 -> <init>
     1097:1626:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):188 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     1627:1629:void initFields():666:668 -> <init>
     1627:1629:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):213 -> <init>
     1627:1629:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):188 -> <init>
@@ -212520,7 +211293,7 @@
     19:19:boolean isInitialized():705 -> a
     20:25:boolean isInitialized():705:710 -> a
     26:48:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):716:738 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:17:int getSerializedSize():743:759 -> c
     18:18:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.computeBytesSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):883:883 -> c
     18:18:int getSerializedSize():759 -> c
@@ -212532,34 +211305,34 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder newBuilder():845 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder newBuilderForType():846 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():188 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.create():869:869 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.access$100():855 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder newBuilder():845 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):848 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder toBuilder():850 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():188 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):848:848 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder toBuilder():850 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():188 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$1 -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$1 -> com.android.tools.r8.internal.ED:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     1:1:void <init>():336:336 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):341:341 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder -> com.android.tools.r8.internal.rD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder -> com.android.tools.r8.internal.FD:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     int bitField0_ -> c
     java.util.List packageParts_ -> d
     java.util.List metadataParts_ -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList jvmPackageName_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$StringTable stringTable_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XZ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$QualifiedNameTable qualifiedNameTable_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QZ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UZ;"}
     java.util.List annotation_ -> i
     java.util.List optionalAnnotationClass_ -> j
     1:549:void <init>():862:1410 -> <init>
@@ -212571,7 +211344,7 @@
     553:787:void <init>():1608:1842 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module.getDefaultInstance():201:201 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):949 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sD;)Lcom/android/tools/r8/internal/rD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GD;)Lcom/android/tools/r8/internal/FD;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module.access$300(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):188:188 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):950 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):950:951 -> a
@@ -212680,10 +211453,10 @@
     89:89:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     89:89:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module):1006 -> a
     90:90:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):855:855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     91:91:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1051:1051 -> a
     91:91:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     92:92:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):341:341 -> a
     92:92:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):336 -> a
     92:92:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1051 -> a
@@ -212709,7 +211482,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder clone():892:892 -> clone
     2:2:java.lang.Object clone():855 -> clone
     1:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module buildPartial():908:915 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GD;"}
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module.access$302(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,java.util.List):188:188 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module buildPartial():915 -> e
     10:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module buildPartial():916:920 -> e
@@ -212732,20 +211505,20 @@
     37:37:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module buildPartial():943 -> e
     38:38:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module.access$1002(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,int):188:188 -> e
     38:38:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module buildPartial():944 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts -> com.android.tools.r8.internal.JD:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     java.lang.Object packageFqName_ -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList shortClassName_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     java.util.List multifileFacadeShortNameId_ -> f
     int multifileFacadeShortNameIdMemoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList multifileFacadeShortName_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList classWithJvmPackageNameShortName_ -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     java.util.List classWithJvmPackageNameMultifileFacadeShortNameId_ -> j
     int classWithJvmPackageNameMultifileFacadeShortNameIdMemoizedSerializedSize -> k
     java.util.List classWithJvmPackageNamePackageId_ -> l
@@ -212753,16 +211526,16 @@
     byte memoizedIsInitialized -> n
     int memoizedSerializedSize -> o
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts defaultInstance -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HD;"}
     1:1:void <clinit>():2511:2511 -> <clinit>
     1684:1684:void <clinit>():4194:4194 -> <clinit>
     1685:1691:void initFields():2880:2886 -> <clinit>
     1685:1691:void <clinit>():4195 -> <clinit>
     1:604:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2338:2941 -> <init>
     1:604:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):2332 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ID;)V"}
     605:605:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     605:605:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2339 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -212774,7 +211547,7 @@
     1208:1208:void <init>(boolean):2341:2341 -> <init>
     1209:1794:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2356:2941 -> <init>
     1209:1794:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):2332 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     1795:1801:void initFields():2880:2886 -> <init>
     1795:1801:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2357 -> <init>
     1795:1801:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$1):2332 -> <init>
@@ -212870,7 +211643,7 @@
     3:3:boolean isInitialized():2898:2898 -> a
     4:4:boolean isInitialized():2895:2895 -> a
     5:6:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2904:2905 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     7:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getPackageFqNameBytes():2569:2577 -> a
     7:15:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2906 -> a
     16:19:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2906:2909 -> a
@@ -212936,40 +211709,40 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder newBuilder():3085 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder newBuilderForType():3086 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2332 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.create():3109:3109 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.access$1300():3095 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder newBuilder():3085 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts):3088 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder toBuilder():3090 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2332 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts):3088:3088 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder toBuilder():3090 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2332 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$1 -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$1 -> com.android.tools.r8.internal.HD:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     1:1:void <init>():2512:2512 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2517:2517 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder -> com.android.tools.r8.internal.uD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder -> com.android.tools.r8.internal.ID:
 # {"id":"sourceFile","fileName":"JvmModuleProtoBuf.java"}
     int bitField0_ -> c
     java.lang.Object packageFqName_ -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList shortClassName_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     java.util.List multifileFacadeShortNameId_ -> f
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList multifileFacadeShortName_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList classWithJvmPackageNameShortName_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jJ;"}
     java.util.List classWithJvmPackageNameMultifileFacadeShortNameId_ -> i
     java.util.List classWithJvmPackageNamePackageId_ -> j
     1:967:void <init>():3102:4068 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.getDefaultInstance():2345:2345 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts):3190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vD;)Lcom/android/tools/r8/internal/uD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JD;)Lcom/android/tools/r8/internal/ID;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.hasPackageFqName():2537:2537 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts):3191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213057,10 +211830,10 @@
     81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts):3256 -> a
     82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):3095:3095 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3275:3275 -> a
     83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3095 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2517:2517 -> a
     84:84:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2512 -> a
     84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3275 -> a
@@ -213086,7 +211859,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder clone():3132:3132 -> clone
     2:2:java.lang.Object clone():3095 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts buildPartial():3148:3154 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JD;"}
     8:8:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.access$1502(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts,java.lang.Object):2332:2332 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts buildPartial():3154 -> e
     9:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts buildPartial():3156:3159 -> e
@@ -213109,36 +211882,36 @@
     43:43:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts buildPartial():3184 -> e
     44:44:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.access$2202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts,int):2332:2332 -> e
     44:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts buildPartial():3185 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.dE:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension methodSignature -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension lambdaClassOriginName -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension typeAnnotation -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension isRaw -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension typeParameterAnnotation -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classModuleName -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classLocalVariable -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension jvmClassFlags -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageModuleName -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Er;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getDefaultInstance():14628:14628 -> <clinit>
     1:1:void <clinit>():3967 -> <clinit>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDefaultInstance():2146:2146 -> <clinit>
@@ -213186,19 +211959,19 @@
     181:182:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite.newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> <clinit>
     181:182:void <clinit>():4198 -> <clinit>
     183:183:void <clinit>():4198:4198 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.PD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int name_ -> d
     int desc_ -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ND;"}
     1:348:void <clinit>():2670:3017 -> <clinit>
     349:349:void initFields():2725:2725 -> <clinit>
     349:349:void <clinit>():3018 -> <clinit>
@@ -213207,7 +211980,7 @@
     350:350:void <clinit>():3018 -> <clinit>
     1:150:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2601:2750 -> <init>
     1:150:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OD;)V"}
     151:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     151:151:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2602 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213219,7 +211992,7 @@
     300:300:void <init>(boolean):2604:2604 -> <init>
     301:432:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2619:2750 -> <init>
     301:432:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     433:434:void initFields():2725:2726 -> <init>
     433:434:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2620 -> <init>
     433:434:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595 -> <init>
@@ -213266,7 +212039,7 @@
     484:484:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2595 -> <init>
     1:5:boolean isInitialized():2730:2734 -> a
     6:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2740:2742 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     9:9:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2742 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213285,24 +212058,24 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2829 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilderForType():2830 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2595 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2853:2853 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.access$2500():2839 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2829 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2595 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2832:2832 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2595 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.ND:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     1:1:void <init>():2671:2671 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2676:2676 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2671 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.AD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.OD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int bitField0_ -> c
     int name_ -> d
@@ -213310,7 +212083,7 @@
     1:1:void <init>():2846:2846 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDefaultInstance():2608:2608 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2898 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)Lcom/android/tools/r8/internal/AD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PD;)Lcom/android/tools/r8/internal/OD;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.hasName():2692:2692 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2899 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213330,10 +212103,10 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2905 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):2839:2839 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2920:2920 -> a
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2839 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2676:2676 -> a
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2671 -> a
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2920 -> a
@@ -213359,7 +212132,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder clone():2866:2866 -> clone
     2:2:java.lang.Object clone():2839 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2882:2888 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PD;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.access$2702(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2595:2595 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2888 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2892:2892 -> e
@@ -213367,19 +212140,19 @@
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2892 -> e
     11:11:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.access$2902(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature,int):2595:2595 -> e
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2893 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.SD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int name_ -> d
     int desc_ -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QD;"}
     1:348:void <clinit>():2208:2555 -> <clinit>
     349:349:void initFields():2263:2263 -> <clinit>
     349:349:void <clinit>():2556 -> <clinit>
@@ -213388,7 +212161,7 @@
     350:350:void <clinit>():2556 -> <clinit>
     1:150:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2139:2288 -> <init>
     1:150:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RD;)V"}
     151:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     151:151:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):2140 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213400,7 +212173,7 @@
     300:300:void <init>(boolean):2142:2142 -> <init>
     301:432:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2157:2288 -> <init>
     301:432:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     433:434:void initFields():2263:2264 -> <init>
     433:434:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2158 -> <init>
     433:434:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133 -> <init>
@@ -213447,7 +212220,7 @@
     484:484:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):2133 -> <init>
     1:5:boolean isInitialized():2268:2272 -> a
     6:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2278:2280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     9:9:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):2280 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213464,7 +212237,7 @@
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.access$1800():2377 -> a
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2367 -> a
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ED;)Lcom/android/tools/r8/internal/DD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;)Lcom/android/tools/r8/internal/RD;"}
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2370:2370 -> a
     1:14:int getSerializedSize():2290:2303 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2391:2391 -> d
@@ -213472,17 +212245,17 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2367 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilderForType():2368 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():2133 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372:2372 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():2133 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.CD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.QD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     1:1:void <init>():2209:2209 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2214:2214 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.DD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.RD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int bitField0_ -> c
     int name_ -> d
@@ -213490,7 +212263,7 @@
     1:1:void <init>():2384:2384 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDefaultInstance():2146:2146 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2436 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ED;)Lcom/android/tools/r8/internal/DD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SD;)Lcom/android/tools/r8/internal/RD;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasName():2230:2230 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2437 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213510,10 +212283,10 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2443 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):2377:2377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2458:2458 -> a
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2214:2214 -> a
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2209 -> a
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):2458 -> a
@@ -213539,7 +212312,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder clone():2404:2404 -> clone
     2:2:java.lang.Object clone():2377 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2420:2426 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SD;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.access$2002(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2133:2133 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2426 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2430:2430 -> e
@@ -213547,27 +212320,27 @@
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2430 -> e
     11:11:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.access$2202(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature,int):2133:2133 -> e
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2431 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.VD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature field_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature delegateMethod_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     byte memoizedIsInitialized -> i
     int memoizedSerializedSize -> j
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature defaultInstance -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TD;"}
     1:728:void <clinit>():3224:3951 -> <clinit>
     729:729:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDefaultInstance():2608:2608 -> <clinit>
     729:729:void initFields():3334 -> <clinit>
@@ -213581,7 +212354,7 @@
     732:735:void <clinit>():3952 -> <clinit>
     1:272:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):3100:3371 -> <init>
     1:272:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):3094 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UD;)V"}
     273:273:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     273:273:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):3101 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213593,7 +212366,7 @@
     544:544:void <init>(boolean):3103:3103 -> <init>
     545:798:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3118:3371 -> <init>
     545:798:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):3094 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDefaultInstance():2608:2608 -> <init>
     799:799:void initFields():3334 -> <init>
     799:799:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3119 -> <init>
@@ -213680,43 +212453,43 @@
     942:942:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):3094 -> <init>
     1:5:boolean isInitialized():3342:3346 -> a
     6:22:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):3352:3368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     1:26:int getSerializedSize():3373:3398 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3486:3486 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.access$3200():3472 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3462 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilderForType():3463 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():3094 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3486:3486 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.access$3200():3472 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3462 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3465 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder toBuilder():3467 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():3094 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3465:3465 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder toBuilder():3467 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():3094 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.TD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     1:1:void <init>():3225:3225 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3230:3230 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.GD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.UD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int bitField0_ -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature field_ -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature delegateMethod_ -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ED;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SD;"}
     1:1:void <init>():3479:3479 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDefaultInstance():2608:2608 -> <init>
     2:2:void <init>():3593 -> <init>
@@ -213726,7 +212499,7 @@
     5:209:void <init>():3653:3857 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getDefaultInstance():3107:3107 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3549 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HD;)Lcom/android/tools/r8/internal/GD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VD;)Lcom/android/tools/r8/internal/UD;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasField():3246:3246 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3550 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -213800,10 +212573,10 @@
     57:57:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     57:57:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature):3565 -> a
     58:58:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):3472:3472 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     59:59:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3580:3580 -> a
     59:59:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3472 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     60:60:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3230:3230 -> a
     60:60:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3225 -> a
     60:60:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):3580 -> a
@@ -213829,7 +212602,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder clone():3505:3505 -> clone
     2:2:java.lang.Object clone():3472 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3521:3527 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VD;"}
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.access$3402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3094:3094 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3527 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3531:3531 -> e
@@ -213846,26 +212619,26 @@
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3543 -> e
     17:17:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.access$3902(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature,int):3094:3094 -> e
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3544 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.cE:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     java.util.List record_ -> c
     java.util.List localName_ -> d
     int localNameMemoizedSerializedSize -> e
     byte memoizedIsInitialized -> f
     int memoizedSerializedSize -> g
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes defaultInstance -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cE;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ID;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WD;"}
     1:1:void <clinit>():171:171 -> <clinit>
     1923:1923:void <clinit>():2093:2093 -> <clinit>
     1924:1925:void initFields():1634:1635 -> <clinit>
     1924:1925:void <clinit>():2094 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):77:77 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XD;)V"}
     1555:1587:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):1631:1663 -> <init>
     1555:1587:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):71 -> <init>
     1588:1588:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
@@ -213880,7 +212653,7 @@
     3174:3174:void <init>(boolean):80:80 -> <init>
     3175:3175:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):95:95 -> <init>
     3175:3175:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)V"}
     4711:4743:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1631:1663 -> <init>
     4711:4743:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):71 -> <init>
     4744:4745:void initFields():1634:1635 -> <init>
@@ -213934,7 +212707,7 @@
     4839:4839:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):71 -> <init>
     1:5:boolean isInitialized():1639:1643 -> a
     6:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1649:1651 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     9:9:java.util.List getLocalNameList():1609:1609 -> a
     9:9:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1653 -> a
     10:17:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):1653:1660 -> a
@@ -213952,24 +212725,24 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1752 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilderForType():1753 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():71 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.create():1776:1776 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.access$1200():1762 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1752 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1755 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder toBuilder():1757 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():71 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1755:1755 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder toBuilder():1757 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():71 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.WD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     1:1:void <init>():172:172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):177:177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.JD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.XD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int bitField0_ -> c
     java.util.List record_ -> d
@@ -213977,7 +212750,7 @@
     1:227:void <init>():1769:1995 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getDefaultInstance():84:84 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1821 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OD;)Lcom/android/tools/r8/internal/JD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cE;)Lcom/android/tools/r8/internal/XD;"}
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.access$1400(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):71:71 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1822 -> a
     3:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1822:1823 -> a
@@ -214010,10 +212783,10 @@
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes):1842 -> a
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):1762:1762 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1857:1857 -> a
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1762 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):177:177 -> a
     32:32:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):172 -> a
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1857 -> a
@@ -214039,22 +212812,22 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder clone():1789:1789 -> clone
     2:2:java.lang.Object clone():1762 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1805:1811 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cE;"}
     8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.access$1402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):71:71 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1811 -> e
     9:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1812:1816 -> e
     14:14:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.access$1502(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.util.List):71:71 -> e
     14:14:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1816 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.bE:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int bitField0_ -> c
     int range_ -> d
     int predefinedIndex_ -> e
     java.lang.Object string_ -> f
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation operation_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aE;"}
     java.util.List substringIndex_ -> h
     int substringIndexMemoizedSerializedSize -> i
     java.util.List replaceChar_ -> j
@@ -214062,16 +212835,16 @@
     byte memoizedIsInitialized -> l
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record defaultInstance -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ND;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bE;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser PARSER -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YD;"}
     1:1:void <clinit>():470:470 -> <clinit>
     1087:1087:void <clinit>():1556:1556 -> <clinit>
     1088:1093:void initFields():774:779 -> <clinit>
     1088:1093:void <clinit>():1557 -> <clinit>
     1:489:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):335:823 -> <init>
     1:489:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):329 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZD;)V"}
     490:490:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.getUnknownFields():123:123 -> <init>
     490:490:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):336 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -214083,7 +212856,7 @@
     978:978:void <init>(boolean):338:338 -> <init>
     979:1449:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):353:823 -> <init>
     979:1449:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):329 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;)V"}
     1450:1455:void initFields():774:779 -> <init>
     1450:1455:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):354 -> <init>
     1450:1455:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):329 -> <init>
@@ -214180,7 +212953,7 @@
     1625:1625:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$1):329 -> <init>
     1:5:boolean isInitialized():783:787 -> a
     6:8:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):793:795 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeInt32(int,int):198:198 -> a
     9:9:void writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):795 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -214242,37 +213015,37 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():938 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilderForType():939 -> d
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder newBuilderForType():329 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.create():962:962 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder.access$200():948 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():938 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):941 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> e
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():329 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):941:941 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> e
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder toBuilder():329 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.KD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.YD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     1:1:void <init>():471:471 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):476:476 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):471 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.LD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.ZD:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int bitField0_ -> c
     int range_ -> d
     int predefinedIndex_ -> e
     java.lang.Object string_ -> f
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation operation_ -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aE;"}
     java.util.List substringIndex_ -> h
     java.util.List replaceChar_ -> i
     1:497:void <init>():955:1451 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.getDefaultInstance():342:342 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1033 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ND;)Lcom/android/tools/r8/internal/LD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bE;)Lcom/android/tools/r8/internal/ZD;"}
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.hasRange():581:581 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1034 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -214324,10 +213097,10 @@
     44:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder.setUnknownFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):127:127 -> a
     44:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):1068 -> a
     45:45:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite):948:948 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     46:46:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1083:1083 -> a
     46:46:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):948 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     47:47:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):476:476 -> a
     47:47:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):471 -> a
     47:47:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1083 -> a
@@ -214353,7 +213126,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder clone():983:983 -> clone
     2:2:java.lang.Object clone():948 -> clone
     1:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():999:1005 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ND;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bE;"}
     8:8:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.access$402(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):329:329 -> e
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():1005 -> e
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():1009:1009 -> e
@@ -214373,20 +213146,20 @@
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():1027 -> e
     26:26:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.access$1002(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record,int):329:329 -> e
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():1028 -> e
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.aE:
 # {"id":"sourceFile","fileName":"JvmProtoBuf.java"}
     int value -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aE;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aE;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aE;"}
     1:19:void <clinit>():493:511 -> <clinit>
     1:2:void <init>(java.lang.String,int,int,int):563:564 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getNumber():538:538 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.z6:
 # {"id":"sourceFile","fileName":"BitEncoding.java"}
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
@@ -214405,7 +213178,7 @@
     29:29:byte[] decodeBytes(java.lang.String[]):191 -> a
     30:46:byte[] decode7to8(byte[]):247:263 -> a
     30:46:byte[] decodeBytes(java.lang.String[]):192 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.Bc:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.lang.String kotlin -> a
     java.util.Map map -> b
@@ -214417,12 +213190,12 @@
     16:46:void com.android.tools.r8.internal.ClassMapperLite.<clinit>():0 -> <clinit>
     47:47:void <clinit>():0:0 -> <clinit>
     47:47:void com.android.tools.r8.internal.ClassMapperLite.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":213,"2":214,"3":215,"4":216},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":213,"2":214,"3":215,"4":216},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     101:108:void <clinit>():54:61 -> <clinit>
     101:108:void com.android.tools.r8.internal.ClassMapperLite.<clinit>():0 -> <clinit>
     109:109:void <clinit>():0:0 -> <clinit>
     109:109:void com.android.tools.r8.internal.ClassMapperLite.<clinit>():0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226,"2":227,"3":228,"4":229},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226,"2":227,"3":228,"4":229},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     173:180:void <clinit>():64:71 -> <clinit>
     173:180:void com.android.tools.r8.internal.ClassMapperLite.<clinit>():0 -> <clinit>
     181:181:void <clinit>():22:22 -> <clinit>
@@ -214437,14 +213210,21 @@
     229:229:void <clinit>():64:64 -> <clinit>
     1:1:void map$lambda$0$add(java.util.Map,java.lang.String,java.lang.String):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Ljava/lang/String;Ljava/lang/String;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmFlags -> com.android.tools.r8.internal.sD:
+# {"id":"sourceFile","fileName":"JvmFlags.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_COMPILED_IN_COMPATIBILITY_MODE -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lq;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField.booleanAfter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$FlagField):253:253 -> <clinit>
+    1:1:void <clinit>():19 -> <clinit>
+    2:2:void <clinit>():19:19 -> <clinit>
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.xD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.uD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -214458,7 +213238,7 @@
     5:5:java.lang.String asString():24:24 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.vD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -214472,13 +213252,13 @@
     5:5:java.lang.String asString():20:20 -> a
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.CD:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     boolean isStrictSemantics -> f
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CD;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE_NEXT -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CD;"}
     1:1:void <clinit>():62:62 -> <clinit>
     2:2:void <init>(int[]):18:18 -> <clinit>
     2:2:void <clinit>():62 -> <clinit>
@@ -214509,7 +213289,7 @@
     16:16:void <init>(int[]):18:18 -> <clinit>
     16:16:void <clinit>():68 -> <clinit>
     1:1:void <init>(int[],boolean):17:17 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.KD:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.strings -> a
     java.util.Set com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.localNameIndices -> b
@@ -214535,7 +213315,7 @@
     55:55:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.<clinit>():101:101 -> <clinit>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.getLocalNameList():1609:1609 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OD;[Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cE;[Ljava/lang/String;)V"}
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):16:16 -> <init>
     3:6:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1353:1356 -> <init>
     3:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):16 -> <init>
@@ -214585,23 +213365,23 @@
     25:25:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getString(int):40 -> a
     26:37:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getString(int):40:51 -> a
     38:53:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getString(int):40:55 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase -> R8$$REMOVED$$CLASS$$188:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase -> R8$$REMOVED$$CLASS$$176:
 # {"id":"sourceFile","fileName":"JvmNameResolverBase.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase$Companion -> R8$$REMOVED$$CLASS$$187:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase$Companion -> R8$$REMOVED$$CLASS$$175:
 # {"id":"sourceFile","fileName":"JvmNameResolverBase.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverKt -> R8$$REMOVED$$CLASS$$189:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverKt -> R8$$REMOVED$$CLASS$$177:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.eE:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fo;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite.newInstance():92:92 -> <clinit>
     1:1:void <clinit>():19 -> <clinit>
     2:15:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf.registerAllExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10:23 -> <clinit>
     2:15:void <clinit>():19 -> <clinit>
     16:16:void <clinit>():19:19 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/ByteArrayInputStream;[Ljava/lang/String;)Lcom/android/tools/r8/internal/wD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/ByteArrayInputStream;[Ljava/lang/String;)Lcom/android/tools/r8/internal/KD;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes.parseDelimitedFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):1738:1738 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parsePartialDelimitedFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):224:224 -> a
@@ -214673,7 +213453,7 @@
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolver readNameResolver(java.io.InputStream,java.lang.String[]):52 -> a
     26:26:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.hasClassName():5780:5780 -> a
     26:26:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a00;Lcom/android/tools/r8/internal/wD;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e00;Lcom/android/tools/r8/internal/KD;)Ljava/lang/String;"}
     27:27:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type.getClassName():5786:5786 -> a
     27:27:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):130 -> a
     28:28:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmNameResolverBase.getQualifiedClassName(int):59:59 -> a
@@ -214681,28 +213461,28 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ClassMapperLite.mapClass(java.lang.String):80:80 -> a
     29:29:java.lang.String mapTypeDefault(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver):130 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt -> R8$$REMOVED$$CLASS$$190:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt -> R8$$REMOVED$$CLASS$$178:
 # {"id":"sourceFile","fileName":"ModuleMapping.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts -> R8$$REMOVED$$CLASS$$191:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts -> R8$$REMOVED$$CLASS$$179:
 # {"id":"sourceFile","fileName":"ModuleMapping.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts$writeMultifileFacadeNames$$inlined$sortedBy$1 -> com.android.tools.r8.internal.FV:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts$writeMultifileFacadeNames$$inlined$sortedBy$1 -> com.android.tools.r8.internal.JV:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     1:1:void <init>():0:0 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.getFirst():27:27 -> compare
-    2:2:int compare(java.lang.Object,java.lang.Object):329 -> compare
+    2:2:int compare(java.lang.Object,java.lang.Object):103 -> compare
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:int compare(java.lang.Object,java.lang.Object):329:329 -> compare
+    3:3:int compare(java.lang.Object,java.lang.Object):103:103 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.getFirst():27:27 -> compare
-    5:5:int compare(java.lang.Object,java.lang.Object):329 -> compare
+    5:5:int compare(java.lang.Object,java.lang.Object):103 -> compare
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:int compare(java.lang.Object,java.lang.Object):329:329 -> compare
+    6:6:int compare(java.lang.Object,java.lang.Object):103:103 -> compare
     7:7:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     7:7:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> R8$$REMOVED$$CLASS$$192:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> R8$$REMOVED$$CLASS$$180:
 # {"id":"sourceFile","fileName":"utfEncoding.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.gE:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.ArrayList strings -> a
     java.util.ArrayList records -> b
@@ -214758,10 +213538,10 @@
     198:199:int getQualifiedClassNameIndex(java.lang.String,boolean):85 -> a
     200:200:int getQualifiedClassNameIndex(java.lang.String,boolean):86:86 -> a
     201:216:int getQualifiedClassNameIndex(java.lang.String,boolean):77:92 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.qB:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qB;"}
     int firstIndex -> b
     java.util.HashMap interned -> c
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner):8:10 -> <init>
@@ -214769,24 +213549,24 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean isEmpty():16:16 -> a
     2:5:java.lang.Integer find(java.lang.Object):19:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ug0;)Ljava/lang/Integer;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.nB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yg0;)Ljava/lang/Integer;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.pB:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap $receiver$inlined -> b
     1:1:void <init>(java.util.HashMap):0:0 -> <init>
-    1:1:int compare(java.lang.Object,java.lang.Object):329:329 -> compare
+    1:1:int compare(java.lang.Object,java.lang.Object):103:103 -> compare
     2:2:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable -> R8$$REMOVED$$CLASS$$193:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable -> R8$$REMOVED$$CLASS$$181:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.SP:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.WP:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.Interner com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.interner -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qB;"}
     1:6:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.<init>():23:28 -> <init>
     1:6:void <init>():56 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.serialize():39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder createTableBuilder():57:57 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder createTableBuilder():55 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.serialize():40 -> a
@@ -214836,14 +213616,14 @@
     36:36:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.serialize():42 -> a
     37:37:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.serialize():44:44 -> a
     38:38:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.MutableTable.serialize():40:40 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.ug0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.yg0:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t00;"}
     byte[] bytes -> b
     int hashCode -> c
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):13:15 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t00;)V"}
     4:4:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite.toByteArray():64:64 -> <init>
     4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):15 -> <init>
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.newInstance(byte[],int,int):130:130 -> <init>
@@ -214868,13 +213648,13 @@
 # {"id":"sourceFile","fileName":"AbstractMessageLite.java"}
     1:1:void <init>():46:46 -> <init>
     void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite.writeTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;)V"}
     int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite.getSerializedSize() -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite.newBuilderForType() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite.toBuilder() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xr;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder -> R8$$REMOVED$$CLASS$$194:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zr;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder -> R8$$REMOVED$$CLASS$$182:
 # {"id":"sourceFile","fileName":"AbstractMessageLite.java"}
 com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.internal.K0:
 # {"id":"sourceFile","fileName":"AbstractMessageLite.java"}
@@ -214891,7 +213671,7 @@
     1:1:void <init>():49:49 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream.newInstance(java.io.InputStream):58:58 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/InputStream;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/L0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/InputStream;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/L0;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):192:192 -> a
     3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream.checkLastTagWas(int):173:173 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):194 -> a
@@ -214913,10 +213693,10 @@
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException.setUnfinishedMessage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):57:57 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):71 -> a
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):71:71 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.U7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lL;"}
     boolean $assertionsDisabled -> c
     1:22:void <clinit>():60:81 -> <clinit>
     1:1:void <init>():84:84 -> <init>
@@ -214924,9 +213704,9 @@
     int partialHash(int,int,int) -> a
     void writeToInternal(java.io.OutputStream,int,int) -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString copyFromUtf8(java.lang.String):269:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/lL;"}
     4:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString concat(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):396:403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;)Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U7;)Lcom/android/tools/r8/internal/U7;"}
     12:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString.concatenate(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):153:160 -> a
     12:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString concat(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):403 -> a
     20:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString.concatenateBytes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):214:219 -> a
@@ -214960,7 +213740,7 @@
     75:75:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString concat(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):403 -> a
     76:76:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString concat(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):399:399 -> a
     77:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString balancedConcat(java.util.Iterator,int):442:450 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;I)Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;I)Lcom/android/tools/r8/internal/U7;"}
     86:95:void copyTo(byte[],int,int,int):490:499 -> a
     96:96:void copyTo(byte[],int,int,int):495:495 -> a
     97:97:void copyTo(byte[],int,int,int):491:491 -> a
@@ -214972,14 +213752,14 @@
     int partialIsValidUtf8(int,int,int) -> b
     boolean isValidUtf8() -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Q7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S7;"}
     int peekCachedHashCode() -> e
     java.lang.String toString(java.lang.String) -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/lang/String;"}
     1:3:java.lang.String toStringUtf8():624:626 -> h
     int size() -> size
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.S7:
 # {"id":"sourceFile","fileName":"ByteString.java"}
     int initialCapacity -> a
     java.util.ArrayList flushedBuffers -> b
@@ -214992,7 +213772,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void flushLastBuffer():914:914 -> c
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString toByteString():827 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/U7;"}
     2:3:byte[] copyArray(byte[],int):835:836 -> c
     2:3:void flushLastBuffer():916 -> c
     2:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString toByteString():827 -> c
@@ -215013,7 +213793,7 @@
     20:28:void flushFullBuffer(int):898:906 -> write
     20:28:void write(byte[],int,int):814 -> write
     29:30:void write(byte[],int,int):815:816 -> write
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Od:
 # {"id":"sourceFile","fileName":"CodedInputStream.java"}
     byte[] buffer -> a
     int bufferSize -> b
@@ -215028,7 +213808,7 @@
     2:29:void <init>(java.io.InputStream):876:903 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException.invalidWireType():99:99 -> a
     1:1:boolean skipField(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Rd;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Td;)Z"}
     2:2:boolean skipField(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):262:262 -> a
     3:4:boolean skipField(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):256:257 -> a
     5:5:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeFixed32NoTag(int):410:410 -> a
@@ -215059,7 +213839,7 @@
     23:23:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeUInt64NoTag(long):385:385 -> a
     23:23:boolean skipField(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):228 -> a
     24:30:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite readMessage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):489:495 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RV;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/L0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/L0;"}
     31:31:void checkLastTagWas(int):173:173 -> a
     31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite readMessage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):496 -> a
     32:32:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite readMessage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):497:497 -> a
@@ -215076,7 +213856,7 @@
     39:40:void popLimit(int):1018:1019 -> a
     41:45:int getBytesUntilLimit():1027:1031 -> a
     1:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString readBytes():504:508 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lL;"}
     6:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString.copyFrom(byte[],int,int):206:208 -> b
     6:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString readBytes():508 -> b
     9:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString readBytes():511:517 -> b
@@ -215145,7 +213925,7 @@
     7:7:int readTag():158 -> i
     8:8:int readTag():158:158 -> i
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> j
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Td:
 # {"id":"sourceFile","fileName":"CodedOutputStream.java"}
     byte[] buffer -> a
     int limit -> b
@@ -215155,9 +213935,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I[B)V"}
     6:10:void <init>(java.io.OutputStream,byte[]):85:89 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream newInstance(java.io.OutputStream,int):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q7;)Lcom/android/tools/r8/internal/Rd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;)Lcom/android/tools/r8/internal/Td;"}
     2:2:void writeBytes(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):263:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/S7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/U7;)V"}
     3:4:void writeBytesNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):455:456 -> a
     3:4:void writeBytes(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):264 -> a
     5:5:int computeInt32Size(int,int):560:560 -> a
@@ -215175,7 +213955,7 @@
     14:14:void refreshBuffer():960:960 -> a
     14:14:void flush():975 -> a
     15:15:void writeRawBytes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):1047:1047 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U7;)V"}
     16:28:void writeRawBytes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,int,int):1147:1159 -> a
     16:28:void writeRawBytes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):1047 -> a
     29:37:void refreshBuffer():958:966 -> a
@@ -215236,10 +214016,10 @@
     12:12:void writeRawByte(int):1042 -> e
     1:4:void writeRawLittleEndian32(int):1246:1249 -> f
     1:4:void writeRawVarint32(int):1195:1198 -> g
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Rd:
 # {"id":"sourceFile","fileName":"CodedOutputStream.java"}
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Bo:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Fo:
 # {"id":"sourceFile","fileName":"ExtensionRegistryLite.java"}
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> b
@@ -215249,7 +214029,7 @@
     3:4:void <init>(boolean):156:157 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:1:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Er;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
     2:2:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -215260,7 +214040,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     5:5:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.Eo:
 # {"id":"sourceFile","fileName":"ExtensionRegistryLite.java"}
     java.lang.Object object -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L0;"}
@@ -215269,13 +214049,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/L0;)V"}
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Ap:
 # {"id":"sourceFile","fileName":"FieldSet.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap fields -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc0;"}
     boolean isImmutable -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
     1:1:void <clinit>():102:102 -> <clinit>
     1:1:void <init>():76:76 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.newFieldMap(int):100:100 -> <init>
@@ -215333,7 +214113,7 @@
     32:32:boolean isInitialized(java.util.Map$Entry):437 -> a
     33:47:boolean isInitialized(java.util.Map$Entry):439:453 -> a
     48:82:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean):556:590 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/rm0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/vm0;)Ljava/lang/Object;"}
     83:83:long com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream.readSInt64():590:590 -> a
     83:83:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean):575 -> a
     84:84:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean):575:575 -> a
@@ -215396,7 +214176,7 @@
     148:148:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean):557 -> a
     149:149:java.lang.Object readPrimitiveField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean):557:557 -> a
     150:173:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):679:702 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rd;Lcom/android/tools/r8/internal/rm0;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Td;Lcom/android/tools/r8/internal/vm0;Ljava/lang/Object;)V"}
     174:174:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeSInt64NoTag(long):517:517 -> a
     174:174:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):702 -> a
     175:175:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.writeSInt64NoTag(long):517:517 -> a
@@ -215470,7 +214250,7 @@
     219:219:void writeElementNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):680 -> a
     220:220:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> a
     220:220:void addRepeatedField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):340 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Br;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;Ljava/lang/Object;)V"}
     221:221:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> a
     221:221:void addRepeatedField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):345 -> a
     222:222:void addRepeatedField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):345:345 -> a
@@ -215479,7 +214259,7 @@
     224:230:void addRepeatedField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):350:356 -> a
     231:231:void addRepeatedField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):341:341 -> a
     232:273:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):835:876 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rm0;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vm0;Ljava/lang/Object;)I"}
     274:274:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858:858 -> a
     275:275:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.computeSInt64SizeNoTag(long):948:948 -> a
     275:275:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):858 -> a
@@ -215521,7 +214301,7 @@
     324:324:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):839:839 -> a
     325:325:int computeElementSizeNoTag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):838:838 -> a
     1:1:void verifyType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):369:369 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rm0;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vm0;Ljava/lang/Object;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType.getJavaType():143:143 -> b
     2:2:void verifyType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Object):373 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -215565,7 +214345,7 @@
     99:99:void mergeFromField(java.util.Map$Entry):532:532 -> b
     100:100:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> b
     100:100:int computeFieldSize(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):885 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Br;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;Ljava/lang/Object;)I"}
     101:101:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> b
     101:101:int computeFieldSize(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):886 -> b
     102:102:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> b
@@ -215577,7 +214357,7 @@
     111:117:int computeFieldSize(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):904 -> b
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> c
     1:1:void setField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):238 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Br;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;Ljava/lang/Object;)V"}
     2:11:void setField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):239:248 -> c
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> c
     12:12:void setField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object):249 -> c
@@ -215589,7 +214369,7 @@
     1:1:java.lang.Object clone():50:50 -> clone
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> clone
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet clone():134 -> clone
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ap;"}
     3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet clone():135:135 -> clone
     4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():180:180 -> clone
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet clone():135 -> clone
@@ -215609,24 +214389,24 @@
     15:15:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.getOverflowEntries():195:195 -> clone
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet clone():141 -> clone
     16:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet clone():141:143 -> clone
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Fr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;Ljava/io/Serializable;Lcom/android/tools/r8/internal/Dr;ILcom/android/tools/r8/internal/rm0;Ljava/lang/Class;)Lcom/android/tools/r8/internal/Cr;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.xr:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;Ljava/io/Serializable;Lcom/android/tools/r8/internal/Fr;ILcom/android/tools/r8/internal/vm0;Ljava/lang/Class;)Lcom/android/tools/r8/internal/Er;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.zr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString unknownFields -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.<init>():118:118 -> <init>
     1:1:void <init>():87 -> <init>
     2:2:void <init>():131:131 -> <init>
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Lcom/android/tools/r8/internal/zr;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dr;)Lcom/android/tools/r8/internal/xr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fr;)Lcom/android/tools/r8/internal/zr;"}
     1:4:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.addAll(java.lang.Iterable,java.util.Collection):329:332 -> a
     5:7:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.checkForNullValues(java.lang.Iterable):348:350 -> a
     5:7:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.addAll(java.lang.Iterable,java.util.Collection):332 -> a
@@ -215637,11 +214417,11 @@
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite$Builder.build() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dr;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.yr:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fr;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Ar:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet extensions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
     boolean extensionsIsMutable -> d
     1:1:void <init>():332:332 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet.emptySet():99:99 -> <init>
@@ -215649,7 +214429,7 @@
     3:3:void <init>():334:334 -> <init>
     1:3:void ensureExtensionsIsMutable():350:352 -> a
     1:3:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):495 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;)V"}
     4:4:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):496:496 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.access$200(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):164:164 -> a
     5:5:void mergeExtensionFields(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):496 -> a
@@ -215687,7 +214467,7 @@
     21:21:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;Ljava/io/Serializable;)Lcom/android/tools/r8/internal/yr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Er;Ljava/io/Serializable;)Lcom/android/tools/r8/internal/Ar;"}
     22:22:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
     22:22:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
     23:25:void ensureExtensionsIsMutable():350:352 -> a
@@ -215711,16 +214491,16 @@
     41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):433:433 -> a
     42:42:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
     42:42:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Cr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet extensions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
     1:1:void <init>():171:171 -> <init>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet.newFieldSet():92:92 -> <init>
     2:2:void <init>():172 -> <init>
     3:3:void <init>():172:172 -> <init>
     4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:175 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;)V"}
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.buildExtensions():361:361 -> <init>
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.access$000(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):327 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -215730,7 +214510,7 @@
     6:8:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):176 -> <init>
     9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):176:176 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Rd;Lcom/android/tools/r8/internal/Bo;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Td;Lcom/android/tools/r8/internal/Fo;I)Z"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite.findLiteExtensionByNumber(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,int):117:117 -> a
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite.parseUnknownField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,int):517 -> a
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite.access$100(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite,int):49 -> a
@@ -215948,7 +214728,7 @@
     159:159:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
     159:159:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181 -> a
     159:159:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Er;)Ljava/lang/Object;"}
     160:160:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):181:181 -> a
     160:160:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):211 -> a
     161:161:java.lang.Object getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):212:212 -> a
@@ -216039,13 +214819,13 @@
     13:13:int extensionsSerializedSize():316 -> g
     14:15:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet.getSerializedSize():761:762 -> g
     14:15:int extensionsSerializedSize():316 -> g
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Br:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     java.util.Iterator iter -> a
     java.util.Map$Entry next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean):279:279 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$1):270 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage.access$200(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage):164:164 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean):274 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$1):270 -> <init>
@@ -216072,7 +214852,7 @@
     11:18:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean):274:281 -> <init>
     11:18:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,boolean,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$1):270 -> <init>
     1:1:void writeUntil(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):288:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Rd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Td;)V"}
     2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getNumber():694:694 -> a
     2:2:void writeUntil(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):288 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -216141,29 +214921,29 @@
     43:44:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet.writeField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.FieldSet$FieldDescriptorLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):744 -> a
     43:44:void writeUntil(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):296 -> a
     45:48:void writeUntil(int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream):298:301 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Dr:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     int number -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vm0;"}
     boolean isRepeated -> d
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType,boolean,boolean):679:683 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/rm0;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/vm0;Z)V"}
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int compareTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Er:
 # {"id":"sourceFile","fileName":"GeneratedMessageLite.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite containingTypeDefaultInstance -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ar;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cr;"}
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite messageDefaultInstance -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dr;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fr;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Br;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dr;"}
     java.lang.reflect.Method enumValueOf -> e
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):786:786 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;Ljava/lang/Object;Lcom/android/tools/r8/internal/Dr;Lcom/android/tools/r8/internal/Br;Ljava/lang/Class;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;Ljava/lang/Object;Lcom/android/tools/r8/internal/Fr;Lcom/android/tools/r8/internal/Dr;Ljava/lang/Class;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteType():698:698 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):793 -> <init>
     3:17:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):793:807 -> <init>
@@ -216198,34 +214978,34 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     4:5:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.TA:
 # {"id":"sourceFile","fileName":"Internal.java"}
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.QA:
 # {"id":"sourceFile","fileName":"Internal.java"}
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.DB:
 # {"id":"sourceFile","fileName":"InvalidProtocolBufferException.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite unfinishedMessage -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L0;"}
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringArrayList -> com.android.tools.r8.internal.dJ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringArrayList -> com.android.tools.r8.internal.hJ:
 # {"id":"sourceFile","fileName":"LazyStringArrayList.java"}
     java.util.List list -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rk0;"}
     1:1:void <clinit>():68:68 -> <clinit>
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList getUnmodifiableView():364:364 -> <clinit>
     2:2:void <clinit>():68 -> <clinit>
     3:3:void <clinit>():68:68 -> <clinit>
     1:2:void <init>():73:74 -> <init>
     3:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList):77:79 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jJ;)V"}
     1:2:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):174:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lL;)V"}
     1:1:void add(int,java.lang.Object):65:65 -> add
     2:3:void add(int,java.lang.String):121:122 -> add
     2:3:void add(int,java.lang.Object):65 -> add
@@ -216234,7 +215014,7 @@
     2:2:boolean addAll(java.util.Collection):131:131 -> addAll
     3:6:boolean addAll(int,java.util.Collection):138:141 -> addAll
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getByteString(int):186:186 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/U7;"}
     2:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString asByteString(java.lang.Object):226:231 -> b
     2:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getByteString(int):187 -> b
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString.copyFrom(byte[]):218:218 -> b
@@ -216247,7 +215027,7 @@
     12:12:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getByteString(int):189:189 -> b
     1:2:void clear():168:169 -> clear
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList getUnmodifiableView():364:364 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rk0;"}
     1:13:java.lang.String get(int):88:100 -> get
     1:13:java.lang.Object get(int):65 -> get
     14:14:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Internal.toStringUtf8(byte[]):206:206 -> get
@@ -216288,16 +215068,16 @@
     9:11:java.lang.String set(int,java.lang.String):116 -> set
     9:11:java.lang.Object set(int,java.lang.Object):65 -> set
     1:1:int size():110:110 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList -> com.android.tools.r8.internal.fJ:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList -> com.android.tools.r8.internal.jJ:
 # {"id":"sourceFile","fileName":"LazyStringList.java"}
     void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lL;)V"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getByteString(int) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/U7;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList getUnmodifiableView() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rk0;"}
     java.util.List getUnderlyingElements() -> l
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.hL:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.lL:
 # {"id":"sourceFile","fileName":"LiteralByteString.java"}
     byte[] bytes -> d
     int hash -> e
@@ -216306,7 +215086,7 @@
     1:1:int size():76:76 -> a
     1:1:boolean equalsRange(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString,int,int):213 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hL;II)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lL;II)Z"}
     2:2:int size():76:76 -> a
     2:2:boolean equalsRange(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString,int,int):213 -> a
     3:3:int size():76:76 -> a
@@ -216346,15 +215126,15 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:java.util.Iterator iterator():52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.gL:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.kL:
 # {"id":"sourceFile","fileName":"LiteralByteString.java"}
     int position -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lL;"}
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString):314:315 -> <init>
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString$1):310 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lL;)V"}
     3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString.size():76:76 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString):316 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString$1):310 -> <init>
@@ -216365,29 +215145,29 @@
     1:1:java.lang.Byte next():325:325 -> next
     1:1:java.lang.Object next():310 -> next
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.yN:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.CN:
 # {"id":"sourceFile","fileName":"MessageLiteOrBuilder.java"}
     boolean isInitialized() -> a
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/L0;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.RV:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.VV:
 # {"id":"sourceFile","fileName":"Parser.java"}
     java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Md;Lcom/android/tools/r8/internal/Bo;)Ljava/lang/Object;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.Y90:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Od;Lcom/android/tools/r8/internal/Fo;)Ljava/lang/Object;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.ca0:
 # {"id":"sourceFile","fileName":"RopeByteString.java"}
     int totalLength -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString left -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString right -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U7;"}
     int leftLength -> g
     int treeDepth -> h
     int hash -> i
     int[] minLengthByDepth -> j
     1:22:void <clinit>():89:110 -> <clinit>
     1:415:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):129:543 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;Lcom/android/tools/r8/internal/S7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U7;Lcom/android/tools/r8/internal/U7;)V"}
     416:420:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):130:134 -> <init>
     1:1:int getTreeDepth():277:277 -> a
     2:9:void writeToInternal(java.io.OutputStream,int,int):407:414 -> a
@@ -216442,14 +215222,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$ByteIterator iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.V90:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.Z90:
 # {"id":"sourceFile","fileName":"RopeByteString.java"}
     java.util.Stack prefixesStack -> a
     1:5:void <init>():602:606 -> <init>
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):602 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:void doBalance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):628:628 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U7;)V"}
     2:2:void insert(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):656:656 -> a
     2:2:void doBalance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):629 -> a
     3:3:int[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString.access$600():70:70 -> a
@@ -216497,14 +215277,14 @@
     40:40:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString.access$500(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString):70:70 -> a
     40:40:void doBalance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):633 -> a
     41:43:void doBalance(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):633:635 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.W90:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.aa0:
 # {"id":"sourceFile","fileName":"RopeByteString.java"}
     java.util.Stack breadCrumbs -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lL;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):722:722 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):716 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U7;)V"}
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):718:718 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):716 -> <init>
     3:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString getLeafByLeft(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):728:730 -> <init>
@@ -216520,7 +215300,7 @@
     8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):723:723 -> <init>
     8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):716 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString next():761:761 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lL;"}
     2:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString getNextNonEmptyLeaf():740:743 -> a
     2:5:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString next():765 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString.access$500(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString):70:70 -> a
@@ -216552,16 +215332,16 @@
     1:1:boolean hasNext():752:752 -> hasNext
     1:1:java.lang.Object next():716:716 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.X90:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.ba0:
 # {"id":"sourceFile","fileName":"RopeByteString.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aa0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$ByteIterator bytes -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kL;"}
     int bytesRemaining -> d
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString):788:790 -> <init>
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):782 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ca0;)V"}
     4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LiteralByteString.iterator():307:307 -> <init>
     4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString):790 -> <init>
     4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.RopeByteString$1):782 -> <init>
@@ -216587,16 +215367,16 @@
     8:8:java.lang.Byte next():799:799 -> next
     8:8:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap -> R8$$REMOVED$$CLASS$$195:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap -> R8$$REMOVED$$CLASS$$183:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.hc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.lc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.maxArraySize -> b
     java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.entryList -> c
     java.util.Map com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.overflowEntries -> d
     boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.isImmutable -> e
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EntrySet com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.lazyEntrySet -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xc0;"}
     int $r8$clinit -> g
       # {"id":"com.android.tools.r8.synthesized"}
     1:4:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.<init>(int):153:156 -> <init>
@@ -216647,35 +215427,35 @@
     14:17:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.remove(java.lang.Object):284 -> remove
     18:21:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.remove(java.lang.Object):288:291 -> remove
     1:1:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.nc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.rc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     java.util.Iterator ITERATOR -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nc0;"}
     java.lang.Iterable ITERABLE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pc0;"}
     1:16:void <clinit>():591:606 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.jc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.nc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     1:1:void <init>():591:591 -> <init>
     1:1:boolean hasNext():594:594 -> hasNext
     1:1:java.lang.Object next():598:598 -> next
     1:1:void remove():602:602 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.lc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.pc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     1:1:void <init>():606:606 -> <init>
     1:1:java.util.Iterator iterator():609:609 -> iterator
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.pc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.tc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     java.lang.Comparable key -> b
     java.lang.Object value -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc0;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,java.util.Map$Entry):406:406 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hc0;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lc0;Ljava/util/Map$Entry;)V"}
     2:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,java.lang.Comparable,java.lang.Object):409:411 -> <init>
     2:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,java.util.Map$Entry):406 -> <init>
     5:7:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,java.lang.Comparable,java.lang.Object):409:411 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hc0;Ljava/lang/Comparable;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lc0;Ljava/lang/Comparable;Ljava/lang/Object;)V"}
     1:1:int compareTo(java.lang.Object):400:400 -> compareTo
     2:2:java.lang.Comparable getKey():416:416 -> compareTo
     2:2:int compareTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$Entry):426 -> compareTo
@@ -216701,16 +215481,16 @@
     2:2:java.lang.Object setValue(java.lang.Object):431 -> setValue
     3:4:java.lang.Object setValue(java.lang.Object):432:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.rc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.vc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     int pos -> b
     boolean nextCalledBeforeRemove -> c
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc0;"}
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap):532:534 -> <init>
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$1):532 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lc0;)V"}
     1:1:boolean hasNext():540:540 -> hasNext
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap.access$400(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap):87:87 -> hasNext
     2:2:boolean hasNext():540 -> hasNext
@@ -216784,13 +215564,13 @@
     27:29:void remove():566 -> remove
     30:30:void remove():566:566 -> remove
     31:31:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.tc0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.xc0:
 # {"id":"sourceFile","fileName":"SmallSortedMap.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lc0;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.SmallSortedMap$1):470 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lc0;)V"}
     1:1:boolean add(java.lang.Object):470:470 -> add
     2:3:boolean add(java.util.Map$Entry):499:500 -> add
     2:3:boolean add(java.lang.Object):470 -> add
@@ -216799,22 +215579,22 @@
     1:1:java.util.Iterator iterator():474:474 -> iterator
     1:3:boolean remove(java.lang.Object):514:516 -> remove
     1:1:int size():479:479 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Lj0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.Pj0:
 # {"id":"sourceFile","fileName":"UninitializedMessageException.java"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):53:53 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList -> com.android.tools.r8.internal.nk0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList -> com.android.tools.r8.internal.rk0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList list -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hJ;"}
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList):52:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hJ;)V"}
     1:1:void add(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lL;)V"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ByteString getByteString(int):68:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/S7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/U7;"}
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList getUnmodifiableView():203:203 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rk0;"}
     1:1:java.lang.String get(int):58:58 -> get
     1:1:java.lang.Object get(int):47 -> get
     1:1:java.util.Iterator iterator():160:160 -> iterator
@@ -216826,11 +215606,11 @@
     3:3:java.util.List getUnderlyingElements():183 -> l
     1:1:java.util.ListIterator listIterator(int):108:108 -> listIterator
     1:1:int size():63:63 -> size
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList$1 -> com.android.tools.r8.internal.jk0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList$1 -> com.android.tools.r8.internal.nk0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     java.util.ListIterator iter -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList,int):108:108 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nk0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rk0;I)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList.access$000(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList,int):109 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList,int):109:109 -> <init>
@@ -216849,11 +215629,11 @@
     1:1:void set(java.lang.Object):108:108 -> set
     2:2:void set(java.lang.String):148:148 -> set
     2:2:void set(java.lang.Object):108 -> set
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList$2 -> com.android.tools.r8.internal.lk0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList$2 -> com.android.tools.r8.internal.pk0:
 # {"id":"sourceFile","fileName":"UnmodifiableLazyStringList.java"}
     java.util.Iterator iter -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList):160:160 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rk0;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.LazyStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList.access$000(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList):161 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UnmodifiableLazyStringList):161:161 -> <init>
@@ -216861,218 +215641,263 @@
     1:1:java.lang.String next():170:170 -> next
     1:1:java.lang.Object next():160 -> next
     1:1:void remove():175:175 -> remove
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.Sk0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.Wk0:
 # {"id":"sourceFile","fileName":"Utf8.java"}
     1:6:int incompleteStateFor(byte[],int,int):341:346 -> a
     7:7:int incompleteStateFor(byte[],int,int):344:344 -> a
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.rm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.vm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType javaType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     int wireType -> c
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType INT32 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType BOOL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType GROUP -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType MESSAGE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nm0;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType ENUM -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rm0;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType ENUM -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vm0;"}
     1:22:void <clinit>():108:129 -> <clinit>
     1:3:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):135:137 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/tm0;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/xm0;I)V"}
     4:6:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):135:137 -> <init>
     4:6:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$1):107 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/tm0;II)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/xm0;II)V"}
     1:1:boolean isPackable():0:0 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.jm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.nm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.lm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.pm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):119:119 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean isPackable():120:120 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.nm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.rm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):122:122 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean isPackable():123:123 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.pm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.tm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType,int):125:125 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean isPackable():126:126 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.tm0:
+com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.xm0:
 # {"id":"sourceFile","fileName":"WireFormat.java"}
     java.lang.Object defaultDefault -> b
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType INT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType LONG -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType STRING -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType ENUM -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
     1:9:void <clinit>():78:86 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.a:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():88:88 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmClassExtensionVisitor):52:52 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmClassExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():57:57 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.b:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():287:287 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmConstructorExtensionVisitor):263:263 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):263 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():267:267 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.c:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmDeclarationContainerExtensionVisitor):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.d:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes -> com.android.tools.r8.internal.lD:
+# {"id":"sourceFile","fileName":"JvmAttributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/UP;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isMovedFromInterfaceCompanion$delegate -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate hasMethodBodiesInInterface$delegate -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.BooleanFlagDelegate isCompiledInCompatibilityMode$delegate -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J6;"}
+    1:1:void <clinit>():23:23 -> <clinit>
+    2:2:com.android.tools.r8.jetbrains.kotlin.reflect.KMutableProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.mutableProperty1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.MutablePropertyReference1):108:108 -> <clinit>
+    2:2:void <clinit>():23 -> <clinit>
+    3:22:void <clinit>():41:60 -> <clinit>
+    23:24:void <clinit>() -> <clinit>
+    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl booleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):66:66 -> <clinit>
+    25:25:void <clinit>():25 -> <clinit>
+    26:45:void <clinit>():23:42 -> <clinit>
+    46:46:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl booleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):66:66 -> <clinit>
+    46:46:void <clinit>():43 -> <clinit>
+    47:67:void <clinit>():41:61 -> <clinit>
+    68:68:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmFlags.getIS_COMPILED_IN_COMPATIBILITY_MODE():19:19 -> <clinit>
+    68:68:void <clinit>():62 -> <clinit>
+    69:69:void <clinit>():62:62 -> <clinit>
+    70:70:com.android.tools.r8.jetbrains.kotlin.metadata.internal.FlagImpl booleanFlag(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):66:66 -> <clinit>
+    70:70:void <clinit>():62 -> <clinit>
+    71:71:void <clinit>():60:60 -> <clinit>
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$hasMethodBodiesInInterface$2 -> com.android.tools.r8.internal.iD:
+# {"id":"sourceFile","fileName":"JvmAttributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$hasMethodBodiesInInterface$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iD;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():42:42 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):42:42 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):78:78 -> a
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):1 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):42 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setJvmFlags(int):37:37 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):78 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):1 -> a
+    3:3:void set(java.lang.Object,java.lang.Object):42 -> a
+    1:1:java.lang.Object get(java.lang.Object):42:42 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):76:76 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):1 -> b
+    2:2:java.lang.Object get(java.lang.Object):42 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getJvmFlags():37:37 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):76 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):1 -> b
+    3:3:java.lang.Object get(java.lang.Object):42 -> b
+    4:4:java.lang.Object get(java.lang.Object):42:42 -> b
+    5:5:java.lang.String getName():42:42 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():42:42 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():42:42 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$isCompiledInCompatibilityMode$2 -> com.android.tools.r8.internal.jD:
+# {"id":"sourceFile","fileName":"JvmAttributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$isCompiledInCompatibilityMode$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jD;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():61:61 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):61:61 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):78:78 -> a
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):1 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):61 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setJvmFlags(int):37:37 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):78 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):1 -> a
+    3:3:void set(java.lang.Object,java.lang.Object):61 -> a
+    1:1:java.lang.Object get(java.lang.Object):61:61 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):76:76 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):1 -> b
+    2:2:java.lang.Object get(java.lang.Object):61 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getJvmFlags():37:37 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):76 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):1 -> b
+    3:3:java.lang.Object get(java.lang.Object):61 -> b
+    4:4:java.lang.Object get(java.lang.Object):61:61 -> b
+    5:5:java.lang.String getName():61:61 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():61:61 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():61:61 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$isMovedFromInterfaceCompanion$2 -> com.android.tools.r8.internal.kD:
+# {"id":"sourceFile","fileName":"JvmAttributes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes$isMovedFromInterfaceCompanion$2 INSTANCE -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kD;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():24:24 -> <init>
+    1:1:void set(java.lang.Object,java.lang.Object):24:24 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Object;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):71:71 -> a
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):1 -> a
+    2:2:void set(java.lang.Object,java.lang.Object):24 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setJvmFlags(int):74:74 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):71 -> a
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):1 -> a
+    3:3:void set(java.lang.Object,java.lang.Object):24 -> a
+    1:1:java.lang.Object get(java.lang.Object):24:24 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):69:69 -> b
+    2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):1 -> b
+    2:2:java.lang.Object get(java.lang.Object):24 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():74:74 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):69 -> b
+    3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.access$getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):1 -> b
+    3:3:java.lang.Object get(java.lang.Object):24 -> b
+    4:4:java.lang.Object get(java.lang.Object):24:24 -> b
+    5:5:java.lang.String getName():24:24 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer getOwner():24:24 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mE;"}
+    1:1:java.lang.String getSignature():24:24 -> d
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.qD:
 # {"id":"sourceFile","fileName":"JvmExtensions.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FH;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    2:350:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:348 -> a
-    2:350:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26 -> a
-    2:350:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
-    351:351:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    351:351:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
-    352:352:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.getSignature():149:149 -> a
-    352:352:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
-    353:353:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):32:32 -> a
-    353:353:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)Ljava/util/List;"}
-    354:354:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():177:177 -> a
-    354:354:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):200 -> a
-    355:355:void setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    356:356:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setModuleName(java.lang.String):37:37 -> a
-    356:356:void setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):32 -> a
-    357:357:java.lang.String getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)Ljava/lang/String;"}
-    358:358:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getAnonymousObjectOriginName():38:38 -> a
-    358:358:java.lang.String getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):40 -> a
-    359:359:void setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;I)V"}
-    360:360:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setJvmFlags(int):39:39 -> a
-    360:360:void setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int):55 -> a
-    361:361:java.lang.String getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;)Ljava/lang/String;"}
-    362:362:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getLambdaClassOriginName():93:93 -> a
-    362:362:java.lang.String getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):95 -> a
-    363:363:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/e;"}
-    364:364:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():113:113 -> a
-    364:364:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):119 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):32:32 -> b
-    1:1:boolean isRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):191 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;)Z"}
-    2:2:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.isRaw():176:176 -> b
-    2:2:boolean isRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):191 -> b
-    3:3:int getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):53:53 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)I"}
-    4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getJvmFlags():39:39 -> b
-    4:4:int getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):53 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):85:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getSignature():92:92 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):85 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):130:130 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getGetterSignature():114:114 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):130 -> b
-    1:1:java.util.List getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):24:24 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)Ljava/util/ArrayList;"}
-    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():36:36 -> c
-    2:2:java.util.List getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):24 -> c
-    3:3:int getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):108:108 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)I"}
-    4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():112:112 -> c
-    4:4:int getJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):108 -> c
-    1:1:java.lang.String getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):30:30 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)Ljava/lang/String;"}
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getModuleName():37:37 -> d
-    2:2:java.lang.String getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):30 -> d
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):141:141 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSetterSignature():115:115 -> d
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):141 -> d
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):152:152 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.e:
+    1:1:void setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):33:33 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setModuleName(java.lang.String):35:35 -> a
+    2:2:void setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):33 -> a
+    3:3:java.lang.String getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):41:41 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)Ljava/lang/String;"}
+    4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getAnonymousObjectOriginName():36:36 -> a
+    4:4:java.lang.String getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):41 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):73:73 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)Lcom/android/tools/r8/internal/DD;"}
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getSignature():61:61 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):73 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):94:94 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)Lcom/android/tools/r8/internal/rD;"}
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():75:75 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature getFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):94 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):151:151 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;)Lcom/android/tools/r8/internal/DD;"}
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.getSignature():91:91 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):151 -> a
+    11:11:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):175:175 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)Ljava/util/List;"}
+    12:12:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():116:116 -> a
+    12:12:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):175 -> a
+    1:1:java.util.List getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):25:25 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)Ljava/util/ArrayList;"}
+    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():34:34 -> b
+    2:2:java.util.List getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):25 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):105:105 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)Lcom/android/tools/r8/internal/DD;"}
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getGetterSignature():76:76 -> b
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):105 -> b
+    5:5:boolean isRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):166:166 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)Z"}
+    6:6:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.isRaw():115:115 -> b
+    6:6:boolean isRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):166 -> b
+    1:1:java.lang.String getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):31:31 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)Ljava/lang/String;"}
+    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getModuleName():35:35 -> c
+    2:2:java.lang.String getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):31 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):116:116 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)Lcom/android/tools/r8/internal/DD;"}
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSetterSignature():77:77 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):116 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.rD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String descriptor -> b
-    1:1:void <init>(java.lang.String,java.lang.String):61:61 -> <init>
-    1:1:java.lang.String getName():61:61 -> b
-    1:1:java.lang.String toString():62:62 -> toString
-    2:2:java.lang.String getDescriptor():61:61 -> toString
-    2:2:java.lang.String toString():62 -> toString
-    3:3:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.f:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/f;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():166:166 -> <clinit>
-    1:1:void <init>():0:0 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFunctionExtensionVisitor):127:128 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFunctionExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):127 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1:1:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    2:2:void visitLambdaClassOriginName(java.lang.String):149:149 -> a
-    3:3:void visitEnd():156:156 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():131:131 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.g:
+    1:1:void <init>(java.lang.String,java.lang.String):49:49 -> <init>
+    1:1:java.lang.String getName():49:49 -> a
+    1:1:boolean equals(java.lang.Object):0:0 -> equals
+    1:1:int hashCode():0:0 -> hashCode
+    1:1:java.lang.String toString():50:50 -> toString
+    2:2:java.lang.String getDescriptor():49:49 -> toString
+    2:2:java.lang.String toString():50 -> toString
+    3:3:java.lang.String toString():50:50 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.wD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:java.lang.String asString():40:40 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt -> R8$$REMOVED$$CLASS$$196:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt -> R8$$REMOVED$$CLASS$$184:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataUtil -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.i:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataUtil -> com.android.tools.r8.internal.AD:
 # {"id":"sourceFile","fileName":"JvmMetadataUtil.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata$default(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer,int,java.lang.Object):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;[I[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;I)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:10:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):42:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;[I[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):48:48 -> a
-    12:18:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):43:49 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):42:42 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataUtil$annotationImpl$kotlin_Metadata$0 -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.h:
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata$default(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer,int,java.lang.Object):26:26 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;[I[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;I)Lcom/android/tools/r8/internal/zD;"}
+    2:10:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):34:42 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;[I[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/zD;"}
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):40:40 -> a
+    12:18:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):35:41 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata Metadata(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):34:34 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataUtil$annotationImpl$kotlin_Metadata$0 -> com.android.tools.r8.internal.zD:
 # {"id":"sourceFile","fileName":"JvmMetadataUtil.kt"}
     int[] bytecodeVersion -> a
     java.lang.String[] data1 -> b
@@ -217082,6 +215907,8 @@
     int kind -> f
     int[] metadataVersion -> g
     java.lang.String packageName -> h
+    1:1:void <init>(int[],java.lang.String[],java.lang.String[],int,java.lang.String,int,int[],java.lang.String):0:0 -> <init>
+    1:1:java.lang.Class annotationType():0:0 -> annotationType
     1:1:int[] bytecodeVersion():0:0 -> bv
     1:1:int[] bv():0 -> bv
     1:1:java.lang.String[] data1():0:0 -> d1
@@ -217120,25 +215947,25 @@
     15:15:java.lang.String pn():0 -> equals
     15:15:boolean equals(java.lang.Object):0 -> equals
     16:16:boolean equals(java.lang.Object):0:0 -> equals
+    1:1:int hashCode():0:0 -> hashCode
     1:1:int kind():0:0 -> k
     1:1:int k():0 -> k
     1:1:int[] metadataVersion():0:0 -> mv
     1:1:int[] mv():0 -> mv
     1:1:java.lang.String packageName():0:0 -> pn
     1:1:java.lang.String pn():0 -> pn
+    1:1:java.lang.String toString():0:0 -> toString
     1:1:int extraInt():0:0 -> xi
     1:1:int xi():0 -> xi
     1:1:java.lang.String extraString():0:0 -> xs
     1:1:java.lang.String xs():0 -> xs
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.j:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion -> com.android.tools.r8.internal.BD:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     int major -> b
     int minor -> c
     int patch -> d
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion LATEST_STABLE_SUPPORTED -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion HIGHEST_ALLOWED_TO_WRITE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion HIGHEST_ALLOWED_TO_WRITE -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
     1:1:void <clinit>():114:114 -> <clinit>
     2:2:int[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.toArray():33:33 -> <clinit>
     2:2:void <clinit>():114 -> <clinit>
@@ -217153,7 +215980,7 @@
     18:18:void <init>(int,int,int):43:43 -> <init>
     19:19:void <init>(int[]):37:37 -> <init>
     1:4:int compareTo(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):56:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)I"}
     1:1:int compareTo(java.lang.Object):30:30 -> compareTo
     1:1:boolean equals(java.lang.Object):85:85 -> equals
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> equals
@@ -217161,2710 +215988,2648 @@
     3:7:boolean equals(java.lang.Object):87:91 -> equals
     1:3:int hashCode():72:74 -> hashCode
     1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.k:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.DD:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String descriptor -> b
-    1:1:void <init>(java.lang.String,java.lang.String):50:50 -> <init>
-    1:1:java.lang.String getDescriptor():50:50 -> b
-    1:1:java.lang.String getName():50:50 -> c
-    1:1:java.lang.String toString():51:51 -> toString
-    2:2:java.lang.String getDescriptor():50:50 -> toString
-    2:2:java.lang.String toString():51 -> toString
-    3:3:java.lang.String toString():51:51 -> toString
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.l:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():119:119 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPackageExtensionVisitor):98:98 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPackageExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):96 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():103:103 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.m:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/m;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():255:255 -> <clinit>
-    1:1:void <init>():0:0 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPropertyExtensionVisitor):174:175 -> <init>
-    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmPropertyExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):174 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-    1:4:void visit(int,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):197:200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/e;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    5:5:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    6:6:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):225:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):238:238 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    2:2:void visitEnd():245:245 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():178:178 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.n:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/n;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():370:370 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeExtensionVisitor):332:333 -> <init>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):332 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:void visitEnd():360:360 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():336:336 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.o:
-# {"id":"sourceFile","fileName":"JvmExtensionVisitors.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/o;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType TYPE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QH;"}
-    1:1:void <clinit>():324:324 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeParameterExtensionVisitor):295:296 -> <init>
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmTypeParameterExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):295 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:void visitEnd():314:314 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType getType():299:299 -> getType
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.p:
+    1:1:void <init>(java.lang.String,java.lang.String):38:38 -> <init>
+    1:1:java.lang.String getDescriptor():38:38 -> a
+    1:1:java.lang.String getName():38:38 -> b
+    1:1:boolean equals(java.lang.Object):0:0 -> equals
+    1:1:int hashCode():0:0 -> hashCode
+    1:1:java.lang.String toString():39:39 -> toString
+    2:2:java.lang.String getDescriptor():38:38 -> toString
+    2:2:java.lang.String toString():39 -> toString
+    3:3:java.lang.String toString():39:39 -> toString
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule -> com.android.tools.r8.internal.bI:
 # {"id":"sourceFile","fileName":"KotlinModuleMetadata.kt"}
     java.util.Map packageParts -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModuleVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModuleVisitor):187:187 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModuleVisitor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModuleVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):187 -> <init>
-    1:1:void <init>():236 -> <init>
-    2:20:void <init>():240:258 -> <init>
-    1:1:java.util.Map getPackageParts():240:240 -> a
+    1:16:void <init>():117:132 -> <init>
+    1:1:java.util.Map getPackageParts():122:122 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/LinkedHashMap;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModuleVisitor -> R8$$REMOVED$$CLASS$$197:
-# {"id":"sourceFile","fileName":"KotlinModuleMetadata.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.q:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts -> com.android.tools.r8.internal.eI:
 # {"id":"sourceFile","fileName":"KotlinModuleMetadata.kt"}
     java.util.List fileFacades -> a
     java.util.Map multiFileClassParts -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
-    1:3:void <init>(java.util.List,java.util.Map):299:301 -> <init>
+    1:3:void <init>(java.util.List,java.util.Map):145:147 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/LinkedHashMap;)V"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.r:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.zI:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     boolean isAllowedToWrite -> a
-    int $r8$clinit -> b
-      # {"id":"com.android.tools.r8.synthesized"}
-    1:1:void <clinit>():885:885 -> <clinit>
-    2:2:int[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.toArray():33:33 -> <clinit>
-    2:2:void <clinit>():885 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void <clinit>():885:885 -> <clinit>
-    1:23:void <init>():58:80 -> <init>
-    1:23:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:26:void <init>():50:75 -> <init>
+    1:26:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
     void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
     1:1:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):78 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/Q;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;"}
-    2:4:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84:86 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)Lcom/android/tools/r8/internal/zI;"}
+    2:4:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):78:80 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     2:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     5:5:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    5:5:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):87 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    5:5:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):81 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     6:6:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> a
-    6:6:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):88 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    6:6:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):82 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):86:86 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):80:80 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     8:14:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.isAtLeast(int,int,int):50:56 -> a
-    8:14:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):94 -> a
-    8:14:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    8:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    8:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    8:14:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):88 -> a
+    8:14:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    8:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    8:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     8:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     15:15:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleWithCurrentCompilerVersion():28:28 -> a
-    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):95 -> a
-    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):89 -> a
+    15:15:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     15:15:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     16:16:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.getMinor():19:19 -> a
     16:16:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleInternal(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion):40 -> a
     16:16:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleWithCurrentCompilerVersion():28 -> a
-    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):95 -> a
-    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):89 -> a
+    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     16:16:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     17:17:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.getMajor():18:18 -> a
     17:17:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.newerThan(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion):53 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleInternal(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion):44 -> a
     17:17:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleWithCurrentCompilerVersion():28 -> a
-    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):95 -> a
-    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):89 -> a
+    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     18:18:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.getMinor():19:19 -> a
     18:18:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.newerThan(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion):55 -> a
     18:18:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleInternal(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion):44 -> a
     18:18:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isCompatibleWithCurrentCompilerVersion():28 -> a
-    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):95 -> a
-    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):89 -> a
+    18:18:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    19:19:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):100:100 -> a
-    19:19:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    19:19:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):94:94 -> a
+    19:19:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     20:20:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion.isStrictSemantics():17:17 -> a
-    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):100 -> a
-    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):94 -> a
+    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):100:100 -> a
-    21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):94:94 -> a
+    21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    22:24:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):99:101 -> a
-    22:24:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):90 -> a
-    22:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    22:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    22:24:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.throwIfNotCompatible$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion,boolean):93:95 -> a
+    22:24:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):84 -> a
+    22:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    22:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     22:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     25:25:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.k():115:115 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):50 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):49 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):56:56 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55:55 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55:55 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54:54 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    28:28:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):499:499 -> a
-    28:28:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    28:28:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):53:53 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    29:29:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xs():110:110 -> a
-    29:29:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):500 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52:52 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     29:29:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    30:30:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):501:501 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    30:30:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):51:51 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
     30:30:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    31:31:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    31:31:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):501 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    32:32:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):501:501 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    33:33:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> a
-    33:33:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):502 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    34:34:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):498:498 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    35:35:void setAllowedToWrite$kotlin_metadata_jvm(boolean):80:80 -> a
-    35:35:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):504 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):55 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54:54 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    37:37:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> a
-    37:37:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):418 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    38:39:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):418:419 -> a
-    38:39:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    38:39:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    38:39:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    40:40:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    40:40:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):419 -> a
-    40:40:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    40:40:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    40:40:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    41:41:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):419:419 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    42:42:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> a
-    42:42:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):420 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    43:43:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):417:417 -> a
-    43:43:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    43:43:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    43:43:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    44:44:void setAllowedToWrite$kotlin_metadata_jvm(boolean):80:80 -> a
-    44:44:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):422 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):54 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):53:53 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    46:46:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52:52 -> a
-    46:46:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    46:46:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    47:48:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):192:193 -> a
-    47:48:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    47:48:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    47:48:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    49:49:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    49:49:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):193 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    50:50:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):193:193 -> a
-    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    51:51:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> a
-    51:51:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):194 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    52:52:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):191:191 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    53:53:void setAllowedToWrite$kotlin_metadata_jvm(boolean):80:80 -> a
-    53:53:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.<init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):196 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):52 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    53:53:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    54:117:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):51:114 -> a
-    54:117:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    54:117:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
-    118:118:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):85:85 -> a
-    118:118:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):47 -> a
-    118:118:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):793 -> a
-    118:118:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
+    31:89:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):50:108 -> a
+    31:89:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
+    31:89:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
+    90:90:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.checkMetadataVersionForRead(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):79:79 -> a
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readMetadataImpl$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):46 -> a
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):398 -> a
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata readStrict(com.android.tools.r8.jetbrains.kotlin.Metadata):0 -> a
     com.android.tools.r8.jetbrains.kotlin.Metadata write() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.r$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.zI$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmClass kmClass -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zH;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> e
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmClass kmClass -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JH;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> d
     1:1:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> <init>
     1:1:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):11 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/Q;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
     2:2:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):11:11 -> <init>
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     3:3:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d2():100:100 -> <init>
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28:28 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27:27 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27:27 -> <init>
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     6:7:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):31:32 -> <init>
     6:7:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> <init>
-    6:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    6:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    6:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    6:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10185:10185 -> <init>
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32 -> <init>
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> <init>
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> <init>
     9:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10185 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     9:9:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> <init>
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> <init>
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10185 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> <init>
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    10:10:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    10:10:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):10185:10185 -> <init>
     11:11:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(byte[],java.lang.String[]):32 -> <init>
     11:11:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readClassDataFrom(java.lang.String[],java.lang.String[]):27 -> <init>
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    11:11:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    12:12:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> <init>
-    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    11:11:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    12:12:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> <init>
+    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
     13:13:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
-    13:13:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24 -> <init>
-    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    14:14:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> <init>
-    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    14:14:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):56:56 -> <init>
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    15:15:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    16:77:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):0:61 -> <init>
-    16:77:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    16:77:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    16:77:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    78:78:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeTable():9708:9708 -> <init>
-    78:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):61 -> <init>
-    78:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    78:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    78:78:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    79:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):61:62 -> <init>
-    79:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    79:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    79:80:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementTable():9757:9757 -> <init>
-    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    81:81:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62:62 -> <init>
-    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    82:82:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    83:83:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementCount():24089:24089 -> <init>
-    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> <init>
-    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    83:83:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> <init>
-    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    84:84:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    85:85:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementList():24076:24076 -> <init>
-    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19 -> <init>
-    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    85:85:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19:19 -> <init>
-    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    86:86:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> <init>
-    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):62 -> <init>
-    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    87:87:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):59:59 -> <init>
-    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    88:88:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    89:89:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterList():9204:9204 -> <init>
+    13:13:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23 -> <init>
+    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    14:14:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> <init>
+    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    14:14:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):54:54 -> <init>
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    15:15:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    16:75:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):0:59 -> <init>
+    16:75:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    16:75:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    16:75:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeTable():9708:9708 -> <init>
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):59 -> <init>
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    76:76:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    77:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):59:60 -> <init>
+    77:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    77:78:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    77:78:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    79:79:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementTable():9757:9757 -> <init>
+    79:79:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    79:79:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    79:79:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    79:79:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60:60 -> <init>
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    80:80:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    81:81:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementCount():24089:24089 -> <init>
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> <init>
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    81:81:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> <init>
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    82:82:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    83:83:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementList():24076:24076 -> <init>
+    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19 -> <init>
+    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    83:83:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19:19 -> <init>
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    84:84:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> <init>
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):60 -> <init>
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    85:85:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):57:57 -> <init>
+    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    86:86:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    87:87:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterList():9204:9204 -> <init>
+    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):63 -> <init>
+    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    87:87:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):63:63 -> <init>
+    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    88:88:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    89:89:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFlags():9165:9165 -> <init>
     89:89:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):65 -> <init>
-    89:89:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    89:89:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    89:89:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):65:65 -> <init>
-    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    90:90:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    91:91:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFlags():9165:9165 -> <init>
-    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):67 -> <init>
-    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    91:91:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    92:92:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags(int):48:48 -> <init>
-    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):67 -> <init>
-    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    92:92:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    93:93:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFqName():9180:9180 -> <init>
-    93:93:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68 -> <init>
-    93:93:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    93:93:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    93:93:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    94:94:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> <init>
-    94:94:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68 -> <init>
-    94:94:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    94:94:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    94:94:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    95:149:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setName(java.lang.String):0:54 -> <init>
-    95:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68 -> <init>
-    95:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    95:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    95:149:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    150:150:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterList():9204:9204 -> <init>
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    150:150:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    151:495:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70:414 -> <init>
-    151:495:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    151:495:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    151:495:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    496:840:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70:414 -> <init>
-    496:840:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    496:840:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    496:840:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> <init>
-    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    841:841:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    842:842:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
-    842:842:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    842:842:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    842:842:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    842:842:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    843:843:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSupertypeList():9239:9239 -> <init>
-    843:843:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
-    843:843:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    843:843:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    843:843:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    843:843:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    844:844:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:24 -> <init>
-    844:844:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    844:844:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    844:844:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    844:844:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    845:845:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9275:9275 -> <init>
-    845:845:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
-    845:845:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    845:845:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    845:845:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    845:845:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    846:951:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:129 -> <init>
-    846:951:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    846:951:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    846:951:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    846:951:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    952:952:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:24 -> <init>
-    952:952:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    952:952:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    952:952:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    952:952:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    953:953:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
-    953:953:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
-    953:953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    953:953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    953:953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    953:953:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    954:954:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):129:129 -> <init>
-    954:954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
-    954:954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    954:954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    954:954:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    955:1301:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71:417 -> <init>
-    955:1301:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    955:1301:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    955:1301:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    1302:1648:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71:417 -> <init>
-    1302:1648:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    1302:1648:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    1302:1648:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    1649:1649:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getConstructorList():9378:9378 -> <init>
-    1649:1649:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    1649:1649:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    1649:1649:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    1649:1649:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    1650:1998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72:420 -> <init>
-    1650:1998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    1650:1998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    1650:1998:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    1999:1999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72:72 -> <init>
-    1999:1999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    1999:1999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    1999:1999:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2000:2000:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170:170 -> <init>
-    2000:2000:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2000:2000:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2000:2000:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2000:2000:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2001:2001:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getFlags():14762:14762 -> <init>
-    2001:2001:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170 -> <init>
+    89:89:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    89:89:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    89:89:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    90:90:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setFlags$kotlin_metadata(int):44:44 -> <init>
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):65 -> <init>
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    90:90:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    90:90:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    91:91:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFqName():9180:9180 -> <init>
+    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):66 -> <init>
+    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    91:91:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    91:91:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    92:92:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> <init>
+    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):66 -> <init>
+    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    92:92:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    92:92:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    93:142:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setName(java.lang.String):0:49 -> <init>
+    93:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):66 -> <init>
+    93:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    93:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    93:142:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    143:143:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeParameterList():9204:9204 -> <init>
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68 -> <init>
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    143:143:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    144:488:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68:412 -> <init>
+    144:488:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    144:488:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    144:488:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    489:833:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):68:412 -> <init>
+    489:833:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    489:833:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    489:833:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> <init>
+    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    834:834:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    834:834:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    835:835:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
+    835:835:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    835:835:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    835:835:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    835:835:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    836:836:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSupertypeList():9239:9239 -> <init>
+    836:836:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
+    836:836:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    836:836:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    836:836:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    836:836:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    837:837:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:24 -> <init>
+    837:837:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    837:837:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    837:837:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    837:837:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    838:838:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSupertypeIdList():9275:9275 -> <init>
+    838:838:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
+    838:838:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    838:838:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    838:838:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    838:838:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    839:944:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:129 -> <init>
+    839:944:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    839:944:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    839:944:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    839:944:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    945:945:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24:24 -> <init>
+    945:945:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    945:945:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    945:945:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    945:945:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
+    946:946:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):24 -> <init>
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    946:946:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    947:947:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.supertypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):129:129 -> <init>
+    947:947:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69 -> <init>
+    947:947:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    947:947:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    947:947:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    948:1294:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69:415 -> <init>
+    948:1294:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    948:1294:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    948:1294:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1295:1641:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):69:415 -> <init>
+    1295:1641:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1295:1641:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1295:1641:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1642:1642:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getConstructorList():9378:9378 -> <init>
+    1642:1642:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1642:1642:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1642:1642:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1642:1642:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1643:1991:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70:418 -> <init>
+    1643:1991:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1643:1991:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1643:1991:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1992:1992:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70:70 -> <init>
+    1992:1992:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1992:1992:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1992:1992:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1993:1993:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):168:168 -> <init>
+    1993:1993:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1993:1993:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1993:1993:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1993:1993:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1994:1994:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getFlags():14762:14762 -> <init>
+    1994:1994:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):168 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2001:2001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2001:2001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2001:2001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2001:2001:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2002:2002:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170:170 -> <init>
-    2002:2002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2002:2002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2002:2002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2002:2002:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2003:2003:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterList():14771:14771 -> <init>
-    2003:2003:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):171 -> <init>
-    2003:2003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2003:2003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2003:2003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2003:2003:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2004:2297:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):171:464 -> <init>
-    2004:2297:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2004:2297:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2004:2297:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2004:2297:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2298:2591:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):171:464 -> <init>
-    2298:2591:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2298:2591:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2298:2591:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2298:2591:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2592:2592:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getVersionRequirementList():14811:14811 -> <init>
-    2592:2592:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172 -> <init>
-    2592:2592:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2592:2592:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2592:2592:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2592:2592:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2593:2593:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172:172 -> <init>
-    2593:2593:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2593:2593:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2593:2593:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2593:2593:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2594:2594:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():333:333 -> <init>
-    2594:2594:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172 -> <init>
-    2594:2594:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2594:2594:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2594:2594:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2594:2594:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2595:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):466:467 -> <init>
-    2595:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2595:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2595:2596:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2595:2596:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2597:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172:467 -> <init>
-    2597:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2597:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2597:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2597:2892:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2893:2893:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> <init>
-    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):174 -> <init>
+    1994:1994:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1994:1994:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1994:1994:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1994:1994:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1995:1995:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):168:168 -> <init>
+    1995:1995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1995:1995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1995:1995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1995:1995:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1996:1996:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterList():14771:14771 -> <init>
+    1996:1996:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):169 -> <init>
+    1996:1996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1996:1996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1996:1996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1996:1996:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1997:2290:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):169:462 -> <init>
+    1997:2290:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    1997:2290:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    1997:2290:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    1997:2290:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2291:2584:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):169:462 -> <init>
+    2291:2584:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2291:2584:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2291:2584:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2291:2584:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2585:2585:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getVersionRequirementList():14811:14811 -> <init>
+    2585:2585:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170 -> <init>
+    2585:2585:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2585:2585:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2585:2585:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2585:2585:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2586:2586:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170:170 -> <init>
+    2586:2586:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2586:2586:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2586:2586:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2586:2586:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2587:2587:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():178:178 -> <init>
+    2587:2587:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170 -> <init>
+    2587:2587:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2587:2587:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2587:2587:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2587:2587:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2588:2589:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):464:465 -> <init>
+    2588:2589:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2588:2589:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2588:2589:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2588:2589:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2590:2885:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):170:465 -> <init>
+    2590:2885:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2590:2885:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2590:2885:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2590:2885:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2886:2886:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> <init>
+    2886:2886:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2893:2893:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):469:469 -> <init>
-    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2894:2894:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):174:174 -> <init>
-    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
-    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2895:2895:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):420:420 -> <init>
-    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2896:2896:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2897:2897:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFunctionList():9413:9413 -> <init>
+    2886:2886:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2886:2886:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2886:2886:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2886:2886:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2887:2887:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):467:467 -> <init>
+    2887:2887:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2887:2887:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2887:2887:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2887:2887:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2888:2888:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmConstructor(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):172:172 -> <init>
+    2888:2888:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):70 -> <init>
+    2888:2888:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2888:2888:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2888:2888:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2889:2889:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):418:418 -> <init>
+    2889:2889:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2889:2889:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2889:2889:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2890:2890:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getFunctionList():9413:9413 -> <init>
+    2890:2890:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
+    2890:2890:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2890:2890:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2890:2890:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2891:2891:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71:71 -> <init>
+    2891:2891:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2891:2891:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2891:2891:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2892:2892:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getPropertyList():9448:9448 -> <init>
+    2892:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
+    2892:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2892:2892:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2892:2892:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71:71 -> <init>
+    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2893:2893:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2893:2893:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2894:2894:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeAliasList():9483:9483 -> <init>
+    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71 -> <init>
+    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2894:2894:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2894:2894:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):71:71 -> <init>
+    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2895:2895:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2895:2895:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2896:2896:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasCompanionObjectName():9189:9189 -> <init>
+    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):72 -> <init>
+    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2896:2896:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2896:2896:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2897:2897:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getCompanionObjectName():9195:9195 -> <init>
     2897:2897:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73 -> <init>
-    2897:2897:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2897:2897:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2897:2897:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73:73 -> <init>
-    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2898:2898:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2899:2899:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getPropertyList():9448:9448 -> <init>
+    2897:2897:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2897:2897:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2897:2897:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2898:2898:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73 -> <init>
+    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2898:2898:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2898:2898:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2899:2899:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setCompanionObject(java.lang.String):84:84 -> <init>
     2899:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73 -> <init>
-    2899:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2899:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2899:2899:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73:73 -> <init>
-    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2900:2900:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2901:2901:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getTypeAliasList():9483:9483 -> <init>
-    2901:2901:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73 -> <init>
-    2901:2901:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2901:2901:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2901:2901:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2902:2902:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):73:73 -> <init>
-    2902:2902:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2902:2902:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2902:2902:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2903:2903:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasCompanionObjectName():9189:9189 -> <init>
-    2903:2903:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):74 -> <init>
-    2903:2903:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2903:2903:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2903:2903:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2904:2904:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getCompanionObjectName():9195:9195 -> <init>
-    2904:2904:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):75 -> <init>
-    2904:2904:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2904:2904:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2904:2904:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2905:2905:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    2905:2905:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):75 -> <init>
-    2905:2905:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2905:2905:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2905:2905:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2906:2906:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setCompanionObject(java.lang.String):89:89 -> <init>
-    2906:2906:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):75 -> <init>
-    2906:2906:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2906:2906:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2906:2906:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2907:2907:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9298:9298 -> <init>
-    2907:2907:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78 -> <init>
-    2907:2907:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2907:2907:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2907:2907:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    2908:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78:423 -> <init>
-    2908:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    2908:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    2908:3253:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78:78 -> <init>
-    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3254:3254:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3255:3255:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78 -> <init>
-    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3255:3255:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):423:423 -> <init>
-    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3256:3256:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3257:3257:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getEnumEntryList():9518:9518 -> <init>
-    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79 -> <init>
-    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3257:3257:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79:79 -> <init>
-    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3258:3258:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3259:3259:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.hasName():22585:22585 -> <init>
-    3259:3259:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):80 -> <init>
-    3259:3259:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3259:3259:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3259:3259:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3260:3260:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81:81 -> <init>
-    3260:3260:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3260:3260:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3260:3260:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3261:3261:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.getName():22591:22591 -> <init>
-    3261:3261:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81 -> <init>
-    3261:3261:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3261:3261:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3261:3261:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3262:3262:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    3262:3262:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81 -> <init>
-    3262:3262:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3262:3262:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3262:3262:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3263:3263:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81:81 -> <init>
-    3263:3263:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3263:3263:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3263:3263:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3264:3264:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):80:80 -> <init>
-    3264:3264:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3264:3264:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3264:3264:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3265:3265:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9554:9554 -> <init>
-    3265:3265:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83 -> <init>
-    3265:3265:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3265:3265:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3265:3265:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3266:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83:426 -> <init>
-    3266:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3266:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3266:3609:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83:83 -> <init>
-    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3610:3610:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3611:3611:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):39:39 -> <init>
-    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83 -> <init>
-    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3611:3611:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):426:426 -> <init>
-    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3612:3612:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3613:3613:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingPropertyName():9576:9576 -> <init>
-    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):84 -> <init>
-    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3613:3613:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3614:3614:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingPropertyName():9582:9582 -> <init>
-    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
-    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3614:3614:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3615:3615:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
-    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3615:3615:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3616:3616:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setInlineClassUnderlyingPropertyName(java.lang.String):109:109 -> <init>
-    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
-    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3616:3616:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> <init>
-    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
+    2899:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2899:2899:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2899:2899:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2900:2900:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getNestedClassNameList():9298:9298 -> <init>
+    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):76 -> <init>
+    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2900:2900:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2900:2900:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    2901:3246:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):76:421 -> <init>
+    2901:3246:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    2901:3246:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    2901:3246:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3247:3247:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):76:76 -> <init>
+    3247:3247:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3247:3247:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3247:3247:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3248:3248:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    3248:3248:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):76 -> <init>
+    3248:3248:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3248:3248:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3248:3248:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3249:3249:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):421:421 -> <init>
+    3249:3249:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3249:3249:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3249:3249:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3250:3250:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getEnumEntryList():9518:9518 -> <init>
+    3250:3250:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):77 -> <init>
+    3250:3250:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3250:3250:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3250:3250:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3251:3251:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):77:77 -> <init>
+    3251:3251:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3251:3251:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3251:3251:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3252:3252:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.hasName():22585:22585 -> <init>
+    3252:3252:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78 -> <init>
+    3252:3252:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3252:3252:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3252:3252:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3253:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79:79 -> <init>
+    3253:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3253:3253:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3253:3253:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3254:3254:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$EnumEntry.getName():22591:22591 -> <init>
+    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79 -> <init>
+    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3254:3254:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3254:3254:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3255:3255:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79 -> <init>
+    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3255:3255:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3255:3255:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):79:79 -> <init>
+    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3256:3256:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3256:3256:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):78:78 -> <init>
+    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3257:3257:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3257:3257:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3258:3258:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getSealedSubclassFqNameList():9554:9554 -> <init>
+    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81 -> <init>
+    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3258:3258:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3258:3258:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3259:3602:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81:424 -> <init>
+    3259:3602:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3259:3602:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3259:3602:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3603:3603:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81:81 -> <init>
+    3603:3603:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3603:3603:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3603:3603:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3604:3604:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.className$kotlin_metadata(int):37:37 -> <init>
+    3604:3604:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):81 -> <init>
+    3604:3604:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3604:3604:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3604:3604:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3605:3605:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):424:424 -> <init>
+    3605:3605:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3605:3605:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3605:3605:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3606:3606:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingPropertyName():9576:9576 -> <init>
+    3606:3606:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):82 -> <init>
+    3606:3606:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3606:3606:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3606:3606:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3607:3607:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingPropertyName():9582:9582 -> <init>
+    3607:3607:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83 -> <init>
+    3607:3607:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3607:3607:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3607:3607:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3608:3608:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    3608:3608:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83 -> <init>
+    3608:3608:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3608:3608:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3608:3608:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3609:3609:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setInlineClassUnderlyingPropertyName(java.lang.String):104:104 -> <init>
+    3609:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):83 -> <init>
+    3609:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3609:3609:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3609:3609:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> <init>
+    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3617:3617:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3618:3618:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
-    3618:3618:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
-    3618:3618:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3618:3618:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3618:3618:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3618:3618:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3619:3619:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingType():9591:9591 -> <init>
-    3619:3619:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):27 -> <init>
-    3619:3619:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
-    3619:3619:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3619:3619:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3619:3619:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3619:3619:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingType():9597:9597 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):27 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3620:3620:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3620:3620:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3621:3621:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingTypeId():9612:9612 -> <init>
-    3621:3621:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):28 -> <init>
-    3621:3621:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
-    3621:3621:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3621:3621:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3621:3621:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3621:3621:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):28 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):98 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3622:3622:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3622:3622:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3623:3623:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingPropertyName():9576:9576 -> <init>
-    3623:3623:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):101 -> <init>
-    3623:3623:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3623:3623:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3623:3623:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3623:3623:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3624:3624:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getPropertyList():9448:9448 -> <init>
-    3624:3624:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):104 -> <init>
-    3624:3624:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3624:3624:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3624:3624:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3624:3624:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3625:3960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):104:439 -> <init>
-    3625:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3625:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3625:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3625:3960:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105:105 -> <init>
-    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3961:3961:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> <init>
-    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3962:3962:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
-    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3963:3963:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3964:3964:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasReceiverType():18339:18339 -> <init>
-    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> <init>
-    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3964:3964:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverType():18345:18345 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3965:3965:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3966:3966:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverTypeId():18360:18360 -> <init>
-    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> <init>
-    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3966:3966:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3967:3967:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3968:3968:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getName():18265:18265 -> <init>
-    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3968:3968:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3969:3969:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3969:3969:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3970:3970:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingPropertyName():9582:9582 -> <init>
-    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
-    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3970:3970:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3971:3971:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> <init>
-    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
+    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3610:3610:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3610:3610:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
+    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
+    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3611:3611:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3611:3611:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3612:3612:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingType():9591:9591 -> <init>
+    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):27 -> <init>
+    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
+    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3612:3612:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3612:3612:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingType():9597:9597 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):27 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3613:3613:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3613:3613:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3614:3614:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingTypeId():9612:9612 -> <init>
+    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):28 -> <init>
+    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
+    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3614:3614:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3614:3614:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.inlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):28 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):96 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3615:3615:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3615:3615:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3616:3616:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.hasInlineClassUnderlyingPropertyName():9576:9576 -> <init>
+    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):99 -> <init>
+    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3616:3616:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3616:3616:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3617:3617:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getPropertyList():9448:9448 -> <init>
+    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102 -> <init>
+    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3617:3617:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3617:3617:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3618:3953:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102:437 -> <init>
+    3618:3953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3618:3953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3618:3953:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3618:3953:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3954:3954:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103:103 -> <init>
+    3954:3954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3954:3954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3954:3954:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3954:3954:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3955:3955:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> <init>
+    3955:3955:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3955:3955:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3955:3955:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3955:3955:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3955:3955:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3956:3956:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
+    3956:3956:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3956:3956:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3956:3956:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3956:3956:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3956:3956:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3957:3957:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.hasReceiverType():18339:18339 -> <init>
+    3957:3957:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> <init>
+    3957:3957:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3957:3957:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3957:3957:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3957:3957:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3957:3957:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverType():18345:18345 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):70 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3958:3958:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3958:3958:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3959:3959:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getReceiverTypeId():18360:18360 -> <init>
+    3959:3959:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> <init>
+    3959:3959:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3959:3959:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3959:3959:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3959:3959:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3959:3959:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):71 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3960:3960:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3960:3960:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3961:3961:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getName():18265:18265 -> <init>
+    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3961:3961:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3961:3961:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3962:3962:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3962:3962:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3962:3962:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3963:3963:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getInlineClassUnderlyingPropertyName():9582:9582 -> <init>
+    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3963:3963:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3963:3963:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3964:3964:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> <init>
+    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3964:3964:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3964:3964:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3965:3965:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> <init>
+    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103 -> <init>
+    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3965:3965:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3965:3965:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):103:103 -> <init>
+    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3966:3966:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3966:3966:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> <init>
+    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):104 -> <init>
+    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3967:3967:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3967:3967:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):104:104 -> <init>
+    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3968:3968:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3968:3968:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85:85 -> <init>
+    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3969:3969:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3969:3969:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3970:3970:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):109:109 -> <init>
+    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):85 -> <init>
+    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3970:3970:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3970:3970:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> <init>
     3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3971:3971:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3972:3972:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> <init>
-    3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105 -> <init>
+    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3971:3971:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3971:3971:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3972:3972:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
     3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3972:3972:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):105:105 -> <init>
+    3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3972:3972:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3972:3972:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3973:3973:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getContextReceiverTypeList():9320:9320 -> <init>
+    3973:3973:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
     3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3973:3973:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> <init>
-    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):106 -> <init>
+    3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3973:3973:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3973:3973:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3974:3974:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:118 -> <init>
     3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3974:3974:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.loadInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):106:106 -> <init>
+    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3974:3974:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3974:3974:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3975:3975:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getContextReceiverTypeIdList():9356:9356 -> <init>
+    3975:3975:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
     3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3975:3975:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3976:3976:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87:87 -> <init>
-    3976:3976:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3976:3976:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3976:3976:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3977:3977:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setInlineClassUnderlyingType(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):114:114 -> <init>
-    3977:3977:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
-    3977:3977:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3977:3977:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3977:3977:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3978:3978:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> <init>
-    3978:3978:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3978:3978:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3978:3978:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3978:3978:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3979:3979:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:0 -> <init>
-    3979:3979:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3979:3979:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3979:3979:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3979:3979:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3980:3980:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getContextReceiverTypeList():9320:9320 -> <init>
-    3980:3980:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
-    3980:3980:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3980:3980:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3980:3980:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3980:3980:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3981:3981:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:118 -> <init>
-    3981:3981:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3981:3981:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3981:3981:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3981:3981:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3982:3982:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getContextReceiverTypeIdList():9356:9356 -> <init>
-    3982:3982:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
-    3982:3982:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3982:3982:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3982:3982:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3982:3982:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    3983:4002:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:137 -> <init>
-    3983:4002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    3983:4002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    3983:4002:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    3983:4002:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4003:4003:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:118 -> <init>
-    4003:4003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    4003:4003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4003:4003:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4003:4003:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4004:4004:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
-    4004:4004:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
-    4004:4004:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    4004:4004:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4004:4004:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4004:4004:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4005:4005:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):137:137 -> <init>
-    4005:4005:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    4005:4005:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4005:4005:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4005:4005:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4006:4006:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():119:119 -> <init>
-    4006:4006:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89 -> <init>
-    4006:4006:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4006:4006:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4006:4006:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4007:4008:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):428:429 -> <init>
-    4007:4008:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4007:4008:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4007:4008:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4009:4349:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):89:429 -> <init>
-    4009:4349:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4009:4349:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4009:4349:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4350:4350:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementList():9722:9722 -> <init>
-    4350:4350:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90 -> <init>
-    4350:4350:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4350:4350:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4350:4350:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4351:4351:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90:90 -> <init>
-    4351:4351:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4351:4351:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4351:4351:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4352:4352:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getVersionRequirements():125:125 -> <init>
-    4352:4352:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90 -> <init>
-    4352:4352:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4352:4352:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4352:4352:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4353:4354:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):431:432 -> <init>
-    4353:4354:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4353:4354:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4353:4354:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4355:4697:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90:432 -> <init>
-    4355:4697:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4355:4697:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4355:4697:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4698:4698:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> <init>
-    4698:4698:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):92 -> <init>
-    4698:4698:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4698:4698:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4698:4698:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4699:4699:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):434:434 -> <init>
-    4699:4699:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4699:4699:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4699:4699:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4700:4700:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):92:92 -> <init>
-    4700:4700:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):52 -> <init>
-    4700:4700:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):29 -> <init>
-    4700:4700:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4701:4701:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):101:101 -> <init>
-    4702:4702:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
-    4702:4702:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):101 -> <init>
-    4703:4703:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):101:101 -> <init>
-    4704:4704:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
-    4704:4704:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):102 -> <init>
-    4705:4705:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):97:97 -> <init>
-    4705:4705:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):99 -> <init>
-    4706:4708:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):94:96 -> <init>
-    4706:4708:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):99 -> <init>
-    4709:4709:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):80:80 -> <init>
-    4709:4709:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):104 -> <init>
-    4710:4710:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):12:12 -> <init>
-    4710:4710:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
-    4710:4710:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):100 -> <init>
-    4711:4711:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):97:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;I)V"}
-    4712:4714:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):94:96 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():80:80 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():108:108 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():95:95 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():109 -> b
-    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():109:112 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter.getT():300:300 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.build():10297:10297 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.build():10298:10298 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter.getC():301:301 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():113:113 -> b
+    3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3975:3975:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3975:3975:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3976:3995:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:137 -> <init>
+    3976:3995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
+    3976:3995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3976:3995:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3976:3995:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3996:3996:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118:118 -> <init>
+    3996:3996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
+    3996:3996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3996:3996:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3996:3996:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3997:3997:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> <init>
+    3997:3997:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):118 -> <init>
+    3997:3997:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
+    3997:3997:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3997:3997:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3997:3997:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3998:3998:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.contextReceiverTypes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):137:137 -> <init>
+    3998:3998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
+    3998:3998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3998:3998:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3998:3998:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    3999:3999:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():114:114 -> <init>
+    3999:3999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87 -> <init>
+    3999:3999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    3999:3999:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    3999:3999:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4000:4001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):426:427 -> <init>
+    4000:4001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4000:4001:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4000:4001:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4002:4342:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):87:427 -> <init>
+    4002:4342:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4002:4342:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4002:4342:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4343:4343:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class.getVersionRequirementList():9722:9722 -> <init>
+    4343:4343:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):88 -> <init>
+    4343:4343:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4343:4343:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4343:4343:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4344:4344:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):88:88 -> <init>
+    4344:4344:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4344:4344:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4344:4344:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4345:4345:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getVersionRequirements():120:120 -> <init>
+    4345:4345:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):88 -> <init>
+    4345:4345:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4345:4345:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4345:4345:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4346:4347:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):429:430 -> <init>
+    4346:4347:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4346:4347:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4346:4347:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4348:4690:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):88:430 -> <init>
+    4348:4690:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4348:4690:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4348:4690:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4691:4691:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> <init>
+    4691:4691:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90 -> <init>
+    4691:4691:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4691:4691:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4691:4691:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4692:4692:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):432:432 -> <init>
+    4692:4692:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4692:4692:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4692:4692:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4693:4693:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):90:90 -> <init>
+    4693:4693:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmClass$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):50 -> <init>
+    4693:4693:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):28 -> <init>
+    4693:4693:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    4694:4694:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):96:96 -> <init>
+    4695:4695:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    4695:4695:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):96 -> <init>
+    4696:4696:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):96:96 -> <init>
+    4697:4697:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    4697:4697:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):97 -> <init>
+    4698:4698:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):92:92 -> <init>
+    4698:4698:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):94 -> <init>
+    4699:4701:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):89:91 -> <init>
+    4699:4701:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):94 -> <init>
+    4702:4702:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):75:75 -> <init>
+    4702:4702:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):99 -> <init>
+    4703:4703:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):12:12 -> <init>
+    4703:4703:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmClass$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):27 -> <init>
+    4703:4703:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):95 -> <init>
+    1:1:void setKmClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):89:89 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)V"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():90:90 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    3:3:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):90:90 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():75:75 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():103 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():103:103 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():90:90 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():104 -> b
+    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():104:107 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter.getT():299:299 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.build():10297:10298 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.ClassWriter.getC():300:300 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():108:108 -> b
     13:13:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():113:113 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():108:108 -> b
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    16:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():113:114 -> b
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():95:95 -> b
-    18:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():114 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    16:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():108:109 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():90:90 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():109 -> b
     19:19:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():114 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():109 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():114 -> b
-    21:21:int getFlags():96:96 -> b
-    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():114 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():114:114 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():109 -> b
+    21:21:int getFlags():91:91 -> b
+    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():109 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():109:109 -> b
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> b
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.build():10299 -> b
-    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder.build():10299:10299 -> b
-    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():113 -> b
-    25:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():900:903 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass getKmClass():94:94 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.s:
+    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():108 -> b
+    25:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():482:485 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmClass getKmClass():89:89 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.AI:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    1:1:void <init>():613:613 -> <init>
+    1:1:void <init>():364:364 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMajor():30:30 -> a
-    1:1:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):821 -> a
+    1:1:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):426 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
+    1:1:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
     2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMinor():30:30 -> a
-    2:2:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):821 -> a
-    2:2:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-    3:4:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):825:826 -> a
-    3:4:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-    5:5:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):825:825 -> a
-    5:5:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-    6:6:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):822:822 -> a
-    6:6:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-    7:7:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):821:821 -> a
-    7:7:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):613 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata writeClass(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,int[],int):647:647 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;[I)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    9:9:void throwIfNotWriteable$kotlin_metadata_jvm(boolean,java.lang.String):817:817 -> a
-    9:9:void throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0 -> a
+    2:2:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):426 -> a
+    2:2:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+    3:4:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):430:431 -> a
+    3:4:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+    5:5:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):430:430 -> a
+    5:5:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+    6:6:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):427:427 -> a
+    6:6:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+    7:7:void checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):426:426 -> a
+    7:7:void access$checkMetadataVersionForWrite(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):364 -> a
+    8:8:void throwIfNotWriteable$kotlin_metadata_jvm(boolean,java.lang.String):422:422 -> a
+    8:8:void com.android.tools.r8.internal.KotlinClassMetadata$Companion.throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-    10:10:void throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0:0 -> a
-    11:11:void throwIfNotWriteable$kotlin_metadata_jvm(boolean,java.lang.String):817:817 -> a
-    11:11:void throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.r$b:
+    9:9:void com.android.tools.r8.internal.KotlinClassMetadata$Companion.throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0:0 -> a
+    10:10:void throwIfNotWriteable$kotlin_metadata_jvm(boolean,java.lang.String):422:422 -> a
+    10:10:void com.android.tools.r8.internal.KotlinClassMetadata$Companion.throwIfNotWriteable$kotlin_metadata_jvm(java.lang.String,boolean):0 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.zI$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage kmPackage -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YH;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> e
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):189:189 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;I)V"}
-    2:10:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):180:188 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():80:80 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():200 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():200:200 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():184:184 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():201 -> b
-    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():201:204 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getT():344:344 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13291:13291 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13292:13292 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getC():345:345 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():205:205 -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage kmPackage -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> d
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):140:141 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
+    3:3:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):141 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):141:141 -> <init>
+    5:5:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):142 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):137:137 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):139 -> <init>
+    7:15:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):128:136 -> <init>
+    7:15:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):139 -> <init>
+    16:16:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):75:75 -> <init>
+    16:16:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):144 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():132:132 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):132:132 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():75:75 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():148 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():148:148 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():132:132 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():149 -> b
+    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():149:152 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getT():343:343 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13291:13292 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getC():344:344 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():153:153 -> b
     13:13:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():205:205 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():153:153 -> b
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    16:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():205:206 -> b
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():184:184 -> b
-    18:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():206 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    16:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():153:154 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():132:132 -> b
+    18:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():154 -> b
     19:19:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():206 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():154 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():206 -> b
-    21:21:int getFlags():188:188 -> b
-    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():206 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():206:206 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():154 -> b
+    21:21:int getFlags():136:136 -> b
+    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():154 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():154:154 -> b
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> b
     23:23:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13293 -> b
-    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
     24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13293:13293 -> b
-    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():205 -> b
-    25:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():900:903 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage getKmPackage():180:180 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.r$c:
+    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():153 -> b
+    25:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():482:485 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage getKmPackage():128:128 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.zI$c:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    java.util.List partClassNames -> c
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> e
-    1:1:void <init>(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):415:415 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;I)V"}
-    2:10:void <init>(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):406:414 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():410:410 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):410:410 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():80:80 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():426 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():426:426 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():410:410 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():427 -> b
-    4:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():427:429 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():410:410 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():429 -> b
+    java.util.List partClassNames -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> d
+    1:1:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):258 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
+    2:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):258:259 -> <init>
+    4:4:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):259 -> <init>
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):259:259 -> <init>
+    6:6:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):260 -> <init>
+    7:7:void <init>(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):255:255 -> <init>
+    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):257 -> <init>
+    8:16:void <init>(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):246:254 -> <init>
+    8:16:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):257 -> <init>
+    17:17:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):75:75 -> <init>
+    17:17:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):262 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():250:250 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):250:250 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():75:75 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():266 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():266:266 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():250:250 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():267 -> b
+    4:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():267:269 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():250:250 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():269 -> b
     8:8:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():429 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():269 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():429 -> b
-    10:477:com.android.tools.r8.jetbrains.kotlin.Metadata write():430:897 -> b
-    478:478:int getFlags():414:414 -> b
-    478:478:com.android.tools.r8.jetbrains.kotlin.Metadata write():430 -> b
-    479:479:com.android.tools.r8.jetbrains.kotlin.Metadata write():430:430 -> b
-    480:480:com.android.tools.r8.jetbrains.kotlin.Metadata write():428:428 -> b
-    1:1:java.util.List getPartClassNames():406:406 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.r$d:
+    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():269 -> b
+    10:219:com.android.tools.r8.jetbrains.kotlin.Metadata write():270:479 -> b
+    220:220:int getFlags():254:254 -> b
+    220:220:com.android.tools.r8.jetbrains.kotlin.Metadata write():270 -> b
+    221:221:com.android.tools.r8.jetbrains.kotlin.Metadata write():270:270 -> b
+    222:222:com.android.tools.r8.jetbrains.kotlin.Metadata write():268:268 -> b
+    1:1:java.util.List getPartClassNames():246:246 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.zI$d:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage kmPackage -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YH;"}
-    java.lang.String facadeClassName -> d
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> f
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):496:496 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Ljava/lang/String;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;I)V"}
-    2:14:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):483:495 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():491:491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):491:491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():80:80 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():508 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():508:508 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():491:491 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():509 -> b
-    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():509:512 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getT():344:344 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13291:13291 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13292:13292 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getC():345:345 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():513:513 -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage kmPackage -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cI;"}
+    java.lang.String facadeClassName -> c
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> e
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):308:308 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
+    2:2:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xs():110:110 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):309 -> <init>
+    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):310:310 -> <init>
+    4:4:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):310 -> <init>
+    5:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):310:310 -> <init>
+    6:6:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):311 -> <init>
+    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):305:305 -> <init>
+    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):307 -> <init>
+    8:20:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):292:304 -> <init>
+    8:20:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):307 -> <init>
+    21:21:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):75:75 -> <init>
+    21:21:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):313 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():300:300 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):300:300 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():75:75 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():317 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():317:317 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():300:300 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():318 -> b
+    4:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():318:321 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getT():343:343 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13291:13292 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext com.android.tools.r8.jetbrains.kotlin.metadata.internal.PackageWriter.getC():344:344 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():322:322 -> b
     13:13:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():513:513 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():322:322 -> b
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    16:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():513:515 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():491:491 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():515 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    16:18:com.android.tools.r8.jetbrains.kotlin.Metadata write():322:324 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():300:300 -> b
+    19:19:com.android.tools.r8.jetbrains.kotlin.Metadata write():324 -> b
     20:20:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():515 -> b
+    20:20:com.android.tools.r8.jetbrains.kotlin.Metadata write():324 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():515 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():515:515 -> b
-    23:23:int getFlags():495:495 -> b
-    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():515 -> b
-    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():515:515 -> b
-    25:25:com.android.tools.r8.jetbrains.kotlin.Metadata write():514:514 -> b
+    21:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():324 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():324:324 -> b
+    23:23:int getFlags():304:304 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():324 -> b
+    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():324:324 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlin.Metadata write():323:323 -> b
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> b
     26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13293 -> b
-    26:26:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
+    26:26:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder.build():13293:13293 -> b
-    27:27:com.android.tools.r8.jetbrains.kotlin.Metadata write():513 -> b
-    28:31:com.android.tools.r8.jetbrains.kotlin.Metadata write():900:903 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage getKmPackage():483:483 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YH;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.t:
+    27:27:com.android.tools.r8.jetbrains.kotlin.Metadata write():322 -> b
+    28:31:com.android.tools.r8.jetbrains.kotlin.Metadata write():482:485 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage getKmPackage():292:292 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.BI:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda kmLambda -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XH;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> e
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda kmLambda -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aI;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> d
     1:1:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/Q;)V"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39:39 -> <init>
-    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):38 -> <init>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):38:38 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     3:3:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d2():100:100 -> <init>
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40:40 -> <init>
-    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39:39 -> <init>
+    4:4:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     5:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readFunctionDataFrom(java.lang.String[],java.lang.String[]):47:48 -> <init>
-    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    5:6:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    5:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16413:16413 -> <init>
     7:7:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> <init>
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> <init>
     8:8:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> <init>
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16413 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> <init>
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> <init>
     9:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16413 -> <init>
     9:9:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> <init>
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):16413:16413 -> <init>
     10:10:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readFunctionDataFrom(java.lang.String[],java.lang.String[]):48 -> <init>
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):40 -> <init>
-    10:10:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    11:11:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> <init>
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    11:11:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):39 -> <init>
+    10:10:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    11:11:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> <init>
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    11:11:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
     12:12:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
-    12:12:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24 -> <init>
-    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    13:13:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> <init>
-    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    14:178:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):0:164 -> <init>
-    14:178:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    14:178:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    179:179:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getTypeTable():16110:16110 -> <init>
-    179:179:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):164 -> <init>
-    179:179:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    179:179:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    180:181:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):164:165 -> <init>
-    180:181:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    180:181:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    182:182:void com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.setFunction(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):294:294 -> <init>
-    182:182:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):165 -> <init>
-    182:182:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):43 -> <init>
-    182:182:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):280 -> <init>
-    183:183:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):281:281 -> <init>
-    184:184:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
-    184:184:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):281 -> <init>
-    185:185:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):281:281 -> <init>
-    186:186:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
-    186:186:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):282 -> <init>
-    187:187:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):277:277 -> <init>
-    187:187:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):279 -> <init>
-    188:196:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):268:276 -> <init>
-    188:196:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):279 -> <init>
-    197:197:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):80:80 -> <init>
-    197:197:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):284 -> <init>
-    198:198:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):277:277 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XH;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;I)V"}
-    199:207:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):268:276 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):272:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():80:80 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():288 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():288:288 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():272:272 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():289 -> b
-    4:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():289:291 -> b
-    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):381:381 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():291 -> b
-    8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):23:23 -> b
-    8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):381 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():291 -> b
-    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():292:292 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.getFunction():294:294 -> b
-    10:10:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):384 -> b
-    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():292 -> b
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):384:384 -> b
-    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():292 -> b
+    12:12:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23 -> <init>
+    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    12:12:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    13:13:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> <init>
+    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    13:13:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    14:176:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):0:162 -> <init>
+    14:176:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    14:176:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    177:177:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getTypeTable():16110:16110 -> <init>
+    177:177:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):162 -> <init>
+    177:177:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    177:177:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    178:179:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):162:163 -> <init>
+    178:179:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    178:179:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    180:180:void com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.setFunction(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):158:158 -> <init>
+    180:180:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean):163 -> <init>
+    180:180:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils.readKmLambda$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):42 -> <init>
+    180:180:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):181 -> <init>
+    181:181:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):182:182 -> <init>
+    182:182:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    182:182:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):182 -> <init>
+    183:183:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):182:182 -> <init>
+    184:184:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    184:184:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):183 -> <init>
+    185:185:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):178:178 -> <init>
+    185:185:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):180 -> <init>
+    186:194:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion,int):169:177 -> <init>
+    186:194:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):180 -> <init>
+    195:195:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.setAllowedToWrite$kotlin_metadata_jvm(boolean):75:75 -> <init>
+    195:195:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):185 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():173:173 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):173:173 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata.isAllowedToWrite$kotlin_metadata_jvm():75:75 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():189 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():189:189 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():173:173 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata write():190 -> b
+    4:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():190:192 -> b
+    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):380:380 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():192 -> b
+    8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):22:22 -> b
+    8:8:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable):380 -> b
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():192 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():193:193 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.getFunction():158:158 -> b
+    10:10:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):383 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():193 -> b
+    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):383:383 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():193 -> b
     12:13:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16505:16506 -> b
-    12:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():293 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():295:295 -> b
+    12:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():194 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():196:196 -> b
     15:15:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():294 -> b
-    16:16:com.android.tools.r8.jetbrains.kotlin.Metadata write():294:294 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():195 -> b
+    16:16:com.android.tools.r8.jetbrains.kotlin.Metadata write():195:195 -> b
     17:17:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> b
-    17:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():294 -> b
-    18:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():294:297 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():272:272 -> b
-    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():297 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():195 -> b
+    18:21:com.android.tools.r8.jetbrains.kotlin.Metadata write():195:198 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():173:173 -> b
+    22:22:com.android.tools.r8.jetbrains.kotlin.Metadata write():198 -> b
     23:23:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():297 -> b
+    23:23:com.android.tools.r8.jetbrains.kotlin.Metadata write():198 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():297 -> b
-    25:25:int getFlags():276:276 -> b
-    25:25:com.android.tools.r8.jetbrains.kotlin.Metadata write():297 -> b
-    26:26:com.android.tools.r8.jetbrains.kotlin.Metadata write():297:297 -> b
+    24:24:com.android.tools.r8.jetbrains.kotlin.Metadata write():198 -> b
+    25:25:int getFlags():177:177 -> b
+    25:25:com.android.tools.r8.jetbrains.kotlin.Metadata write():198 -> b
+    26:26:com.android.tools.r8.jetbrains.kotlin.Metadata write():198:198 -> b
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> b
     27:27:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507 -> b
-    27:27:com.android.tools.r8.jetbrains.kotlin.Metadata write():293 -> b
+    27:27:com.android.tools.r8.jetbrains.kotlin.Metadata write():194 -> b
     28:28:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder.build():16507:16507 -> b
-    28:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():293 -> b
-    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.getFunction():294:294 -> b
-    29:29:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):384 -> b
-    29:29:com.android.tools.r8.jetbrains.kotlin.Metadata write():292 -> b
-    30:33:com.android.tools.r8.jetbrains.kotlin.Metadata write():900:903 -> b
-    34:34:com.android.tools.r8.jetbrains.kotlin.Metadata write():299:299 -> b
-    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():272:272 -> b
-    35:35:com.android.tools.r8.jetbrains.kotlin.Metadata write():299 -> b
+    28:28:com.android.tools.r8.jetbrains.kotlin.Metadata write():194 -> b
+    29:29:com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda.getFunction():158:158 -> b
+    29:29:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.LambdaWriter.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):383 -> b
+    29:29:com.android.tools.r8.jetbrains.kotlin.Metadata write():193 -> b
+    30:33:com.android.tools.r8.jetbrains.kotlin.Metadata write():482:485 -> b
+    34:34:com.android.tools.r8.jetbrains.kotlin.Metadata write():200:200 -> b
+    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():173:173 -> b
+    35:35:com.android.tools.r8.jetbrains.kotlin.Metadata write():200 -> b
     36:36:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    36:36:com.android.tools.r8.jetbrains.kotlin.Metadata write():299 -> b
+    36:36:com.android.tools.r8.jetbrains.kotlin.Metadata write():200 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:37:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    37:37:com.android.tools.r8.jetbrains.kotlin.Metadata write():299 -> b
-    38:38:com.android.tools.r8.jetbrains.kotlin.Metadata write():299:299 -> b
-    39:39:int getFlags():276:276 -> b
-    39:39:com.android.tools.r8.jetbrains.kotlin.Metadata write():299 -> b
-    40:40:com.android.tools.r8.jetbrains.kotlin.Metadata write():299:299 -> b
-    1:1:boolean isLambda():307:307 -> c
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.u:
+    37:37:com.android.tools.r8.jetbrains.kotlin.Metadata write():200 -> b
+    38:38:com.android.tools.r8.jetbrains.kotlin.Metadata write():200:200 -> b
+    39:39:int getFlags():177:177 -> b
+    39:39:com.android.tools.r8.jetbrains.kotlin.Metadata write():200 -> b
+    40:40:com.android.tools.r8.jetbrains.kotlin.Metadata write():200:200 -> b
+    1:1:boolean isLambda():208:208 -> c
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.CI:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
-    com.android.tools.r8.jetbrains.kotlin.Metadata original -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FN;"}
-    boolean lenient -> d
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    int flags -> f
-    1:1:void <clinit>():605:605 -> <clinit>
-    2:2:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> <clinit>
-    2:2:void <clinit>():605 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> <clinit>
-    3:3:void <clinit>():605 -> <clinit>
-    4:4:void <clinit>():605:605 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):576:585 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FN;Z)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():580:580 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):580:580 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():588:588 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/h;"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():580:580 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlin.Metadata write():589 -> b
-    3:5:com.android.tools.r8.jetbrains.kotlin.Metadata write():589:591 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():580:580 -> b
-    6:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():592 -> b
-    7:7:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():592 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    com.android.tools.r8.jetbrains.kotlin.Metadata original -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/S;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    int flags -> d
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):334:338 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)V"}
+    6:6:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> <init>
+    6:6:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):338 -> <init>
+    7:7:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):338:338 -> <init>
+    8:8:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xi():105:105 -> <init>
+    8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):343 -> <init>
+    9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.Metadata,boolean):343:343 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():338:338 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BD;"}
+    2:2:void setVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):338:338 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():338:338 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlin.Metadata write():347 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zD;"}
+    2:4:com.android.tools.r8.jetbrains.kotlin.Metadata write():347:349 -> b
+    5:5:int com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.k():115:115 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlin.Metadata write():349 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlin.Metadata write():349:349 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion getVersion():338:338 -> b
+    7:7:com.android.tools.r8.jetbrains.kotlin.Metadata write():350 -> b
     8:8:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():592 -> b
-    9:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():593:596 -> b
-    13:13:int getFlags():585:585 -> b
-    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():597 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():597:597 -> b
-    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():590:590 -> b
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinModuleMetadata -> com.android.tools.r8.jetbrains.kotlin.metadata.jvm.v:
+    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata write():350 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> b
+    9:9:com.android.tools.r8.jetbrains.kotlin.Metadata write():350 -> b
+    10:10:com.android.tools.r8.jetbrains.kotlin.Metadata write():351:351 -> b
+    11:11:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> b
+    11:11:com.android.tools.r8.jetbrains.kotlin.Metadata write():351 -> b
+    12:12:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d2():100:100 -> b
+    12:12:com.android.tools.r8.jetbrains.kotlin.Metadata write():352 -> b
+    13:13:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.xs():110:110 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlin.Metadata write():353 -> b
+    14:14:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.pn():125:125 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlin.Metadata write():354 -> b
+    15:15:int getFlags():343:343 -> b
+    15:15:com.android.tools.r8.jetbrains.kotlin.Metadata write():355 -> b
+    16:16:com.android.tools.r8.jetbrains.kotlin.Metadata write():355:355 -> b
+    17:17:com.android.tools.r8.jetbrains.kotlin.Metadata write():348:348 -> b
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinModuleMetadata -> com.android.tools.r8.internal.DI:
 # {"id":"sourceFile","fileName":"KotlinModuleMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule kmModule -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bI;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion version -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
-    1:12:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):36:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/p;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)V"}
-    1:1:byte[] write():67:67 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    1:12:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):28:39 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/internal/BD;)V"}
+    1:1:byte[] write():49:49 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.create():869:869 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.access$100():855 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module.newBuilder():845 -> a
-    2:2:byte[] write():67 -> a
-    3:3:byte[] write():68:68 -> a
-    4:4:java.util.Map com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule.getPackageParts():240:240 -> a
-    4:4:byte[] write():68 -> a
+    2:2:byte[] write():49 -> a
+    3:3:byte[] write():50:50 -> a
+    4:4:java.util.Map com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmModule.getPackageParts():122:122 -> a
+    4:4:byte[] write():50 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:byte[] write():305:305 -> a
-    6:6:byte[] write():68:68 -> a
+    5:5:byte[] write():150:150 -> a
+    6:6:byte[] write():50:50 -> a
     7:173:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.<init>(java.lang.String):0:166 -> a
-    7:173:byte[] write():69 -> a
-    174:174:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts.getFileFacades():300:300 -> a
-    174:174:byte[] write():70 -> a
+    7:173:byte[] write():51 -> a
+    174:174:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts.getFileFacades():146:146 -> a
+    174:174:byte[] write():52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    175:175:byte[] write():70:70 -> a
+    175:175:byte[] write():52:52 -> a
     176:345:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addPart(java.lang.String,java.lang.String):0:169 -> a
-    176:345:byte[] write():71 -> a
-    346:346:java.util.Map com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts.getMultiFileClassParts():301:301 -> a
-    346:346:byte[] write():73 -> a
-    347:347:byte[] write():73:73 -> a
+    176:345:byte[] write():53 -> a
+    346:346:java.util.Map com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KmPackageParts.getMultiFileClassParts():147:147 -> a
+    346:346:byte[] write():55 -> a
+    347:347:byte[] write():55:55 -> a
     348:517:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addPart(java.lang.String,java.lang.String):0:169 -> a
-    348:517:byte[] write():74 -> a
+    348:517:byte[] write():56 -> a
     518:518:java.util.Set com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getParts():163:163 -> a
     518:518:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):181 -> a
-    518:518:byte[] write():77 -> a
+    518:518:byte[] write():59 -> a
     519:520:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):181:182 -> a
-    519:520:byte[] write():77 -> a
+    519:520:byte[] write():59 -> a
     521:521:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.create():3109:3109 -> a
     521:521:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.access$1300():3095 -> a
     521:521:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.newBuilder():3085 -> a
     521:521:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    521:521:byte[] write():77 -> a
+    521:521:byte[] write():59 -> a
     522:523:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.setPackageFqName(java.lang.String):3352:3353 -> a
     522:523:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):183 -> a
-    522:523:byte[] write():77 -> a
+    522:523:byte[] write():59 -> a
     524:524:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):185:185 -> a
-    524:524:byte[] write():77 -> a
+    524:524:byte[] write():59 -> a
     525:525:java.util.Set com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getParts():163:163 -> a
     525:525:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):186 -> a
-    525:525:byte[] write():77 -> a
+    525:525:byte[] write():59 -> a
     526:529:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):303:306 -> a
-    526:529:byte[] write():77 -> a
+    526:529:byte[] write():59 -> a
     530:530:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getPackageName(java.lang.String):264:264 -> a
     530:530:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):187 -> a
-    530:530:byte[] write():77 -> a
+    530:530:byte[] write():59 -> a
     531:531:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
     531:531:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):187 -> a
-    531:531:byte[] write():77 -> a
+    531:531:byte[] write():59 -> a
     532:534:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):307:309 -> a
-    532:534:byte[] write():77 -> a
+    532:534:byte[] write():59 -> a
     535:535:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):190:190 -> a
-    535:535:byte[] write():77 -> a
+    535:535:byte[] write():59 -> a
     536:538:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):313:315 -> a
     536:538:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    536:538:byte[] write():77 -> a
+    536:538:byte[] write():59 -> a
     539:806:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeName(java.lang.String):0:267 -> a
     539:806:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):209 -> a
     539:806:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    539:806:byte[] write():77 -> a
+    539:806:byte[] write():59 -> a
     807:807:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):317:317 -> a
     807:807:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    807:807:byte[] write():77 -> a
+    807:807:byte[] write():59 -> a
     808:812:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):316:320 -> a
     808:812:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    808:812:byte[] write():77 -> a
+    808:812:byte[] write():59 -> a
     813:821:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):316:324 -> a
     813:821:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    813:821:byte[] write():77 -> a
+    813:821:byte[] write():59 -> a
     822:822:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):209:209 -> a
     822:822:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    822:822:byte[] write():77 -> a
+    822:822:byte[] write():59 -> a
     823:823:java.util.SortedMap com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.toSortedMap(java.util.Map,java.util.Comparator):97:97 -> a
     823:823:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):209 -> a
     823:823:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    823:823:byte[] write():77 -> a
+    823:823:byte[] write():59 -> a
     824:825:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):209:210 -> a
     824:825:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    824:825:byte[] write():77 -> a
+    824:825:byte[] write():59 -> a
     826:826:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getClassName(java.lang.String):265:265 -> a
     826:826:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):211 -> a
     826:826:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    826:826:byte[] write():77 -> a
+    826:826:byte[] write():59 -> a
     827:829:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureShortClassNameIsMutable():3390:3392 -> a
     827:829:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addShortClassName(java.lang.String):3484 -> a
     827:829:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):211 -> a
     827:829:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    827:829:byte[] write():77 -> a
+    827:829:byte[] write():59 -> a
     830:830:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addShortClassName(java.lang.String):3485:3485 -> a
     830:830:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):211 -> a
     830:830:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    830:830:byte[] write():77 -> a
+    830:830:byte[] write():59 -> a
     831:831:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getClassName(java.lang.String):265:265 -> a
     831:831:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):254 -> a
     831:831:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     831:831:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    831:831:byte[] write():77 -> a
+    831:831:byte[] write():59 -> a
     832:832:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):355:355 -> a
     832:832:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     832:832:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    832:832:byte[] write():77 -> a
+    832:832:byte[] write():59 -> a
     833:937:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):254:358 -> a
     833:937:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     833:937:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    833:937:byte[] write():77 -> a
+    833:937:byte[] write():59 -> a
     938:938:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):356:356 -> a
     938:938:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     938:938:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    938:938:byte[] write():77 -> a
+    938:938:byte[] write():59 -> a
     939:941:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureMultifileFacadeShortNameIdIsMutable():3546:3548 -> a
     939:941:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addMultifileFacadeShortNameId(int):3614 -> a
     939:941:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     939:941:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    939:941:byte[] write():77 -> a
+    939:941:byte[] write():59 -> a
     942:942:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addMultifileFacadeShortNameId(int):3615:3615 -> a
     942:942:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsWithinPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map):213 -> a
     942:942:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):191 -> a
-    942:942:byte[] write():77 -> a
+    942:942:byte[] write():59 -> a
     943:1047:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):225:329 -> a
     943:1047:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    943:1047:byte[] write():77 -> a
+    943:1047:byte[] write():59 -> a
     1048:1048:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getPackageName(java.lang.String):264:264 -> a
     1048:1048:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):226 -> a
     1048:1048:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1048:1048:byte[] write():77 -> a
+    1048:1048:byte[] write():59 -> a
     1049:1049:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):331:331 -> a
     1049:1049:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1049:1049:byte[] write():77 -> a
+    1049:1049:byte[] write():59 -> a
     1050:1054:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):330:334 -> a
     1050:1054:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1050:1054:byte[] write():77 -> a
+    1050:1054:byte[] write():59 -> a
     1055:1063:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):330:338 -> a
     1055:1063:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1055:1063:byte[] write():77 -> a
+    1055:1063:byte[] write():59 -> a
     1064:1064:java.util.SortedMap com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.toSortedMap(java.util.Map):87:87 -> a
     1064:1064:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):226 -> a
     1064:1064:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1064:1064:byte[] write():77 -> a
+    1064:1064:byte[] write():59 -> a
     1065:1066:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):226:227 -> a
     1065:1066:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1065:1066:byte[] write():77 -> a
+    1065:1066:byte[] write():59 -> a
     1067:1067:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ProtocolStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.getJvmPackageNameList():1427:1427 -> a
     1067:1067:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):228 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1067:1067:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1067:1067:byte[] write():77 -> a
+    1067:1067:byte[] write():59 -> a
     1068:1068:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ProtocolStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.getJvmPackageNameList():1427:1427 -> a
     1068:1068:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):228 -> a
     1068:1068:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1068:1068:byte[] write():77 -> a
+    1068:1068:byte[] write():59 -> a
     1069:1069:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):228:228 -> a
     1069:1069:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1069:1069:byte[] write():77 -> a
+    1069:1069:byte[] write():59 -> a
     1070:1072:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.ensureJvmPackageNameIsMutable():1412:1414 -> a
     1070:1072:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addJvmPackageName(java.lang.String):1494 -> a
     1070:1072:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):229 -> a
     1070:1072:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1070:1072:byte[] write():77 -> a
+    1070:1072:byte[] write():59 -> a
     1073:1073:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addJvmPackageName(java.lang.String):1495:1495 -> a
     1073:1073:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):229 -> a
     1073:1073:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1073:1073:byte[] write():77 -> a
+    1073:1073:byte[] write():59 -> a
     1074:1074:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ProtocolStringList com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.getJvmPackageNameList():1427:1427 -> a
     1074:1074:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):231 -> a
     1074:1074:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1074:1074:byte[] write():77 -> a
+    1074:1074:byte[] write():59 -> a
     1075:1187:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):231:343 -> a
     1075:1187:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1075:1187:byte[] write():77 -> a
+    1075:1187:byte[] write():59 -> a
     1188:1455:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeName(java.lang.String):0:267 -> a
     1188:1455:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):232 -> a
     1188:1455:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1188:1455:byte[] write():77 -> a
+    1188:1455:byte[] write():59 -> a
     1456:1456:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):345:345 -> a
     1456:1456:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1456:1456:byte[] write():77 -> a
+    1456:1456:byte[] write():59 -> a
     1457:1461:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):344:348 -> a
     1457:1461:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1457:1461:byte[] write():77 -> a
+    1457:1461:byte[] write():59 -> a
     1462:1470:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):344:352 -> a
     1462:1470:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1462:1470:byte[] write():77 -> a
+    1462:1470:byte[] write():59 -> a
     1471:1471:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):232:232 -> a
     1471:1471:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1471:1471:byte[] write():77 -> a
+    1471:1471:byte[] write():59 -> a
     1472:1472:java.util.SortedMap com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt.toSortedMap(java.util.Map,java.util.Comparator):97:97 -> a
     1472:1472:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):232 -> a
     1472:1472:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1472:1472:byte[] write():77 -> a
+    1472:1472:byte[] write():59 -> a
     1473:1474:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):232:233 -> a
     1473:1474:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1473:1474:byte[] write():77 -> a
+    1473:1474:byte[] write():59 -> a
     1475:1475:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getClassName(java.lang.String):265:265 -> a
     1475:1475:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):234 -> a
     1475:1475:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1475:1475:byte[] write():77 -> a
+    1475:1475:byte[] write():59 -> a
     1476:1478:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureClassWithJvmPackageNameShortNameIsMutable():3810:3812 -> a
     1476:1478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addClassWithJvmPackageNameShortName(java.lang.String):3892 -> a
     1476:1478:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):234 -> a
     1476:1478:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1476:1478:byte[] write():77 -> a
+    1476:1478:byte[] write():59 -> a
     1479:1479:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addClassWithJvmPackageNameShortName(java.lang.String):3893:3893 -> a
     1479:1479:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):234 -> a
     1479:1479:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1479:1479:byte[] write():77 -> a
+    1479:1479:byte[] write():59 -> a
     1480:1480:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getClassName(java.lang.String):265:265 -> a
     1480:1480:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):254 -> a
     1480:1480:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):237 -> a
     1480:1480:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1480:1480:byte[] write():77 -> a
+    1480:1480:byte[] write():59 -> a
     1481:1481:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):355:355 -> a
     1481:1481:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):237 -> a
     1481:1481:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1481:1481:byte[] write():77 -> a
+    1481:1481:byte[] write():59 -> a
     1482:1586:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):254:358 -> a
     1482:1586:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):237 -> a
     1482:1586:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1482:1586:byte[] write():77 -> a
+    1482:1586:byte[] write():59 -> a
     1587:1587:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.getMultifileFacadeShortNameId(java.lang.String,java.util.Map):356:356 -> a
     1587:1587:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):237 -> a
     1587:1587:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1587:1587:byte[] write():77 -> a
+    1587:1587:byte[] write():59 -> a
     1588:1590:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureClassWithJvmPackageNameMultifileFacadeShortNameIdIsMutable():3948:3950 -> a
     1588:1590:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addClassWithJvmPackageNameMultifileFacadeShortNameId(int):4026 -> a
     1588:1590:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):236 -> a
     1588:1590:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1588:1590:byte[] write():77 -> a
+    1588:1590:byte[] write():59 -> a
     1591:1591:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addClassWithJvmPackageNameMultifileFacadeShortNameId(int):4027:4027 -> a
     1591:1591:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):236 -> a
     1591:1591:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1591:1591:byte[] write():77 -> a
+    1591:1591:byte[] write():59 -> a
     1592:1599:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):240:247 -> a
     1592:1599:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1592:1599:byte[] write():77 -> a
+    1592:1599:byte[] write():59 -> a
     1600:1602:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureClassWithJvmPackageNamePackageIdIsMutable():4070:4072 -> a
     1600:1602:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addAllClassWithJvmPackageNamePackageId(java.lang.Iterable):4166 -> a
     1600:1602:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1600:1602:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1600:1602:byte[] write():77 -> a
+    1600:1602:byte[] write():59 -> a
     1603:1603:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addAllClassWithJvmPackageNamePackageId(java.lang.Iterable):4167:4167 -> a
     1603:1603:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writePartsOutsidePackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.List,java.util.Map,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):250 -> a
     1603:1603:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):192 -> a
-    1603:1603:byte[] write():77 -> a
+    1603:1603:byte[] write():59 -> a
     1604:1604:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258:258 -> a
     1604:1604:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1604:1604:byte[] write():77 -> a
+    1604:1604:byte[] write():59 -> a
     1605:1609:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.zip(java.lang.Iterable,java.lang.Iterable):3859:3863 -> a
     1605:1609:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258 -> a
     1605:1609:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1605:1609:byte[] write():77 -> a
+    1605:1609:byte[] write():59 -> a
     1610:1610:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1610:1610:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.zip(java.lang.Iterable,java.lang.Iterable):3425 -> a
     1610:1610:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258 -> a
     1610:1610:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1610:1610:byte[] write():77 -> a
+    1610:1610:byte[] write():59 -> a
     1611:1611:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.zip(java.lang.Iterable,java.lang.Iterable):3863:3863 -> a
     1611:1611:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258 -> a
     1611:1611:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1611:1611:byte[] write():77 -> a
+    1611:1611:byte[] write():59 -> a
     1612:1612:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):362:362 -> a
     1612:1612:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1612:1612:byte[] write():77 -> a
+    1612:1612:byte[] write():59 -> a
     1613:1613:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258:258 -> a
     1613:1613:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1613:1613:byte[] write():77 -> a
+    1613:1613:byte[] write():59 -> a
     1614:1614:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component1():0:0 -> a
     1614:1614:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1614:1614:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1614:1614:byte[] write():77 -> a
+    1614:1614:byte[] write():59 -> a
     1615:1615:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258:258 -> a
     1615:1615:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1615:1615:byte[] write():77 -> a
+    1615:1615:byte[] write():59 -> a
     1616:1616:java.lang.Object com.android.tools.r8.jetbrains.kotlin.Pair.component2():0:0 -> a
     1616:1616:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258 -> a
     1616:1616:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1616:1616:byte[] write():77 -> a
+    1616:1616:byte[] write():59 -> a
     1617:1617:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):258:258 -> a
     1617:1617:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1617:1617:byte[] write():77 -> a
+    1617:1617:byte[] write():59 -> a
     1618:1618:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.getMultifileFacadeShortNameCount():3684:3684 -> a
     1618:1618:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1618:1618:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1618:1618:byte[] write():77 -> a
+    1618:1618:byte[] write():59 -> a
     1619:1619:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.getMultifileFacadeShortNameCount():3684:3684 -> a
     1619:1619:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):259 -> a
     1619:1619:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1619:1619:byte[] write():77 -> a
+    1619:1619:byte[] write():59 -> a
     1620:1620:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):259:259 -> a
     1620:1620:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1620:1620:byte[] write():77 -> a
+    1620:1620:byte[] write():59 -> a
     1621:1621:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addMultifileFacadeShortName(java.lang.String):3746:3746 -> a
     1621:1621:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):260 -> a
     1621:1621:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1621:1621:byte[] write():77 -> a
+    1621:1621:byte[] write():59 -> a
     1622:1624:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureMultifileFacadeShortNameIsMutable():3654:3656 -> a
     1622:1624:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addMultifileFacadeShortName(java.lang.String):3748 -> a
     1622:1624:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):260 -> a
     1622:1624:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1622:1624:byte[] write():77 -> a
+    1622:1624:byte[] write():59 -> a
     1625:1625:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addMultifileFacadeShortName(java.lang.String):3749:3749 -> a
     1625:1625:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.writeMultifileFacadeNames(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder,java.util.Map):260 -> a
     1625:1625:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):193 -> a
-    1625:1625:byte[] write():77 -> a
+    1625:1625:byte[] write():59 -> a
     1626:1628:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.ensurePackagePartsIsMutable():1067:1069 -> a
     1626:1628:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1176 -> a
     1626:1628:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1626:1628:byte[] write():77 -> a
+    1626:1628:byte[] write():59 -> a
     1629:1629:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1177:1177 -> a
     1629:1629:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1629:1629:byte[] write():77 -> a
+    1629:1629:byte[] write():59 -> a
     1630:1631:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3140:3141 -> a
     1630:1631:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1177 -> a
     1630:1631:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1630:1631:byte[] write():77 -> a
+    1630:1631:byte[] write():59 -> a
     1632:1632:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1177:1177 -> a
     1632:1632:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1632:1632:byte[] write():77 -> a
+    1632:1632:byte[] write():59 -> a
     1633:1633:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     1633:1633:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3142 -> a
     1633:1633:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1177 -> a
     1633:1633:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1633:1633:byte[] write():77 -> a
+    1633:1633:byte[] write():59 -> a
     1634:1634:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3142:3142 -> a
     1634:1634:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addPackageParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1177 -> a
     1634:1634:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):182 -> a
-    1634:1634:byte[] write():77 -> a
+    1634:1634:byte[] write():59 -> a
     1635:1636:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):197:198 -> a
-    1635:1636:byte[] write():77 -> a
+    1635:1636:byte[] write():59 -> a
     1637:1637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.create():3109:3109 -> a
     1637:1637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.access$1300():3095 -> a
     1637:1637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts.newBuilder():3085 -> a
     1637:1637:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1637:1637:byte[] write():77 -> a
+    1637:1637:byte[] write():59 -> a
     1638:1639:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.setPackageFqName(java.lang.String):3352:3353 -> a
     1638:1639:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):199 -> a
-    1638:1639:byte[] write():77 -> a
+    1638:1639:byte[] write():59 -> a
     1640:1640:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):200:200 -> a
-    1640:1640:byte[] write():77 -> a
+    1640:1640:byte[] write():59 -> a
     1641:1643:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.ensureShortClassNameIsMutable():3390:3392 -> a
     1641:1643:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addAllShortClassName(java.lang.Iterable):3501 -> a
     1641:1643:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):200 -> a
-    1641:1643:byte[] write():77 -> a
+    1641:1643:byte[] write():59 -> a
     1644:1644:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.addAllShortClassName(java.lang.Iterable):3502:3502 -> a
     1644:1644:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):200 -> a
-    1644:1644:byte[] write():77 -> a
+    1644:1644:byte[] write():59 -> a
     1645:1647:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.ensureMetadataPartsIsMutable():1240:1242 -> a
     1645:1647:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1349 -> a
     1645:1647:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1645:1647:byte[] write():77 -> a
+    1645:1647:byte[] write():59 -> a
     1648:1648:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1350:1350 -> a
     1648:1648:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1648:1648:byte[] write():77 -> a
+    1648:1648:byte[] write():59 -> a
     1649:1650:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3140:3141 -> a
     1649:1650:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1350 -> a
     1649:1650:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1649:1650:byte[] write():77 -> a
+    1649:1650:byte[] write():59 -> a
     1651:1651:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1350:1350 -> a
     1651:1651:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1651:1651:byte[] write():77 -> a
+    1651:1651:byte[] write():59 -> a
     1652:1652:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     1652:1652:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3142 -> a
     1652:1652:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1350 -> a
     1652:1652:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1652:1652:byte[] write():77 -> a
+    1652:1652:byte[] write():59 -> a
     1653:1653:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder.build():3142:3142 -> a
     1653:1653:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.addMetadataParts(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$PackageParts$Builder):1350 -> a
     1653:1653:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.PackageParts.addTo(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder):198 -> a
-    1653:1653:byte[] write():77 -> a
+    1653:1653:byte[] write():59 -> a
     1654:1655:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.build():900:901 -> a
-    1654:1655:byte[] write():99 -> a
-    1656:1656:byte[] write():99:99 -> a
+    1654:1655:byte[] write():81 -> a
+    1656:1656:byte[] write():81:81 -> a
     1657:1657:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> a
-    1657:1657:byte[] write():99 -> a
+    1657:1657:byte[] write():81 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1658:1658:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> a
-    1658:1658:byte[] write():99 -> a
-    1659:1659:byte[] write():99:99 -> a
+    1658:1658:byte[] write():81 -> a
+    1659:1659:byte[] write():81:81 -> a
     1660:1661:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):288:289 -> a
-    1660:1661:byte[] write():99 -> a
+    1660:1661:byte[] write():81 -> a
     1662:1662:int[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.toArray():33:33 -> a
     1662:1662:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):290 -> a
-    1662:1662:byte[] write():99 -> a
+    1662:1662:byte[] write():81 -> a
     1663:1665:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):291:293 -> a
-    1663:1665:byte[] write():99 -> a
+    1663:1665:byte[] write():81 -> a
     1666:1666:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.getMajor():18:18 -> a
     1666:1666:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionSpecificBehaviorKt.isKotlin1Dot4OrLater(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion):23 -> a
     1666:1666:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):295 -> a
-    1666:1666:byte[] write():99 -> a
+    1666:1666:byte[] write():81 -> a
     1667:1667:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion.getMinor():19:19 -> a
     1667:1667:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionSpecificBehaviorKt.isKotlin1Dot4OrLater(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion):23 -> a
     1667:1667:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):295 -> a
-    1667:1667:byte[] write():99 -> a
+    1667:1667:byte[] write():81 -> a
     1668:1668:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):296:296 -> a
-    1668:1668:byte[] write():99 -> a
+    1668:1668:byte[] write():81 -> a
     1669:1669:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):77:77 -> a
     1669:1669:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):298 -> a
-    1669:1669:byte[] write():99 -> a
+    1669:1669:byte[] write():81 -> a
     1670:1670:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.CodedOutputStream.newInstance(java.io.OutputStream,int):106:106 -> a
     1670:1670:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):79 -> a
     1670:1670:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):298 -> a
-    1670:1670:byte[] write():99 -> a
+    1670:1670:byte[] write():81 -> a
     1671:1672:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):81:82 -> a
     1671:1672:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):298 -> a
-    1671:1672:byte[] write():99 -> a
+    1671:1672:byte[] write():81 -> a
     1673:1674:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.ModuleMappingKt.serializeToByteArray(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.BinaryVersion,int):299:300 -> a
-    1673:1674:byte[] write():99 -> a
+    1673:1674:byte[] write():81 -> a
     1675:1675:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
     1675:1675:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.build():902 -> a
-    1675:1675:byte[] write():99 -> a
+    1675:1675:byte[] write():81 -> a
     1676:1676:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmModuleProtoBuf$Module$Builder.build():902:902 -> a
-    1676:1676:byte[] write():99 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension -> com.android.tools.r8.internal.gD:
+    1676:1676:byte[] write():81 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension -> com.android.tools.r8.internal.mD:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    java.util.List localDelegatedProperties -> b
+    java.util.List localDelegatedProperties -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    java.lang.String moduleName -> c
-    java.lang.String anonymousObjectOriginName -> d
-    int jvmFlags -> e
-    1:2:void <init>():35:36 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension -> com.android.tools.r8.internal.iD:
+    java.lang.String moduleName -> b
+    java.lang.String anonymousObjectOriginName -> c
+    int jvmFlags -> d
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():43:43 -> <clinit>
+    1:2:void <init>():33:34 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():40:40 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension$Companion -> R8$$REMOVED$$CLASS$$185:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature signature -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    1:1:void <init>():148:148 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt -> R8$$REMOVED$$CLASS$$198:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension -> com.android.tools.r8.internal.oD:
+# {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature signature -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():98:98 -> <clinit>
+    1:1:void <init>():90:90 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():94:94 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt -> R8$$REMOVED$$CLASS$$186:
 # {"id":"sourceFile","fileName":"JvmExceptionUtils.kt"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt -> com.android.tools.r8.internal.pD:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;)Lcom/android/tools/r8/internal/gD;"}
-    2:202:com.android.tools.r8.jetbrains.kotlin.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:200 -> a
-    2:202:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):14 -> a
-    203:203:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):14:14 -> a
-    204:204:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)Lcom/android/tools/r8/internal/xD;"}
-    205:474:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:269 -> a
-    205:474:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):17 -> a
-    475:475:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):17:17 -> a
-    476:476:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;)Lcom/android/tools/r8/internal/kD;"}
-    477:477:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Lcom/android/tools/r8/internal/yD;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension -> com.android.tools.r8.internal.kD:
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):15:15 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;)Lcom/android/tools/r8/internal/LD;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):15 -> a
+    3:3:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getExtensions$kotlin_metadata():147:147 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):48 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):15 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):48:48 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):15 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):15:15 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):18:18 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)Lcom/android/tools/r8/internal/tD;"}
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):18 -> a
+    8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getExtensions$kotlin_metadata():233:233 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):56 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):18 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):56:56 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):18 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):18:18 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):21:21 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)Lcom/android/tools/r8/internal/MD;"}
+    12:72:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPropertyExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:60 -> a
+    12:72:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):21 -> a
+    73:73:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):21:21 -> a
+    74:74:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):24:24 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;)Lcom/android/tools/r8/internal/oD;"}
+    75:75:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    75:75:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):24 -> a
+    76:76:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getExtensions$kotlin_metadata():180:180 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):64 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):24 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):64:64 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):24 -> a
+    78:78:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):24:24 -> a
+    79:79:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):30:30 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/internal/hE;"}
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):30 -> a
+    81:81:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmType.getExtensions$kotlin_metadata():490:490 -> a
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):72 -> a
+    81:81:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):30 -> a
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):72:72 -> a
+    82:82:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):30 -> a
+    83:83:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):30:30 -> a
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.access$getTYPE$cp():33:33 -> a
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension$Companion.getTYPE():43 -> a
+    84:84:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):12 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)Lcom/android/tools/r8/internal/mD;"}
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    85:85:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):12 -> a
+    86:86:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getExtensions$kotlin_metadata():122:122 -> a
+    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):44 -> a
+    86:86:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):12 -> a
+    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):44:44 -> a
+    87:87:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):12 -> a
+    88:88:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):12:12 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension -> com.android.tools.r8.internal.tD:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature signature -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    java.lang.String lambdaClassOriginName -> d
-    1:1:void <init>():91:91 -> <init>
-    1:1:void visit(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    2:2:void visitLambdaClassOriginName(java.lang.String):100:100 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmMetadataExtensions -> com.android.tools.r8.internal.oD:
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature signature -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    java.lang.String lambdaClassOriginName -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>():60:60 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():65:65 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmMetadataExtensions -> com.android.tools.r8.internal.yD:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():21:21 -> <init>
     1:1:void com.android.tools.r8.internal.JvmMetadataExtensions.readTypeAliasExtensions(com.android.tools.r8.internal.KmTypeAlias,com.android.tools.r8.internal.ProtoBuf$TypeAlias,com.android.tools.r8.internal.ReadContext):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hI;Lcom/android/tools/r8/internal/d00;Lcom/android/tools/r8/internal/v10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jI;Lcom/android/tools/r8/internal/h00;Lcom/android/tools/r8/internal/z10;)V"}
     2:2:void com.android.tools.r8.internal.JvmMetadataExtensions.readValueParameterExtensions(com.android.tools.r8.internal.KmValueParameter,com.android.tools.r8.internal.ProtoBuf$ValueParameter,com.android.tools.r8.internal.ReadContext):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qI;Lcom/android/tools/r8/internal/n00;Lcom/android/tools/r8/internal/v10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;Lcom/android/tools/r8/internal/r00;Lcom/android/tools/r8/internal/z10;)V"}
     3:3:void com.android.tools.r8.internal.JvmMetadataExtensions.writeTypeAliasExtensions(com.android.tools.r8.internal.KmTypeAlias,com.android.tools.r8.internal.ProtoBuf$TypeAlias$Builder,com.android.tools.r8.internal.WriteContext):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hI;Lcom/android/tools/r8/internal/c00;Lcom/android/tools/r8/internal/zm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jI;Lcom/android/tools/r8/internal/g00;Lcom/android/tools/r8/internal/Dm0;)V"}
     4:4:void com.android.tools.r8.internal.JvmMetadataExtensions.writeValueParameterExtensions(com.android.tools.r8.internal.KmValueParameter,com.android.tools.r8.internal.ProtoBuf$ValueParameter$Builder,com.android.tools.r8.internal.WriteContext):0:0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qI;Lcom/android/tools/r8/internal/m00;Lcom/android/tools/r8/internal/zm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;Lcom/android/tools/r8/internal/q00;Lcom/android/tools/r8/internal/Dm0;)V"}
     5:9:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):23:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/internal/gZ;Lcom/android/tools/r8/internal/v10;)V"}
-    10:10:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/internal/kZ;Lcom/android/tools/r8/internal/z10;)V"}
+    10:10:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
     10:10:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):27 -> a
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setAnonymousObjectOriginName(java.lang.String):38:38 -> a
+    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setAnonymousObjectOriginName(java.lang.String):36:36 -> a
     11:11:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):27 -> a
     12:12:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):30:30 -> a
-    13:13:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():36:36 -> a
+    13:13:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():34:34 -> a
     13:13:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):31 -> a
     14:17:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):31:34 -> a
-    18:18:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
+    18:18:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
     18:18:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):34 -> a
     19:19:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):34:34 -> a
-    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setModuleName(java.lang.String):37:37 -> a
+    20:20:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setModuleName(java.lang.String):35:35 -> a
     20:20:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):34 -> a
     21:21:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):36:36 -> a
-    22:22:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setJvmFlags(int):39:39 -> a
+    22:22:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setJvmFlags(int):37:37 -> a
     22:22:void readClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):37 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    23:23:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FH;Lcom/android/tools/r8/internal/jZ;Lcom/android/tools/r8/internal/v10;)V"}
-    24:372:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:348 -> a
-    24:372:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26 -> a
-    24:372:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):87 -> a
-    373:373:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    373:373:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):87 -> a
-    374:374:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88:88 -> a
-    375:375:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    375:375:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    376:376:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    376:376:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    377:471:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:94 -> a
-    377:471:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    472:472:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasName():2230:2230 -> a
-    472:472:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):95 -> a
-    472:472:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    473:473:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    473:473:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):96 -> a
-    473:473:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    474:476:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):96:98 -> a
-    474:476:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    477:477:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasDesc():2249:2249 -> a
-    477:477:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):100 -> a
-    477:477:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    478:478:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    478:478:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101 -> a
-    478:478:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    479:479:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101:101 -> a
-    479:479:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    480:480:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterList():14771:14771 -> a
-    480:480:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):103 -> a
-    480:480:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    481:530:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):103:152 -> a
-    481:530:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    531:579:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):104:152 -> a
-    531:579:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    580:582:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):105:107 -> a
-    580:582:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    583:583:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66:66 -> a
-    583:583:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    584:584:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> a
-    584:584:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66 -> a
-    584:584:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    585:585:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> a
-    585:585:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66 -> a
-    585:585:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    586:586:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66:66 -> a
-    586:586:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    587:587:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):149:149 -> a
-    587:587:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
-    588:588:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    588:588:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FH;Lcom/android/tools/r8/internal/iZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    589:937:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:348 -> a
-    589:937:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26 -> a
-    589:937:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):190 -> a
-    938:938:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    938:938:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):190 -> a
-    939:939:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.getSignature():149:149 -> a
-    939:939:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):191 -> a
-    940:940:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):191:191 -> a
-    941:941:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    941:941:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lI;Lcom/android/tools/r8/internal/h00;Lcom/android/tools/r8/internal/v10;)V"}
-    942:1781:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> a
-    942:1781:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29 -> a
-    942:1781:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
-    1782:1782:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    1782:1782:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
-    1783:1783:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):93:93 -> a
-    1784:1784:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():162:162 -> a
-    1784:1784:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94 -> a
-    1785:1785:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94:94 -> a
-    1786:1786:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    1786:1786:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94 -> a
-    1787:1787:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94:94 -> a
-    1788:1788:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    1788:1788:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lI;Lcom/android/tools/r8/internal/f00;Lcom/android/tools/r8/internal/zm0;)V"}
-    1789:2628:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> a
-    1789:2628:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29 -> a
-    1789:2628:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
-    2629:2629:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    2629:2629:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
-    2630:2630:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():162:162 -> a
-    2630:2630:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):197 -> a
-    2631:2631:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):261:261 -> a
-    2632:2632:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198:198 -> a
-    2633:2633:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():23:23 -> a
-    2633:2633:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2634:2634:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198:198 -> a
-    2635:2636:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
-    2635:2636:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2637:2637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    2637:2637:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> a
+    23:23:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mI;Lcom/android/tools/r8/internal/l00;Lcom/android/tools/r8/internal/z10;)V"}
+    24:24:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    24:24:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
+    25:25:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getExtensions$kotlin_metadata():434:434 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    25:25:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68:68 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    26:26:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
+    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter) -> a
+    27:27:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):92 -> a
+    28:28:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):93:93 -> a
+    29:29:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():103:103 -> a
+    29:29:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94 -> a
+    30:30:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94:94 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    31:31:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94 -> a
+    32:32:void readTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):94:94 -> a
+    33:33:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> a
+    33:33:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mI;Lcom/android/tools/r8/internal/j00;Lcom/android/tools/r8/internal/Dm0;)V"}
+    34:34:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    34:34:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
+    35:35:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getExtensions$kotlin_metadata():434:434 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    35:35:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
+    36:36:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68:68 -> a
+    36:36:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    36:36:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> a
+    37:37:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):196 -> a
+    38:38:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():103:103 -> a
+    38:38:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):197 -> a
+    39:39:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):257:257 -> a
+    40:40:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198:198 -> a
+    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():22:22 -> a
+    41:41:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    42:42:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198:198 -> a
+    43:44:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
+    43:44:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    45:45:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    45:45:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2637:2637:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2637:2637:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2638:2638:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
-    2638:2638:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2638:2638:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2639:2641:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    2639:2641:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
-    2639:2641:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2642:2642:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
-    2642:2642:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2643:2643:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    2643:2643:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2643:2643:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2644:2644:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2644:2644:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
-    2644:2644:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2645:2645:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
-    2645:2645:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
-    2646:2646:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):32:32 -> a
-    2646:2646:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/internal/a00;Lcom/android/tools/r8/internal/v10;)V"}
-    2647:2647:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):100:100 -> a
-    2648:2648:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.setRaw(boolean):176:176 -> a
-    2648:2648:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):100 -> a
-    2649:2649:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):101:101 -> a
-    2650:2650:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():177:177 -> a
-    2650:2650:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102 -> a
-    2651:2651:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102:102 -> a
-    2652:2652:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    2652:2652:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102 -> a
-    2653:2653:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102:102 -> a
-    2654:2654:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):32:32 -> a
-    2654:2654:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/internal/ZZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    2655:2655:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.isRaw():176:176 -> a
-    2655:2655:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):204 -> a
-    2656:2656:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):204:204 -> a
-    2657:2657:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():177:177 -> a
-    2657:2657:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):205 -> a
-    2658:2658:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):263:263 -> a
-    2659:2659:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206:206 -> a
-    2660:2660:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():23:23 -> a
-    2660:2660:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2661:2661:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206:206 -> a
-    2662:2663:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
-    2662:2663:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2664:2664:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    2664:2664:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    45:45:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    45:45:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    46:46:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    46:46:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    46:46:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    47:49:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    47:49:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
+    47:49:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
+    50:50:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    51:51:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    51:51:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
+    52:52:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
+    53:53:void writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):198 -> a
+    54:56:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):42:44 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;Lcom/android/tools/r8/internal/KZ;Lcom/android/tools/r8/internal/z10;)V"}
+    57:57:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():48:48 -> a
+    57:57:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):45 -> a
+    58:61:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):45:48 -> a
+    62:62:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    62:62:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48 -> a
+    63:63:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48:48 -> a
+    64:64:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.setModuleName(java.lang.String):49:49 -> a
+    64:64:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48 -> a
+    65:66:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):55:56 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/internal/FZ;Lcom/android/tools/r8/internal/z10;)V"}
+    67:67:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    67:67:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    68:68:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    68:68:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    69:143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:74 -> a
+    69:143:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    144:144:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasName():2230:2230 -> a
+    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
+    144:144:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    145:145:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
+    145:145:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    146:146:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getName():15907:15907 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
+    146:146:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    147:147:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasDesc():2249:2249 -> a
+    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):76 -> a
+    147:147:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    148:148:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77 -> a
+    148:148:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    149:149:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77:77 -> a
+    149:149:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    150:150:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReceiverType():15981:15981 -> a
+    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
+    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    150:150:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverType():15987:15987 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    151:151:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    152:152:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverTypeId():16002:16002 -> a
+    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
+    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    152:152:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
+    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
+    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    153:153:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    154:154:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:79 -> a
+    154:154:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    155:155:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getValueParameterList():16069:16069 -> a
+    155:155:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    155:155:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    156:221:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:144 -> a
+    156:221:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    222:287:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:144 -> a
+    222:287:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    288:290:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):3263:3265 -> a
+    288:290:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
+    288:290:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    291:293:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):146:148 -> a
+    291:293:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    294:361:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):81:148 -> a
+    294:361:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    362:362:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReturnType():15916:15916 -> a
+    362:362:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
+    362:362:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    362:362:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    363:363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnType():15922:15922 -> a
+    363:363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
+    363:363:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    363:363:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    364:364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48:48 -> a
+    364:364:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    364:364:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    365:365:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnTypeId():15937:15937 -> a
+    365:365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
+    365:365:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    365:365:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    366:366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
+    366:366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
+    366:366:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    366:366:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    367:371:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82:86 -> a
+    367:371:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    372:372:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54:54 -> a
+    372:372:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    373:373:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> a
+    373:373:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54 -> a
+    373:373:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    374:374:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> a
+    374:374:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54 -> a
+    374:374:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    375:375:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54:54 -> a
+    375:375:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    376:376:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61:61 -> a
+    376:376:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    377:379:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):58:60 -> a
+    380:380:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    380:380:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):60 -> a
+    381:381:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setLambdaClassOriginName(java.lang.String):62:62 -> a
+    381:381:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):60 -> a
+    382:383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49:50 -> a
+    382:383:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
+    382:383:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
+    384:385:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):65:66 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/NZ;Lcom/android/tools/r8/internal/z10;)V"}
+    386:386:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    386:386:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    387:387:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    387:387:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    388:504:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):0:116 -> a
+    388:504:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    388:504:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    505:505:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasField():3246:3246 -> a
+    505:505:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):117 -> a
+    505:505:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    505:505:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    506:506:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getField():3252:3252 -> a
+    506:506:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):117 -> a
+    506:506:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    506:506:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    507:507:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.hasName():2692:2692 -> a
+    507:507:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
+    507:507:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    507:507:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    508:508:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getName():2698:2698 -> a
+    508:508:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
+    508:508:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    508:508:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    509:509:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getName():18265:18265 -> a
+    509:509:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
+    509:509:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    509:509:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    510:510:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDesc():2721:2721 -> a
+    510:510:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):122 -> a
+    510:510:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    510:510:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    511:514:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):122:125 -> a
+    511:514:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
+    511:514:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
+    515:515:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):67:67 -> a
+    516:516:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasGetter():3284:3284 -> a
+    516:516:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):69 -> a
+    517:517:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getGetter():3290:3290 -> a
+    517:517:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):69 -> a
+    518:518:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasSetter():3299:3299 -> a
+    518:518:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):71 -> a
+    519:519:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getSetter():3305:3305 -> a
+    519:519:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):71 -> a
+    520:520:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):72:72 -> a
+    521:521:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setJvmFlags(int):74:74 -> a
+    521:521:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):72 -> a
+    522:522:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):55:55 -> a
+    522:522:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
+    523:523:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> a
+    523:523:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):55 -> a
+    523:523:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
+    524:524:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> a
+    524:524:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):55 -> a
+    524:524:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
+    525:525:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):55:55 -> a
+    525:525:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
+    526:526:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):75:75 -> a
+    526:526:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
+    527:527:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74:74 -> a
+    528:528:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    528:528:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
+    529:529:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    529:529:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
+    530:530:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    530:530:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
+    531:531:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    531:531:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
+    532:532:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74:74 -> a
+    533:533:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):76:76 -> a
+    533:533:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
+    534:534:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75:75 -> a
+    535:535:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    535:535:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
+    536:536:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    536:536:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
+    537:537:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    537:537:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
+    538:538:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    538:538:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
+    539:539:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75:75 -> a
+    540:540:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):77:77 -> a
+    540:540:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
+    541:541:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasSyntheticMethod():3265:3265 -> a
+    541:541:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):78 -> a
+    542:542:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getSyntheticMethod():3275:3275 -> a
+    542:542:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):78 -> a
+    543:543:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79:79 -> a
+    544:544:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    544:544:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
+    545:545:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    545:545:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
+    546:546:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    546:546:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
+    547:547:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    547:547:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
+    548:548:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79:79 -> a
+    549:549:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):78:78 -> a
+    549:549:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
+    550:550:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasDelegateMethod():3319:3319 -> a
+    550:550:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):82 -> a
+    551:551:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getDelegateMethod():3330:3330 -> a
+    551:551:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):82 -> a
+    552:552:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83:83 -> a
+    553:553:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    553:553:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
+    554:554:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    554:554:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
+    555:555:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    555:555:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
+    556:556:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):34:34 -> a
+    556:556:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
+    557:557:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83:83 -> a
+    558:558:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):79:79 -> a
+    558:558:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
+    559:560:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):87:88 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;Lcom/android/tools/r8/internal/nZ;Lcom/android/tools/r8/internal/z10;)V"}
+    561:561:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    561:561:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    562:562:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():23:23 -> a
+    562:562:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    563:657:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:94 -> a
+    563:657:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    658:658:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasName():2230:2230 -> a
+    658:658:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):95 -> a
+    658:658:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    659:659:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
+    659:659:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):96 -> a
+    659:659:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    660:662:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):96:98 -> a
+    660:662:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    663:663:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasDesc():2249:2249 -> a
+    663:663:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):100 -> a
+    663:663:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    664:664:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
+    664:664:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101 -> a
+    664:664:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    665:665:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):101:101 -> a
+    665:665:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    666:666:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor.getValueParameterList():14771:14771 -> a
+    666:666:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):103 -> a
+    666:666:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    667:716:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):103:152 -> a
+    667:716:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    717:765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):104:152 -> a
+    717:765:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    766:768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmConstructorSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):105:107 -> a
+    766:768:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    769:769:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54:54 -> a
+    769:769:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    770:770:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> a
+    770:770:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54 -> a
+    770:770:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    771:771:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> a
+    771:771:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54 -> a
+    771:771:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    772:772:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):54:54 -> a
+    772:772:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    773:773:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):91:91 -> a
+    773:773:void readConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):88 -> a
+    774:775:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):99:100 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/internal/e00;Lcom/android/tools/r8/internal/z10;)V"}
+    776:776:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.setRaw(boolean):115:115 -> a
+    776:776:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):100 -> a
+    777:777:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):101:101 -> a
+    778:778:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():116:116 -> a
+    778:778:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102 -> a
+    779:779:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102:102 -> a
+    780:780:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():22:22 -> a
+    780:780:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102 -> a
+    781:781:void readTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):102:102 -> a
+    782:782:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):111:111 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/internal/iZ;Lcom/android/tools/r8/internal/Dm0;)V"}
+    783:783:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getAnonymousObjectOriginName():36:36 -> a
+    783:783:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):112 -> a
+    784:784:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113:113 -> a
+    785:785:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    785:785:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113 -> a
+    786:786:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113:113 -> a
+    787:787:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():34:34 -> a
+    787:787:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):115 -> a
+    788:788:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):253:253 -> a
+    789:789:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116:116 -> a
+    790:791:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
+    790:791:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    792:792:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    792:792:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2664:2664:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2664:2664:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2665:2665:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
-    2665:2665:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2665:2665:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2666:2668:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    2666:2668:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
-    2666:2668:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2669:2669:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
-    2669:2669:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2670:2670:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    2670:2670:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    2670:2670:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2671:2671:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    2671:2671:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
-    2671:2671:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2672:2672:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
-    2672:2672:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
-    2673:2675:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):42:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/internal/GZ;Lcom/android/tools/r8/internal/v10;)V"}
-    2676:2676:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():70:70 -> a
-    2676:2676:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):45 -> a
-    2677:2680:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):45:48 -> a
-    2681:2681:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    2681:2681:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48 -> a
-    2682:2682:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48:48 -> a
-    2683:2683:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.setModuleName(java.lang.String):71:71 -> a
-    2683:2683:void readPackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):48 -> a
-    2684:2685:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):55:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;Lcom/android/tools/r8/internal/BZ;Lcom/android/tools/r8/internal/v10;)V"}
-    2686:2686:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    2686:2686:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2687:2687:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    2687:2687:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2688:2762:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):0:74 -> a
-    2688:2762:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2763:2763:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasName():2230:2230 -> a
-    2763:2763:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
-    2763:2763:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2764:2764:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    2764:2764:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
-    2764:2764:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2765:2765:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getName():15907:15907 -> a
-    2765:2765:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):75 -> a
-    2765:2765:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2766:2766:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.hasDesc():2249:2249 -> a
-    2766:2766:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):76 -> a
-    2766:2766:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2767:2767:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    2767:2767:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77 -> a
-    2767:2767:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2768:2768:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):77:77 -> a
-    2768:2768:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2769:2769:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReceiverType():15981:15981 -> a
-    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
-    2769:2769:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2769:2769:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2770:2770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverType():15987:15987 -> a
-    2770:2770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):56 -> a
-    2770:2770:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2770:2770:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2771:2771:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReceiverTypeId():16002:16002 -> a
-    2771:2771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
-    2771:2771:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2771:2771:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2772:2772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
-    2772:2772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):57 -> a
-    2772:2772:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2772:2772:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2773:2773:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:79 -> a
-    2773:2773:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2774:2774:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getValueParameterList():16069:16069 -> a
-    2774:2774:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2774:2774:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2775:2840:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:144 -> a
-    2775:2840:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2841:2906:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79:144 -> a
-    2841:2906:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2907:2909:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.plus(java.util.Collection,java.lang.Iterable):3263:3265 -> a
-    2907:2909:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):79 -> a
-    2907:2909:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2910:2912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):146:148 -> a
-    2910:2912:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2913:2980:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):81:148 -> a
-    2913:2980:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2981:2981:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.hasReturnType():15916:15916 -> a
-    2981:2981:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
-    2981:2981:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    2981:2981:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2982:2982:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnType():15922:15922 -> a
-    2982:2982:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48 -> a
-    2982:2982:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    2982:2982:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2983:2983:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):48:48 -> a
-    2983:2983:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    2983:2983:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2984:2984:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function.getReturnTypeId():15937:15937 -> a
-    2984:2984:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
-    2984:2984:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    2984:2984:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2985:2985:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable.get(int):34:34 -> a
-    2985:2985:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49 -> a
-    2985:2985:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    2985:2985:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2986:2990:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82:86 -> a
-    2986:2990:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2991:2991:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66:66 -> a
-    2991:2991:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2992:2992:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getName():19:19 -> a
-    2992:2992:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66 -> a
-    2992:2992:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2993:2993:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> a
-    2993:2993:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66 -> a
-    2993:2993:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2994:2994:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method):66:66 -> a
-    2994:2994:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2995:2995:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):92:92 -> a
-    2995:2995:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    2996:2998:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):58:60 -> a
-    2999:2999:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    2999:2999:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):60 -> a
-    3000:3000:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setLambdaClassOriginName(java.lang.String):93:93 -> a
-    3000:3000:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):60 -> a
-    3001:3002:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):49:50 -> a
-    3001:3002:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable):82 -> a
-    3001:3002:void readFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):56 -> a
-    3003:3004:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):65:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/internal/JZ;Lcom/android/tools/r8/internal/v10;)V"}
-    3005:3005:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getStrings():24:24 -> a
-    3005:3005:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3006:3006:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getTypes():25:25 -> a
-    3006:3006:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3007:3123:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):0:116 -> a
-    3007:3123:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3007:3123:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3124:3124:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasField():3246:3246 -> a
-    3124:3124:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):117 -> a
-    3124:3124:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3124:3124:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3125:3125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getField():3252:3252 -> a
-    3125:3125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):117 -> a
-    3125:3125:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3125:3125:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3126:3126:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.hasName():2692:2692 -> a
-    3126:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
-    3126:3126:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3126:3126:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3127:3127:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getName():2698:2698 -> a
-    3127:3127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
-    3127:3127:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3127:3127:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3128:3128:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getName():18265:18265 -> a
-    3128:3128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):120 -> a
-    3128:3128:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3128:3128:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3129:3129:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.getDesc():2721:2721 -> a
-    3129:3129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):122 -> a
-    3129:3129:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3129:3129:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3130:3133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean):122:125 -> a
-    3130:3133:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.getJvmFieldSignature$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.TypeTable,boolean,int,java.lang.Object):110 -> a
-    3130:3133:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):66 -> a
-    3134:3134:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):67:67 -> a
-    3135:3135:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasGetter():3284:3284 -> a
-    3135:3135:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):69 -> a
-    3136:3136:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getGetter():3290:3290 -> a
-    3136:3136:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):69 -> a
-    3137:3137:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasSetter():3299:3299 -> a
-    3137:3137:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):71 -> a
-    3138:3138:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getSetter():3305:3305 -> a
-    3138:3138:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):71 -> a
-    3139:3139:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):72:72 -> a
-    3140:3140:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setJvmFlags(int):112:112 -> a
-    3140:3140:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):72 -> a
-    3141:3141:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):67:67 -> a
-    3141:3141:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
-    3142:3142:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getName():23:23 -> a
-    3142:3142:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):67 -> a
-    3142:3142:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
-    3143:3143:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> a
-    3143:3143:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):67 -> a
-    3143:3143:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
-    3144:3144:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignatureKt.wrapAsPublic(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field):67:67 -> a
-    3144:3144:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
-    3145:3145:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):113:113 -> a
-    3145:3145:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):73 -> a
-    3146:3146:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74:74 -> a
-    3147:3147:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    3147:3147:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
-    3148:3148:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3148:3148:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
-    3149:3149:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    3149:3149:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
-    3150:3150:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3150:3150:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
-    3151:3151:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74:74 -> a
-    3152:3152:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):114:114 -> a
-    3152:3152:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):74 -> a
-    3153:3153:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75:75 -> a
-    3154:3154:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    3154:3154:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
-    3155:3155:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3155:3155:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
-    3156:3156:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    3156:3156:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
-    3157:3157:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3157:3157:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
-    3158:3158:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75:75 -> a
-    3159:3159:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):115:115 -> a
-    3159:3159:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):75 -> a
-    3160:3160:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasSyntheticMethod():3265:3265 -> a
-    3160:3160:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):78 -> a
-    3161:3161:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getSyntheticMethod():3275:3275 -> a
-    3161:3161:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):78 -> a
-    3162:3162:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79:79 -> a
-    3163:3163:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    3163:3163:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
-    3164:3164:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3164:3164:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
-    3165:3165:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    3165:3165:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
-    3166:3166:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3166:3166:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
-    3167:3167:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79:79 -> a
-    3168:3168:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):116:116 -> a
-    3168:3168:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):79 -> a
-    3169:3169:boolean com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.hasDelegateMethod():3319:3319 -> a
-    3169:3169:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):82 -> a
-    3170:3170:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.getDelegateMethod():3330:3330 -> a
-    3170:3170:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):82 -> a
-    3171:3171:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83:83 -> a
-    3172:3172:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getName():2236:2236 -> a
-    3172:3172:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
-    3173:3173:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3173:3173:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
-    3174:3174:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.getDesc():2259:2259 -> a
-    3174:3174:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
-    3175:3175:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.get(int):36:36 -> a
-    3175:3175:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
-    3176:3176:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83:83 -> a
-    3177:3177:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):117:117 -> a
-    3177:3177:void readPropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext):83 -> a
-    3178:3178:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/internal/eZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    3179:3179:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getAnonymousObjectOriginName():38:38 -> a
-    3179:3179:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):112 -> a
-    3180:3180:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113:113 -> a
-    3181:3181:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    3181:3181:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113 -> a
-    3182:3182:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):113:113 -> a
-    3183:3183:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getLocalDelegatedProperties():36:36 -> a
-    3183:3183:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):115 -> a
-    3184:3184:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):257:257 -> a
-    3185:3185:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116:116 -> a
-    3186:3187:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
-    3186:3187:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3188:3188:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    3188:3188:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    792:792:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    792:792:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    793:793:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    793:793:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    793:793:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    794:796:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    794:796:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
+    794:796:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    797:797:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
+    797:797:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    798:798:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    798:798:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    798:798:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
+    799:799:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    800:800:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
+    800:800:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
+    801:801:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getModuleName():35:35 -> a
+    801:801:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):118 -> a
+    802:802:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
+    803:803:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
+    803:803:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119 -> a
+    804:804:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
+    805:805:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    805:805:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119 -> a
+    806:806:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
+    807:807:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getJvmFlags():37:37 -> a
+    807:807:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):121 -> a
+    808:808:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):121:121 -> a
+    809:809:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):126:126 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;Lcom/android/tools/r8/internal/JZ;Lcom/android/tools/r8/internal/Dm0;)V"}
+    810:810:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():48:48 -> a
+    810:810:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):127 -> a
+    811:811:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):255:255 -> a
+    812:812:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128:128 -> a
+    813:814:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
+    813:814:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    815:815:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    815:815:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3188:3188:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3188:3188:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3189:3189:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
-    3189:3189:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3189:3189:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3190:3192:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    3190:3192:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
-    3190:3192:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3193:3193:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
-    3193:3193:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3194:3194:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    3194:3194:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3194:3194:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3195:3195:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3195:3195:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
-    3195:3195:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3196:3196:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
-    3196:3196:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):116 -> a
-    3197:3197:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getModuleName():37:37 -> a
-    3197:3197:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):118 -> a
-    3198:3198:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
-    3199:3199:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
-    3199:3199:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119 -> a
-    3200:3200:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
-    3201:3201:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    3201:3201:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119 -> a
-    3202:3202:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):119:119 -> a
-    3203:3203:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.getJvmFlags():39:39 -> a
-    3203:3203:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):121 -> a
-    3204:3204:void writeClassExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):121:121 -> a
-    3205:3205:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/internal/FZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    3206:3206:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():70:70 -> a
-    3206:3206:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):127 -> a
-    3207:3207:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):259:259 -> a
-    3208:3208:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128:128 -> a
-    3209:3210:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18855:18856 -> a
-    3209:3210:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3211:3211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
-    3211:3211:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
+    815:815:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    815:815:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    816:816:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    816:816:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    816:816:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    817:819:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    817:819:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
+    817:819:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    820:820:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
+    820:820:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    821:821:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    821:821:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    821:821:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    822:822:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    822:822:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
+    822:822:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    823:823:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
+    823:823:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
+    824:824:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():49:49 -> a
+    824:824:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):130 -> a
+    825:825:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):131:131 -> a
+    826:826:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
+    826:826:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):131 -> a
+    827:827:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132:132 -> a
+    828:828:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    828:828:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132 -> a
+    829:829:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132:132 -> a
+    830:830:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):147:147 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/internal/EZ;Lcom/android/tools/r8/internal/Dm0;)V"}
+    831:831:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getSignature():61:61 -> a
+    831:831:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):148 -> a
+    832:832:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):148:148 -> a
+    833:833:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getLambdaClassOriginName():62:62 -> a
+    833:833:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149 -> a
+    834:834:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149:149 -> a
+    835:835:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):28:28 -> a
+    835:835:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149 -> a
+    836:836:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149:149 -> a
+    837:838:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):155:156 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/MZ;Lcom/android/tools/r8/internal/Dm0;)V"}
+    839:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3486:3486 -> a
+    839:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.access$3200():3472 -> a
+    839:839:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.newBuilder():3462 -> a
+    839:839:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):156 -> a
+    840:840:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():75:75 -> a
+    840:840:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):159 -> a
+    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2853:2853 -> a
+    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.access$2500():2839 -> a
+    841:841:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder():2829 -> a
+    841:841:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):161 -> a
+    842:842:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162:162 -> a
+    843:871:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    843:871:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162 -> a
+    872:873:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.setName(int):2950:2951 -> a
+    872:873:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162 -> a
+    874:874:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():75:75 -> a
+    874:874:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
+    875:875:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163:163 -> a
+    876:876:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature.getDescriptor():49:49 -> a
+    876:876:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
+    877:905:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    877:905:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
+    906:907:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.setDesc(int):2994:2995 -> a
+    906:907:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
+    908:909:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2874:2875 -> a
+    908:909:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
+    910:912:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3613:3615 -> a
+    910:912:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):161 -> a
+    913:913:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    913:913:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876 -> a
+    913:913:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
+    914:914:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876:2876 -> a
+    914:914:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
+    915:915:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getGetterSignature():76:76 -> a
+    915:915:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):166 -> a
+    916:916:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):168:168 -> a
+    917:919:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setGetter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3757:3759 -> a
+    917:919:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):168 -> a
+    920:920:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSetterSignature():77:77 -> a
+    920:920:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):170 -> a
+    921:921:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):172:172 -> a
+    922:924:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setSetter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3817:3819 -> a
+    922:924:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):172 -> a
+    925:926:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):174:175 -> a
+    927:929:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setSyntheticMethod(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3685:3687 -> a
+    927:929:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):175 -> a
+    930:930:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSyntheticMethodForDelegate():79:79 -> a
+    930:930:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):177 -> a
+    931:931:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):178:178 -> a
+    932:934:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setDelegateMethod(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3892:3894 -> a
+    932:934:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):178 -> a
+    935:935:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():74:74 -> a
+    935:935:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180 -> a
+    936:936:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> a
+    936:936:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180 -> a
+    937:937:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180:180 -> a
+    938:938:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():74:74 -> a
+    938:938:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):181 -> a
+    939:942:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):181:184 -> a
+    943:944:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3513:3514 -> a
+    943:944:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
+    945:945:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184:184 -> a
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    946:946:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515 -> a
+    946:946:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
+    947:947:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515:3515 -> a
+    947:947:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
+    948:948:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):190:190 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;Lcom/android/tools/r8/internal/mZ;Lcom/android/tools/r8/internal/Dm0;)V"}
+    949:949:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.getSignature():91:91 -> a
+    949:949:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):191 -> a
+    950:950:void writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):191:191 -> a
+    951:951:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):203:203 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/internal/d00;Lcom/android/tools/r8/internal/Dm0;)V"}
+    952:952:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.isRaw():115:115 -> a
+    952:952:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):204 -> a
+    953:953:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):204:204 -> a
+    954:954:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.getAnnotations():116:116 -> a
+    954:954:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):205 -> a
+    955:955:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):259:259 -> a
+    956:956:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206:206 -> a
+    957:957:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():22:22 -> a
+    957:957:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    958:958:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206:206 -> a
+    959:960:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4369:4370 -> a
+    959:960:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    961:961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension.getContainingTypeDefaultInstance():825:825 -> a
+    961:961:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3211:3211:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3211:3211:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3212:3212:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
-    3212:3212:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3212:3212:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3213:3215:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
-    3213:3215:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
-    3213:3215:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3216:3216:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
-    3216:3216:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3217:3217:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
-    3217:3217:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
-    3217:3217:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3218:3218:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3218:3218:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857 -> a
-    3218:3218:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3219:3219:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder.build():18857:18857 -> a
-    3219:3219:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):128 -> a
-    3220:3220:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():71:71 -> a
-    3220:3220:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):130 -> a
-    3221:3221:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):131:131 -> a
-    3222:3222:boolean com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.areEqual(java.lang.Object,java.lang.Object):169:169 -> a
-    3222:3222:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):131 -> a
-    3223:3223:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132:132 -> a
-    3224:3224:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    3224:3224:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132 -> a
-    3225:3225:void writePackageExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):132:132 -> a
-    3226:3226:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;Lcom/android/tools/r8/internal/AZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    3227:3227:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getSignature():92:92 -> a
-    3227:3227:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):148 -> a
-    3228:3228:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):148:148 -> a
-    3229:3229:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getLambdaClassOriginName():93:93 -> a
-    3229:3229:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149 -> a
-    3230:3230:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149:149 -> a
-    3231:3231:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):29:29 -> a
-    3231:3231:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149 -> a
-    3232:3232:void writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):149:149 -> a
-    3233:3234:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):155:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/internal/IZ;Lcom/android/tools/r8/internal/zm0;)V"}
-    3235:3235:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3486:3486 -> a
-    3235:3235:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.access$3200():3472 -> a
-    3235:3235:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature.newBuilder():3462 -> a
-    3235:3235:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):156 -> a
-    3236:3236:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():113:113 -> a
-    3236:3236:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):159 -> a
-    3237:3237:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2853:2853 -> a
-    3237:3237:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.access$2500():2839 -> a
-    3237:3237:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder():2829 -> a
-    3237:3237:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):161 -> a
-    3238:3238:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162:162 -> a
-    3239:3268:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3239:3268:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162 -> a
-    3269:3270:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.setName(int):2950:2951 -> a
-    3269:3270:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):162 -> a
-    3271:3271:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getFieldSignature():113:113 -> a
-    3271:3271:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
-    3272:3272:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163:163 -> a
-    3273:3273:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature.getDescriptor():61:61 -> a
-    3273:3273:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
-    3274:3303:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3274:3303:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
-    3304:3305:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.setDesc(int):2994:2995 -> a
-    3304:3305:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):163 -> a
-    3306:3307:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2874:2875 -> a
-    3306:3307:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
-    3308:3310:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setField(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):3613:3615 -> a
-    3308:3310:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):161 -> a
-    3311:3311:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3311:3311:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876 -> a
-    3311:3311:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
-    3312:3312:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.build():2876:2876 -> a
-    3312:3312:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):164 -> a
-    3313:3313:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getGetterSignature():114:114 -> a
-    3313:3313:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):166 -> a
-    3314:3314:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):168:168 -> a
-    3315:3317:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setGetter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3757:3759 -> a
-    3315:3317:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):168 -> a
-    3318:3318:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSetterSignature():115:115 -> a
-    3318:3318:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):170 -> a
-    3319:3319:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):172:172 -> a
-    3320:3322:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setSetter(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3817:3819 -> a
-    3320:3322:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):172 -> a
-    3323:3324:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):174:175 -> a
-    3325:3327:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setSyntheticMethod(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3685:3687 -> a
-    3325:3327:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):175 -> a
-    3328:3328:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSyntheticMethodForDelegate():117:117 -> a
-    3328:3328:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):177 -> a
-    3329:3329:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):178:178 -> a
-    3330:3332:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.setDelegateMethod(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):3892:3894 -> a
-    3330:3332:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):178 -> a
-    3333:3333:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():112:112 -> a
-    3333:3333:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180 -> a
-    3334:3334:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property.getDefaultInstance():17979:17979 -> a
-    3334:3334:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180 -> a
-    3335:3335:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):180:180 -> a
-    3336:3336:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getJvmFlags():112:112 -> a
-    3336:3336:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):181 -> a
-    3337:3340:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):181:184 -> a
-    3341:3342:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3513:3514 -> a
-    3341:3342:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
-    3343:3343:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184:184 -> a
-    3344:3344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3344:3344:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515 -> a
-    3344:3344:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
-    3345:3345:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3515:3515 -> a
-    3345:3345:void writePropertyExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):184 -> a
-    3346:3346:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension createClassExtension():222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AH;"}
-    3347:3347:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;Lcom/android/tools/r8/internal/zm0;)Lcom/android/tools/r8/internal/ED;"}
-    3348:3348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2391:2391 -> a
-    3348:3348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.access$1800():2377 -> a
-    3348:3348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder():2367 -> a
-    3348:3348:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):250 -> a
-    3349:3349:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):251:251 -> a
-    3350:3379:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3350:3379:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):251 -> a
-    3380:3381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.setName(int):2488:2489 -> a
-    3380:3381:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):251 -> a
-    3382:3382:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():50:50 -> a
-    3382:3382:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):252 -> a
-    3383:3412:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:29 -> a
-    3383:3412:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):252 -> a
-    3413:3414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.setDesc(int):2532:2533 -> a
-    3413:3414:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):252 -> a
-    3415:3416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2412:2413 -> a
-    3415:3416:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):253 -> a
-    3417:3417:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
-    3417:3417:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414 -> a
-    3417:3417:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):253 -> a
-    3418:3418:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414:2414 -> a
-    3418:3418:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):253 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension createConstructorExtension():239:239 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GH;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension createFunctionExtension():235:235 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UH;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension createPackageExtension():224:224 -> d
+    961:961:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    961:961:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    962:962:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):368:368 -> a
+    962:962:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    962:962:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    963:965:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.ensureExtensionsIsMutable():350:352 -> a
+    963:965:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):454 -> a
+    963:965:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    966:966:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):455:455 -> a
+    966:966:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    967:967:void com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> a
+    967:967:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.addExtension(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):453 -> a
+    967:967:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    968:968:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    968:968:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371 -> a
+    968:968:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    969:969:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
+    969:969:void writeTypeExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):206 -> a
+    970:970:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmClassExtension createClassExtension():222:222 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KH;"}
+    971:971:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):246:246 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DD;Lcom/android/tools/r8/internal/Dm0;)Lcom/android/tools/r8/internal/SD;"}
+    972:972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2391:2391 -> a
+    972:972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.access$1800():2377 -> a
+    972:972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder():2367 -> a
+    972:972:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):246 -> a
+    973:973:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):247:247 -> a
+    974:1002:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    974:1002:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):247 -> a
+    1003:1004:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.setName(int):2488:2489 -> a
+    1003:1004:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):247 -> a
+    1005:1005:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():38:38 -> a
+    1005:1005:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):248 -> a
+    1006:1034:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.get(java.lang.String):0:28 -> a
+    1006:1034:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):248 -> a
+    1035:1036:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.setDesc(int):2532:2533 -> a
+    1035:1036:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):248 -> a
+    1037:1038:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2412:2413 -> a
+    1037:1038:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):249 -> a
+    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):316:316 -> a
+    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414 -> a
+    1039:1039:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):249 -> a
+    1040:1040:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2414:2414 -> a
+    1040:1040:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):249 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmConstructorExtension createConstructorExtension():235:235 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OH;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmFunctionExtension createFunctionExtension():231:231 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZH;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPropertyExtension createPropertyExtension():237:237 -> e
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPackageExtension createPackageExtension():224:224 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeAliasExtension createTypeAliasExtension():245:245 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension createTypeExtension():243:243 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension createTypeParameterExtension():241:241 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mI;"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmValueParameterExtension createValueParameterExtension():247:247 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rI;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension -> com.android.tools.r8.internal.xD:
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmPropertyExtension createPropertyExtension():233:233 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeAliasExtension createTypeAliasExtension():241:241 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeExtension createTypeExtension():239:239 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension createTypeParameterExtension():237:237 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nI;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmValueParameterExtension createValueParameterExtension():243:243 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qI;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension -> com.android.tools.r8.internal.LD:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    java.util.List localDelegatedProperties -> b
+    java.util.List localDelegatedProperties -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    java.lang.String moduleName -> c
-    1:2:void <init>():69:70 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension -> com.android.tools.r8.internal.yD:
+    java.lang.String moduleName -> b
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:2:void <init>():47:48 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():52:52 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension -> com.android.tools.r8.internal.MD:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    int jvmFlags -> c
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature fieldSignature -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/e;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getterSignature -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setterSignature -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature syntheticMethodForDelegate -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    1:1:void <init>():111:111 -> <init>
-    1:4:void visit(int,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):125:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/e;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    5:5:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):136:136 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():116:116 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils -> com.android.tools.r8.internal.RD:
+    int jvmFlags -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature fieldSignature -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getterSignature -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setterSignature -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature syntheticMethodForDelegate -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DD;"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>():73:73 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():78:78 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DD;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():82:82 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmReadUtils -> com.android.tools.r8.internal.fE:
 # {"id":"sourceFile","fileName":"JvmReadUtils.kt"}
     1:1:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d1():95:95 -> a
     1:1:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):11 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/Q;)Lcom/android/tools/r8/internal/YH;"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/S;)Lcom/android/tools/r8/internal/cI;"}
     2:2:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):11:11 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     3:3:java.lang.String[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.d2():100:100 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33:33 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32:32 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37:37 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     6:7:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):41:42 -> a
     6:7:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> a
-    6:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    6:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13217:13217 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42 -> a
     8:8:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> a
     9:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> a
     9:9:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     9:9:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42 -> a
     9:9:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):209:209 -> a
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):49 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13217 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.ExtensionRegistryLite):13217:13217 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> a
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
-    12:12:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
+    12:12:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> a
+    12:12:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
     13:13:int[] com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper.mv():120:120 -> a
-    13:13:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    14:14:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):24:24 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):112:112 -> a
-    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    16:133:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):0:117 -> a
-    16:133:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    16:133:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    134:134:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getTypeTable():13061:13061 -> a
-    134:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):117 -> a
-    134:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    134:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    135:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):117:118 -> a
-    135:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    135:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getVersionRequirementTable():13076:13076 -> a
-    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118:118 -> a
-    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    139:139:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementCount():24089:24089 -> a
-    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
-    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    141:141:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementList():24076:24076 -> a
-    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19 -> a
-    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19:19 -> a
-    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):118 -> a
-    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):115:115 -> a
-    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    145:145:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getFunctionList():12950:12950 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123:123 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    147:147:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getPropertyList():12985:12985 -> a
-    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123 -> a
-    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123:123 -> a
-    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    149:149:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getTypeAliasList():13020:13020 -> a
+    13:13:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    14:14:boolean isLessThan14(com.android.tools.r8.jetbrains.kotlin.Metadata):23:23 -> a
+    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):110:110 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    16:131:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):0:115 -> a
+    16:131:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    16:131:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getTypeTable():13061:13061 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):115 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    132:132:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    133:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):115:116 -> a
+    133:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    133:134:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    135:135:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getVersionRequirementTable():13076:13076 -> a
+    135:135:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    135:135:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    135:135:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116:116 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    136:136:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    137:137:int com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementCount():24089:24089 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
+    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    138:138:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    139:139:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.getRequirementList():24076:24076 -> a
+    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19 -> a
+    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    139:139:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):19:19 -> a
+    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    140:140:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.create(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):116 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):113:113 -> a
+    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    142:142:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    143:143:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getFunctionList():12950:12950 -> a
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121 -> a
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    143:143:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121:121 -> a
+    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    144:144:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    145:145:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getPropertyList():12985:12985 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    145:145:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121:121 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    146:146:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    147:147:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package.getTypeAliasList():13020:13020 -> a
+    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121 -> a
+    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    147:147:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):121:121 -> a
+    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    148:148:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    149:149:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():31:31 -> a
     149:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123 -> a
-    149:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    149:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123:123 -> a
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    151:151:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadContext.getExtensions$kotlin_metadata():33:33 -> a
-    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):125 -> a
-    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):447:447 -> a
-    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):125:125 -> a
-    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):109 -> a
-    153:153:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):34 -> a
-    154:154:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):12:12 -> a
-    154:154:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension -> com.android.tools.r8.internal.TD:
+    149:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    149:149:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):445:445 -> a
+    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    150:150:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List):123:123 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage com.android.tools.r8.jetbrains.kotlin.metadata.internal.ReadersKt.toKmPackage$default(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.ProtoBuf$Package,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.deserialization.NameResolver,boolean,java.util.List,int,java.lang.Object):107 -> a
+    151:151:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):33 -> a
+    152:152:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExceptionUtilsKt.requireNotEmpty(com.android.tools.r8.jetbrains.kotlin.Metadata):12:12 -> a
+    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage readKmPackage$kotlin_metadata_jvm(com.android.tools.r8.jetbrains.kotlin.Metadata):32 -> a
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension -> com.android.tools.r8.internal.hE:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    boolean isRaw -> c
-    java.util.List annotations -> d
+    boolean isRaw -> a
+    java.util.List annotations -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:3:void <init>():175:177 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension -> com.android.tools.r8.internal.UD:
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():123:123 -> <clinit>
+    1:3:void <init>():114:116 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():119:119 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension -> com.android.tools.r8.internal.iE:
 # {"id":"sourceFile","fileName":"JvmExtensionNodes.kt"}
-    java.util.List annotations -> c
+    java.util.List annotations -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:2:void <init>():161:162 -> <init>
-com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmWriteUtilsKt -> com.android.tools.r8.internal.VD:
+    com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType TYPE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WH;"}
+    1:1:void <clinit>():110:110 -> <clinit>
+    1:2:void <init>():102:103 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType getType():106:106 -> getType
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WH;"}
+com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmWriteUtilsKt -> com.android.tools.r8.internal.jE:
 # {"id":"sourceFile","fileName":"JvmWriteUtils.kt"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():23:23 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.serialization.StringTable com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext.getStrings():22:22 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):14 -> a
     1:1:com.android.tools.r8.internal.Pair com.android.tools.r8.internal.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.internal.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.internal.WriteContext):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ar;Lcom/android/tools/r8/internal/zm0;)Lcom/android/tools/r8/internal/JV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cr;Lcom/android/tools/r8/internal/Dm0;)Lcom/android/tools/r8/internal/NV;"}
     2:4:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):14:16 -> a
     2:4:com.android.tools.r8.internal.Pair com.android.tools.r8.internal.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.internal.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.internal.WriteContext):0 -> a
     5:5:byte[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeDataBytes(com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.serialization.JvmStringTable,com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite):63:63 -> a
@@ -220058,7 +218823,7 @@
     199:199:java.lang.String[] com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.metadata.jvm.serialization.JvmStringTable):59 -> a
     199:199:com.android.tools.r8.jetbrains.kotlin.Pair writeProtoBufData(com.android.tools.r8.jetbrains.kotlin.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlin.metadata.internal.WriteContext):16 -> a
     199:199:com.android.tools.r8.internal.Pair com.android.tools.r8.internal.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.internal.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.internal.WriteContext):0 -> a
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.nA:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     int first -> b
     int last -> c
@@ -220068,7 +218833,7 @@
     28:28:void <init>(int,int,int):86:86 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator iterator():105:105 -> iterator
     1:1:java.util.Iterator iterator():78 -> iterator
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.mA:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.oA:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> b
     int finalElement -> c
@@ -220084,10 +218849,10 @@
     5:9:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():36 -> next
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():36:36 -> next
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.pA:
 # {"id":"sourceFile","fileName":"PrimitiveRanges.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pA;"}
     1:1:void <clinit>():85:85 -> <clinit>
     1:1:void <init>(int,int):53:53 -> <init>
     1:1:boolean equals(java.lang.Object):75:75 -> equals
@@ -220118,42 +218883,42 @@
     4:4:int com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression.getLast():98:98 -> toString
     4:4:java.lang.String toString():81 -> toString
     5:5:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> R8$$REMOVED$$CLASS$$199:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> R8$$REMOVED$$CLASS$$187:
 # {"id":"sourceFile","fileName":"PrimitiveRanges.kt"}
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt -> R8$$REMOVED$$CLASS$$200:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt -> R8$$REMOVED$$CLASS$$188:
 # {"id":"sourceFile","fileName":"_Ranges.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.kE:
 # {"id":"sourceFile","fileName":"KCallable.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.lE:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.mE:
 # {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.EmptySequence -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.jetbrains.kotlin.sequences.EmptySequence -> com.android.tools.r8.internal.dn:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.EmptySequence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bn;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dn;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     1:1:java.util.Iterator iterator():45:45 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence -> com.android.tools.r8.internal.Up:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/za0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Da0;"}
     boolean sendWhen -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 predicate -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KI;"}
     1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,boolean,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):157:160 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/za0;ZLcom/android/tools/r8/internal/Wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Da0;ZLcom/android/tools/r8/internal/Yq;)V"}
     1:1:java.util.Iterator iterator():163:163 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence$iterator$1 -> com.android.tools.r8.internal.Qp:
+com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence$iterator$1 -> com.android.tools.r8.internal.Tp:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> b
     int nextState -> c
     java.lang.Object nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Up;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence):163:163 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Up;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence.access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence):157:157 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence):164 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FilteringSequence):164:165 -> <init>
@@ -220187,26 +218952,26 @@
     14:18:java.lang.Object next():183:187 -> next
     19:19:java.lang.Object next():184:184 -> next
     1:1:void remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence -> com.android.tools.r8.internal.qq:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/za0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Da0;"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KI;"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 iterator -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):286:290 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/za0;Lcom/android/tools/r8/internal/Wq;Lcom/android/tools/r8/internal/Wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Da0;Lcom/android/tools/r8/internal/Yq;Lcom/android/tools/r8/internal/Yq;)V"}
     1:1:java.util.Iterator iterator():298:298 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence$iterator$1 -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence$iterator$1 -> com.android.tools.r8.internal.pq:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> b
     java.util.Iterator itemIterator -> c
     int state -> d
     com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qq;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence):298:298 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qq;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence.access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence):286:286 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence):299 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence):299:299 -> <init>
@@ -220220,20 +218985,20 @@
     1:6:java.lang.Object next():307:312 -> next
     7:7:java.lang.Object next():307:307 -> next
     1:1:void remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.za0:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.Da0:
 # {"id":"sourceFile","fileName":"Sequence.kt"}
     java.util.Iterator iterator() -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator -> com.android.tools.r8.internal.Aa0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator -> com.android.tools.r8.internal.Ea0:
 # {"id":"sourceFile","fileName":"SequenceBuilder.kt"}
     int state -> b
     java.lang.Object nextValue -> c
     com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation nextStep -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zg;"}
     1:1:void com.android.tools.r8.jetbrains.kotlin.sequences.SequenceScope.<init>():51:51 -> <init>
     1:1:void <init>():104 -> <init>
     1:2:void resumeWith(java.lang.Object):183:184 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.coroutines.CoroutineContext getContext():188:188 -> getContext
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rm;"}
     1:1:boolean hasNext():112:112 -> hasNext
     2:2:java.lang.Throwable exceptionalState():158:158 -> hasNext
     2:2:boolean hasNext():123 -> hasNext
@@ -220256,79 +219021,82 @@
     12:12:java.lang.Object nextNotReady():152:152 -> next
     12:12:java.lang.Object next():135 -> next
     1:1:void remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.sequences.SequenceScope -> R8$$REMOVED$$CLASS$$201:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequenceScope -> R8$$REMOVED$$CLASS$$189:
 # {"id":"sourceFile","fileName":"SequenceBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt -> com.android.tools.r8.internal.Ba0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt -> com.android.tools.r8.internal.Fa0:
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filter(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):435:435 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/za0;Lcom/android/tools/r8/internal/Wq;)Lcom/android/tools/r8/internal/Rp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Da0;Lcom/android/tools/r8/internal/Yq;)Lcom/android/tools/r8/internal/Up;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filterNotNull(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):512:512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/re;)Lcom/android/tools/r8/internal/Rp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/te;)Lcom/android/tools/r8/internal/Up;"}
     3:3:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filterNot(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):500:500 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filterNotNull(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):512 -> a
     4:8:java.util.List com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.toList(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):812:816 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/za0;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Da0;)Ljava/util/List;"}
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):22:22 -> a
     9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.toList(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):817 -> a
     10:12:java.util.List com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.toList(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):818:820 -> a
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt -> com.android.tools.r8.internal.Da0:
+    13:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.asSequence(java.lang.Object[]):24039:24040 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.sequenceOf(java.lang.Object[]):37 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Lcom/android/tools/r8/internal/Da0;"}
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt -> com.android.tools.r8.internal.Ha0:
 # {"id":"sourceFile","fileName":"SequenceBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1 -> com.android.tools.r8.internal.Ca0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1 -> com.android.tools.r8.internal.Ga0:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 $block$inlined -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z80;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kr;)V"}
-    1:1:java.util.Iterator iterator():699:699 -> iterator
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mr;)V"}
+    1:1:java.util.Iterator iterator():23:23 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):37:37 -> iterator
-    2:2:java.util.Iterator iterator():699 -> iterator
+    2:2:java.util.Iterator iterator():23 -> iterator
     3:3:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt.createCoroutineUnintercepted(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):163:163 -> iterator
     3:3:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):38 -> iterator
-    3:3:java.util.Iterator iterator():699 -> iterator
+    3:3:java.util.Iterator iterator():23 -> iterator
     4:4:void com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator.setNextStep(com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):108:108 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):38 -> iterator
-    4:4:java.util.Iterator iterator():699 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesJVMKt -> com.android.tools.r8.internal.Ea0:
+    4:4:java.util.Iterator iterator():23 -> iterator
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesJVMKt -> com.android.tools.r8.internal.Ia0:
 # {"id":"sourceFile","fileName":"SequencesJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$1 -> com.android.tools.r8.internal.Fa0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$1 -> com.android.tools.r8.internal.Ja0:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ja0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):82:82 -> a
     2:84:java.util.Iterator invoke(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):0:82 -> a
     2:84:java.lang.Object invoke(java.lang.Object):82 -> a
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$3 -> com.android.tools.r8.internal.Ga0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$3 -> com.android.tools.r8.internal.Ka0:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt$flatten$3 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ga0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ka0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):98:98 -> a
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt -> R8$$REMOVED$$CLASS$$202:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt -> R8$$REMOVED$$CLASS$$190:
 # {"id":"sourceFile","fileName":"_Sequences.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$asIterable$$inlined$Iterable$1 -> com.android.tools.r8.internal.Ha0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$asIterable$$inlined$Iterable$1 -> com.android.tools.r8.internal.La0:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence $this_asIterable$inlined -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ki;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mi;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ki;)V"}
-    1:1:java.util.Iterator iterator():71:71 -> iterator
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mi;)V"}
+    1:1:java.util.Iterator iterator():18:18 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence.iterator():1190:1190 -> iterator
-    2:2:java.util.Iterator iterator():71 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$filterNotNull$1 -> com.android.tools.r8.internal.Ia0:
+    2:2:java.util.Iterator iterator():18 -> iterator
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$filterNotNull$1 -> com.android.tools.r8.internal.Ma0:
 # {"id":"sourceFile","fileName":"_Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$filterNotNull$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ia0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ma0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Boolean invoke(java.lang.Object):512:512 -> a
     1:1:java.lang.Object invoke(java.lang.Object):512 -> a
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$flatMap$2 -> com.android.tools.r8.internal.Ja0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$flatMap$2 -> com.android.tools.r8.internal.Na0:
 # {"id":"sourceFile","fileName":"_Sequences.kt"}
     int com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference.flags -> g
     com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$flatMap$2 INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ja0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Na0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     2:4:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference.<init>(int,java.lang.Object,java.lang.Class,java.lang.String,java.lang.String,int):50:52 -> <init>
@@ -220336,7 +219104,7 @@
     2:4:void <init>():0 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KFunction com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection.function(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference):90:90 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference.computeReflected():69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WD;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
     2:2:java.lang.Object invoke(java.lang.Object):876:876 -> a
     3:879:java.util.Iterator invoke(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):0:876 -> a
     3:879:java.lang.Object invoke(java.lang.Object):876 -> a
@@ -220371,29 +219139,29 @@
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.getName():120:120 -> toString
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference.toString():136 -> toString
     13:13:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionReference.toString():136:136 -> toString
-com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$onEach$1 -> com.android.tools.r8.internal.Ka0:
+com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt$onEach$1 -> com.android.tools.r8.internal.Oa0:
 # {"id":"sourceFile","fileName":"_Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $action -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KI;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yq;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):2175:2175 -> a
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.Ch0:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.Gh0:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/za0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Da0;"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KI;"}
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):205:206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/za0;Lcom/android/tools/r8/internal/Wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Da0;Lcom/android/tools/r8/internal/Yq;)V"}
     1:1:java.util.Iterator iterator():207:207 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.Bh0:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.Fh0:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ch0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gh0;"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):207:207 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ch0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gh0;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence.access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):205:205 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):208 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):208:208 -> <init>
@@ -220403,35 +219171,35 @@
     2:2:java.lang.Object next():210 -> next
     3:3:java.lang.Object next():210:210 -> next
     1:1:void remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.text.CharsKt -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt -> com.android.tools.r8.internal.yb:
     1:4:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):237:240 -> a
-com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> R8$$REMOVED$$CLASS$$203:
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> R8$$REMOVED$$CLASS$$191:
 # {"id":"sourceFile","fileName":"Char.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.mi:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence input -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/String;"}
     int startIndex -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KI;"}
     1:5:void <init>(java.lang.CharSequence,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):1183:1187 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;IILcom/android/tools/r8/internal/kr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;IILcom/android/tools/r8/internal/mr;)V"}
     1:1:java.util.Iterator iterator():1190:1190 -> iterator
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.li:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     int nextState -> b
     int currentStartIndex -> c
     int nextSearchIndex -> d
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pA;"}
     int counter -> f
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ki;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mi;"}
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1190:1191 -> <init>
     1:2:void com.android.tools.r8.internal.DelimitedRangesSequence$iterator$1.<init>(com.android.tools.r8.internal.DelimitedRangesSequence):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ki;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mi;)V"}
     3:3:int com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence.access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1183:1183 -> <init>
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1192 -> <init>
     3:3:void com.android.tools.r8.internal.DelimitedRangesSequence$iterator$1.<init>(com.android.tools.r8.internal.DelimitedRangesSequence):0 -> <init>
@@ -220445,7 +219213,7 @@
     7:7:void com.android.tools.r8.internal.DelimitedRangesSequence$iterator$1.<init>(com.android.tools.r8.internal.DelimitedRangesSequence):0 -> <init>
     8:8:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):0:0 -> <init>
     8:8:void com.android.tools.r8.internal.DelimitedRangesSequence$iterator$1.<init>(com.android.tools.r8.internal.DelimitedRangesSequence):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12,"4":13,"5":14},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12,"4":13,"5":14},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     9:9:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1414:1414 -> <init>
     9:9:void <init>(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1192 -> <init>
     9:9:void com.android.tools.r8.internal.DelimitedRangesSequence$iterator$1.<init>(com.android.tools.r8.internal.DelimitedRangesSequence):0 -> <init>
@@ -220496,28 +219264,28 @@
     9:9:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange next():1225:1225 -> next
     9:9:java.lang.Object next():1190 -> next
     1:1:void remove():0:0 -> remove
-com.android.tools.r8.jetbrains.kotlin.text.Regex -> com.android.tools.r8.internal.o40:
+com.android.tools.r8.jetbrains.kotlin.text.Regex -> com.android.tools.r8.internal.s40:
 # {"id":"sourceFile","fileName":"Regex.kt"}
     java.util.regex.Pattern nativePattern -> b
     1:1:void <init>(java.lang.String):88:88 -> <init>
     2:5:void <init>(java.util.regex.Pattern):81:84 -> <init>
     2:5:void <init>(java.lang.String):88 -> <init>
     1:1:java.lang.String toString():297:297 -> toString
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__AppendableKt -> com.android.tools.r8.internal.Gf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__AppendableKt -> com.android.tools.r8.internal.Kf0:
 # {"id":"sourceFile","fileName":"Appendable.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.Hf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.Lf0:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.If0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.Mf0:
 # {"id":"sourceFile","fileName":"RegexExtensionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.Jf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.Nf0:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.Kf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.Of0:
 # {"id":"sourceFile","fileName":"StringBuilderJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.Lf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.Pf0:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.Mf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.Qf0:
 # {"id":"sourceFile","fileName":"StringNumberConversionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.Pf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.Tf0:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     1:1:boolean contains(java.lang.CharSequence,java.lang.CharSequence,boolean):0:0 -> a
     1:1:boolean contains$default(java.lang.CharSequence,java.lang.CharSequence,boolean,int,java.lang.Object):1156 -> a
@@ -220709,7 +219477,7 @@
     472:915:java.lang.String substringBefore(java.lang.String,char,java.lang.String):0:443 -> c
     472:915:java.lang.String substringBefore$default(java.lang.String,char,java.lang.String,int,java.lang.Object):441 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;C)Ljava/lang/String;"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$1 -> com.android.tools.r8.internal.Nf0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$1 -> com.android.tools.r8.internal.Rf0:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     char[] $delimiters -> b
     boolean $ignoreCase -> c
@@ -220723,7 +219491,7 @@
     1258:1258:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1258:1258:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):1255 -> a
     1258:1258:java.lang.Object invoke(java.lang.Object,java.lang.Object):1254 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.Of0:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.Sf0:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.util.List $delimitersList -> b
     boolean $ignoreCase -> c
@@ -220835,175 +219603,248 @@
     1315:1315:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1315:1315:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):1278 -> a
     1315:1315:java.lang.Object invoke(java.lang.Object,java.lang.Object):1278 -> a
-com.android.tools.r8.keepanno.annotations.KeepItemKind -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.keepanno.annotations.KeepItemKind -> com.android.tools.r8.internal.qG:
 # {"id":"sourceFile","fileName":"KeepItemKind.java"}
     com.android.tools.r8.keepanno.annotations.KeepItemKind DEFAULT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qG;"}
     com.android.tools.r8.keepanno.annotations.KeepItemKind[] $VALUES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/eG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/qG;"}
     1:8:void <clinit>():7:14 -> <clinit>
     9:9:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.keepanno.annotations.KeepItemKind[] values():6:6 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/eG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/qG;"}
 com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo -> com.android.tools.r8.kotlin.a:
 # {"id":"sourceFile","fileName":"ConcreteKotlinPropertyInfo.java"}
-    int flags -> a
-    int getterFlags -> b
-    int setterFlags -> c
-    java.lang.String name -> d
-    com.android.tools.r8.kotlin.KotlinTypeInfo returnType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    com.android.tools.r8.kotlin.KotlinValueParameterInfo setterParameter -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
-    java.util.List typeParameters -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty kmProperty -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fI;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo returnType -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    com.android.tools.r8.kotlin.KotlinValueParameterInfo setterParameter -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    int jvmFlags -> j
-    com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo fieldSignature -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/K;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getterSignature -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo setterSignature -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForDelegate -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    java.util.List contextReceiverTypes -> p
-    boolean $assertionsDisabled -> q
+    java.util.List typeParameters -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo fieldSignature -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/L;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getterSignature -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo setterSignature -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForDelegate -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    java.util.List contextReceiverTypes -> k
+    boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
-    1:18:void <init>(int,int,int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinValueParameterInfo,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,int,com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,java.util.List):80:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILjava/lang/String;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/s0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/t0;ILcom/android/tools/r8/kotlin/K;Lcom/android/tools/r8/kotlin/M;Lcom/android/tools/r8/kotlin/M;Lcom/android/tools/r8/kotlin/M;Lcom/android/tools/r8/kotlin/M;Ljava/util/List;)V"}
-    1:122:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):0:121 -> a
-    1:122:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/e;)V"}
-    123:123:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):113:113 -> a
-    123:123:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):121 -> a
-    123:123:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):188 -> a
-    124:256:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:132 -> a
-    124:256:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    257:257:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):114:114 -> a
-    257:257:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):132 -> a
-    257:257:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):195 -> a
-    258:258:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/kotlin/a;"}
-    259:259:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getFlags():496:496 -> a
-    259:259:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    260:260:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538:538 -> a
-    260:260:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):104 -> a
-    261:261:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> a
-    261:261:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    261:261:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):104 -> a
-    262:265:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:108 -> a
-    266:266:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():592:592 -> a
-    266:266:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109 -> a
-    267:267:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109:109 -> a
-    268:270:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:53 -> a
-    268:270:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109 -> a
-    271:271:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    271:271:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54 -> a
-    271:271:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109 -> a
-    272:273:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):55:56 -> a
-    272:273:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):109 -> a
-    274:274:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():568:568 -> a
-    274:274:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):110 -> a
-    275:275:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):110:110 -> a
-    276:276:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():602:602 -> a
-    276:276:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111 -> a
-    277:277:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111:111 -> a
-    278:281:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo com.android.tools.r8.kotlin.KotlinVersionRequirementInfo.create(java.util.List):24:27 -> a
-    278:281:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111 -> a
-    282:283:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):112:113 -> a
-    284:285:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):35:36 -> a
-    284:285:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113 -> a
-    286:286:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature.getDescriptor():61:61 -> a
-    286:286:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37 -> a
-    286:286:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113 -> a
-    287:287:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):79:79 -> a
-    287:287:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37 -> a
-    287:287:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113 -> a
-    288:288:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-    288:288:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113 -> a
-    289:289:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):115:115 -> a
-    290:293:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):114:117 -> a
-    294:294:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):116:116 -> a
-    295:295:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):152:152 -> a
-    295:295:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):119 -> a
-    296:296:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):118:118 -> a
-    297:297:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):165:165 -> a
-    297:297:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121 -> a
-    298:298:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSyntheticMethodForDelegate():117:117 -> a
-    298:298:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):165 -> a
-    298:298:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121 -> a
-    299:299:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):120:120 -> a
-    300:300:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():578:578 -> a
-    300:300:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):123 -> a
-    301:301:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):123:123 -> a
-    302:302:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:122 -> a
-    303:303:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gI;)Lcom/android/tools/r8/kotlin/o0;"}
-    304:304:boolean rewriteNoBacking(java.util.function.Consumer,com.android.tools.r8.graph.AppView):144:144 -> a
+    1:13:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinValueParameterInfo,java.util.List,com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,java.util.List):62:74 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/t0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/kotlin/L;Lcom/android/tools/r8/kotlin/N;Lcom/android/tools/r8/kotlin/N;Lcom/android/tools/r8/kotlin/N;Lcom/android/tools/r8/kotlin/N;Ljava/util/List;)V"}
+    1:97:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):0:96 -> a
+    1:97:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):166 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/rD;)V"}
+    98:98:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):75:75 -> a
+    98:98:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setFieldSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):96 -> a
+    98:98:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature):166 -> a
+    99:206:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:107 -> a
+    99:206:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):173 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/DD;)V"}
+    207:207:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):76:76 -> a
+    207:207:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setGetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):107 -> a
+    207:207:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):173 -> a
+    208:211:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):79:82 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/kotlin/a;"}
+    212:212:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():318:318 -> a
+    212:212:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):83 -> a
+    213:213:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):83:83 -> a
+    214:218:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47:51 -> a
+    214:218:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):83 -> a
+    219:219:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():294:294 -> a
+    219:219:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):84 -> a
+    220:221:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):84:85 -> a
+    222:223:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):35:36 -> a
+    222:223:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
+    224:224:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature.getDescriptor():49:49 -> a
+    224:224:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37 -> a
+    224:224:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
+    225:225:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):79:79 -> a
+    225:225:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37 -> a
+    225:225:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
+    226:226:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
+    226:226:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
+    227:227:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):87:87 -> a
+    228:231:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):86:89 -> a
+    232:232:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):88:88 -> a
+    233:233:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):127:127 -> a
+    233:233:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    234:234:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):90:90 -> a
+    235:235:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):140:140 -> a
+    235:235:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):93 -> a
+    236:236:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.getSyntheticMethodForDelegate():79:79 -> a
+    236:236:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):140 -> a
+    236:236:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):93 -> a
+    237:237:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):92:92 -> a
+    238:238:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():304:304 -> a
+    238:238:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):95 -> a
+    239:239:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):95:95 -> a
+    240:240:com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94:94 -> a
+    241:241:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):96:96 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/kotlin/p0;"}
+    242:242:boolean rewriteNoBacking(java.util.function.Consumer,com.android.tools.r8.graph.AppView):116:116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    305:314:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):155:164 -> a
+    243:243:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):127:127 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;)Z"}
-    315:324:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):161:170 -> a
-    325:330:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):167:172 -> a
-    331:331:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():568:568 -> a
-    331:331:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):176 -> a
-    332:332:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):176:176 -> a
-    333:338:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):173:178 -> a
-    339:339:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():578:578 -> a
-    339:339:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):182 -> a
-    340:340:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):182:182 -> a
-    341:346:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):179:184 -> a
-    347:347:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():602:602 -> a
-    347:347:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):184 -> a
-    348:378:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):184:214 -> a
-    379:379:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):110:110 -> a
-    379:379:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):214 -> a
-    380:380:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setJvmFlags(int):112:112 -> a
-    380:380:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setJvmFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,int):110 -> a
-    380:380:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):214 -> a
-    381:382:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):215:216 -> a
-    383:393:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):226:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    394:394:void com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
-    394:394:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):237 -> a
+    244:507:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.<init>(java.lang.String):0:263 -> a
+    244:507:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):127 -> a
+    508:509:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):128:129 -> a
+    510:510:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):76:76 -> a
+    510:510:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    511:573:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):0:62 -> a
+    511:573:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):76 -> a
+    511:573:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    574:574:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):62:62 -> a
+    574:574:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):76 -> a
+    574:574:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    575:575:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):271:271 -> a
+    575:575:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):77 -> a
+    575:575:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    576:847:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:271 -> a
+    576:847:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):77 -> a
+    576:847:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    848:848:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):281:281 -> a
+    848:848:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):78 -> a
+    848:848:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    849:1130:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.Modality):0:281 -> a
+    849:1130:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):78 -> a
+    849:1130:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1131:1131:com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):288:288 -> a
+    1131:1131:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):79 -> a
+    1131:1131:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1132:1420:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind):0:288 -> a
+    1132:1420:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):79 -> a
+    1132:1420:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1421:1421:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isVar(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):295:295 -> a
+    1421:1421:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):80 -> a
+    1421:1421:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1422:1422:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVar(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):295:295 -> a
+    1422:1422:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):80 -> a
+    1422:1422:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1423:1423:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isConst(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):300:300 -> a
+    1423:1423:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):81 -> a
+    1423:1423:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1424:1424:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setConst(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):300:300 -> a
+    1424:1424:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):81 -> a
+    1424:1424:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1425:1425:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isLateinit(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):305:305 -> a
+    1425:1425:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):82 -> a
+    1425:1425:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1426:1426:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setLateinit(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):305:305 -> a
+    1426:1426:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):82 -> a
+    1426:1426:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1427:1427:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasConstant(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):328:328 -> a
+    1427:1427:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):83 -> a
+    1427:1427:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1428:1428:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasConstant(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):328:328 -> a
+    1428:1428:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):83 -> a
+    1428:1428:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1429:1429:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):333:333 -> a
+    1429:1429:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):84 -> a
+    1429:1429:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1430:1430:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):333:333 -> a
+    1430:1430:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):84 -> a
+    1430:1430:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1431:1431:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isDelegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):341:341 -> a
+    1431:1431:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):85 -> a
+    1431:1431:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1432:1432:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setDelegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):341:341 -> a
+    1432:1432:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):85 -> a
+    1432:1432:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1433:1433:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):346:346 -> a
+    1433:1433:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):86 -> a
+    1433:1433:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1434:1434:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):346:346 -> a
+    1434:1434:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):86 -> a
+    1434:1434:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1435:1435:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):89:89 -> a
+    1435:1435:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1436:1436:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.isMovedFromInterfaceCompanion(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):23:23 -> a
+    1436:1436:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):89 -> a
+    1436:1436:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1437:1437:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setMovedFromInterfaceCompanion(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,boolean):23:23 -> a
+    1437:1437:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):88 -> a
+    1437:1437:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):129 -> a
+    1438:1438:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130:130 -> a
+    1439:1439:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    1439:1439:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    395:395:void com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
-    395:395:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):237 -> a
-    396:406:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):239:249 -> a
-    407:407:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):234:234 -> a
+    1440:1440:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    1440:1440:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130 -> a
+    1441:1442:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130:131 -> a
+    1443:1443:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetter():285:285 -> a
+    1443:1443:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):131 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1444:1444:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132:132 -> a
+    1445:1445:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.set_hasSetter(boolean):266:266 -> a
+    1445:1445:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setSetter(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):287 -> a
+    1445:1445:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1446:1446:void com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.setSetter(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):288:288 -> a
+    1446:1446:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1447:1447:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):133:133 -> a
+    1448:1448:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetter():285:285 -> a
+    1448:1448:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):133 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1449:1453:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):133:137 -> a
+    1454:1460:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):136:142 -> a
+    1461:1470:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):139:148 -> a
+    1471:1476:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):145:150 -> a
+    1477:1477:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():294:294 -> a
+    1477:1477:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):154 -> a
+    1478:1478:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):154:154 -> a
+    1479:1484:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):151:156 -> a
+    1485:1485:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():304:304 -> a
+    1485:1485:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):160 -> a
+    1486:1486:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):160:160 -> a
+    1487:1487:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):157:157 -> a
+    1488:1488:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():328:328 -> a
+    1488:1488:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):162 -> a
+    1489:1489:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):162:162 -> a
+    1490:1490:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():328:328 -> a
+    1490:1490:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):162 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1491:1523:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):162:194 -> a
+    1524:1533:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):205:214 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
+    1534:1534:void com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
+    1534:1534:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):215 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1535:1535:void com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
+    1535:1535:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):215 -> a
+    1536:1546:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):217:227 -> a
+    1547:1547:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):212:212 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/q0;)Ljava/util/function/Consumer;"}
+    1548:1548:java.util.function.Consumer lambda$trace$7(com.android.tools.r8.kotlin.KotlinTypeInfo):213:213 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
-    408:408:java.util.function.Consumer lambda$trace$7(com.android.tools.r8.kotlin.KotlinTypeInfo):235:235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
-    1:144:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:143 -> b
-    1:144:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):202 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    145:145:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):115:115 -> b
-    145:145:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):143 -> b
-    145:145:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):202 -> b
-    1:155:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:154 -> c
-    1:155:void lambda$rewrite$4(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):210 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    156:156:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):116:116 -> c
-    156:156:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):154 -> c
-    156:156:void lambda$rewrite$4(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):210 -> c
-    1:168:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:167 -> d
-    1:168:void lambda$rewrite$5(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):219 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    169:169:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):117:117 -> d
-    169:169:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):167 -> d
-    169:169:void lambda$rewrite$5(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):219 -> d
-    1:1:java.lang.String toString():255:255 -> toString
+    1:119:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:118 -> b
+    1:119:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):180 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/DD;)V"}
+    120:120:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):77:77 -> b
+    120:120:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSetterSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):118 -> b
+    120:120:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):180 -> b
+    1:130:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:129 -> c
+    1:130:void lambda$rewrite$4(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):188 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/DD;)V"}
+    131:131:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):78:78 -> c
+    131:131:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):129 -> c
+    131:131:void lambda$rewrite$4(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):188 -> c
+    1:143:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:142 -> d
+    1:143:void lambda$rewrite$5(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):198 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;Lcom/android/tools/r8/internal/DD;)V"}
+    144:144:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPropertyExtension.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):79:79 -> d
+    144:144:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):142 -> d
+    144:144:void lambda$rewrite$5(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):198 -> d
+    1:1:java.lang.String toString():233:233 -> toString
 com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.kotlin.g:
 # {"id":"sourceFile","fileName":"Kotlin.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -221023,7 +219864,7 @@
 com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.kotlin.b:
 # {"id":"sourceFile","fileName":"Kotlin.java"}
     java.util.Set kotlinStaticallyKnownTypes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:1:void <clinit>():58:58 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> <clinit>
     2:2:void <clinit>():58 -> <clinit>
@@ -221032,7 +219873,7 @@
     16:16:void <clinit>():78 -> <clinit>
     17:27:void <clinit>():79:89 -> <clinit>
     1:2:void lambda$static$0(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,java.lang.String):81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wu;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yu;Ljava/lang/String;)V"}
 com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.kotlin.c:
 # {"id":"sourceFile","fileName":"Kotlin.java"}
     com.android.tools.r8.graph.DexType lambdaType -> a
@@ -221094,143 +219935,143 @@
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.kotlin.m:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     java.util.Map EMPTY_ARGUMENTS -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):35:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/m;"}
-    3:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):70:70 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sH;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/m;"}
+    3:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):68:68 -> a
     3:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36 -> a
-    4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue.getClassName():167:167 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):72 -> a
+    4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue.getClassName():162:162 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36 -> a
-    5:7:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):71:73 -> a
-    5:7:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36 -> a
-    8:9:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):37:38 -> a
-    10:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):101:101 -> a
+    5:5:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
+    5:5:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36 -> a
+    6:7:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):37:38 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):98:98 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
+    9:9:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue.getEnumClassName():115:115 -> a
+    9:9:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):100 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
+    10:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):99:99 -> a
     10:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
-    11:11:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue.getEnumClassName():115:115 -> a
-    11:11:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):103 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    11:11:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue.getEnumEntryName():115:115 -> a
+    11:11:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):101 -> a
     11:11:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
-    12:12:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):102:102 -> a
+    12:12:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):101:101 -> a
     12:12:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
-    13:13:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue.getEnumEntryName():115:115 -> a
-    13:13:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    13:13:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):38 -> a
-    15:16:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):39:40 -> a
-    17:17:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):132:132 -> a
-    17:17:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue.getAnnotation():134:134 -> a
-    18:18:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):133 -> a
+    13:14:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):39:40 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):129:129 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue.getAnnotation():134:134 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:18:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
-    19:21:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
-    19:21:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):133 -> a
-    19:21:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
-    22:24:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
-    22:24:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):133 -> a
-    22:24:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
-    25:25:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
-    25:25:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
-    26:27:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):41:42 -> a
-    28:28:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):210:210 -> a
-    28:28:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):44 -> a
-    29:33:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
+    17:19:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
+    17:19:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):130 -> a
+    17:19:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
+    20:22:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
+    20:22:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):130 -> a
+    20:22:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
+    23:23:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
+    23:23:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):40 -> a
+    24:25:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):41:42 -> a
+    26:26:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):207:207 -> a
+    26:26:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):44 -> a
+    27:31:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/B1;)Ljava/util/Map;"}
-    34:34:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Lcom/android/tools/r8/internal/iH;)V"}
+    32:32:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):55:55 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedHashMap;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Lcom/android/tools/r8/internal/sH;)V"}
     boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.kotlin.h:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/n;"}
-    1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):126:127 -> <init>
+    1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):123:124 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/n;)V"}
-    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):138:138 -> a
+    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/fH;)V"}
-    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):143:143 -> b
+    2:2:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):143:143 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/pH;)V"}
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):140:140 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.kotlin.i:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     java.util.List value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/i;"}
-    1:2:void <clinit>():155:156 -> <clinit>
+    1:2:void <clinit>():152:153 -> <clinit>
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    3:3:void <clinit>():156 -> <clinit>
-    4:4:void <clinit>():156:156 -> <clinit>
-    1:2:void <init>(java.util.List):160:161 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
-    1:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayValue,com.android.tools.r8.graph.DexItemFactory):165:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH$a;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/i;"}
-    9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):177:178 -> a
+    3:3:void <clinit>():153 -> <clinit>
+    4:4:void <clinit>():153:153 -> <clinit>
+    1:2:void <init>(java.util.List):157:158 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
+    1:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument$ArrayValue,com.android.tools.r8.graph.DexItemFactory):162:169 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sH$a;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/i;"}
+    9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):174:175 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    11:11:void lambda$rewrite$0(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iH;)V"}
-    1:13:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):184:196 -> b
+    11:11:void lambda$rewrite$0(java.util.List,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):188:188 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/sH;)V"}
+    1:13:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):181:193 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.kotlin.j:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
-    1:2:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,int):64:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)V"}
-    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):78:78 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
+    1:2:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference):63:64 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)V"}
+    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):84:84 -> a
-    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):83:83 -> b
+    2:2:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):81:81 -> a
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):80:80 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.kotlin.k:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
     java.lang.String enumEntryName -> c
-    1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):95:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;Ljava/lang/String;)V"}
-    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
+    1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):92:94 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;Ljava/lang/String;)V"}
+    1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):106:106 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):116:116 -> a
-    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):114:114 -> b
+    2:2:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):113:113 -> a
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):111:111 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.kotlin.l:
 # {"id":"sourceFile","fileName":"KotlinAnnotationArgumentInfo.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument argument -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iH;"}
-    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):205:206 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sH;"}
+    1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):202:203 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sH;)V"}
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):220:220 -> b
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):217:217 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
 com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.kotlin.n:
 # {"id":"sourceFile","fileName":"KotlinAnnotationInfo.java"}
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
     java.util.Map arguments -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     java.util.List EMPTY_ANNOTATIONS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <clinit>():24:24 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     2:2:void <clinit>():24 -> <clinit>
     3:3:void <clinit>():24:24 -> <clinit>
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.util.Map):30:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;Ljava/util/Map;)V"}
     1:16:void lambda$rewrite$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.lang.String):60:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
     17:18:void lambda$rewrite$1(com.android.tools.r8.utils.BooleanBox,java.util.Map,com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):67:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Ljava/util/Map;Lcom/android/tools/r8/graph/y;Ljava/lang/String;Lcom/android/tools/r8/kotlin/m;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Ljava/util/Map;Lcom/android/tools/r8/graph/y;Ljava/lang/String;Lcom/android/tools/r8/kotlin/m;)V"}
     19:19:void lambda$rewrite$1(com.android.tools.r8.utils.BooleanBox,java.util.Map,com.android.tools.r8.graph.AppView,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):67:67 -> a
     20:20:void lambda$rewrite$0(java.util.Map,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/String;Lcom/android/tools/r8/internal/iH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/lang/String;Lcom/android/tools/r8/internal/sH;)V"}
     21:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):84:85 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     23:23:void lambda$trace$3(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):85:85 -> a
@@ -221240,182 +220081,145 @@
     4:28:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):55:79 -> b
 com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.kotlin.o:
 # {"id":"sourceFile","fileName":"KotlinClassInfo.java"}
-    int flags -> a
-    java.lang.String name -> b
-    boolean nameCanBeSynthesizedFromClassOrAnonymousObjectOrigin -> c
-    java.lang.String moduleName -> d
-    java.util.List constructorsWithNoBacking -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo declarationContainerInfo -> f
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class classMetadata -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zI$a;"}
+    boolean nameCanBeSynthesizedFromClassOrAnonymousObjectOrigin -> b
+    java.lang.String moduleName -> c
+    java.util.List constructorsWithNoBacking -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo declarationContainerInfo -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/C;"}
-    java.util.List typeParameters -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List superTypes -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List sealedSubClasses -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List nestedClasses -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List enumEntries -> k
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    com.android.tools.r8.kotlin.KotlinTypeReference anonymousObjectOrigin -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
-    java.lang.String packageName -> n
-    com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/O;"}
-    int[] metadataVersion -> p
-    java.lang.String inlineClassUnderlyingPropertyName -> q
-    com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    int jvmFlags -> s
-    java.lang.String companionObjectName -> t
-    java.util.List contextReceiverTypes -> u
-    com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/W;"}
-    1:24:void <init>(int,java.lang.String,boolean,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,int[],java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,int,java.lang.String,java.util.List):94:117 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;ZLjava/lang/String;Lcom/android/tools/r8/kotlin/C;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Ljava/util/List;Lcom/android/tools/r8/kotlin/t0;Lcom/android/tools/r8/kotlin/r0;Ljava/lang/String;Lcom/android/tools/r8/kotlin/O;[ILjava/lang/String;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/W;ILjava/lang/String;Ljava/util/List;)V"}
-    1:43:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):0:42 -> a
-    1:43:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):446 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    44:44:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setAnonymousObjectOriginName(java.lang.String):38:38 -> a
-    44:44:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):42 -> a
-    44:44:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):446 -> a
-    45:45:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$a;Ljava/lang/String;[ILcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/o;"}
-    46:46:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    46:46:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):128 -> a
-    47:50:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129:132 -> a
-    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):87:87 -> a
-    51:51:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):132 -> a
-    52:61:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):132:141 -> a
-    62:62:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):45:45 -> a
-    62:62:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    63:63:int com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getFlags():320:320 -> a
-    63:63:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    64:64:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47:47 -> a
-    64:64:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    65:69:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61:65 -> a
-    65:69:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47 -> a
-    65:69:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    70:72:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:53 -> a
-    70:72:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    70:72:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47 -> a
-    70:72:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    73:73:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    73:73:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54 -> a
-    73:73:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    73:73:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47 -> a
-    73:73:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    74:75:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):55:56 -> a
-    74:75:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    74:75:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47 -> a
-    74:75:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    76:78:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66:68 -> a
-    76:78:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47 -> a
-    76:78:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    79:79:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():333:333 -> a
-    79:79:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    79:79:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    80:80:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48:48 -> a
-    80:80:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    81:84:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo com.android.tools.r8.kotlin.KotlinVersionRequirementInfo.create(java.util.List):24:27 -> a
-    81:84:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48 -> a
-    81:84:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    85:85:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):49:49 -> a
-    85:85:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):143 -> a
-    86:99:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):144:157 -> a
-    100:102:com.android.tools.r8.kotlin.KotlinTypeReference getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):202:204 -> a
-    100:102:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):165 -> a
-    103:106:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):166:169 -> a
-    107:107:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):168:168 -> a
-    108:113:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):167:172 -> a
-    114:114:int com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getFlags():48:48 -> a
-    114:114:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):173 -> a
-    115:122:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):173:180 -> a
-    123:127:java.util.List getSuperTypes(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):238:242 -> a
-    123:127:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):180 -> a
-    128:128:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):181:181 -> a
-    129:135:java.util.List getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):224:230 -> a
-    129:135:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):181 -> a
-    136:140:java.util.List getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):229:233 -> a
-    136:140:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):181 -> a
-    141:142:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):182:183 -> a
-    143:143:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getVersionRequirements():125:125 -> a
-    143:143:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):184 -> a
-    144:144:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):184:184 -> a
-    145:148:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo com.android.tools.r8.kotlin.KotlinVersionRequirementInfo.create(java.util.List):24:27 -> a
-    145:148:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):184 -> a
-    149:149:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):188:188 -> a
-    150:150:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):187:187 -> a
-    151:151:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingPropertyName():109:109 -> a
-    151:151:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):190 -> a
-    152:152:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():114:114 -> a
-    152:152:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):191 -> a
-    153:155:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):191:193 -> a
-    156:162:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):246:252 -> a
-    156:162:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):194 -> a
-    163:164:void com.android.tools.r8.graph.DexEncodedField.setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
-    163:164:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):252 -> a
-    163:164:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):194 -> a
-    165:165:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):257:257 -> a
-    165:165:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):194 -> a
-    166:166:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):256:256 -> a
-    166:166:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):194 -> a
-    167:167:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():119:119 -> a
-    167:167:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196 -> a
-    168:168:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):196:196 -> a
-    169:169:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):195:195 -> a
-    170:170:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):197:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gI;)Lcom/android/tools/r8/kotlin/o0;"}
-    171:176:java.util.List getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):212:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/List;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/vu;"}
-    177:180:java.util.List getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):216:219 -> a
-    181:189:java.util.List setEnumEntries(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass):262:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
-    190:192:void lambda$setEnumEntries$1(java.util.Collection,com.android.tools.r8.graph.DexEncodedField):272:274 -> a
+    java.util.List typeParameters -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List superTypes -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List sealedSubClasses -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List nestedClasses -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List enumEntries -> j
+    com.android.tools.r8.kotlin.KotlinTypeReference anonymousObjectOrigin -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
+    java.lang.String packageName -> l
+    com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> m
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/P;"}
+    java.lang.String inlineClassUnderlyingPropertyName -> n
+    com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> o
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    java.lang.String companionObjectName -> p
+    java.util.List contextReceiverTypes -> q
+    com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/X;"}
+    1:20:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,boolean,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,java.lang.String,java.util.List):85:104 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$a;ZLjava/lang/String;Lcom/android/tools/r8/kotlin/C;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Ljava/util/List;Lcom/android/tools/r8/kotlin/s0;Ljava/lang/String;Lcom/android/tools/r8/kotlin/P;Ljava/lang/String;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/X;Ljava/lang/String;Ljava/util/List;)V"}
+    1:44:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):0:43 -> a
+    1:44:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):433 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    45:45:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmClassExtension.setAnonymousObjectOriginName(java.lang.String):36:36 -> a
+    45:45:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):43 -> a
+    45:45:void lambda$rewrite$3(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):433 -> a
+    46:46:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):113:113 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$a;Ljava/lang/String;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/o;"}
+    47:47:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    47:47:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):114 -> a
+    48:51:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):115:118 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):89:89 -> a
+    52:52:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):118 -> a
+    53:62:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):118:127 -> a
+    63:65:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):41:43 -> a
+    63:65:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129 -> a
+    66:70:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56:60 -> a
+    66:70:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
+    66:70:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129 -> a
+    71:75:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47:51 -> a
+    71:75:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61 -> a
+    71:75:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
+    71:75:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129 -> a
+    76:78:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61:63 -> a
+    76:78:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
+    76:78:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129 -> a
+    79:79:com.android.tools.r8.kotlin.KotlinConstructorInfo com.android.tools.r8.kotlin.KotlinConstructorInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:44 -> a
+    79:79:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):129 -> a
+    80:93:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):130:143 -> a
+    94:96:com.android.tools.r8.kotlin.KotlinTypeReference getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):184:186 -> a
+    94:96:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):151 -> a
+    97:100:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):152:155 -> a
+    101:101:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):154:154 -> a
+    102:114:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):153:165 -> a
+    115:119:java.util.List getSuperTypes(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):220:224 -> a
+    115:119:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):165 -> a
+    120:120:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):166:166 -> a
+    121:127:java.util.List getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):206:212 -> a
+    121:127:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):166 -> a
+    128:132:java.util.List getSealedSubClasses(java.util.List,com.android.tools.r8.graph.DexItemFactory):211:215 -> a
+    128:132:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):166 -> a
+    133:138:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):167:172 -> a
+    139:139:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):171:171 -> a
+    140:140:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingPropertyName():104:104 -> a
+    140:140:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):173 -> a
+    141:141:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():109:109 -> a
+    141:141:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):174 -> a
+    142:142:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):174:174 -> a
+    143:154:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):228:239 -> a
+    143:154:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):176 -> a
+    155:155:java.lang.String setCompanionObject(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):238:238 -> a
+    155:155:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):176 -> a
+    156:156:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():114:114 -> a
+    156:156:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):178 -> a
+    157:157:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):178:178 -> a
+    158:158:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):177:177 -> a
+    159:159:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):179:179 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/kotlin/p0;"}
+    160:165:java.util.List getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):194:199 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/List;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/internal/xu;"}
+    166:169:java.util.List getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexItemFactory):198:201 -> a
+    170:178:java.util.List setEnumEntries(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexClass):244:252 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
+    179:181:void lambda$setEnumEntries$1(java.util.Collection,com.android.tools.r8.graph.DexEncodedField):254:256 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/graph/g1;)V"}
-    193:194:void com.android.tools.r8.graph.DexEncodedField.setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
-    193:194:void lambda$setEnumEntries$1(java.util.Collection,com.android.tools.r8.graph.DexEncodedField):274 -> a
-    195:273:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):294:372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
-    274:284:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):369:379 -> a
-    285:344:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):378:437 -> a
-    345:365:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):434:454 -> a
-    366:370:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):453:457 -> a
-    371:371:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):455:455 -> a
-    372:372:void lambda$rewrite$2(java.util.List,java.lang.String):419:419 -> a
-    373:373:void lambda$rewrite$2(java.util.List,java.lang.String):418:418 -> a
-    374:374:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinConstructorInfo):472:472 -> a
+    182:226:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):276:320 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
+    227:264:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):319:356 -> a
+    265:277:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):353:365 -> a
+    278:335:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):362:419 -> a
+    336:343:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):418:425 -> a
+    344:363:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):422:441 -> a
+    364:370:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):440:446 -> a
+    371:371:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):444:444 -> a
+    372:372:void lambda$rewrite$2(java.util.List,java.lang.String):406:406 -> a
+    373:373:void lambda$rewrite$2(java.util.List,java.lang.String):405:405 -> a
+    374:374:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinConstructorInfo):461:461 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/z;)Ljava/util/function/Consumer;"}
-    375:385:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):472:482 -> a
+    375:385:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):461:471 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    386:386:java.util.function.Consumer lambda$trace$5(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):474:474 -> a
+    386:386:java.util.function.Consumer lambda$trace$5(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):463:463 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/q0;)Ljava/util/function/Consumer;"}
+    387:387:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeInfo):464:464 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
-    387:387:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeInfo):475:475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
-    388:388:java.util.function.Consumer lambda$trace$7(com.android.tools.r8.kotlin.KotlinTypeReference):476:476 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)Ljava/util/function/Consumer;"}
-    1:1:java.util.function.Consumer lambda$trace$8(com.android.tools.r8.kotlin.KotlinTypeReference):477:477 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)Ljava/util/function/Consumer;"}
-    2:2:java.util.function.Consumer lambda$trace$9(com.android.tools.r8.kotlin.KotlinTypeInfo):478:478 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
-    1:1:java.lang.String getPackageName():462:462 -> r
-    1:1:int[] getMetadataVersion():467:467 -> u
+    388:388:java.util.function.Consumer lambda$trace$7(com.android.tools.r8.kotlin.KotlinTypeReference):465:465 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
+    1:1:java.util.function.Consumer lambda$trace$8(com.android.tools.r8.kotlin.KotlinTypeReference):466:466 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
+    2:2:java.util.function.Consumer lambda$trace$9(com.android.tools.r8.kotlin.KotlinTypeInfo):467:467 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
+    1:1:java.lang.String getPackageName():451:451 -> r
+    1:1:int[] getMetadataVersion():456:456 -> u
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class.getVersion():90:90 -> u
+    2:2:int[] getMetadataVersion():456 -> u
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:int[] getMetadataVersion():456:456 -> u
 com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.kotlin.p:
 # {"id":"sourceFile","fileName":"KotlinClassLevelInfo.java"}
     com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
     boolean isNoKotlinInformation() -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/m0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/n0;"}
     com.android.tools.r8.kotlin.KotlinFileFacadeInfo asFileFacade() -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/H;"}
     boolean isSyntheticClass() -> l
     com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo asMultiFileClassPart() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/e0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/f0;"}
     boolean isMultiFileFacade() -> n
     boolean isFileFacade() -> o
     java.lang.String getPackageName() -> r
@@ -221450,7 +220254,7 @@
     95:105:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Supplier):130:140 -> a
     106:106:boolean isLambda(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Supplier):135:135 -> a
     107:107:boolean hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/T;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/U;)Z"}
     108:108:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier.dexItemFactory():186:186 -> a
     108:108:boolean hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
     109:109:boolean hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):149:149 -> a
@@ -221458,18 +220262,18 @@
     110:110:boolean hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
     111:113:java.util.Map toElementMap(com.android.tools.r8.graph.DexEncodedAnnotation):159:161 -> a
     111:113:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/e1;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/e1;)Lcom/android/tools/r8/internal/zI;"}
     114:114:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):154:154 -> a
     115:119:int getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):192:196 -> a
     115:119:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Ljava/util/IdentityHashMap;)Lcom/android/tools/r8/internal/zI;"}
     120:135:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):170:185 -> a
     136:139:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):184:187 -> a
     140:140:int getKind(com.android.tools.r8.kotlin.Kotlin,java.util.Map):194:194 -> a
     140:140:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,java.util.Map):169 -> a
     141:141:com.android.tools.r8.jetbrains.kotlin.Metadata extractMetadataWithPossiblyUnsupportedMetadataVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):201:201 -> a
     141:141:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/zI;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/p;"}
     142:142:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMajor():30:30 -> a
     142:142:com.android.tools.r8.jetbrains.kotlin.Metadata extractMetadataWithPossiblyUnsupportedMetadataVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -221479,130 +220283,164 @@
     143:143:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):219 -> a
     144:149:com.android.tools.r8.jetbrains.kotlin.Metadata extractMetadataWithPossiblyUnsupportedMetadataVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):205:210 -> a
     144:149:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):219 -> a
-    150:167:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):220:237 -> a
-    168:188:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):236:256 -> a
-    189:196:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):261:268 -> a
+    150:165:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):220:235 -> a
+    166:184:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.AppView,java.util.function.Consumer):234:252 -> a
+    185:192:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):257:264 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;)[I"}
-    197:197:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):262:262 -> a
-    198:201:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):287:290 -> a
+    193:193:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):258:258 -> a
+    194:197:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):283:286 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Ljava/lang/String;)Ljava/lang/String;"}
-    202:202:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):288:288 -> a
-    1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):274:281 -> b
+    198:198:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):284:284 -> a
+    1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):270:277 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/N2;Ljava/lang/String;)[Ljava/lang/String;"}
-    9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):275:275 -> b
+    9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):271:271 -> b
 com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.kotlin.q:
 # {"id":"sourceFile","fileName":"KotlinClassMetadataReader.java"}
-    1:1:void <init>(java.lang.String):295:295 -> <init>
+    1:1:void <init>(java.lang.String):291:291 -> <init>
 com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.kotlin.x:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     1:1:void <init>():23:23 -> <init>
-    boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
+    boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView) -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
     1:1:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/I2;"}
 com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.kotlin.s:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
     boolean isLocalOrAnonymous -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean):63:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;Z)V"}
-    1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
-    2:3:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,java.lang.String):72:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;Ljava/lang/String;)V"}
-    4:4:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,java.lang.String):72:72 -> a
-    5:5:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;Z)V"}
+    1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):70:70 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
+    2:4:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):72:74 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    5:5:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):72:72 -> a
+    6:6:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    6:6:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):72 -> a
+    7:7:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    6:6:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/I2;"}
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinTypeReference.rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):188:188 -> a
-    7:7:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):85 -> a
+    8:8:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):86:86 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/I2;"}
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinTypeReference.rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):188:188 -> a
+    9:9:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinTypeReference.rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):188:189 -> a
-    8:9:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):85 -> a
+    10:11:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinTypeReference.rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):188:189 -> a
+    10:11:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):86 -> a
 com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.kotlin.t:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     java.lang.String typeAlias -> a
-    1:2:void <init>(java.lang.String):113:114 -> <init>
+    1:2:void <init>(java.lang.String):114:115 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
+    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):120:120 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    3:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):120 -> a
 com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.kotlin.u:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     int typeId -> a
-    1:2:void <init>(int):93:94 -> <init>
+    1:2:void <init>(int):94:95 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
+    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):100:100 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    3:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):100 -> a
 com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.kotlin.v:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     java.lang.String classifier -> a
-    1:2:void <init>(java.lang.String):132:133 -> <init>
+    1:2:void <init>(java.lang.String):133:134 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
+    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):139:139 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    3:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):139 -> a
 com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.kotlin.w:
 # {"id":"sourceFile","fileName":"KotlinClassifierInfo.java"}
     java.lang.String classifier -> a
-    1:2:void <init>(java.lang.String):151:152 -> <init>
+    1:2:void <init>(java.lang.String):152:153 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):157:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/graph/y;)Z"}
+    2:2:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):158:158 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/graph/y;)Z"}
+    3:3:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.setClassifier(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier):453:453 -> a
+    3:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.AppView):158 -> a
 com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.kotlin.y:
 # {"id":"sourceFile","fileName":"KotlinCompanionInfo.java"}
     java.lang.String companionObjectFieldName -> a
     1:2:void <init>(java.lang.String):18:19 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/naming/r0;)Z"}
-    4:166:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.visitCompanionObject(java.lang.String):0:162 -> a
-    4:166:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):35 -> a
-    167:167:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):36:36 -> a
+    2:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:34 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/naming/r0;)Z"}
+    4:4:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.setCompanionObject(java.lang.String):84:84 -> a
+    4:4:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):35 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    5:5:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):36:36 -> a
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/y;"}
 com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.kotlin.z:
 # {"id":"sourceFile","fileName":"KotlinConstructorInfo.java"}
-    int flags -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor kmConstructor -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
     java.util.List valueParameters -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    1:5:void <init>(int,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):36:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/t0;Lcom/android/tools/r8/kotlin/M;)V"}
-    1:1:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:0 -> a
-    1:1:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FH;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):178 -> a
-    2:2:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61 -> a
-    3:351:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:348 -> a
-    3:351:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26 -> a
-    3:351:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):178 -> a
-    3:351:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61 -> a
-    352:352:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):26:26 -> a
-    352:352:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):178 -> a
-    352:352:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61 -> a
-    353:353:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):149:149 -> a
-    353:353:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):178 -> a
-    353:353:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61 -> a
-    354:367:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):56:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;)Z"}
-    368:373:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):66:71 -> a
-    374:374:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():333:333 -> a
-    374:374:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):71 -> a
-    375:376:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):71:72 -> a
-    377:377:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinValueParameterInfo):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
-    378:380:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):88:90 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):33:36 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/kotlin/N;)V"}
+    1:154:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:153 -> a
+    1:154:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):57 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;Lcom/android/tools/r8/internal/DD;)V"}
+    155:155:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmConstructorExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):91:91 -> a
+    155:155:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):153 -> a
+    155:155:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):57 -> a
+    156:156:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):50:50 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;)Z"}
+    157:157:void com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.<init>():168:168 -> a
+    157:157:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):50 -> a
+    158:158:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51:51 -> a
+    159:159:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):174:174 -> a
+    159:159:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    160:160:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):40:40 -> a
+    160:160:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):174 -> a
+    160:160:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    161:161:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,boolean):40:40 -> a
+    161:161:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):174 -> a
+    161:161:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    162:162:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):178:178 -> a
+    162:162:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):175 -> a
+    162:162:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    163:341:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:178 -> a
+    163:341:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):175 -> a
+    163:341:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    342:342:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSecondary(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):183:183 -> a
+    342:342:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
+    342:342:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    343:343:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setSecondary(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,boolean):183:183 -> a
+    343:343:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):176 -> a
+    343:343:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    344:344:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):191:191 -> a
+    344:344:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):177 -> a
+    344:344:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    345:345:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,boolean):191:191 -> a
+    345:345:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):177 -> a
+    345:345:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):51 -> a
+    346:358:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):53:65 -> a
+    359:359:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):62:62 -> a
+    360:360:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():178:178 -> a
+    360:360:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):67 -> a
+    361:361:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):67:67 -> a
+    362:362:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():178:178 -> a
+    362:362:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):67 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    363:364:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):67:68 -> a
+    365:365:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinValueParameterInfo):84:84 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/t0;)Ljava/util/function/Consumer;"}
+    366:368:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):84:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/z;"}
@@ -221610,198 +220448,180 @@
 com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.kotlin.A:
 # {"id":"sourceFile","fileName":"KotlinContractInfo.java"}
     java.util.List effects -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/A;"}
-    1:1:void <clinit>():24:24 -> <clinit>
+    1:1:void <clinit>():23:23 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    2:2:void <clinit>():24 -> <clinit>
-    3:3:void <clinit>():24:24 -> <clinit>
-    1:2:void <init>(java.util.List):28:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
-    1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):50:50 -> a
+    2:2:void <clinit>():23 -> <clinit>
+    3:3:void <clinit>():23:23 -> <clinit>
+    1:2:void <init>(java.util.List):27:28 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
+    1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/E;)Ljava/util/function/Consumer;"}
-    2:2:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:50 -> a
+    2:2:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    1:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):54:58 -> b
+    1:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):53:58 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():1059:1059 -> b
-    6:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58:58 -> b
+    7:7:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():21:21 -> b
+    7:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58 -> b
+    8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58:58 -> b
 com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.kotlin.C:
 # {"id":"sourceFile","fileName":"KotlinDeclarationContainerInfo.java"}
     java.util.List typeAliases -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List functionsWithNoBacking -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List propertiesWithNoBacking -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:4:void <init>(java.util.List,java.util.List,java.util.List):50:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)V"}
-    1:12:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):64:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Ljava/util/HashMap;Ljava/util/HashMap;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Ljava/util/function/Consumer;Lcom/android/tools/r8/kotlin/W;)Lcom/android/tools/r8/kotlin/C;"}
-    13:13:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():50:50 -> a
-    13:13:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):76 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):76:76 -> a
-    15:15:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> a
-    15:15:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):88 -> a
-    16:29:void keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):158:171 -> a
-    16:29:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):88 -> a
-    30:37:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):89:96 -> a
-    38:40:void com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):119:121 -> a
-    38:40:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):97 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):152:152 -> a
-    41:41:void com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):123 -> a
-    41:41:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):97 -> a
-    42:42:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):101:101 -> a
-    43:44:void com.android.tools.r8.graph.DexEncodedField.setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):138:139 -> a
-    43:44:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):104 -> a
-    45:50:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):105:110 -> a
-    51:51:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538:538 -> a
-    51:51:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):113 -> a
-    52:52:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> a
-    52:52:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538 -> a
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:4:void <init>(java.util.List,java.util.List,java.util.List):51:54 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)V"}
+    1:12:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):65:76 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QH;Ljava/util/HashMap;Ljava/util/HashMap;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Ljava/util/function/Consumer;Lcom/android/tools/r8/kotlin/X;)Lcom/android/tools/r8/kotlin/C;"}
+    13:13:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():38:38 -> a
+    13:13:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):77 -> a
+    14:14:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):77:77 -> a
+    15:15:void keepIfInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):159:159 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):89 -> a
+    16:16:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):233:233 -> a
+    16:16:void keepIfInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):159 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):89 -> a
+    17:26:void keepIfInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):163:172 -> a
+    17:26:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):89 -> a
+    27:34:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):90:97 -> a
+    35:37:void com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):121:123 -> a
+    35:37:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):98 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):127:127 -> a
+    38:38:void com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor.<init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):125 -> a
+    38:38:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):98 -> a
+    39:48:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):102:111 -> a
+    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    49:49:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):114 -> a
+    50:50:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):180:180 -> a
+    50:50:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):114 -> a
+    51:433:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):0:382 -> a
+    51:433:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):180 -> a
+    51:433:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):114 -> a
+    434:434:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):181:181 -> a
+    434:434:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):114 -> a
+    435:442:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):115:122 -> a
+    443:443:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    443:443:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125 -> a
+    444:444:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):180:180 -> a
+    444:444:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125 -> a
+    445:827:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):0:382 -> a
+    445:827:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):180 -> a
+    445:827:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125 -> a
+    828:828:void keepIfAccessorInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):181:181 -> a
+    828:828:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125 -> a
+    829:837:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):126:134 -> a
+    838:853:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):133:148 -> a
+    854:855:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):187:188 -> a
+    854:855:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    856:861:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):45:50 -> a
+    856:861:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    856:861:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    862:866:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
+    862:866:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50 -> a
+    862:866:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    862:866:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    867:869:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
+    867:869:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    867:869:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50 -> a
+    867:869:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    867:869:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    870:872:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
+    870:872:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    870:872:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50 -> a
+    870:872:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    870:872:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    873:875:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
+    873:875:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50 -> a
+    873:875:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    873:875:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    876:876:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):50:50 -> a
+    876:876:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189 -> a
+    876:876:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    877:879:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):189:191 -> a
+    877:879:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148 -> a
+    880:881:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):149:150 -> a
+    882:886:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):203:207 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/kotlin/X;)Z"}
+    887:887:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> a
+    887:887:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):113 -> a
-    53:54:void keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):177:178 -> a
-    53:54:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):113 -> a
-    55:62:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):114:121 -> a
-    63:63:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538:538 -> a
-    63:63:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):124 -> a
-    64:64:int com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes.getFlags$kotlin_metadata():480:480 -> a
-    64:64:int com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetterFlags():538 -> a
+    888:888:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):208:208 -> a
+    889:889:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> a
+    889:889:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):211 -> a
+    890:890:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):211:211 -> a
+    891:891:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):210:210 -> a
+    892:892:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):286:286 -> a
+    892:892:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):212 -> a
+    893:893:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):286:286 -> a
+    893:893:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):212 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    64:64:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):124 -> a
-    65:66:void keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):177:178 -> a
-    65:66:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):124 -> a
-    67:75:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125:133 -> a
-    76:91:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):132:147 -> a
-    92:93:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):184:185 -> a
-    92:93:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    94:94:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):52:52 -> a
-    94:94:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    94:94:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    95:95:int com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getFlags():665:665 -> a
-    95:95:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):53 -> a
+    894:894:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):286:286 -> a
+    894:894:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):212 -> a
+    895:895:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):287:287 -> a
+    895:895:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):212 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    95:95:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    95:95:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    96:100:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54:58 -> a
-    96:100:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    96:100:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    101:105:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
-    101:105:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58 -> a
-    101:105:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    101:105:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    106:108:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
-    106:108:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    106:108:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58 -> a
-    106:108:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    106:108:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    109:111:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
-    109:111:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    109:111:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58 -> a
-    109:111:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    109:111:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    112:114:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
-    112:114:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58 -> a
-    112:114:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    112:114:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    115:115:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():695:695 -> a
-    115:115:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59 -> a
-    115:115:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    115:115:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    116:116:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:59 -> a
-    116:116:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    116:116:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    117:120:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo com.android.tools.r8.kotlin.KotlinVersionRequirementInfo.create(java.util.List):24:27 -> a
-    117:120:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59 -> a
-    117:120:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    117:120:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    121:121:com.android.tools.r8.kotlin.KotlinTypeAliasInfo com.android.tools.r8.kotlin.KotlinTypeAliasInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:59 -> a
-    121:121:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186 -> a
-    121:121:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    122:124:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186:188 -> a
-    122:124:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):147 -> a
-    125:126:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):148:149 -> a
-    127:131:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):200:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/kotlin/W;)Z"}
-    132:132:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> a
-    132:132:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):205 -> a
+    896:899:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):213:216 -> a
+    900:900:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
+    900:900:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):205:205 -> a
-    134:134:com.android.tools.r8.kotlin.KotlinFieldLevelInfo com.android.tools.r8.graph.DexEncodedField.getKotlinInfo():124:124 -> a
-    134:134:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):208 -> a
-    135:135:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):208:208 -> a
-    136:136:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):207:207 -> a
-    137:137:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):283:283 -> a
-    137:137:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):209 -> a
-    138:138:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):283:283 -> a
-    138:138:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):209 -> a
+    901:901:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):217:217 -> a
+    902:902:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
+    902:902:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):218 -> a
+    903:904:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):218:219 -> a
+    905:905:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
+    905:905:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):222 -> a
+    906:913:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):222:229 -> a
+    914:916:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):228:230 -> a
+    917:917:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):301:301 -> a
+    917:917:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):238 -> a
+    918:918:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):301:301 -> a
+    918:918:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    139:139:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):283:283 -> a
-    139:139:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):209 -> a
-    140:140:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setBackingField(com.android.tools.r8.graph.DexEncodedField):284:284 -> a
-    140:140:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):209 -> a
+    919:919:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):301:301 -> a
+    919:919:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):238 -> a
+    920:920:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):302:302 -> a
+    920:920:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    141:144:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):210:213 -> a
-    145:145:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
-    145:145:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):214 -> a
+    921:921:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):291:291 -> a
+    921:921:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
+    922:922:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):291:291 -> a
+    922:922:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    146:146:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):214:214 -> a
-    147:147:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
-    147:147:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):215 -> a
-    148:149:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):215:216 -> a
-    150:150:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
-    150:150:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):219 -> a
-    151:158:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):219:226 -> a
-    159:161:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):225:227 -> a
-    162:162:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    162:162:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
-    163:163:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    163:163:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
+    923:923:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):291:291 -> a
+    923:923:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
+    924:924:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):292:292 -> a
+    924:924:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    164:164:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    164:164:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
-    165:165:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSyntheticMethodForAnnotations(com.android.tools.r8.graph.DexEncodedMethod):299:299 -> a
-    165:165:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
+    925:925:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
+    925:925:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
+    926:926:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
+    926:926:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    166:166:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    166:166:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):229 -> a
-    167:167:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    167:167:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):229 -> a
+    927:927:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):296:296 -> a
+    927:927:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
+    928:928:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):297:297 -> a
+    928:928:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):235 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    168:168:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    168:168:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):229 -> a
-    169:169:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setGetter(com.android.tools.r8.graph.DexEncodedMethod):289:289 -> a
-    169:169:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):229 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    170:170:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    170:170:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
-    171:171:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    171:171:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    172:172:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    172:172:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
-    173:173:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup.setSetter(com.android.tools.r8.graph.DexEncodedMethod):294:294 -> a
-    173:173:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):232 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    174:193:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):241:260 -> a
-    194:194:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g0;)Lcom/android/tools/r8/kotlin/B;"}
-    195:195:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeAliasInfo):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/n0;)Ljava/util/function/Consumer;"}
-    196:198:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):270:272 -> a
+    929:948:boolean rewrite(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):244:263 -> a
+    949:949:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):211:211 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/h0;)Lcom/android/tools/r8/kotlin/B;"}
+    950:950:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeAliasInfo):273:273 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
+    951:953:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):273:275 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    199:199:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/J;)Ljava/util/function/Consumer;"}
-    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):226:226 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g0;)Lcom/android/tools/r8/kotlin/B;"}
-    1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):272:272 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g0;)Ljava/util/function/Consumer;"}
+    954:954:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):274:274 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/K;)Ljava/util/function/Consumer;"}
+    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):229:229 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/h0;)Lcom/android/tools/r8/kotlin/B;"}
+    1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):275:275 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/h0;)Ljava/util/function/Consumer;"}
 com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.kotlin.B:
 # {"id":"sourceFile","fileName":"KotlinDeclarationContainerInfo.java"}
     com.android.tools.r8.graph.DexEncodedField backingField -> a
@@ -221813,109 +220633,114 @@
     com.android.tools.r8.graph.DexEncodedMethod syntheticMethodForAnnotations -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j1;"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():275:275 -> <clinit>
-    1:6:void <init>():275:280 -> <init>
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:6:void <init>():278:283 -> <init>
 com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.kotlin.D:
 # {"id":"sourceFile","fileName":"KotlinEffectExpressionInfo.java"}
-    int flags -> a
-    java.lang.Integer parameterIndex -> b
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue constantValue -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EH;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    java.util.List andArguments -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List orArguments -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List NO_EXPRESSIONS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinEffectExpressionInfo NO_EXPRESSION -> h
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression kmEffectExpression -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SH;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    java.util.List andArguments -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List orArguments -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List NO_EXPRESSIONS -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinEffectExpressionInfo NO_EXPRESSION -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/D;"}
-    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <clinit>():24:24 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    2:2:void <clinit>():25 -> <clinit>
-    3:5:void <clinit>():25:27 -> <clinit>
-    1:7:void <init>(int,java.lang.Integer,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):42:48 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Integer;Lcom/android/tools/r8/internal/EH;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)V"}
-    1:3:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MH;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/kotlin/D;"}
-    4:4:int com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getFlags():1140:1140 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):57 -> a
-    5:5:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getParameterIndex():1147:1147 -> a
-    5:5:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getConstantValue():1152:1152 -> a
-    6:6:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():1157:1157 -> a
-    7:7:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    8:8:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60:60 -> a
-    9:9:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():1163:1163 -> a
-    9:9:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61 -> a
-    10:10:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61:61 -> a
-    11:11:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():1169:1169 -> a
-    11:11:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):62 -> a
-    12:12:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):62:62 -> a
-    13:20:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/internal/vu;"}
-    21:28:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:86 -> a
+    2:2:void <clinit>():24 -> <clinit>
+    3:4:void <clinit>():24:25 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):38:42 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SH;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)V"}
+    1:3:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):48:50 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SH;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/kotlin/D;"}
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():78:78 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):52 -> a
+    5:5:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):52:52 -> a
+    6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():84:84 -> a
+    6:6:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):53 -> a
+    7:7:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):53:53 -> a
+    8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():90:90 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54 -> a
+    9:9:com.android.tools.r8.kotlin.KotlinEffectExpressionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54:54 -> a
+    10:17:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/internal/xu;"}
+    18:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):71:78 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    29:29:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> a
+    26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):77:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/D;)Ljava/util/function/Consumer;"}
-    1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):86:86 -> b
+    1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):78:78 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/D;)Ljava/util/function/Consumer;"}
-    2:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):90:94 -> b
+    2:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):82:87 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    7:7:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setFlags(int):1140:1140 -> b
-    7:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):94 -> b
+    8:8:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):220:220 -> b
+    8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    9:463:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):0:454 -> b
+    9:463:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):220 -> b
+    9:463:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    464:464:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setNegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,boolean):454:454 -> b
+    464:464:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):220 -> b
+    464:464:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    465:465:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullCheckPredicate(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):463:463 -> b
+    465:465:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):221 -> b
+    465:465:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    466:466:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setNullCheckPredicate(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,boolean):463:463 -> b
+    466:466:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):221 -> b
+    466:466:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    467:467:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):88:88 -> b
+    468:468:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getParameterIndex():68:68 -> b
+    468:468:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):88 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):95:95 -> b
-    9:9:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setParameterIndex(java.lang.Integer):1147:1147 -> b
-    9:9:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):95 -> b
-    10:10:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):96:96 -> b
-    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue):1152:1152 -> b
-    11:11:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):97 -> b
-    12:14:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):99:101 -> b
-    15:17:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100:102 -> b
-    18:18:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():1163:1163 -> b
-    18:18:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):106 -> b
-    19:19:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):106:106 -> b
-    20:25:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):103:108 -> b
-    26:26:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():1169:1169 -> b
-    26:26:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):112 -> b
-    27:27:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):112:112 -> b
-    28:28:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):109:109 -> b
+    469:469:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setParameterIndex(java.lang.Integer):68:68 -> b
+    469:469:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):88 -> b
+    470:470:com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getConstantValue():73:73 -> b
+    470:470:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    471:471:void com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.setConstantValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstantValue):73:73 -> b
+    471:471:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):91 -> b
+    472:476:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):93:97 -> b
+    477:482:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):94:99 -> b
+    483:483:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():84:84 -> b
+    483:483:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):103 -> b
+    484:484:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):103:103 -> b
+    485:490:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100:105 -> b
+    491:491:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():90:90 -> b
+    491:491:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):109 -> b
+    492:492:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):109:109 -> b
+    493:493:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):106:106 -> b
 com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.kotlin.E:
 # {"id":"sourceFile","fileName":"KotlinEffectInfo.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UH;"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind invocationKind -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TH;"}
     java.util.List constructorArguments -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/D;"}
-    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,java.util.List,com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):33:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OH;Lcom/android/tools/r8/internal/NH;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/D;)V"}
-    1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind,java.util.List,com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):32:36 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UH;Lcom/android/tools/r8/internal/TH;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/kotlin/D;)V"}
+    1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/D;)Ljava/util/function/Consumer;"}
-    2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
+    2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    1:3:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):55:57 -> b
+    1:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):54:57 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    4:4:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():1097:1097 -> b
-    4:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):61 -> b
-    5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):61:61 -> b
-    6:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58:58 -> b
+    5:5:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():43:43 -> b
+    5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):61 -> b
+    6:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):61:61 -> b
+    7:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):58:58 -> b
 com.android.tools.r8.kotlin.KotlinEnumEntryInfo -> com.android.tools.r8.kotlin.F:
 # {"id":"sourceFile","fileName":"KotlinEnumEntryInfo.java"}
     java.lang.String enumEntry -> a
     1:2:void <init>(java.lang.String):18:19 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:3:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zH;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/naming/r0;)Z"}
-    4:176:void com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.visitEnumEntry(java.lang.String):0:172 -> a
-    4:176:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):35 -> a
-    177:177:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):36:36 -> a
+    2:5:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:36 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/naming/r0;)Z"}
     boolean isEnumEntry() -> i
     com.android.tools.r8.kotlin.KotlinEnumEntryInfo asEnumEntry() -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/F;"}
@@ -221924,236 +220749,471 @@
 # {"id":"sourceFile","fileName":"KotlinFieldLevelInfo.java"}
 com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.kotlin.H:
 # {"id":"sourceFile","fileName":"KotlinFileFacadeInfo.java"}
-    com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/f0;"}
-    java.lang.String packageName -> b
-    int[] metadataVersion -> c
-    1:4:void <init>(com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String,int[]):28:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/f0;Ljava/lang/String;[I)V"}
-    1:3:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):41:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$b;Ljava/lang/String;[ILcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/H;"}
-    4:7:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
-    8:8:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.writeFileFacade(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,int[],int):667:667 -> a
-    8:8:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):63 -> a
-    9:9:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):63:63 -> a
-    10:10:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):62:62 -> a
-    11:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade kmFileFacade -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zI$b;"}
+    com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/g0;"}
+    java.lang.String packageName -> c
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade,com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String):27:30 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$b;Lcom/android/tools/r8/kotlin/g0;Ljava/lang/String;)V"}
+    1:4:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):39:42 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$b;Ljava/lang/String;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/H;"}
+    5:7:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):58:60 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
+    8:9:void com.android.tools.r8.kotlin.KotlinMetadataUtils.updateJvmMetadataVersionIfRequired(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):226:227 -> a
+    8:9:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60 -> a
+    10:10:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):61:61 -> a
+    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.setKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):128:128 -> a
+    11:11:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):61 -> a
+    12:12:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):62:62 -> a
+    13:13:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    12:12:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
-    12:12:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82 -> a
+    14:14:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
+    14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:14:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
-    13:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82 -> a
+    15:16:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
+    15:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81 -> a
     com.android.tools.r8.kotlin.KotlinFileFacadeInfo asFileFacade() -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/H;"}
     boolean isFileFacade() -> o
-    1:1:java.lang.String getPackageName():68:68 -> r
-    1:1:int[] getMetadataVersion():77:77 -> u
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.kotlin.I:
+    1:1:java.lang.String getPackageName():67:67 -> r
+    1:1:int[] getMetadataVersion():76:76 -> u
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade.getVersion():132:132 -> u
+    2:2:int[] getMetadataVersion():76 -> u
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:int[] getMetadataVersion():76:76 -> u
+com.android.tools.r8.kotlin.KotlinFlagUtils -> com.android.tools.r8.kotlin.I:
+# {"id":"sourceFile","fileName":"KotlinFlagUtils.java"}
+    1:2:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):93:94 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;)Ljava/util/Map;"}
+    3:392:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullable(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):0:389 -> a
+    3:392:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):94 -> a
+    393:394:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):94:95 -> a
+    395:395:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):394:394 -> a
+    395:395:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):95 -> a
+    396:397:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):95:96 -> a
+    398:398:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isDefinitelyNonNull(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):399:399 -> a
+    398:398:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):96 -> a
+    399:399:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):96:96 -> a
+    400:400:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):118:118 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gI;Lcom/android/tools/r8/internal/gI;)V"}
+    401:474:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):0:73 -> a
+    401:474:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):118 -> a
+    475:548:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,boolean):0:73 -> a
+    475:548:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):118 -> a
+    549:549:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):356:356 -> a
+    549:549:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):119 -> a
+    550:906:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:356 -> a
+    550:906:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):119 -> a
+    907:907:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):366:366 -> a
+    907:907:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):120 -> a
+    908:1274:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.Modality):0:366 -> a
+    908:1274:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):120 -> a
+    1275:1275:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNotDefault(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):372:372 -> a
+    1275:1275:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):121 -> a
+    1276:1276:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setNotDefault(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,boolean):372:372 -> a
+    1276:1276:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):121 -> a
+    1277:1277:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):377:377 -> a
+    1277:1277:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):122 -> a
+    1278:1278:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,boolean):377:377 -> a
+    1278:1278:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):122 -> a
+    1279:1279:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):382:382 -> a
+    1279:1279:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):123 -> a
+    1280:1280:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,boolean):382:382 -> a
+    1280:1280:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes,com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):123 -> a
+    1281:1282:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):127:128 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;)Ljava/util/HashMap;"}
+    1283:1312:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):0:29 -> a
+    1283:1312:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):128 -> a
+    1313:1314:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):128:129 -> a
+    1315:1315:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):114:114 -> a
+    1315:1315:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):129 -> a
+    1316:1317:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):129:130 -> a
+    1318:1318:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):106:106 -> a
+    1318:1318:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):130 -> a
+    1319:1320:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):130:131 -> a
+    1321:1321:com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):119:119 -> a
+    1321:1321:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):131 -> a
+    1322:1323:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):131:132 -> a
+    1324:1324:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInner(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):129:129 -> a
+    1324:1324:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):132 -> a
+    1325:1326:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):132:133 -> a
+    1327:1327:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isData(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):135:135 -> a
+    1327:1327:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):133 -> a
+    1328:1329:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):133:134 -> a
+    1330:1330:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):140:140 -> a
+    1330:1330:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):134 -> a
+    1331:1332:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):134:135 -> a
+    1333:1333:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):145:145 -> a
+    1333:1333:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):135 -> a
+    1334:1335:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):135:136 -> a
+    1336:1336:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):153:153 -> a
+    1336:1336:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):136 -> a
+    1337:1338:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):136:137 -> a
+    1339:1339:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isFunInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):160:160 -> a
+    1339:1339:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):137 -> a
+    1340:1341:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):137:138 -> a
+    1342:1342:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasEnumEntries(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):168:168 -> a
+    1342:1342:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):138 -> a
+    1343:1345:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):138:140 -> a
+    1346:1346:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.isCompiledInCompatibilityMode(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):60:60 -> a
+    1346:1346:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):140 -> a
+    1347:1348:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):140:141 -> a
+    1349:1349:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getHasMethodBodiesInInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):41:41 -> a
+    1349:1349:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):141 -> a
+    1350:1350:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):141:141 -> a
+    1351:1351:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):146:146 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JH;Lcom/android/tools/r8/internal/JH;)V"}
+    1352:1381:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):0:29 -> a
+    1352:1381:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):146 -> a
+    1382:1382:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):29:29 -> a
+    1382:1382:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):146 -> a
+    1383:1383:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):114:114 -> a
+    1383:1383:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):147 -> a
+    1384:1498:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:114 -> a
+    1384:1498:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):147 -> a
+    1499:1499:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):106:106 -> a
+    1499:1499:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):148 -> a
+    1500:1606:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.Modality):0:106 -> a
+    1500:1606:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):148 -> a
+    1607:1607:com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):119:119 -> a
+    1607:1607:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):149 -> a
+    1608:1727:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.ClassKind):0:119 -> a
+    1608:1727:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):149 -> a
+    1728:1728:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInner(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):129:129 -> a
+    1728:1728:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):150 -> a
+    1729:1729:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setInner(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):129:129 -> a
+    1729:1729:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):150 -> a
+    1730:1730:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isData(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):135:135 -> a
+    1730:1730:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):151 -> a
+    1731:1731:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setData(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):135:135 -> a
+    1731:1731:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):151 -> a
+    1732:1732:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):140:140 -> a
+    1732:1732:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):152 -> a
+    1733:1733:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):140:140 -> a
+    1733:1733:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):152 -> a
+    1734:1734:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):145:145 -> a
+    1734:1734:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):153 -> a
+    1735:1735:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):145:145 -> a
+    1735:1735:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):153 -> a
+    1736:1736:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):153:153 -> a
+    1736:1736:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):154 -> a
+    1737:1737:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):153:153 -> a
+    1737:1737:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):154 -> a
+    1738:1738:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isFunInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):160:160 -> a
+    1738:1738:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):155 -> a
+    1739:1739:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setFunInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):160:160 -> a
+    1739:1739:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):155 -> a
+    1740:1740:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasEnumEntries(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):168:168 -> a
+    1740:1740:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):156 -> a
+    1741:1741:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasEnumEntries(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):168:168 -> a
+    1741:1741:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):156 -> a
+    1742:1742:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):159:159 -> a
+    1743:1743:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.isCompiledInCompatibilityMode(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):60:60 -> a
+    1743:1743:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):159 -> a
+    1744:1744:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setCompiledInCompatibilityMode(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):60:60 -> a
+    1744:1744:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):158 -> a
+    1745:1745:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.getHasMethodBodiesInInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):41:41 -> a
+    1745:1745:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):161 -> a
+    1746:1746:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.setHasMethodBodiesInInterface(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,boolean):41:41 -> a
+    1746:1746:void copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):160 -> a
+    1747:1748:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):213:214 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SH;)Ljava/util/HashMap;"}
+    1749:2203:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):0:454 -> a
+    1749:2203:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):214 -> a
+    2204:2205:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):214:215 -> a
+    2206:2206:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullCheckPredicate(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):463:463 -> a
+    2206:2206:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):215 -> a
+    2207:2207:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):215:215 -> a
+    2208:2209:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):253:254 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mI;)Ljava/util/Map;"}
+    2210:2621:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isReified(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):0:411 -> a
+    2210:2621:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):254 -> a
+    2622:2622:java.util.Map extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):254:254 -> a
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.kotlin.J:
 # {"id":"sourceFile","fileName":"KotlinFlexibleTypeUpperBoundInfo.java"}
     java.lang.String typeFlexibilityId -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo kotlinTypeInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/I;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/J;"}
     boolean $assertionsDisabled -> d
     1:4:void <clinit>():15:18 -> <clinit>
     1:4:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo):25:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/o0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/p0;)V"}
     1:1:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iI;)V"}
     2:6:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):57:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     7:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):61:64 -> a
     1:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):42:47 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
     7:10:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):47:50 -> b
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.kotlin.J:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.kotlin.K:
 # {"id":"sourceFile","fileName":"KotlinFunctionInfo.java"}
-    int flags -> a
-    java.lang.String name -> b
-    java.util.List valueParameters -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo returnType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    java.util.List typeParameters -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/M;"}
-    com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    com.android.tools.r8.kotlin.KotlinContractInfo contract -> j
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction kmFunction -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YH;"}
+    java.util.List valueParameters -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo returnType -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    java.util.List typeParameters -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
+    com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
+    com.android.tools.r8.kotlin.KotlinContractInfo contract -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/A;"}
-    boolean crossInlineParameter -> k
-    java.util.List contextReceiverTypes -> l
-    1:13:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinTypeReference,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinContractInfo,boolean,java.util.List):62:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/M;Lcom/android/tools/r8/kotlin/r0;Lcom/android/tools/r8/kotlin/t0;Lcom/android/tools/r8/kotlin/A;ZLjava/util/List;)V"}
-    1:88:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:87 -> a
-    1:88:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;)V"}
-    89:89:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):92:92 -> a
-    89:89:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):87 -> a
-    89:89:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):172 -> a
-    90:187:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):0:97 -> a
-    90:187:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    188:188:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setLambdaClassOriginName(java.lang.String):93:93 -> a
-    188:188:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):97 -> a
-    188:188:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):179 -> a
-    189:189:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/kotlin/J;"}
-    190:194:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61:65 -> a
-    190:194:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
-    195:197:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:53 -> a
-    195:197:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    195:197:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
-    198:198:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():756:756 -> a
-    198:198:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54 -> a
-    198:198:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    198:198:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
-    199:200:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):55:56 -> a
-    199:200:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66 -> a
-    199:200:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
-    201:203:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66:68 -> a
-    201:203:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):85 -> a
-    204:205:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):86:87 -> a
-    206:206:boolean com.android.tools.r8.kotlin.KotlinValueParameterInfo.isCrossInline():43:43 -> a
-    206:206:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):87 -> a
-    207:207:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):92:92 -> a
-    208:208:int com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getFlags():374:374 -> a
-    208:208:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):93 -> a
-    209:214:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94:99 -> a
-    215:217:com.android.tools.r8.kotlin.KotlinTypeReference getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):111:113 -> a
-    215:217:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):100 -> a
-    218:218:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():409:409 -> a
-    218:218:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):101 -> a
-    219:219:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):101:101 -> a
-    220:223:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo com.android.tools.r8.kotlin.KotlinVersionRequirementInfo.create(java.util.List):24:27 -> a
-    220:223:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):101 -> a
-    224:224:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContract():414:414 -> a
-    224:224:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    225:225:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):35:35 -> a
-    225:225:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    226:226:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102:102 -> a
-    227:227:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():1059:1059 -> a
-    227:227:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):37 -> a
-    227:227:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    228:232:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:42 -> a
-    228:232:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    233:233:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):41:41 -> a
-    233:233:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    233:233:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    234:234:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():1090:1090 -> a
-    234:234:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    boolean crossInlineParameter -> i
+    java.util.List contextReceiverTypes -> j
+    1:11:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinTypeReference,com.android.tools.r8.kotlin.KotlinContractInfo,boolean,java.util.List):55:65 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/kotlin/N;Lcom/android/tools/r8/kotlin/s0;Lcom/android/tools/r8/kotlin/A;ZLjava/util/List;)V"}
+    1:76:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):0:75 -> a
+    1:76:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):163 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/internal/DD;)V"}
+    77:77:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):61:61 -> a
+    77:77:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):75 -> a
+    77:77:void lambda$rewrite$1(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature):163 -> a
+    78:163:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):0:85 -> a
+    78:163:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):172 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    164:164:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.setLambdaClassOriginName(java.lang.String):62:62 -> a
+    164:164:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):85 -> a
+    164:164:void lambda$rewrite$2(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):172 -> a
+    165:165:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76:76 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/kotlin/K;"}
+    166:170:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56:60 -> a
+    166:170:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76 -> a
+    171:175:com.android.tools.r8.kotlin.KotlinValueParameterInfo com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):47:51 -> a
+    171:175:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61 -> a
+    171:175:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76 -> a
+    176:178:java.util.List com.android.tools.r8.kotlin.KotlinValueParameterInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):61:63 -> a
+    176:178:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76 -> a
+    179:179:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:77 -> a
+    180:180:boolean com.android.tools.r8.kotlin.KotlinValueParameterInfo.isCrossInline():39:39 -> a
+    180:180:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    234:234:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    234:234:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    235:235:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():1091:1091 -> a
-    235:235:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    235:235:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    235:235:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    236:236:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():1097:1097 -> a
-    236:236:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
-    236:236:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    236:236:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    237:237:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:44 -> a
-    237:237:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    237:237:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    238:245:java.util.List com.android.tools.r8.kotlin.KotlinEffectExpressionInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67:74 -> a
-    238:245:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
-    238:245:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    238:245:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    246:246:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():1102:1102 -> a
-    246:246:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):45 -> a
-    246:246:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    246:246:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    247:247:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):45:45 -> a
-    247:247:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-    247:247:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    248:250:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43:45 -> a
-    248:250:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):102 -> a
-    251:251:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():393:393 -> a
-    251:251:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105 -> a
-    252:252:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):105:105 -> a
-    253:253:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):104:104 -> a
-    254:254:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gI;)Lcom/android/tools/r8/kotlin/o0;"}
-    255:255:boolean rewriteNoBacking(java.util.function.Consumer,com.android.tools.r8.graph.AppView):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    256:274:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130:148 -> a
+    181:181:boolean com.android.tools.r8.kotlin.KotlinValueParameterInfo.isCrossInline():39:39 -> a
+    181:181:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78 -> a
+    182:620:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isCrossinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):0:438 -> a
+    182:620:boolean com.android.tools.r8.kotlin.KotlinValueParameterInfo.isCrossInline():39 -> a
+    182:620:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78 -> a
+    621:627:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):83:89 -> a
+    628:628:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):83:83 -> a
+    628:628:com.android.tools.r8.kotlin.KotlinTypeReference getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):100 -> a
+    628:628:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):90 -> a
+    629:629:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getLambdaClassOriginName():62:62 -> a
+    629:629:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):83 -> a
+    629:629:com.android.tools.r8.kotlin.KotlinTypeReference getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):100 -> a
+    629:629:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):90 -> a
+    630:630:com.android.tools.r8.kotlin.KotlinTypeReference getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory):102:102 -> a
+    630:630:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):90 -> a
+    631:631:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContract():230:230 -> a
+    631:631:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    632:632:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:34 -> a
+    632:632:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    633:633:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91:91 -> a
+    634:634:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():21:21 -> a
+    634:634:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):36 -> a
+    634:634:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    635:639:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):37:41 -> a
+    635:639:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    640:640:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):40:40 -> a
+    640:640:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    640:640:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    641:641:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():36:36 -> a
+    641:641:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):41 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    641:641:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    641:641:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    642:642:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():37:37 -> a
+    642:642:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    642:642:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    642:642:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    643:643:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():43:43 -> a
+    643:643:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
+    643:643:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    643:643:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    644:644:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43:43 -> a
+    644:644:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    644:644:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    645:652:java.util.List com.android.tools.r8.kotlin.KotlinEffectExpressionInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
+    645:652:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
+    645:652:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    645:652:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    653:653:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():48:48 -> a
+    653:653:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
+    653:653:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    653:653:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    654:654:com.android.tools.r8.kotlin.KotlinEffectInfo com.android.tools.r8.kotlin.KotlinEffectInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:44 -> a
+    654:654:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
+    654:654:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    655:657:com.android.tools.r8.kotlin.KotlinContractInfo com.android.tools.r8.kotlin.KotlinContractInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42:44 -> a
+    655:657:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):91 -> a
+    658:658:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():209:209 -> a
+    658:658:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94 -> a
+    659:659:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):94:94 -> a
+    660:660:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):93:93 -> a
+    661:661:com.android.tools.r8.kotlin.KotlinTypeInfo lambda$create$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):95:95 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/kotlin/p0;"}
+    662:662:java.lang.String getName():109:109 -> a
+    662:662:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/y;)Z"}
-    275:284:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):145:154 -> a
-    285:290:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):151:156 -> a
-    291:291:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():393:393 -> a
-    291:291:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):160 -> a
-    292:292:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):160:160 -> a
-    293:302:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):157:166 -> a
-    303:308:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):163:168 -> a
-    309:309:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():409:409 -> a
-    309:309:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):168 -> a
-    310:327:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):168:185 -> a
-    328:328:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinValueParameterInfo):205:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
-    329:342:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):205:218 -> a
+    663:670:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):123:130 -> a
+    671:865:void com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.<init>(java.lang.String):0:194 -> a
+    671:865:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130 -> a
+    866:867:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):131:132 -> a
+    868:868:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):198:198 -> a
+    868:868:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    869:920:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):0:51 -> a
+    869:920:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):198 -> a
+    869:920:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    921:921:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):51:51 -> a
+    921:921:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):198 -> a
+    921:921:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    922:922:com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):200:200 -> a
+    922:922:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):199 -> a
+    922:922:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    923:1123:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind):0:200 -> a
+    923:1123:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):199 -> a
+    923:1123:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1124:1124:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):218:218 -> a
+    1124:1124:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):200 -> a
+    1124:1124:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1125:1343:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.Modality):0:218 -> a
+    1125:1343:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):200 -> a
+    1125:1343:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1344:1344:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isOperator(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):223:223 -> a
+    1344:1344:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):201 -> a
+    1344:1344:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1345:1345:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setOperator(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):223:223 -> a
+    1345:1345:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):201 -> a
+    1345:1345:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1346:1346:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInfix(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):228:228 -> a
+    1346:1346:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):202 -> a
+    1346:1346:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1347:1347:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setInfix(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):228:228 -> a
+    1347:1347:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):202 -> a
+    1347:1347:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1348:1348:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):233:233 -> a
+    1348:1348:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):203 -> a
+    1348:1348:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1349:1349:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):233:233 -> a
+    1349:1349:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):203 -> a
+    1349:1349:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1350:1350:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isTailrec(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):238:238 -> a
+    1350:1350:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):204 -> a
+    1350:1350:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1351:1351:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setTailrec(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):238:238 -> a
+    1351:1351:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):204 -> a
+    1351:1351:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1352:1352:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):243:243 -> a
+    1352:1352:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):205 -> a
+    1352:1352:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1353:1353:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):243:243 -> a
+    1353:1353:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):205 -> a
+    1353:1353:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1354:1354:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):248:248 -> a
+    1354:1354:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):206 -> a
+    1354:1354:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1355:1355:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):248:248 -> a
+    1355:1355:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):206 -> a
+    1355:1355:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1356:1356:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):253:253 -> a
+    1356:1356:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):207 -> a
+    1356:1356:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1357:1357:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):253:253 -> a
+    1357:1357:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):207 -> a
+    1357:1357:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1358:1358:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):208:208 -> a
+    1358:1358:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):208 -> a
+    1358:1358:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1359:1567:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:208 -> a
+    1359:1567:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):208 -> a
+    1359:1567:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1568:1568:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):261:261 -> a
+    1568:1568:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):209 -> a
+    1568:1568:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1569:1569:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,boolean):261:261 -> a
+    1569:1569:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):209 -> a
+    1569:1569:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):132 -> a
+    1570:1575:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):134:139 -> a
+    1576:1585:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):136:145 -> a
+    1586:1591:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):142:147 -> a
+    1592:1592:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():209:209 -> a
+    1592:1592:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):151 -> a
+    1593:1593:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):151:151 -> a
+    1594:1603:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):148:157 -> a
+    1604:1604:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):154:154 -> a
+    1605:1605:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():225:225 -> a
+    1605:1605:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):159 -> a
+    1606:1606:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):159:159 -> a
+    1607:1607:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():225:225 -> a
+    1607:1607:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):159 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1608:1628:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):159:179 -> a
+    1629:1629:boolean rewriteNoBacking(java.util.function.Consumer,com.android.tools.r8.graph.AppView):113:113 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
+    1630:1630:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinValueParameterInfo):199:199 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/t0;)Ljava/util/function/Consumer;"}
+    1631:1644:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):199:212 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    343:343:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):210:210 -> a
+    1645:1645:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):204:204 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/q0;)Ljava/util/function/Consumer;"}
+    1646:1646:java.util.function.Consumer lambda$trace$5(com.android.tools.r8.kotlin.KotlinTypeInfo):205:205 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
-    344:344:java.util.function.Consumer lambda$trace$5(com.android.tools.r8.kotlin.KotlinTypeInfo):211:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/J;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/K;"}
     boolean isFunction() -> j
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.kotlin.K:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.kotlin.L:
 # {"id":"sourceFile","fileName":"KotlinJvmFieldSignatureInfo.java"}
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
     java.lang.String name -> b
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):25:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;Ljava/lang/String;)V"}
     1:13:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):42:54 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/graph/y;)Z"}
     14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-com.android.tools.r8.kotlin.KotlinJvmMetadataVersionUtils -> com.android.tools.r8.kotlin.L:
+com.android.tools.r8.kotlin.KotlinJvmMetadataVersionUtils -> com.android.tools.r8.kotlin.M:
 # {"id":"sourceFile","fileName":"KotlinJvmMetadataVersionUtils.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion MIN_SUPPORTED_VERSION -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMajor():30:30 -> a
     1:1:int[] toIntArray(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):14 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/j;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BD;)[I"}
     2:2:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMinor():30:30 -> a
     2:2:int[] toIntArray(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):14 -> a
     3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getPatch():30:30 -> a
     3:3:int[] toIntArray(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):14 -> a
     4:4:int[] toIntArray(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion):14:14 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.kotlin.M:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.kotlin.N:
 # {"id":"sourceFile","fileName":"KotlinJvmMethodSignatureInfo.java"}
     java.lang.String name -> a
     com.android.tools.r8.kotlin.KotlinTypeReference returnType -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/s0;"}
     java.util.List parameters -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.lang.String invalidDescriptor -> d
     java.util.List EMPTY_PARAMETERS_LIST -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> f
     1:3:void <clinit>():24:26 -> <clinit>
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     4:4:void <clinit>():26 -> <clinit>
     5:5:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference,java.util.List):34:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/r0;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/s0;Lcom/android/tools/r8/internal/xu;)V"}
     6:10:void <init>(java.lang.String,java.lang.String):41:45 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/M;"}
-    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():50:50 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DD;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/N;"}
+    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature.getDescriptor():38:38 -> a
     2:2:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):54 -> a
     3:7:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):55:59 -> a
     8:8:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):79:79 -> a
@@ -222169,62 +221229,62 @@
     44:49:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):125:130 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     50:50:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)Ljava/util/function/Consumer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.kotlin.N:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.kotlin.O:
 # {"id":"sourceFile","fileName":"KotlinLambdaInfo.java"}
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/J;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/K;"}
     boolean hasBacking -> b
-    1:3:void <init>(com.android.tools.r8.kotlin.KotlinFunctionInfo,boolean):28:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/J;Z)V"}
-    1:6:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):54:59 -> a
+    1:3:void <init>(com.android.tools.r8.kotlin.KotlinFunctionInfo,boolean):27:29 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/K;Z)V"}
+    1:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):53:59 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Z"}
-    7:7:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
-    7:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
+    8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:13:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60:65 -> a
-    14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
+    9:14:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60:65 -> a
+    15:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.kotlin.O:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.kotlin.P:
 # {"id":"sourceFile","fileName":"KotlinLocalDelegatedPropertyInfo.java"}
     java.util.List propertyInfos -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/O;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/P;"}
     boolean $assertionsDisabled -> c
     1:4:void <clinit>():20:23 -> <clinit>
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     5:5:void <clinit>():23 -> <clinit>
     6:6:void <clinit>():23:23 -> <clinit>
     1:2:void <init>(java.util.List):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:10:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):33:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/kotlin/O;"}
-    11:11:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getFieldSignature():129:129 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/kotlin/P;"}
+    11:11:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getFieldSignature():101:101 -> a
     11:11:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42 -> a
     12:12:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):42:42 -> a
-    13:13:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getGetterSignature():134:134 -> a
+    13:13:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getGetterSignature():106:106 -> a
     13:13:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
     14:14:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43:43 -> a
-    15:15:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getSetterSignature():139:139 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo.getSetterSignature():111:111 -> a
     15:15:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
     16:19:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:47 -> a
     20:20:com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:34 -> a
     21:21:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/g0;)Ljava/util/function/Consumer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/h0;)Ljava/util/function/Consumer;"}
     22:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56:56 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.kotlin.P:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.kotlin.Q:
 # {"id":"sourceFile","fileName":"KotlinMemberLevelInfo.java"}
     boolean isProperty() -> a
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/g0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/h0;"}
     boolean isNoKotlinInformation() -> c
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/J;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/K;"}
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/y;"}
@@ -222235,7 +221295,7 @@
     boolean isConstructor() -> p
     com.android.tools.r8.kotlin.KotlinEnumEntryInfo asEnumEntry() -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/F;"}
-com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper -> com.android.tools.r8.kotlin.Q:
+com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper -> com.android.tools.r8.kotlin.S:
 # {"id":"sourceFile","fileName":"KotlinMetadataAnnotationWrapper.java"}
     int kind -> a
     int[] metadataVersion -> b
@@ -222249,7 +221309,7 @@
     1:2:void <clinit>():22:23 -> <clinit>
     1:9:void <init>(java.lang.Integer,int[],java.lang.String[],java.lang.String[],java.lang.String,java.lang.String,java.lang.Integer):47:55 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper wrap(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;)Lcom/android/tools/r8/kotlin/Q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI;)Lcom/android/tools/r8/kotlin/S;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.kotlin.KotlinClassMetadataReader.extractMetadataWithPossiblyUnsupportedMetadataVersion(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):201:201 -> a
     2:2:com.android.tools.r8.kotlin.KotlinMetadataAnnotationWrapper wrap(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):60 -> a
     3:3:int com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.getMajor():30:30 -> a
@@ -222298,24 +221358,24 @@
     1:1:java.lang.String pn():125:125 -> pn
     1:1:int xi():105:105 -> xi
     1:1:java.lang.String xs():110:110 -> xs
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.kotlin.S:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.kotlin.T:
 # {"id":"sourceFile","fileName":"KotlinMetadataDiagnostic.java"}
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
     1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String):23:26 -> <init>
     1:7:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):46:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/lang/String;)Lcom/android/tools/r8/kotlin/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/lang/String;)Lcom/android/tools/r8/kotlin/T;"}
     8:9:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic unknownClassifier(java.lang.String):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/kotlin/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/kotlin/T;"}
     10:17:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):70:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Throwable;)Lcom/android/tools/r8/kotlin/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Throwable;)Lcom/android/tools/r8/kotlin/T;"}
     18:19:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic unknownMetadataVersion():81:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/T;"}
     1:1:java.lang.String getDiagnosticMessage():41:41 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():31:31 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():36:36 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.kotlin.U:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.kotlin.V:
 # {"id":"sourceFile","fileName":"KotlinMetadataEnqueuerExtension.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -222348,7 +221408,7 @@
     50:50:com.android.tools.r8.kotlin.KotlinMethodLevelInfo com.android.tools.r8.graph.DexEncodedMethod.getKotlinInfo():618:618 -> a
     50:50:void done(com.android.tools.r8.shaking.Enqueuer):111 -> a
     51:51:void done(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
-    52:52:boolean com.android.tools.r8.kotlin.KotlinFunctionInfo.hasCrossInlineParameter():78:78 -> a
+    52:52:boolean com.android.tools.r8.kotlin.KotlinFunctionInfo.hasCrossInlineParameter():69:69 -> a
     52:52:void done(com.android.tools.r8.shaking.Enqueuer):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     53:58:void done(com.android.tools.r8.shaking.Enqueuer):112:117 -> a
@@ -222389,43 +221449,56 @@
     103:103:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markClassInitializerMayBePostponed():289 -> a
     103:103:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218 -> a
     103:103:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):78 -> a
-    104:104:void com.android.tools.r8.graph.DexProgramClass.clearKotlinInfo():587:587 -> a
+    104:104:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    104:104:void com.android.tools.r8.graph.DexProgramClass.clearKotlinInfo():587 -> a
     104:104:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):80 -> a
-    105:111:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):81:87 -> a
-    112:116:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer,java.util.function.Supplier):45:49 -> a
-    112:116:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):87 -> a
-    117:119:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):581:583 -> a
-    117:119:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):86 -> a
-    120:122:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):92:94 -> a
-    123:123:java.lang.Boolean lambda$done$0():76:76 -> a
-    124:125:boolean lambda$done$1(com.android.tools.r8.graph.DexAnnotation):83:84 -> a
+    105:105:void com.android.tools.r8.graph.DexProgramClass.clearKotlinInfo():587:587 -> a
+    105:105:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    106:112:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):81:87 -> a
+    113:113:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer,java.util.function.Supplier):45:45 -> a
+    113:113:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):87 -> a
+    114:114:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    114:114:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer,java.util.function.Supplier):47 -> a
+    114:114:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):87 -> a
+    115:115:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Consumer,java.util.function.Supplier):49:49 -> a
+    115:115:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):87 -> a
+    116:117:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):581:582 -> a
+    116:117:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):86 -> a
+    118:118:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    118:118:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):582 -> a
+    118:118:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):86 -> a
+    119:120:void com.android.tools.r8.graph.DexProgramClass.setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):582:583 -> a
+    119:120:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):86 -> a
+    121:123:void lambda$done$4(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):92:94 -> a
+    124:124:java.lang.Boolean lambda$done$0():76:76 -> a
+    125:126:boolean lambda$done$1(com.android.tools.r8.graph.DexAnnotation):83:84 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;)Z"}
-    126:126:void lambda$done$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
+    127:127:void lambda$done$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):90:90 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/j1;)V"}
-    127:127:void lambda$done$5(java.util.Set,com.android.tools.r8.graph.ProgramMethod):113:113 -> a
+    128:128:void lambda$done$5(java.util.Set,com.android.tools.r8.graph.ProgramMethod):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/C5;)V"}
-    128:139:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:135 -> a
+    129:140:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):124:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;ZLcom/android/tools/r8/graph/D2;)V"}
-    140:140:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
-    140:140:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135 -> a
-    141:142:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135:136 -> a
-    143:147:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135:139 -> a
-    148:148:void lambda$done$8(com.android.tools.r8.graph.ProgramMember):149:149 -> a
+    141:141:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
+    141:141:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135 -> a
+    142:143:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135:136 -> a
+    144:148:void lambda$done$7(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):135:139 -> a
+    149:149:void lambda$done$8(com.android.tools.r8.graph.ProgramMember) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B5;)V"}
-    149:149:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
-    149:149:void lambda$done$8(com.android.tools.r8.graph.ProgramMember):149 -> a
-    150:150:void lambda$done$8(com.android.tools.r8.graph.ProgramMember):149:149 -> a
-    151:151:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
-    151:151:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146 -> a
+    150:150:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
+    150:150:void lambda$done$8(com.android.tools.r8.graph.ProgramMember):149 -> a
+    151:151:void lambda$done$8(com.android.tools.r8.graph.ProgramMember):149:149 -> a
+    152:152:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
+    152:152:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-    152:152:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
-    152:152:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146 -> a
-    153:154:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146:147 -> a
+    153:153:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):52:52 -> a
+    153:153:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146 -> a
+    154:155:void lambda$done$9(com.android.tools.r8.graph.DexProgramClass):146:147 -> a
     1:1:java.lang.Boolean lambda$done$3():91:91 -> b
     2:3:boolean lambda$done$6(com.android.tools.r8.graph.DexAnnotation):130:131 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;)Z"}
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.kotlin.T:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.kotlin.U:
 # {"id":"sourceFile","fileName":"KotlinMetadataEnqueuerExtension.java"}
     com.android.tools.r8.graph.ProgramDefinition context -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y5;"}
@@ -222433,20 +221506,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/I;"}
     java.util.Set prunedTypes -> c
     com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/U;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/V;"}
     1:4:void <init>(com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier,java.util.Set):162:165 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/U;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/I;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/V;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/I;Ljava/util/Set;)V"}
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():186:186 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
     1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):170:170 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/b0;"}
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):178:181 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/E0;"}
-com.android.tools.r8.kotlin.KotlinMetadataException -> com.android.tools.r8.kotlin.V:
+com.android.tools.r8.kotlin.KotlinMetadataException -> com.android.tools.r8.kotlin.W:
 # {"id":"sourceFile","fileName":"KotlinMetadataException.java"}
     1:1:void <init>(java.lang.Throwable):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Exception;)V"}
-com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.kotlin.W:
+com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.kotlin.X:
 # {"id":"sourceFile","fileName":"KotlinMetadataMembersTracker.java"}
     int count -> a
     java.util.Set references -> b
@@ -222457,7 +221530,7 @@
     1:3:void add(com.android.tools.r8.graph.DexMember):26:28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)V"}
     4:10:boolean isEqual(com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,com.android.tools.r8.graph.AppView):33:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/W;Lcom/android/tools/r8/graph/y;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/X;Lcom/android/tools/r8/graph/y;)Z"}
     11:14:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):894:897 -> a
     11:14:boolean isEqual(com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,com.android.tools.r8.graph.AppView):40 -> a
     15:15:boolean com.android.tools.r8.com.google.common.collect.Sets$3.isEmpty():940:940 -> a
@@ -222479,7 +221552,7 @@
     25:25:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.difference(java.util.Set,java.util.Set):894 -> a
     25:25:boolean isEqual(com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,com.android.tools.r8.graph.AppView):40 -> a
     26:26:void lambda$isEqual$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.Sets$SetView,com.android.tools.r8.graph.DexMember):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ya0;Lcom/android/tools/r8/graph/r2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cb0;Lcom/android/tools/r8/graph/r2;)V"}
     27:27:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.AppView.getKotlinMetadataLens():716:716 -> a
     27:27:void lambda$isEqual$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.Sets$SetView,com.android.tools.r8.graph.DexMember):53 -> a
     28:28:void lambda$isEqual$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.Sets$SetView,com.android.tools.r8.graph.DexMember):53:53 -> a
@@ -222493,7 +221566,7 @@
     37:37:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
     37:37:boolean isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65 -> a
     37:37:boolean lambda$isEqual$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):56 -> a
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.kotlin.Y:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.kotlin.Z:
 # {"id":"sourceFile","fileName":"KotlinMetadataRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -222523,73 +221596,81 @@
     172:172:void runForD8(java.util.concurrent.ExecutorService):162:162 -> a
     173:173:void runForD8(java.util.concurrent.ExecutorService):143:143 -> a
     174:184:void lambda$runForD8$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):146:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/kotlin/X;Lcom/android/tools/r8/graph/D2;)V"}
-    185:194:void lambda$runForD8$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):151:160 -> a
-    195:214:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):173:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/p;Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/kotlin/X;)V"}
-    215:220:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):189:194 -> a
-    221:221:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
-    221:221:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):194 -> a
-    222:232:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):196:206 -> a
-    233:237:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):180:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/IV;Lcom/android/tools/r8/kotlin/p;Lcom/android/tools/r8/kotlin/X;)Ljava/lang/Boolean;"}
-    238:238:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):181:181 -> a
-    239:243:boolean verifyRewrittenMetadataIsEquivalent(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):214:218 -> a
-    239:243:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):179 -> a
-    244:244:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):179:179 -> a
-    245:248:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):198:201 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/kotlin/Y;Lcom/android/tools/r8/graph/D2;)V"}
+    185:185:void lambda$runForD8$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):151:151 -> a
+    186:186:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    186:186:void lambda$runForD8$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):157 -> a
+    187:187:void lambda$runForD8$2(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    188:207:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):173:192 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/p;Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/kotlin/Y;)V"}
+    208:213:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):189:194 -> a
+    214:214:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
+    214:214:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):194 -> a
+    215:225:void writeKotlinInfoToAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):196:206 -> a
+    226:230:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):180:184 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/MV;Lcom/android/tools/r8/kotlin/p;Lcom/android/tools/r8/kotlin/Y;)Ljava/lang/Boolean;"}
+    231:231:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):181:181 -> a
+    232:236:boolean verifyRewrittenMetadataIsEquivalent(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):214:218 -> a
+    232:236:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):179 -> a
+    237:237:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Pair,com.android.tools.r8.kotlin.KotlinClassLevelInfo,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):179:179 -> a
+    238:241:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):198:201 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/lang/Throwable;)Ljava/lang/Boolean;"}
-    249:249:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> a
-    249:249:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):201 -> a
+    242:242:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):129:129 -> a
+    242:242:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    250:250:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
-    250:250:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):201 -> a
-    251:260:boolean kotlinMetadataFieldExists(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):228:237 -> a
+    243:243:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):130:130 -> a
+    243:243:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):201 -> a
+    244:253:boolean kotlinMetadataFieldExists(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):228:237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/H2;)Z"}
-    261:261:boolean lambda$kotlinMetadataFieldExists$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):235:235 -> a
+    254:254:boolean lambda$kotlinMetadataFieldExists$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):235:235 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/j1;)Z"}
-    262:264:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):245:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FN;Ljava/lang/String;[ILcom/android/tools/r8/kotlin/X;)Lcom/android/tools/r8/graph/r0;"}
-    265:269:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):285:289 -> a
-    265:269:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):249 -> a
-    270:270:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):249:249 -> a
-    271:277:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):247:253 -> a
-    278:283:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):252:257 -> a
-    284:288:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):293:297 -> a
-    284:288:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):257 -> a
-    289:289:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):257:257 -> a
-    290:295:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):256:261 -> a
-    296:300:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):293:297 -> a
-    296:300:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):261 -> a
-    301:301:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):261:261 -> a
-    302:308:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):260:266 -> a
-    309:317:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):264:272 -> a
-    318:325:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):269:276 -> a
-    326:332:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):275:281 -> a
-    333:342:int[] getMaxVersion(int[],int[]):302:311 -> a
-    343:343:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
-    343:343:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):108 -> a
+    255:257:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):245:247 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JN;Ljava/lang/String;[ILcom/android/tools/r8/kotlin/Y;)Lcom/android/tools/r8/graph/r0;"}
+    258:262:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):285:289 -> a
+    258:262:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):249 -> a
+    263:263:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):249:249 -> a
+    264:270:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):247:253 -> a
+    271:276:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):252:257 -> a
+    277:281:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):293:297 -> a
+    277:281:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):257 -> a
+    282:282:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):257:257 -> a
+    283:288:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):256:261 -> a
+    289:293:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):293:297 -> a
+    289:293:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):261 -> a
+    294:294:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):261:261 -> a
+    295:301:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):260:266 -> a
+    302:310:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):264:272 -> a
+    311:318:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):269:276 -> a
+    319:325:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlin.Metadata,java.lang.String,int[],com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo):275:281 -> a
+    326:335:int[] getMaxVersion(int[],int[]):302:311 -> a
+    336:336:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
+    336:336:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):108 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/kotlin/X;Lcom/android/tools/r8/graph/D2;)V"}
-    344:354:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):109:119 -> a
-    355:355:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879:879 -> a
-    355:355:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/kotlin/Y;Lcom/android/tools/r8/graph/D2;)V"}
+    337:337:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getInvalidKotlinInfo():85:85 -> a
+    337:337:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):109 -> a
+    338:338:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):113:113 -> a
+    339:339:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo com.android.tools.r8.kotlin.KotlinMetadataUtils.getNoKotlinInfo():81:81 -> a
+    339:339:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):117 -> a
+    340:342:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):117:119 -> a
+    343:343:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879:879 -> a
+    343:343:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    356:356:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879:879 -> a
-    356:356:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
-    357:357:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):224:224 -> a
-    357:357:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879 -> a
+    344:344:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879:879 -> a
+    344:344:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
+    345:345:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):224:224 -> a
+    345:345:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    357:357:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
-    358:358:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):224:224 -> a
-    358:358:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879 -> a
-    358:358:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
-    359:359:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):130:130 -> a
-    360:361:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):125:126 -> a
-    362:362:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):212:212 -> a
-    362:362:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):126 -> a
-    363:363:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
-    363:363:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):123 -> a
+    345:345:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
+    346:346:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):224:224 -> a
+    346:346:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexProgramClass):879 -> a
+    346:346:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):119 -> a
+    347:347:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):130:130 -> a
+    348:349:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):125:126 -> a
+    350:350:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):212:212 -> a
+    350:350:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):126 -> a
+    351:351:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
+    351:351:void lambda$runForR8$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo,com.android.tools.r8.graph.DexProgramClass):123 -> a
     1:2:void runForR8(java.util.concurrent.ExecutorService):87:88 -> b
     3:3:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.AppView.getKotlinMetadataLens():716:716 -> b
     3:3:void runForR8(java.util.concurrent.ExecutorService):88 -> b
@@ -222607,7 +221688,7 @@
     156:156:void runForR8(java.util.concurrent.ExecutorService):132:132 -> b
     157:157:void runForR8(java.util.concurrent.ExecutorService):132:132 -> b
     158:158:void runForR8(java.util.concurrent.ExecutorService):105:105 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.kotlin.X:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.kotlin.Y:
 # {"id":"sourceFile","fileName":"KotlinMetadataRewriter.java"}
     boolean writeKind -> a
     boolean writeMetadataVersion -> b
@@ -222617,568 +221698,875 @@
     boolean writePackageName -> f
     boolean writeExtraInt -> g
     1:8:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean):56:63 -> <init>
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.kotlin.a0:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.kotlin.b0:
 # {"id":"sourceFile","fileName":"KotlinMetadataUtils.java"}
-    com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/Z;"}
-    com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/Z;"}
-    boolean $assertionsDisabled -> c
-    1:4:void <clinit>():33:36 -> <clinit>
-    1:8:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):91:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    9:13:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature toDefaultJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,int):103:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;I)Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/k;"}
-    14:16:boolean isValidMethodDescriptor(java.lang.String):145:147 -> a
-    17:25:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):162:170 -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion VERSION_1_4_0 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BD;"}
+    com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/a0;"}
+    com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/a0;"}
+    boolean $assertionsDisabled -> d
+    1:5:void <clinit>():34:38 -> <clinit>
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getInvalidKotlinInfo():85:85 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/a0;"}
+    2:9:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):93:100 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/DD;"}
+    10:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature toDefaultJvmMethodSignature(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature,int):105:109 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DD;I)Lcom/android/tools/r8/internal/DD;"}
+    15:17:boolean isValidMethodDescriptor(java.lang.String):147:149 -> a
+    18:26:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):164:172 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
-    26:26:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):180:180 -> a
+    27:27:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):182:182 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/graph/B1;)Z"}
-    27:27:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    27:27:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    28:28:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):182:182 -> a
-    29:29:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
-    29:29:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):184 -> a
-    30:40:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):187:197 -> a
-    41:49:java.lang.String getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):201:209 -> a
+    28:28:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
+    28:28:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):182 -> a
+    29:29:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):184:184 -> a
+    30:30:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
+    30:30:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):186 -> a
+    31:41:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):189:199 -> a
+    42:50:java.lang.String getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):203:211 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/lang/String;)Ljava/lang/String;"}
-    50:50:java.lang.String getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):205:205 -> a
-    51:53:java.lang.String getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):218:220 -> a
-    54:54:int[] getCompatibleKotlinInfo():229:229 -> a
-    55:55:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> a
-    55:55:int[] getCompatibleKotlinInfo():229 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:int[] com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion.toIntArray():40:40 -> a
-    56:56:int[] getCompatibleKotlinInfo():229 -> a
-    57:57:java.lang.Object consume(java.lang.Object,java.util.function.Consumer):233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;)Ljava/lang/Object;"}
-    58:58:boolean rewriteIfNotNull(com.android.tools.r8.graph.AppView,java.lang.Object,java.util.function.Consumer,com.android.tools.r8.utils.TriFunction):242:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Oh0;)Z"}
-    59:60:boolean rewriteList(com.android.tools.r8.graph.AppView,java.util.List,java.util.List,com.android.tools.r8.utils.TriFunction):250:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/Oh0;)Z"}
-    61:62:boolean rewriteList(com.android.tools.r8.graph.AppView,java.util.List,java.util.function.Consumer,com.android.tools.r8.utils.TriFunction):260:261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Oh0;)Z"}
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> R8$$REMOVED$$CLASS$$204:
+    51:51:java.lang.String getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):207:207 -> a
+    52:54:java.lang.String getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):220:222 -> a
+    55:56:void updateJvmMetadataVersionIfRequired(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):226:227 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI;)V"}
+    57:57:boolean rewriteIfNotNull(com.android.tools.r8.graph.AppView,java.lang.Object,java.util.function.Consumer,com.android.tools.r8.utils.TriFunction):236:236 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Sh0;)Z"}
+    58:59:boolean rewriteList(com.android.tools.r8.graph.AppView,java.util.List,java.util.List,com.android.tools.r8.utils.TriFunction):244:245 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/Sh0;)Z"}
+    60:61:boolean rewriteList(com.android.tools.r8.graph.AppView,java.util.List,java.util.function.Consumer,com.android.tools.r8.utils.TriFunction):254:255 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Sh0;)Z"}
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():81:81 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/a0;"}
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> R8$$REMOVED$$CLASS$$192:
 # {"id":"sourceFile","fileName":"KotlinMetadataUtils.java"}
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.kotlin.Z:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.kotlin.a0:
 # {"id":"sourceFile","fileName":"KotlinMetadataUtils.java"}
     java.lang.String name -> a
-    1:2:void <init>(java.lang.String):43:44 -> <init>
+    1:2:void <init>(java.lang.String):45:46 -> <init>
     1:1:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    2:2:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
+    2:2:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):56:56 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
     boolean isNoKotlinInformation() -> c
-    1:1:java.lang.String getPackageName():59:59 -> r
-    1:1:java.lang.String toString():49:49 -> toString
-    1:1:int[] getMetadataVersion():64:64 -> u
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.kotlin.b0:
+    1:1:java.lang.String getPackageName():61:61 -> r
+    1:1:java.lang.String toString():51:51 -> toString
+    1:1:int[] getMetadataVersion():66:66 -> u
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.kotlin.c0:
 # {"id":"sourceFile","fileName":"KotlinMetadataWriter.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:5:void writeKotlinMetadataAnnotation(java.lang.String,com.android.tools.r8.graph.DexAnnotation,java.io.PrintStream,com.android.tools.r8.kotlin.Kotlin):54:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;Ljava/io/PrintStream;Lcom/android/tools/r8/kotlin/g;)V"}
     6:22:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):64:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/zI;)Ljava/lang/String;"}
     23:29:java.lang.String kotlinClassMetadataToString(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):86:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$a;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$a;Ljava/lang/String;)Ljava/lang/String;"}
     30:30:void lambda$kotlinClassMetadataToString$0(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$a;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zI$a;Ljava/lang/String;)V"}
     31:37:java.lang.String kotlinFileFacadeMetadataToString(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):97:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$b;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$b;Ljava/lang/String;)Ljava/lang/String;"}
     38:38:void lambda$kotlinFileFacadeMetadataToString$1(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$b;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zI$b;Ljava/lang/String;)V"}
     39:39:java.lang.String kotlinMultiFileClassFacadeMetadataString(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$c;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$c;Ljava/lang/String;)Ljava/lang/String;"}
     40:50:java.lang.String kotlinMultiFileClassPartToString(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):116:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$d;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$d;Ljava/lang/String;)Ljava/lang/String;"}
     51:51:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$d;Ljava/lang/String;)V"}
-    52:52:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():487:487 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zI$d;Ljava/lang/String;)V"}
+    52:52:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():296:296 -> a
     52:52:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):123 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     53:55:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):122:124 -> a
     56:78:java.lang.String kotlinSyntheticClassToString(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String):131:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/t;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BI;Ljava/lang/String;)Ljava/lang/String;"}
     79:79:void lambda$kotlinSyntheticClassToString$3(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,java.lang.String):145:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/XH;Ljava/lang/String;)V"}
-    80:84:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):180:184 -> a
-    85:88:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
-    85:88:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):184 -> a
-    89:92:void lambda$appendKmList$6(java.util.Collection,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):188:191 -> a
-    93:94:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):200:201 -> a
-    95:98:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
-    95:98:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):201 -> a
-    99:99:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):201:201 -> a
-    100:101:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):205:206 -> a
-    102:105:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
-    102:105:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):206 -> a
-    106:106:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):206:206 -> a
-    107:154:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer):211:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
-    155:155:java.lang.String lambda$appendKmDeclarationContainer$9(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TH;)Ljava/lang/String;"}
-    156:156:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):226:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/TH;)V"}
-    157:170:java.lang.String lambda$appendKmDeclarationContainer$12(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):241:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bI;)Ljava/lang/String;"}
-    171:171:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.getKmLambda():268:268 -> a
-    171:171:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):138 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/aI;Ljava/lang/String;)V"}
+    80:80:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.getKmLambda():169:169 -> a
+    80:80:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/t;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
-    172:182:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):140:150 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BI;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
+    81:91:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):140:150 -> a
+    92:96:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):180:184 -> a
+    97:100:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
+    97:100:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Collection,java.util.function.BiConsumer):184 -> a
+    101:104:void lambda$appendKmList$6(java.util.Collection,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):188:191 -> a
+    105:106:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):200:201 -> a
+    107:110:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
+    107:110:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):201 -> a
+    111:111:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):201:201 -> a
+    112:113:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):205:206 -> a
+    114:117:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> a
+    114:117:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):206 -> a
+    118:118:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):206:206 -> a
+    119:166:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer):211:258 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/QH;Ljava/lang/String;)V"}
+    167:167:java.lang.String lambda$appendKmDeclarationContainer$9(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):224:224 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;)Ljava/lang/String;"}
+    168:168:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):226:226 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/YH;)V"}
+    169:182:java.lang.String lambda$appendKmDeclarationContainer$12(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):241:254 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fI;)Ljava/lang/String;"}
     183:183:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/hI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/jI;)V"}
     184:185:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):274:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;)V"}
-    186:260:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):0:74 -> a
-    186:260:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275 -> a
-    261:261:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():71:71 -> a
-    261:261:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):74 -> a
-    261:261:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275 -> a
-    262:263:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275:276 -> a
-    264:268:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):281:285 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/cI;)V"}
+    186:248:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):0:62 -> a
+    186:248:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275 -> a
+    249:249:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():49:49 -> a
+    249:249:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):62 -> a
+    249:249:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275 -> a
+    250:251:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):275:276 -> a
+    252:256:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):281:285 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/cI;Ljava/lang/String;)V"}
+    257:257:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56:56 -> a
+    257:257:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285 -> a
+    258:258:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():48:48 -> a
+    258:258:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56 -> a
+    258:258:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285 -> a
+    259:259:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285:285 -> a
+    260:260:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):281:281 -> a
+    261:271:void appendFlags(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.Map):291:301 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Ljava/util/Map;Ljava/lang/String;)V"}
+    272:278:void lambda$appendFlags$19(java.lang.StringBuilder,java.lang.String,java.lang.String,java.lang.Object):294:300 -> a
+    279:302:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):305:328 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;)V"}
+    303:318:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324:339 -> a
+    319:322:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):338:341 -> a
+    323:329:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):340:346 -> a
+    330:336:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):342:348 -> a
+    337:343:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):347:353 -> a
+    344:389:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):349:394 -> a
+    390:390:void lambda$appendKmClass$20(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):311:311 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    391:391:void lambda$appendKmClass$21(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):322:322 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iI;)V"}
+    392:392:void lambda$appendKmClass$24(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):365:365 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fI;)V"}
+    393:393:java.lang.String lambda$appendKmClass$26(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):380:380 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NH;)Ljava/lang/String;"}
+    394:394:void lambda$appendKmClass$27(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):382:382 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/NH;)V"}
+    395:395:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):399:399 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/NH;Ljava/lang/String;)V"}
+    396:396:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404:404 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/NH;Ljava/lang/String;)V"}
+    397:398:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):165:166 -> a
+    397:398:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    399:439:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):0:40 -> a
+    399:439:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):166 -> a
+    399:439:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    440:441:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):166:167 -> a
+    440:441:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    442:442:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):178:178 -> a
+    442:442:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):167 -> a
+    442:442:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    443:444:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):167:168 -> a
+    443:444:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    445:445:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSecondary(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):183:183 -> a
+    445:445:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):168 -> a
+    445:445:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    446:447:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):168:169 -> a
+    446:447:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    448:448:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):191:191 -> a
+    448:448:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):169 -> a
+    448:448:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    449:449:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):169:169 -> a
+    449:449:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404 -> a
+    450:458:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):404:412 -> a
+    459:459:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor.getVersionRequirements():178:178 -> a
+    459:459:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):413 -> a
+    460:460:void lambda$appendKmConstructor$32(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):413:413 -> a
+    461:461:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):418:418 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
-    269:269:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68:68 -> a
-    269:269:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285 -> a
-    270:270:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():70:70 -> a
-    270:270:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68 -> a
-    270:270:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285 -> a
-    271:271:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):285:285 -> a
-    272:272:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):281:281 -> a
-    273:297:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):290:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;)V"}
-    298:313:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):310:325 -> a
-    314:317:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):324:327 -> a
-    318:324:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):326:332 -> a
-    325:331:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):328:334 -> a
-    332:338:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):333:339 -> a
-    339:384:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass):335:380 -> a
-    385:385:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):297:297 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    386:386:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):308:308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/gI;)V"}
-    387:387:void lambda$appendKmClass$23(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):351:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/bI;)V"}
-    388:388:java.lang.String lambda$appendKmClass$25(com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):366:366 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FH;)Ljava/lang/String;"}
-    389:389:void lambda$appendKmClass$26(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):368:368 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/FH;)V"}
-    390:390:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor):385:385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/FH;Ljava/lang/String;)V"}
-    391:391:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):404:404 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    392:392:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):464:464 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    393:396:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):531:534 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    397:397:void lambda$appendKmType$47(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):552:552 -> a
+    462:462:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423:423 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    463:464:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):181:182 -> a
+    463:464:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    465:516:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):0:51 -> a
+    465:516:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):182 -> a
+    465:516:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    517:518:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):182:183 -> a
+    517:518:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    519:519:com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):200:200 -> a
+    519:519:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):183 -> a
+    519:519:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    520:521:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):183:184 -> a
+    520:521:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    522:522:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):218:218 -> a
+    522:522:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):184 -> a
+    522:522:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    523:524:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):184:185 -> a
+    523:524:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    525:525:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isOperator(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):223:223 -> a
+    525:525:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):185 -> a
+    525:525:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    526:527:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):185:186 -> a
+    526:527:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    528:528:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInfix(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):228:228 -> a
+    528:528:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):186 -> a
+    528:528:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    529:530:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):186:187 -> a
+    529:530:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    531:531:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):233:233 -> a
+    531:531:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):187 -> a
+    531:531:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    532:533:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):187:188 -> a
+    532:533:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    534:534:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isTailrec(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):238:238 -> a
+    534:534:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):188 -> a
+    534:534:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    535:536:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):188:189 -> a
+    535:536:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    537:537:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):243:243 -> a
+    537:537:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):189 -> a
+    537:537:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    538:539:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):189:190 -> a
+    538:539:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    540:540:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):248:248 -> a
+    540:540:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):190 -> a
+    540:540:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    541:542:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):190:191 -> a
+    541:542:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    543:543:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):253:253 -> a
+    543:543:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):191 -> a
+    543:543:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    544:545:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):191:192 -> a
+    544:545:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    546:546:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):208:208 -> a
+    546:546:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):192 -> a
+    546:546:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    547:548:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):192:193 -> a
+    547:548:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    549:549:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasNonStableParameterNames(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):261:261 -> a
+    549:549:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):193 -> a
+    549:549:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    550:550:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):193:193 -> a
+    550:550:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423 -> a
+    551:568:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):423:440 -> a
+    569:569:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getVersionRequirements():225:225 -> a
+    569:569:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):445 -> a
+    570:570:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):445:445 -> a
+    571:571:com.android.tools.r8.jetbrains.kotlin.metadata.KmContract com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContract():230:230 -> a
+    571:571:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):446 -> a
+    572:593:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):448:469 -> a
+    594:594:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):83:83 -> a
+    594:594:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):473 -> a
+    595:595:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmFunctionExtension.getLambdaClassOriginName():62:62 -> a
+    595:595:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction):83 -> a
+    595:595:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):473 -> a
+    596:596:void lambda$appendKmFunction$40(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):469:469 -> a
+    597:597:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):478:478 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    598:598:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483:483 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    599:600:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):58:59 -> a
+    599:600:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    601:663:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):0:62 -> a
+    601:663:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):59 -> a
+    601:663:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    664:665:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):59:60 -> a
+    664:665:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    666:666:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):271:271 -> a
+    666:666:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):60 -> a
+    666:666:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    667:668:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):60:61 -> a
+    667:668:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    669:669:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):281:281 -> a
+    669:669:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):61 -> a
+    669:669:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    670:671:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):61:62 -> a
+    670:671:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    672:672:com.android.tools.r8.jetbrains.kotlin.metadata.MemberKind com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getKind(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):288:288 -> a
+    672:672:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):62 -> a
+    672:672:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    673:674:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):62:63 -> a
+    673:674:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    675:675:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isVar(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):295:295 -> a
+    675:675:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):63 -> a
+    675:675:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    676:677:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):63:64 -> a
+    676:677:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    678:678:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isConst(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):300:300 -> a
+    678:678:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):64 -> a
+    678:678:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    679:680:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):64:65 -> a
+    679:680:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    681:681:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isLateinit(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):305:305 -> a
+    681:681:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):65 -> a
+    681:681:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    682:683:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):65:66 -> a
+    682:683:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    684:684:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasConstant(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):328:328 -> a
+    684:684:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):66 -> a
+    684:684:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    685:686:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):66:67 -> a
+    685:686:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    687:687:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):333:333 -> a
+    687:687:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):67 -> a
+    687:687:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    688:689:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):67:68 -> a
+    688:689:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    690:690:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isDelegated(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):341:341 -> a
+    690:690:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):68 -> a
+    690:690:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    691:692:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):68:69 -> a
+    691:692:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    693:693:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExpect(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):346:346 -> a
+    693:693:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):69 -> a
+    693:693:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    694:696:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):69:71 -> a
+    694:696:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    697:697:boolean com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmAttributes.isMovedFromInterfaceCompanion(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):23:23 -> a
+    697:697:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):71 -> a
+    697:697:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    698:698:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):71:71 -> a
+    698:698:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483 -> a
+    699:716:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):483:500 -> a
+    717:717:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getGetter():275:275 -> a
+    717:717:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    718:719:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):107:108 -> a
+    718:719:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    720:793:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):0:73 -> a
+    720:793:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):108 -> a
+    720:793:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    794:795:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):108:109 -> a
+    794:795:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    796:796:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):356:356 -> a
+    796:796:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):109 -> a
+    796:796:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    797:798:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):109:110 -> a
+    797:798:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    799:799:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):366:366 -> a
+    799:799:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):110 -> a
+    799:799:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    800:801:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):110:111 -> a
+    800:801:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    802:802:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNotDefault(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):372:372 -> a
+    802:802:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):111 -> a
+    802:802:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    803:804:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):111:112 -> a
+    803:804:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    805:805:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):377:377 -> a
+    805:805:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):112 -> a
+    805:805:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    806:807:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):112:113 -> a
+    806:807:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    808:808:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):382:382 -> a
+    808:808:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):113 -> a
+    808:808:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    809:809:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):113:113 -> a
+    809:809:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):501 -> a
+    810:810:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):500:500 -> a
+    811:811:com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetter():285:285 -> a
+    811:811:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):502 -> a
+    812:812:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):503:503 -> a
+    813:814:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):107:108 -> a
+    813:814:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    815:815:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):73:73 -> a
+    815:815:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):108 -> a
+    815:815:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    816:817:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):108:109 -> a
+    816:817:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    818:818:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):356:356 -> a
+    818:818:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):109 -> a
+    818:818:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    819:820:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):109:110 -> a
+    819:820:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    821:821:com.android.tools.r8.jetbrains.kotlin.metadata.Modality com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getModality(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):366:366 -> a
+    821:821:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):110 -> a
+    821:821:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    822:823:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):110:111 -> a
+    822:823:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    824:824:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNotDefault(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):372:372 -> a
+    824:824:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):111 -> a
+    824:824:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    825:826:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):111:112 -> a
+    825:826:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    827:827:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isExternal(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):377:377 -> a
+    827:827:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):112 -> a
+    827:827:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    828:829:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):112:113 -> a
+    828:829:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    830:830:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isInline(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):382:382 -> a
+    830:830:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):113 -> a
+    830:830:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    831:831:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmPropertyAccessorAttributes):113:113 -> a
+    831:831:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):504 -> a
+    832:835:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):503:506 -> a
+    836:836:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getVersionRequirements():328:328 -> a
+    836:836:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):511 -> a
+    837:854:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):511:528 -> a
+    855:855:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):127:127 -> a
+    855:855:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):530 -> a
+    856:856:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):535:535 -> a
+    857:857:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):531:531 -> a
+    858:858:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):127:127 -> a
+    858:858:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):537 -> a
+    859:859:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):542:542 -> a
+    860:860:void lambda$appendKmProperty$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):538:538 -> a
+    861:864:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):548:551 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    865:865:void lambda$appendKmType$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):569:569 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/oI;)V"}
-    398:398:void lambda$appendKmType$49(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):557:557 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    399:399:void lambda$appendKmType$53(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):570:570 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
-    400:400:void lambda$appendKmType$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):586:586 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
-    401:401:void lambda$appendKmType$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):585:585 -> a
-    402:402:void lambda$appendKmType$54(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):601:601 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fH;)V"}
-    403:403:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):607:607 -> a
+    866:866:void lambda$appendKmType$50(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):574:574 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    867:867:void lambda$appendKmType$54(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):587:587 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/XH;Ljava/lang/String;)V"}
+    868:868:void lambda$appendKmType$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):603:603 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/XH;Ljava/lang/String;)V"}
+    869:869:void lambda$appendKmType$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):602:602 -> a
+    870:870:void lambda$appendKmType$55(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):618:618 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/pH;)V"}
+    871:871:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection):624:624 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/oI;Ljava/lang/String;)V"}
-    404:404:void lambda$appendValueParameters$59(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):630:630 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/qI;)V"}
-    405:408:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):636:639 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qI;Ljava/lang/String;)V"}
-    409:409:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):661:661 -> a
+    872:872:void lambda$appendValueParameters$60(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):647:647 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/pI;)V"}
+    873:876:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):653:656 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/pI;Ljava/lang/String;)V"}
+    877:877:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):678:678 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)V"}
-    410:410:void lambda$appendTypeParameters$63(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):666:666 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/lI;)V"}
-    411:411:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):671:671 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/lI;Ljava/lang/String;)V"}
-    412:412:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):707:707 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    413:413:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):747:747 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fH;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
-    414:415:void lambda$appendKmAnnotation$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.String):752:753 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fH;Ljava/lang/String;)V"}
-    416:416:void lambda$appendKmAnnotation$77(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):765:765 -> a
-    417:417:void lambda$appendKmAnnotation$76(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):770:770 -> a
-    418:418:void lambda$appendKmAnnotation$75(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):776:776 -> a
-    419:419:void lambda$appendKmAnnotation$75(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):775:775 -> a
-    420:429:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):783:792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iH;)V"}
-    430:430:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):798:798 -> a
+    878:878:void lambda$appendTypeParameters$64(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):683:683 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/mI;)V"}
+    879:879:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):688:688 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/mI;Ljava/lang/String;)V"}
+    880:880:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):724:724 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    881:881:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):764:764 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pH;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
+    882:883:void lambda$appendKmAnnotation$80(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.String):769:770 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/pH;Ljava/lang/String;)V"}
+    884:884:void lambda$appendKmAnnotation$78(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):782:782 -> a
+    885:885:void lambda$appendKmAnnotation$76(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):793:793 -> a
+    886:886:void lambda$appendKmAnnotation$76(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):792:792 -> a
+    887:896:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):800:809 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/sH;)V"}
+    897:897:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):815:815 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Ljava/util/ArrayList;)V"}
-    431:431:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):809:809 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/uI;)V"}
-    432:433:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):814:815 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/uI;Ljava/lang/String;)V"}
-    434:437:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):814:817 -> a
-    438:440:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):816:818 -> a
-    441:441:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getErrorCode():1001:1001 -> a
-    441:441:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):822 -> a
-    442:443:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):823:824 -> a
-    444:451:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):818:825 -> a
-    452:452:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getMessage():1006:1006 -> a
-    452:452:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):826 -> a
-    453:459:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):825:831 -> a
-    460:460:void lambda$appendKmVersionRequirement$81(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):827:827 -> a
-    461:461:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):836:836 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/IH;Ljava/lang/String;)V"}
-    462:462:void lambda$appendKmContract$84(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):851:851 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/LH;)V"}
-    463:463:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):855:855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/LH;Ljava/lang/String;)V"}
-    464:464:void lambda$appendKmEffect$87(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):877:877 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/MH;)V"}
-    465:465:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):893:893 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
+    898:898:void lambda$appendKmVersionRequirement$83(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement):826:826 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/tI;)V"}
+    899:900:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):831:832 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/tI;Ljava/lang/String;)V"}
+    901:904:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):831:834 -> a
+    905:907:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):833:835 -> a
+    908:908:java.lang.Integer com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getErrorCode():514:514 -> a
+    908:908:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):839 -> a
+    909:910:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):840:841 -> a
+    911:918:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):835:842 -> a
+    919:919:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getMessage():519:519 -> a
+    919:919:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):843 -> a
+    920:922:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):842:844 -> a
+    923:923:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getVersion():524:524 -> a
+    923:923:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):848 -> a
+    924:924:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):848:848 -> a
+    925:925:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):844:844 -> a
+    926:926:com.android.tools.r8.jetbrains.kotlin.metadata.KmVersion com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement.getVersion():524:524 -> a
+    926:926:void lambda$appendKmVersionRequirement$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmVersionRequirement,java.lang.String):848 -> a
+    927:927:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract):853:853 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/PH;Ljava/lang/String;)V"}
+    928:928:void lambda$appendKmContract$85(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):868:868 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/RH;)V"}
+    929:929:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect):872:872 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RH;Ljava/lang/String;)V"}
+    930:930:void lambda$appendKmEffect$88(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):894:894 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/SH;)V"}
+    931:931:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):910:910 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    932:939:void lambda$appendKmEffectExpression$97(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):915:922 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    940:953:void lambda$appendKmEffectExpression$97(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):916:929 -> a
+    954:978:void lambda$appendKmEffectExpression$97(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):923:947 -> a
     1:1:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):166:166 -> b
     2:5:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):158:161 -> b
     2:5:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):166 -> b
     6:6:void lambda$appendKmSection$5(java.util.function.Consumer,java.lang.String):169:169 -> b
     7:9:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):220:222 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/QH;Ljava/lang/String;)V"}
     10:14:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):221:225 -> b
     15:15:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):216:216 -> b
     16:16:void lambda$appendKmDeclarationContainer$13(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):257:257 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/bI;)V"}
-    17:17:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):307:307 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    18:18:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):303:303 -> b
-    19:19:void lambda$appendKmClass$28(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):379:379 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/gI;)V"}
-    20:20:void lambda$appendKmConstructor$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):396:396 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/FH;Ljava/lang/String;)V"}
-    21:21:void lambda$appendKmFunction$32(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):415:415 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    22:22:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):475:475 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    23:23:void lambda$appendKmType$48(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):550:550 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    24:24:void lambda$appendKmType$48(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):546:546 -> b
-    25:25:void lambda$appendKmType$50(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):562:562 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    26:26:void lambda$appendKmType$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):579:579 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
-    27:32:void lambda$appendKmType$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):575:580 -> b
-    33:33:void lambda$appendKmTypeProjection$57(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,java.lang.String):616:616 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fI;)V"}
+    17:17:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):321:321 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    18:18:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):317:317 -> b
+    19:19:void lambda$appendKmClass$29(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):393:393 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iI;)V"}
+    20:20:void lambda$appendKmConstructor$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):410:410 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/NH;Ljava/lang/String;)V"}
+    21:21:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):429:429 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    22:22:void lambda$appendKmProperty$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):489:489 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    23:23:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):567:567 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    24:24:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):563:563 -> b
+    25:25:void lambda$appendKmType$51(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):579:579 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    26:26:void lambda$appendKmType$53(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):596:596 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/XH;Ljava/lang/String;)V"}
+    27:32:void lambda$appendKmType$53(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,java.lang.String):592:597 -> b
+    33:33:void lambda$appendKmTypeProjection$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,java.lang.String):633:633 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/oI;Ljava/lang/String;)V"}
-    34:34:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):625:625 -> b
+    34:34:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):642:642 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)V"}
-    35:35:void lambda$appendValueParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):650:650 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qI;Ljava/lang/String;)V"}
-    36:36:void lambda$appendTypeParameter$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):689:689 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/lI;Ljava/lang/String;)V"}
-    37:37:void lambda$appendTypeParameter$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):685:685 -> b
-    38:38:void lambda$appendTypeAlias$70(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):721:721 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    39:39:void lambda$appendTypeAlias$70(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):717:717 -> b
-    40:40:void lambda$appendTypeAlias$69(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):723:723 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fH;)V"}
-    41:46:void lambda$appendKmAnnotation$78(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):758:763 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fH;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
-    47:47:void lambda$appendKmAnnotation$78(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):759:759 -> b
-    48:48:void lambda$appendKmArgument$80(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):790:790 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iH;)V"}
-    49:49:void lambda$appendKmContract$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):846:846 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/IH;Ljava/lang/String;)V"}
-    50:50:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():1059:1059 -> b
-    50:50:void lambda$appendKmContract$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):850 -> b
+    35:35:void lambda$appendValueParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):667:667 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/pI;Ljava/lang/String;)V"}
+    36:36:void lambda$appendTypeParameter$66(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):706:706 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/mI;Ljava/lang/String;)V"}
+    37:37:void lambda$appendTypeParameter$66(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):702:702 -> b
+    38:38:void lambda$appendTypeAlias$71(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):738:738 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    39:39:void lambda$appendTypeAlias$71(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):734:734 -> b
+    40:40:void lambda$appendTypeAlias$70(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):740:740 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/pH;)V"}
+    41:46:void lambda$appendKmAnnotation$79(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):775:780 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pH;Ljava/lang/StringBuilder;Ljava/lang/String;)V"}
+    47:47:void lambda$appendKmAnnotation$79(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):776:776 -> b
+    48:48:void lambda$appendKmAnnotation$77(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):787:787 -> b
+    49:49:void lambda$appendKmArgument$81(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotationArgument):807:807 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/sH;)V"}
+    50:50:void lambda$appendKmContract$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):863:863 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/PH;Ljava/lang/String;)V"}
+    51:51:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmContract.getEffects():21:21 -> b
+    51:51:void lambda$appendKmContract$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):867 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    51:51:void lambda$appendKmContract$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):850:850 -> b
-    52:52:void lambda$appendKmContract$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):846:846 -> b
-    53:53:void lambda$appendKmEffect$88(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):871:871 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/LH;Ljava/lang/String;)V"}
-    54:54:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():1097:1097 -> b
-    54:54:void lambda$appendKmEffect$88(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):875 -> b
+    52:52:void lambda$appendKmContract$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):867:867 -> b
+    53:53:void lambda$appendKmContract$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):863:863 -> b
+    54:54:void lambda$appendKmEffect$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):888:888 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RH;Ljava/lang/String;)V"}
+    55:55:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConstructorArguments():43:43 -> b
+    55:55:void lambda$appendKmEffect$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):892 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:55:void lambda$appendKmEffect$88(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):875:875 -> b
-    56:56:void lambda$appendKmEffect$88(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):871:871 -> b
-    57:57:void lambda$appendKmEffect$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):886:886 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
-    58:58:void lambda$appendKmEffectExpression$92(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):929:929 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/MH;)V"}
-    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():114:114 -> c
-    1:1:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):321 -> c
+    56:56:void lambda$appendKmEffect$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):892:892 -> b
+    57:57:void lambda$appendKmEffect$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):888:888 -> b
+    58:58:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):903:903 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    59:59:void lambda$appendKmEffectExpression$93(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):946:946 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/SH;)V"}
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():78:78 -> c
+    1:1:void lambda$appendKmEffectExpression$92(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):934 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    2:2:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):321:321 -> c
-    3:5:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):236:238 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    2:2:void lambda$appendKmEffectExpression$92(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):934:934 -> c
+    3:3:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getInlineClassUnderlyingType():109:109 -> c
+    3:3:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):335 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
-    6:25:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):237:256 -> c
-    26:26:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):232:232 -> c
-    27:27:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):286:286 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/bI;)V"}
-    28:37:void lambda$appendKmConstructor$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmConstructor,java.lang.String):390:399 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/FH;Ljava/lang/String;)V"}
-    38:38:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):420:420 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    39:39:void lambda$appendKmFunction$37(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):452:452 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/gI;)V"}
-    40:40:void lambda$appendKmProperty$41(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):480:480 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    41:41:void lambda$appendKmType$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):599:599 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    42:42:void lambda$appendKmType$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):595:595 -> c
-    43:49:void lambda$appendKmTypeProjection$58(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,java.lang.String):612:618 -> c
+    4:4:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):335:335 -> c
+    5:7:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):236:238 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/QH;Ljava/lang/String;)V"}
+    8:27:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):237:256 -> c
+    28:28:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):232:232 -> c
+    29:29:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty):286:286 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fI;)V"}
+    30:30:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):434:434 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    31:31:void lambda$appendKmFunction$38(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):466:466 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iI;)V"}
+    32:32:void lambda$appendKmProperty$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):494:494 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    33:33:void lambda$appendKmType$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):616:616 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    34:34:void lambda$appendKmType$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):612:612 -> c
+    35:41:void lambda$appendKmTypeProjection$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,java.lang.String):629:635 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/oI;Ljava/lang/String;)V"}
-    50:50:void lambda$appendValueParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):655:655 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qI;Ljava/lang/String;)V"}
-    51:55:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):696:700 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/lI;Ljava/lang/String;)V"}
-    56:56:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> c
-    56:56:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> c
-    56:56:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):700 -> c
-    57:896:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> c
-    57:896:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29 -> c
-    57:896:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> c
-    57:896:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):700 -> c
-    897:897:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> c
-    897:897:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> c
-    897:897:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):700 -> c
-    898:898:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():162:162 -> c
-    898:898:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> c
-    898:898:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):700 -> c
-    899:899:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):700:700 -> c
-    900:900:void lambda$appendTypeParameter$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):696:696 -> c
-    901:901:void lambda$appendTypeParameter$66(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):702:702 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/fH;)V"}
-    902:902:void lambda$appendTypeAlias$71(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):728:728 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    903:903:void lambda$appendKmVersionRequirement$83(java.lang.StringBuilder,java.util.List,java.lang.String):803:803 -> c
-    904:904:void lambda$appendKmContract$86(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):841:841 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/IH;Ljava/lang/String;)V"}
-    905:905:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):860:860 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/LH;Ljava/lang/String;)V"}
-    906:906:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():1090:1090 -> c
-    906:906:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):860 -> c
+    42:42:void lambda$appendValueParameter$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):672:672 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/pI;Ljava/lang/String;)V"}
+    43:47:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):713:717 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/mI;Ljava/lang/String;)V"}
+    48:48:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> c
+    48:48:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    48:48:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> c
+    49:49:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> c
+    49:49:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    49:49:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    50:50:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getExtensions$kotlin_metadata():434:434 -> c
+    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68 -> c
+    50:50:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> c
+    50:50:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    50:50:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68:68 -> c
+    51:51:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> c
+    51:51:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    51:51:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    52:52:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> c
+    52:52:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    52:52:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    53:53:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():103:103 -> c
+    53:53:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> c
+    53:53:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717 -> c
+    54:54:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):717:717 -> c
+    55:55:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):713:713 -> c
+    56:56:void lambda$appendTypeParameter$67(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation):719:719 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/pH;)V"}
+    57:57:void lambda$appendTypeAlias$72(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):745:745 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    58:58:void lambda$appendKmVersionRequirement$84(java.lang.StringBuilder,java.util.List,java.lang.String):820:820 -> c
+    59:59:void lambda$appendKmContract$87(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):858:858 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/PH;Ljava/lang/String;)V"}
+    60:60:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):877:877 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RH;Ljava/lang/String;)V"}
+    61:61:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getType():36:36 -> c
+    61:61:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):877 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    907:908:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):860:861 -> c
-    909:909:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():1091:1091 -> c
-    909:909:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):865 -> c
-    910:910:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):865:865 -> c
-    911:916:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):861:866 -> c
-    917:917:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():1102:1102 -> c
-    917:917:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):878 -> c
-    918:920:void lambda$appendKmEffect$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):880:882 -> c
-    921:921:void lambda$appendKmEffectExpression$94(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):941:941 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/MH;)V"}
-    922:922:com.android.tools.r8.jetbrains.kotlin.metadata.KmType com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.isInstanceType():1157:1157 -> c
-    922:922:void lambda$appendKmEffectExpression$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):917 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
-    923:923:void lambda$appendKmEffectExpression$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):917:917 -> c
+    62:63:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):877:878 -> c
+    64:64:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectInvocationKind com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getInvocationKind():37:37 -> c
+    64:64:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):882 -> c
+    65:65:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):882:882 -> c
+    66:71:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):878:883 -> c
+    72:72:com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect.getConclusion():48:48 -> c
+    72:72:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):895 -> c
+    73:75:void lambda$appendKmEffect$91(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffect,java.lang.String):897:899 -> c
+    76:76:void lambda$appendKmEffectExpression$95(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression):958:958 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/SH;)V"}
     1:3:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):267:269 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/QH;Ljava/lang/String;)V"}
     4:4:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmDeclarationContainer,java.lang.String):263:263 -> d
-    5:5:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):350:350 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    6:6:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):346:346 -> d
-    7:7:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):425:425 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    8:8:void lambda$appendKmFunction$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):440:440 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/IH;Ljava/lang/String;)V"}
-    9:9:void lambda$appendKmProperty$44(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):504:504 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/gI;)V"}
-    10:61:void lambda$appendKmType$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):539:590 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/gI;Ljava/lang/String;)V"}
-    62:62:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():568:568 -> d
-    62:62:void lambda$appendKmProperty$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):485 -> d
+    5:5:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getTypeParameters():294:294 -> d
+    5:5:void lambda$appendKmProperty$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):499 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    63:63:void lambda$appendKmProperty$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):485:485 -> d
-    64:71:void lambda$appendValueParameter$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):644:651 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qI;Ljava/lang/String;)V"}
-    72:87:void lambda$appendTypeParameter$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):676:691 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/lI;Ljava/lang/String;)V"}
-    88:88:void lambda$appendTypeAlias$72(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):735:735 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    89:89:void lambda$appendKmEffectExpression$93(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):923:923 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
-    90:90:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():1163:1163 -> d
-    90:90:void lambda$appendKmEffectExpression$93(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):927 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    6:6:void lambda$appendKmProperty$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):499:499 -> d
+    7:7:void lambda$appendKmClass$25(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):364:364 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    8:8:void lambda$appendKmClass$25(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):360:360 -> d
+    9:9:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):439:439 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    10:10:void lambda$appendKmFunction$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmContract,java.lang.String):454:454 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/PH;Ljava/lang/String;)V"}
+    11:11:void lambda$appendKmProperty$45(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):522:522 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iI;)V"}
+    12:63:void lambda$appendKmType$57(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmType,java.lang.String):556:607 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/iI;Ljava/lang/String;)V"}
+    64:64:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661:661 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/pI;Ljava/lang/String;)V"}
+    65:66:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):237:238 -> d
+    65:66:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    67:151:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):0:84 -> d
+    67:151:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):238 -> d
+    67:151:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    152:154:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):238:240 -> d
+    152:154:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    155:155:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isCrossinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):438:438 -> d
+    155:155:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):240 -> d
+    155:155:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    156:157:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):240:241 -> d
+    156:157:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    158:158:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNoinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):443:443 -> d
+    158:158:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):241 -> d
+    158:158:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    159:159:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):241:241 -> d
+    159:159:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661 -> d
+    160:161:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):661:662 -> d
+    162:162:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():389:389 -> d
+    162:162:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):662 -> d
+    163:169:void lambda$appendValueParameter$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,java.lang.String):662:668 -> d
+    170:185:void lambda$appendTypeParameter$69(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.lang.String):693:708 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/mI;Ljava/lang/String;)V"}
+    186:186:void lambda$appendTypeAlias$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):752:752 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    187:187:void lambda$appendKmEffectExpression$94(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):940:940 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    188:188:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getAndArguments():84:84 -> d
+    188:188:void lambda$appendKmEffectExpression$94(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):944 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:void lambda$appendKmEffectExpression$93(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):927:927 -> d
-    92:92:void lambda$appendKmEffectExpression$93(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):923:923 -> d
-    1:3:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):362:364 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    4:8:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):363:367 -> e
-    9:9:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):358:358 -> e
-    10:10:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):430:430 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    11:11:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():592:592 -> e
-    11:11:void lambda$appendKmProperty$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):492 -> e
+    189:189:void lambda$appendKmEffectExpression$94(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):944:944 -> d
+    190:190:void lambda$appendKmEffectExpression$94(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):940:940 -> d
+    1:1:com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getSetterParameter():318:318 -> e
+    1:1:void lambda$appendKmProperty$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):510 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    12:12:void lambda$appendKmProperty$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):492:492 -> e
-    13:13:void lambda$appendTypeParameter$64(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):690:690 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/gI;)V"}
-    14:14:void lambda$appendTypeAlias$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):740:740 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    15:15:void lambda$appendKmEffectExpression$95(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):935:935 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
-    16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():1169:1169 -> e
-    16:16:void lambda$appendKmEffectExpression$95(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):939 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    2:2:void lambda$appendKmProperty$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):510:510 -> e
+    3:5:void lambda$appendKmClass$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):376:378 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    6:10:void lambda$appendKmClass$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):377:381 -> e
+    11:11:void lambda$appendKmClass$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):372:372 -> e
+    12:12:void lambda$appendKmFunction$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):444:444 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    13:13:void lambda$appendTypeParameter$65(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):707:707 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/android/tools/r8/internal/iI;)V"}
+    14:14:void lambda$appendTypeAlias$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):757:757 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    15:15:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):952:952 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/SH;Ljava/lang/String;)V"}
+    16:16:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression.getOrArguments():90:90 -> e
+    16:16:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):956 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:void lambda$appendKmEffectExpression$95(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):939:939 -> e
-    18:18:void lambda$appendKmEffectExpression$95(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):935:935 -> e
-    1:1:void lambda$appendKmClass$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):374:374 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/zH;Ljava/lang/String;)V"}
-    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():119:119 -> f
-    2:2:void lambda$appendKmClass$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):378 -> f
+    17:17:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):956:956 -> e
+    18:18:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):952:952 -> e
+    1:1:void lambda$appendKmClass$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):388:388 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/JH;Ljava/lang/String;)V"}
+    2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmClass.getContextReceiverTypes():114:114 -> f
+    2:2:void lambda$appendKmClass$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):392 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void lambda$appendKmClass$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):378:378 -> f
-    4:4:void lambda$appendKmClass$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):374:374 -> f
-    5:5:void lambda$appendKmFunction$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):447:447 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():393:393 -> f
-    6:6:void lambda$appendKmFunction$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):451 -> f
+    3:3:void lambda$appendKmClass$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):392:392 -> f
+    4:4:void lambda$appendKmClass$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmClass,java.lang.String):388:388 -> f
+    5:5:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):461:461 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/YH;Ljava/lang/String;)V"}
+    6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction.getContextReceiverTypes():209:209 -> f
+    6:6:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):465 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:void lambda$appendKmFunction$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):451:451 -> f
-    8:8:void lambda$appendKmFunction$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):447:447 -> f
-    9:9:void lambda$appendKmProperty$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):499:499 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    10:10:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():578:578 -> f
-    10:10:void lambda$appendKmProperty$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):503 -> f
+    7:7:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):465:465 -> f
+    8:8:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):461:461 -> f
+    9:9:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):517:517 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/fI;Ljava/lang/String;)V"}
+    10:10:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty.getContextReceiverTypes():304:304 -> f
+    10:10:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):521 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:void lambda$appendKmProperty$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):503:503 -> f
-    12:12:void lambda$appendKmProperty$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):499:499 -> f
-    13:42:void lambda$appendTypeAlias$74(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):712:741 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/hI;Ljava/lang/String;)V"}
-    43:50:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):898:905 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/MH;Ljava/lang/String;)V"}
-    51:64:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):899:912 -> f
-    65:89:void lambda$appendKmEffectExpression$96(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmEffectExpression,java.lang.String):906:930 -> f
-    1:51:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):409:459 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/TH;Ljava/lang/String;)V"}
-    52:52:void lambda$appendKmFunction$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmFunction,java.lang.String):455:455 -> g
-    53:102:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):469:518 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bI;Ljava/lang/String;)V"}
-    103:114:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):514:525 -> g
-    115:115:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):521:521 -> g
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.kotlin.c0:
+    11:11:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):521:521 -> f
+    12:12:void lambda$appendKmProperty$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmProperty,java.lang.String):517:517 -> f
+    13:30:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):729:746 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/jI;Ljava/lang/String;)V"}
+    31:32:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):225:226 -> f
+    31:32:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746 -> f
+    33:128:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):0:95 -> f
+    33:128:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):226 -> f
+    33:128:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746 -> f
+    129:130:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):226:227 -> f
+    129:130:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746 -> f
+    131:131:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):421:421 -> f
+    131:131:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):227 -> f
+    131:131:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746 -> f
+    132:132:java.util.Map com.android.tools.r8.kotlin.KotlinFlagUtils.extractFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):227:227 -> f
+    132:132:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746 -> f
+    133:140:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):746:753 -> f
+    141:141:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():373:373 -> f
+    141:141:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):758 -> f
+    142:142:void lambda$appendTypeAlias$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,java.lang.String):758:758 -> f
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.kotlin.d0:
 # {"id":"sourceFile","fileName":"KotlinMethodLevelInfo.java"}
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.kotlin.d0:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.kotlin.e0:
 # {"id":"sourceFile","fileName":"KotlinMultiFileClassFacadeInfo.java"}
-    java.util.List partClassNames -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.lang.String packageName -> b
-    int[] metadataVersion -> c
-    1:4:void <init>(java.util.List,java.lang.String,int[]):30:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Ljava/lang/String;[I)V"}
-    1:4:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,int[],com.android.tools.r8.graph.DexItemFactory):41:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$c;Ljava/lang/String;[ILcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/d0;"}
-    5:9:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,int[],com.android.tools.r8.graph.DexItemFactory):43:47 -> a
-    10:24:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):62:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
-    25:25:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.writeMultiFileClassFacade(java.util.List,int[],int):726:726 -> a
-    25:25:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76 -> a
-    26:26:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:77 -> a
-    27:27:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):75:75 -> a
-    28:28:void lambda$rewrite$0(java.util.List,java.lang.String):69:69 -> a
-    29:29:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinTypeReference):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)Ljava/util/function/Consumer;"}
-    30:30:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade kmMultiFileClassFacade -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zI$c;"}
+    java.util.List partClassNames -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.lang.String packageName -> c
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.util.List,java.lang.String):31:34 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$c;Lcom/android/tools/r8/internal/xu;Ljava/lang/String;)V"}
+    1:4:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,com.android.tools.r8.graph.DexItemFactory):41:44 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$c;Ljava/lang/String;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/kotlin/e0;"}
+    5:9:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
+    10:23:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):62:75 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
+    24:24:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.setPartClassNames(java.util.List):246:246 -> a
+    24:24:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):75 -> a
+    25:25:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76:76 -> a
+    26:27:void com.android.tools.r8.kotlin.KotlinMetadataUtils.updateJvmMetadataVersionIfRequired(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):226:227 -> a
+    26:27:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76 -> a
+    28:28:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:77 -> a
+    29:29:void lambda$rewrite$0(java.util.List,java.lang.String):69:69 -> a
+    30:30:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinTypeReference):92:92 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/s0;)Ljava/util/function/Consumer;"}
+    31:31:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     boolean isMultiFileFacade() -> n
     1:1:java.lang.String getPackageName():82:82 -> r
     1:1:int[] getMetadataVersion():87:87 -> u
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.kotlin.e0:
-# {"id":"sourceFile","fileName":"KotlinMultiFileClassPartInfo.java"}
-    java.lang.String facadeClassName -> a
-    com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/f0;"}
-    java.lang.String packageName -> c
-    int[] metadataVersion -> d
-    1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String,int[]):32:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/f0;Ljava/lang/String;[I)V"}
-    1:2:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):46:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/r$d;Ljava/lang/String;[ILcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/e0;"}
-    3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():487:487 -> a
-    3:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):48 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):49:49 -> a
-    5:8:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):66:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
-    9:759:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.writeMultiFileClassPart(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String,int[],int):0:750 -> a
-    9:759:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):69 -> a
-    760:760:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):70:70 -> a
-    761:761:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):68:68 -> a
-    762:762:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    763:763:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
-    763:763:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade.getVersion():250:250 -> u
+    2:2:int[] getMetadataVersion():87 -> u
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    764:765:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
-    764:765:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
+    3:3:int[] getMetadataVersion():87:87 -> u
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.kotlin.f0:
+# {"id":"sourceFile","fileName":"KotlinMultiFileClassPartInfo.java"}
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart classPart -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zI$d;"}
+    com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/g0;"}
+    java.lang.String packageName -> c
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String):27:30 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$d;Lcom/android/tools/r8/kotlin/g0;Ljava/lang/String;)V"}
+    1:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):39:41 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zI$d;Ljava/lang/String;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/f0;"}
+    4:6:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):56:58 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
+    7:8:void com.android.tools.r8.kotlin.KotlinMetadataUtils.updateJvmMetadataVersionIfRequired(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):226:227 -> a
+    7:8:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):58 -> a
+    9:9:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):59:59 -> a
+    10:10:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.setKmPackage(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):292:292 -> a
+    10:10:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):59 -> a
+    11:11:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):60:60 -> a
+    12:12:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:79 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
+    13:13:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
+    13:13:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    14:15:void com.android.tools.r8.kotlin.KotlinPackageInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
+    14:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79 -> a
     com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo asMultiFileClassPart() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/e0;"}
-    1:1:java.lang.String getPackageName():75:75 -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/f0;"}
+    1:1:java.lang.String getPackageName():65:65 -> r
     boolean isMultiFileClassPart() -> t
-    1:1:int[] getMetadataVersion():84:84 -> u
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.kotlin.f0:
+    1:1:int[] getMetadataVersion():74:74 -> u
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getVersion():300:300 -> u
+    2:2:int[] getMetadataVersion():74 -> u
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:int[] getMetadataVersion():74:74 -> u
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.kotlin.g0:
 # {"id":"sourceFile","fileName":"KotlinPackageInfo.java"}
     java.lang.String moduleName -> a
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/C;"}
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/O;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/P;"}
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/W;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/X;"}
     1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):34:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/C;Lcom/android/tools/r8/kotlin/O;Lcom/android/tools/r8/kotlin/W;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/C;Lcom/android/tools/r8/kotlin/P;Lcom/android/tools/r8/kotlin/X;)V"}
     1:3:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):46:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/f0;"}
-    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):87:87 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/kotlin/g0;"}
+    4:4:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):89:89 -> a
     4:4:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):48 -> a
     5:13:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):48:56 -> a
-    14:88:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):0:74 -> a
-    14:88:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):57 -> a
-    89:89:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():71:71 -> a
-    89:89:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):74 -> a
-    89:89:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):57 -> a
-    90:90:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):62:62 -> a
-    91:91:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    91:91:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):63 -> a
-    92:92:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):58:58 -> a
-    93:93:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68:68 -> a
-    93:93:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):67 -> a
-    94:94:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():70:70 -> a
-    94:94:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68 -> a
-    94:94:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):67 -> a
-    95:95:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):68:68 -> a
-    96:96:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    96:96:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):69 -> a
-    97:97:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):66:66 -> a
-    98:99:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YH;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Z"}
-    100:100:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getFunctions():240:240 -> a
-    100:100:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77 -> a
+    14:76:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):0:62 -> a
+    14:76:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):57 -> a
+    77:77:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getModuleName():49:49 -> a
+    77:77:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):62 -> a
+    77:77:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):57 -> a
+    78:78:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):62:62 -> a
+    79:79:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    79:79:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):63 -> a
+    80:80:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):58:58 -> a
+    81:81:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56:56 -> a
+    81:81:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):67 -> a
+    82:82:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():48:48 -> a
+    82:82:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56 -> a
+    82:82:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):67 -> a
+    83:83:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):68:68 -> a
+    84:84:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    84:84:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):69 -> a
+    85:85:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):66:66 -> a
+    86:87:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74:75 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cI;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Z"}
+    88:88:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getFunctions():135:135 -> a
+    88:88:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    101:101:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:77 -> a
-    102:102:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getProperties():245:245 -> a
-    102:102:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):78 -> a
-    103:103:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):78:78 -> a
-    104:104:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getTypeAliases():250:250 -> a
-    104:104:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):79 -> a
-    105:105:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):79:79 -> a
-    106:113:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76:83 -> a
-    114:114:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68:68 -> a
-    114:114:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85 -> a
-    115:115:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():70:70 -> a
-    115:115:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):68 -> a
-    115:115:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85 -> a
-    116:116:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85:85 -> a
-    117:119:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):84:86 -> a
-    120:120:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):76:76 -> a
-    120:120:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):86 -> a
-    121:121:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.setModuleName(java.lang.String):71:71 -> a
-    121:121:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):76 -> a
-    121:121:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):86 -> a
-    122:122:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):87:87 -> a
-    123:124:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
+    89:89:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:77 -> a
+    90:90:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getProperties():140:140 -> a
+    90:90:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):78 -> a
+    91:91:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):78:78 -> a
+    92:92:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage.getTypeAliases():145:145 -> a
+    92:92:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):79 -> a
+    93:93:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):79:79 -> a
+    94:101:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76:83 -> a
+    102:102:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56:56 -> a
+    102:102:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85 -> a
+    103:103:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.getLocalDelegatedProperties():48:48 -> a
+    103:103:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage):56 -> a
+    103:103:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85 -> a
+    104:104:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):85:85 -> a
+    105:107:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):84:86 -> a
+    108:108:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):64:64 -> a
+    108:108:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):86 -> a
+    109:109:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmPackageExtension.setModuleName(java.lang.String):49:49 -> a
+    109:109:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,java.lang.String):64 -> a
+    109:109:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):86 -> a
+    110:110:boolean rewrite(com.android.tools.r8.jetbrains.kotlin.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):87:87 -> a
+    111:112:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:93 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.kotlin.g0:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.kotlin.h0:
 # {"id":"sourceFile","fileName":"KotlinPropertyInfo.java"}
     1:1:boolean isProperty():0:0 -> a
     boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView) -> a
@@ -223186,10 +222574,10 @@
     boolean rewriteNoBacking(java.util.function.Consumer,com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/g0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/h0;"}
     1:1:com.android.tools.r8.kotlin.KotlinPropertyInfoDelegate$PropertyType getPropertyType():17:17 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
-com.android.tools.r8.kotlin.KotlinPropertyInfoDelegate -> com.android.tools.r8.kotlin.h0:
+com.android.tools.r8.kotlin.KotlinPropertyInfoDelegate -> com.android.tools.r8.kotlin.i0:
 # {"id":"sourceFile","fileName":"KotlinPropertyInfoDelegate.java"}
     com.android.tools.r8.kotlin.ConcreteKotlinPropertyInfo delegate -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/a;"}
@@ -223204,33 +222592,33 @@
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:75 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     1:1:com.android.tools.r8.kotlin.KotlinPropertyInfo getReference():31:31 -> getReference
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/g0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/h0;"}
     1:1:com.android.tools.r8.kotlin.KotlinPropertyInfoDelegate$PropertyType getPropertyType():26:26 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.kotlin.k0:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.kotlin.l0:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:17:java.lang.String parseStratumContents(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):194:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/i0;Lcom/android/tools/r8/kotlin/l0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/j0;Lcom/android/tools/r8/kotlin/m0;)Ljava/lang/String;"}
     18:18:java.lang.String parseStratumContents(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):203:203 -> a
     19:19:void lambda$parseStratumContents$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):199:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/l0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/m0;Ljava/util/List;)V"}
     20:38:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):220:238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/kotlin/l0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/kotlin/m0;)V"}
     39:39:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):231:231 -> a
     40:40:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):227:227 -> a
     41:41:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):222:222 -> a
     42:44:int asInteger(java.lang.String):247:249 -> a
     45:76:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):263:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/l0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/kotlin/m0;)V"}
     77:84:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):289:296 -> a
     1:1:boolean lambda$parseStratumContents$1(java.lang.String):211:211 -> b
     2:2:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):213:213 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/l0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/m0;Ljava/util/List;)V"}
     1:26:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):125:150 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/kotlin/k0$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/kotlin/l0$b;"}
     27:27:java.lang.String com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readNextLine():52:52 -> c
     27:27:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):56 -> c
     27:27:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):150 -> c
@@ -223265,7 +222653,7 @@
     60:60:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.close():120:120 -> c
     60:60:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):148 -> c
     61:61:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):148:148 -> c
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.kotlin.i0:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.kotlin.j0:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
@@ -223273,9 +222661,9 @@
     1:1:void <clinit>():41:41 -> <clinit>
     1:2:void <init>(java.lang.String):47:48 -> <init>
     1:1:void readUntil(java.lang.String,int,com.android.tools.r8.utils.ThrowingConsumer):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     2:5:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):94:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;ILcom/android/tools/r8/internal/Tg0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;ILcom/android/tools/r8/internal/Xg0;)Ljava/lang/String;"}
     6:6:java.lang.String readNextLine():52:52 -> a
     6:6:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):98 -> a
     7:14:java.lang.String readUntil(java.util.function.Predicate,int,com.android.tools.r8.utils.ThrowingConsumer):98:105 -> a
@@ -223291,33 +222679,33 @@
     2:2:boolean readExpectedLine(java.lang.String):56:56 -> d
     2:2:void readExpectedLineOrThrow(java.lang.String):61 -> d
     3:3:void readExpectedLineOrThrow(java.lang.String):62:62 -> d
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.kotlin.j0:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.kotlin.k0:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     1:1:void <init>(java.lang.String):37:37 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.kotlin.k0$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.kotlin.l0$a:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/k0$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/l0$c;"}
     com.android.tools.r8.naming.Range range -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/N0;"}
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):356:358 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/k0$c;Lcom/android/tools/r8/naming/N0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/l0$c;Lcom/android/tools/r8/naming/N0;)V"}
     1:1:com.android.tools.r8.naming.Range getRange():366:366 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/N0;"}
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():362:362 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/k0$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/l0$c;"}
     1:10:java.lang.String toString():371:380 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.kotlin.k0$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.kotlin.l0$b:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     com.android.tools.r8.utils.SegmentTree inlineePositions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aa0;"}
     com.android.tools.r8.utils.SegmentTree calleePositions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aa0;"}
     1:3:void <init>(com.android.tools.r8.utils.SegmentTree,com.android.tools.r8.utils.SegmentTree):305:307 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wa0;Lcom/android/tools/r8/internal/wa0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aa0;Lcom/android/tools/r8/internal/Aa0;)V"}
     1:1:java.util.Map$Entry lookupInlinedPosition(int):311:311 -> a
     2:2:int inlinePositionsCount():319:319 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.kotlin.k0$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.kotlin.l0$c:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     java.lang.String fileName -> a
     java.lang.String path -> b
@@ -223325,282 +222713,354 @@
     1:1:java.lang.String getFileName():339:339 -> a
     1:1:java.lang.String getPath():343:343 -> b
     1:1:java.lang.String toString():348:348 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.kotlin.l0:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.kotlin.m0:
 # {"id":"sourceFile","fileName":"KotlinSourceDebugExtensionParser.java"}
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aa0;"}
     java.util.Map files -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:4:void <init>():323:326 -> <init>
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.kotlin.m0:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.kotlin.n0:
 # {"id":"sourceFile","fileName":"KotlinSyntheticClassInfo.java"}
-    com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/N;"}
-    java.lang.String packageName -> b
-    int[] metadataVersion -> c
+    com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass syntheticClass -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BI;"}
+    com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/O;"}
+    java.lang.String packageName -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.kotlin.KotlinLambdaInfo,com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour,java.lang.String,int[]):35:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/N;ILjava/lang/String;[I)V"}
-    1:2:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):76:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/IV;"}
-    3:3:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.writeSyntheticClass(int[],int):704:704 -> a
-    3:3:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77 -> a
-    4:10:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:83 -> a
-    11:697:com.android.tools.r8.jetbrains.kotlin.Metadata com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$Companion.writeLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,int[],int):0:686 -> a
-    11:697:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):83 -> a
-    698:698:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):83:83 -> a
-    699:699:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):82:82 -> a
-    700:700:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):88:88 -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.kotlin.KotlinLambdaInfo,com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour,java.lang.String):34:38 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BI;Lcom/android/tools/r8/kotlin/O;ILjava/lang/String;)V"}
+    1:1:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74:74 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/MV;"}
+    2:3:void com.android.tools.r8.kotlin.KotlinMetadataUtils.updateJvmMetadataVersionIfRequired(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata):226:227 -> a
+    2:3:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74 -> a
+    4:10:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):75:81 -> a
+    11:11:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.setKmLambda(com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda):169:169 -> a
+    11:11:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):81 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    12:12:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):82:82 -> a
+    13:13:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.setFlags(int):177:177 -> a
+    13:13:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):82 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    14:14:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):83:83 -> a
+    15:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    701:701:void com.android.tools.r8.kotlin.KotlinLambdaInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
-    701:701:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
+    16:16:void com.android.tools.r8.kotlin.KotlinLambdaInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
+    16:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    702:702:void com.android.tools.r8.kotlin.KotlinLambdaInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
-    702:702:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
-    703:710:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):107:114 -> a
+    17:17:void com.android.tools.r8.kotlin.KotlinLambdaInfo.trace(com.android.tools.r8.graph.DexDefinitionSupplier):70:70 -> a
+    17:17:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89 -> a
+    18:25:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):107:114 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/g;)I"}
-    711:711:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.getKmLambda():268:268 -> a
-    711:711:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):49 -> a
+    26:26:com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.getKmLambda():169:169 -> a
+    26:26:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/jetbrains/kotlin/metadata/jvm/t;Ljava/lang/String;[ILcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/kotlin/m0;"}
-    712:715:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):50:53 -> a
-    716:716:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    716:716:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):53 -> a
-    717:728:com.android.tools.r8.kotlin.KotlinLambdaInfo com.android.tools.r8.kotlin.KotlinLambdaInfo.create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):39:50 -> a
-    717:728:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):53 -> a
-    729:729:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):55:55 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BI;Ljava/lang/String;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/kotlin/g;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/kotlin/n0;"}
+    27:31:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):48:52 -> a
+    32:32:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    32:32:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):52 -> a
+    33:44:com.android.tools.r8.kotlin.KotlinLambdaInfo com.android.tools.r8.kotlin.KotlinLambdaInfo.create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlin.metadata.KmLambda,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:49 -> a
+    33:44:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):52 -> a
+    45:45:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):54:54 -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/m0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/kotlin/n0;"}
     boolean isSyntheticClass() -> l
     1:1:java.lang.String getPackageName():95:95 -> r
     1:1:int[] getMetadataVersion():100:100 -> u
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.kotlin.n0:
+    2:2:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmMetadataVersion com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$SyntheticClass.getVersion():173:173 -> u
+    2:2:int[] getMetadataVersion():100 -> u
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:int[] getMetadataVersion():100:100 -> u
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.kotlin.o0:
 # {"id":"sourceFile","fileName":"KotlinTypeAliasInfo.java"}
-    int flags -> a
-    java.lang.String name -> b
-    com.android.tools.r8.kotlin.KotlinTypeInfo underlyingType -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    java.util.List typeParameters -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List annotations -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    boolean $assertionsDisabled -> h
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:10:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo):38:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/t0;)V"}
-    1:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:84 -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias kmTypeAlias -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jI;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo underlyingType -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    java.util.List typeParameters -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List annotations -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):33:40 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jI;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)V"}
+    1:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):77:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    5:5:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
-    6:6:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):84:84 -> a
+    5:5:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):79:79 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/q0;)Ljava/util/function/Consumer;"}
+    6:6:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):80:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/n;)Ljava/util/function/Consumer;"}
-    1:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):63:70 -> b
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):54:54 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    9:16:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):67:74 -> b
-    17:19:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):73:75 -> b
-    20:20:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():695:695 -> b
-    20:20:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):75 -> b
-    21:21:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):75:75 -> b
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.kotlin.o0:
+    2:349:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.<init>(java.lang.String):0:347 -> b
+    2:349:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):54 -> b
+    350:351:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):55:56 -> b
+    352:352:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):232:232 -> b
+    352:352:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56 -> b
+    353:353:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):95:95 -> b
+    353:353:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):232 -> b
+    353:353:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56 -> b
+    354:354:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,boolean):95:95 -> b
+    354:354:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):232 -> b
+    354:354:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56 -> b
+    355:355:com.android.tools.r8.jetbrains.kotlin.metadata.Visibility com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):421:421 -> b
+    355:355:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):233 -> b
+    355:355:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56 -> b
+    356:777:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setVisibility(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.Visibility):0:421 -> b
+    356:777:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias):233 -> b
+    356:777:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):56 -> b
+    778:784:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):57:63 -> b
+    785:794:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):60:69 -> b
+    795:795:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):66:66 -> b
+    796:796:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():373:373 -> b
+    796:796:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):71 -> b
+    797:797:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):71:71 -> b
+    798:798:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeAlias.getVersionRequirements():373:373 -> b
+    798:798:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):71 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    799:799:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):71:71 -> b
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.kotlin.p0:
 # {"id":"sourceFile","fileName":"KotlinTypeInfo.java"}
-    int flags -> a
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmType kmType -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iI;"}
     com.android.tools.r8.kotlin.KotlinClassifierInfo classifier -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/x;"}
     com.android.tools.r8.kotlin.KotlinTypeInfo abbreviatedType -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
     java.util.List arguments -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List annotations -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/I;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/J;"}
     boolean isRaw -> h
     java.util.List EMPTY_ARGUMENTS -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <clinit>():29:29 -> <clinit>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <clinit>():28:28 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    2:2:void <clinit>():29 -> <clinit>
-    3:3:void <clinit>():29:29 -> <clinit>
-    1:9:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo,boolean):48:56 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/kotlin/x;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/kotlin/I;Z)V"}
-    1:2:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):63:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/gI;)Lcom/android/tools/r8/kotlin/o0;"}
-    3:4:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):27:28 -> a
-    3:4:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    5:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$Class.getName():1220:1220 -> a
-    5:5:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):28 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    6:9:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):32:35 -> a
-    6:9:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    10:13:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:37 -> a
-    10:13:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):79:79 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38 -> a
-    14:14:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    15:20:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:43 -> a
-    15:20:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    21:21:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier$TypeAlias.getName():1235:1235 -> a
-    21:21:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    22:27:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43:48 -> a
-    22:27:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65 -> a
-    28:30:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):66:68 -> a
-    31:35:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:81 -> a
-    31:35:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
-    36:38:com.android.tools.r8.kotlin.KotlinTypeProjectionInfo com.android.tools.r8.kotlin.KotlinTypeProjectionInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):29:31 -> a
-    36:38:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):82 -> a
-    36:38:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
-    39:41:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):82:84 -> a
-    39:41:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
-    42:42:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69:69 -> a
-    43:47:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory) -> a
-    43:47:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69 -> a
-    48:50:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
-    48:50:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    48:50:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69 -> a
-    51:53:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
-    51:53:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    51:53:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69 -> a
-    54:56:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
-    54:56:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69 -> a
-    57:57:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):71:71 -> a
-    58:62:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:38 -> a
-    58:62:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    63:63:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):72:72 -> a
-    64:73:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):114:123 -> a
+    2:2:void <clinit>():28 -> <clinit>
+    3:3:void <clinit>():28:28 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo,boolean):47:55 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iI;Lcom/android/tools/r8/kotlin/x;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/kotlin/J;Z)V"}
+    1:1:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):62:62 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/iI;)Lcom/android/tools/r8/kotlin/p0;"}
+    2:10:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):27:35 -> a
+    2:10:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    11:14:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:37 -> a
+    11:14:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):79:79 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38 -> a
+    15:15:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    16:26:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:48 -> a
+    16:26:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):64 -> a
+    27:29:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65:67 -> a
+    30:34:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):76:80 -> a
+    30:34:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67 -> a
+    35:37:com.android.tools.r8.kotlin.KotlinTypeProjectionInfo com.android.tools.r8.kotlin.KotlinTypeProjectionInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeProjection,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):29:31 -> a
+    35:37:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):81 -> a
+    35:37:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67 -> a
+    38:40:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):81:83 -> a
+    38:40:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):67 -> a
+    41:41:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68:68 -> a
+    42:46:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
+    42:46:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
+    47:49:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
+    47:49:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    47:49:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
+    50:52:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
+    50:52:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    50:52:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
+    53:55:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
+    53:55:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):68 -> a
+    56:56:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70:70 -> a
+    57:61:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):34:38 -> a
+    57:61:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):69 -> a
+    62:62:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):71:71 -> a
+    63:72:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):117:126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    74:74:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/q0;)Ljava/util/function/Consumer;"}
-    75:75:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):123:123 -> a
+    73:73:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):124:124 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/r0;)Ljava/util/function/Consumer;"}
+    74:74:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):126:126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/n;)Ljava/util/function/Consumer;"}
-    76:76:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/graph/I2;"}
-    1:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89:93 -> b
+    75:75:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):130:130 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/graph/I2;"}
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87:87 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    6:20:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):92:106 -> b
-    21:26:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):103:108 -> b
-    27:27:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):32:32 -> b
-    27:27:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):193 -> b
-    27:27:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):108 -> b
-    28:28:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.setRaw(boolean):176:176 -> b
-    28:28:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):193 -> b
-    28:28:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):108 -> b
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.kotlin.p0:
+    2:2:void com.android.tools.r8.jetbrains.kotlin.metadata.KmType.<init>():448:448 -> b
+    2:2:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):87 -> b
+    3:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):88:89 -> b
+    5:5:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101:101 -> b
+    5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    6:395:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNullable(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):0:389 -> b
+    6:395:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101 -> b
+    6:395:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    396:396:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setNullable(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):389:389 -> b
+    396:396:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):101 -> b
+    396:396:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    397:397:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmType):394:394 -> b
+    397:397:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):102 -> b
+    397:397:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    398:398:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setSuspend(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):394:394 -> b
+    398:398:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):102 -> b
+    398:398:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    399:399:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isDefinitelyNonNull(com.android.tools.r8.jetbrains.kotlin.metadata.KmType) -> b
+    399:399:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):103 -> b
+    399:399:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    400:400:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setDefinitelyNonNull(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):399:399 -> b
+    400:400:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):103 -> b
+    400:400:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    401:404:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):90:93 -> b
+    405:409:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):92:96 -> b
+    410:414:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):95:99 -> b
+    415:426:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):98:109 -> b
+    427:432:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):106:111 -> b
+    433:433:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):168:168 -> b
+    433:433:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):111 -> b
+    434:434:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeExtension.setRaw(boolean):115:115 -> b
+    434:434:void com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.setRaw(com.android.tools.r8.jetbrains.kotlin.metadata.KmType,boolean):168 -> b
+    434:434:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):111 -> b
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.kotlin.q0:
 # {"id":"sourceFile","fileName":"KotlinTypeParameterInfo.java"}
-    int flags -> a
-    int id -> b
-    java.lang.String name -> c
-    com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance variance -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
-    java.util.List originalUpperBounds -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List annotations -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List EMPTY_TYPE_PARAMETERS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    java.util.List EMPTY_UPPER_BOUNDS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <clinit>():27:27 -> <clinit>
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter kmTypeParameter -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mI;"}
+    java.util.List originalUpperBounds -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List annotations -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List EMPTY_TYPE_PARAMETERS -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    java.util.List EMPTY_UPPER_BOUNDS -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <clinit>():25:25 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    2:2:void <clinit>():27 -> <clinit>
-    3:4:void <clinit>():27:28 -> <clinit>
-    1:7:void <init>(int,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance,java.util.List,java.util.List):43:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Lcom/android/tools/r8/internal/sI;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)V"}
-    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):65:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/internal/vu;"}
-    6:11:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):54:59 -> a
-    6:11:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    12:19:java.util.List getUpperBounds(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):77:84 -> a
-    12:19:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59 -> a
-    12:19:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    20:20:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> a
-    20:20:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    20:20:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    21:860:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> a
-    21:860:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29 -> a
-    21:860:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> a
-    21:860:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    21:860:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    861:861:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> a
-    861:861:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> a
-    861:861:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    861:861:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    862:862:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():162:162 -> a
-    862:862:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> a
-    862:862:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    862:862:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    863:863:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60:60 -> a
-    863:863:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    864:868:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
-    864:868:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    864:868:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    869:871:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
-    869:871:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    869:871:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    869:871:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    872:874:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
-    872:874:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
-    872:874:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    872:874:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    875:877:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
-    875:877:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60 -> a
-    875:877:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    878:878:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):60:60 -> a
-    878:878:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70 -> a
-    879:881:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):70:72 -> a
-    882:882:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/o0;)Ljava/util/function/Consumer;"}
-    883:884:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):107:108 -> a
+    2:2:void <clinit>():25 -> <clinit>
+    3:4:void <clinit>():25:26 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,java.util.List,java.util.List):35:38 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mI;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)V"}
+    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:55 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/internal/xu;"}
+    6:8:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):43:45 -> a
+    6:8:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    9:16:java.util.List getUpperBounds(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):63:70 -> a
+    9:16:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):45 -> a
+    9:16:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> a
+    17:17:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    17:17:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    17:17:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> a
+    18:18:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    18:18:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    18:18:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    18:18:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    19:19:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getExtensions$kotlin_metadata():434:434 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    19:19:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    19:19:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    19:19:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68:68 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> a
+    20:20:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    20:20:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    20:20:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> a
+    21:21:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    21:21:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    21:21:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    22:22:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():103:103 -> a
+    22:22:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> a
+    22:22:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    22:22:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    23:23:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46:46 -> a
+    23:23:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    24:28:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):43:47 -> a
+    24:28:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    24:28:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    29:31:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):36:38 -> a
+    29:31:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    29:31:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    29:31:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    32:34:com.android.tools.r8.kotlin.KotlinAnnotationInfo com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(com.android.tools.r8.jetbrains.kotlin.metadata.KmAnnotation,com.android.tools.r8.graph.DexItemFactory):37:39 -> a
+    32:34:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48 -> a
+    32:34:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    32:34:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    35:37:java.util.List com.android.tools.r8.kotlin.KotlinAnnotationInfo.create(java.util.List,com.android.tools.r8.graph.DexItemFactory):48:50 -> a
+    35:37:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46 -> a
+    35:37:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    38:38:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):46:46 -> a
+    38:38:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56 -> a
+    39:41:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):56:58 -> a
+    42:42:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):96:96 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/p0;)Ljava/util/function/Consumer;"}
+    43:44:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):96:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    885:885:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):108:108 -> a
+    45:45:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):97:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/n;)Ljava/util/function/Consumer;"}
-    1:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):88:94 -> b
+    1:3:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):74:76 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    8:13:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):91:96 -> b
-    14:14:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> b
-    14:14:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> b
-    14:14:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100 -> b
-    15:854:com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.visitExtensions(com.android.tools.r8.jetbrains.kotlin.metadata.KmExtensionType):0:839 -> b
-    15:854:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29 -> b
-    15:854:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> b
-    15:854:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100 -> b
-    855:855:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):29:29 -> b
-    855:855:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> b
-    855:855:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100 -> b
-    856:856:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():162:162 -> b
-    856:856:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):185 -> b
-    856:856:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100 -> b
-    857:857:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):100:100 -> b
-    858:858:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):97:97 -> b
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.kotlin.q0:
+    4:431:void com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.<init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance):0:427 -> b
+    4:431:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):76 -> b
+    432:433:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):77:78 -> b
+    434:434:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):259:259 -> b
+    434:434:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):78 -> b
+    435:435:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isReified(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):411:411 -> b
+    435:435:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):259 -> b
+    435:435:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):78 -> b
+    436:436:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setReified(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,boolean):411:411 -> b
+    436:436:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):259 -> b
+    436:436:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):78 -> b
+    437:441:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):79:83 -> b
+    442:447:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):80:85 -> b
+    448:448:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> b
+    448:448:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    448:448:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    449:449:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):0:0 -> b
+    449:449:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> b
+    449:449:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    449:449:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    450:450:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter.getExtensions$kotlin_metadata():434:434 -> b
+    450:450:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68 -> b
+    450:450:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> b
+    450:450:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    450:450:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    451:451:com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.ExtensionNodesKt.getExtension(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter,com.android.tools.r8.jetbrains.kotlin.metadata.internal.extensions.KmExtensionType):68:68 -> b
+    451:451:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27 -> b
+    451:451:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    451:451:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    452:452:com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):27:27 -> b
+    452:452:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    452:452:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    453:453:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.internal.JvmTypeParameterExtension.getAnnotations():103:103 -> b
+    453:453:java.util.List com.android.tools.r8.jetbrains.kotlin.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmTypeParameter):160 -> b
+    453:453:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89 -> b
+    454:454:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):89:89 -> b
+    455:455:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):86:86 -> b
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.kotlin.r0:
 # {"id":"sourceFile","fileName":"KotlinTypeProjectionInfo.java"}
     com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance variance -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rI;"}
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sI;Lcom/android/tools/r8/kotlin/o0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rI;Lcom/android/tools/r8/kotlin/p0;)V"}
     1:1:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlin.metadata.KmType):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iI;)V"}
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
     1:1:boolean isStarProjection():35:35 -> b
     1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):39 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
     2:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):40:43 -> b
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.kotlin.r0:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.kotlin.s0:
 # {"id":"sourceFile","fileName":"KotlinTypeReference.java"}
     com.android.tools.r8.graph.DexType known -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -223612,7 +223072,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/I2;Z)V"}
     6:10:void <init>(java.lang.String):41:45 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinTypeReference fromBinaryNameOrKotlinClassifier(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;)Lcom/android/tools/r8/kotlin/s0;"}
     2:2:boolean com.android.tools.r8.utils.DescriptorUtils.isValidBinaryName(java.lang.String):732:732 -> a
     2:2:com.android.tools.r8.kotlin.KotlinTypeReference fromBinaryNameOrKotlinClassifier(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String):59 -> a
     3:3:boolean com.android.tools.r8.utils.DescriptorUtils.isValidBinaryName(java.lang.String):731:731 -> a
@@ -223622,7 +223082,7 @@
     5:6:com.android.tools.r8.kotlin.KotlinTypeReference fromBinaryNameOrKotlinClassifier(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String):64:65 -> a
     7:15:com.android.tools.r8.kotlin.KotlinTypeReference fromBinaryNameOrKotlinClassifier(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String):62:70 -> a
     16:20:com.android.tools.r8.kotlin.KotlinTypeReference fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.lang.String,boolean):87:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Z)Lcom/android/tools/r8/kotlin/r0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/lang/String;Z)Lcom/android/tools/r8/kotlin/s0;"}
     21:26:boolean toRenamedBinaryNameOrDefault(java.util.function.Consumer,com.android.tools.r8.graph.AppView,java.lang.String):132:137 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;Ljava/lang/String;)Z"}
     27:34:void lambda$toRenamedBinaryNameOrDefault$0(java.lang.String,java.util.function.Consumer,java.lang.String):140:147 -> a
@@ -223641,41 +223101,60 @@
     1:5:java.lang.String toKotlinClassifier(boolean):121:125 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/lang/String;"}
     6:6:java.lang.String toKotlinClassifier(boolean):124:124 -> w
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.kotlin.s0:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.kotlin.t0:
 # {"id":"sourceFile","fileName":"KotlinValueParameterInfo.java"}
-    java.lang.String name -> a
-    int flags -> b
-    com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/o0;"}
-    java.util.List EMPTY_VALUE_PARAMETERS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <clinit>():24:24 -> <clinit>
+    com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter kmValueParameter -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pI;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo type -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/p0;"}
+    java.util.List EMPTY_VALUE_PARAMETERS -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <clinit>():23:23 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    2:2:void <clinit>():24 -> <clinit>
-    3:3:void <clinit>():24:24 -> <clinit>
-    1:5:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo):35:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/kotlin/o0;Lcom/android/tools/r8/kotlin/o0;)V"}
-    1:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):85:87 -> a
+    2:2:void <clinit>():23 -> <clinit>
+    3:3:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo):32:35 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pI;Lcom/android/tools/r8/kotlin/p0;Lcom/android/tools/r8/kotlin/p0;)V"}
+    1:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:84 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;)V"}
-    1:7:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):72:78 -> b
+    1:1:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):67:67 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/y;)Z"}
-    8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):75:75 -> b
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.kotlin.t0:
-# {"id":"sourceFile","fileName":"KotlinVersionRequirementInfo.java"}
-    java.util.List versionRequirements -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/t0;"}
-    1:2:void <clinit>():14:15 -> <clinit>
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
-    3:3:void <clinit>():15 -> <clinit>
-    4:4:void <clinit>():15:15 -> <clinit>
-    1:2:void <init>(java.util.List):19:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
-    1:4:boolean rewrite(java.util.function.Consumer):31:34 -> a
-com.android.tools.r8.lightir.ByteArrayIterator -> com.android.tools.r8.internal.D7:
+    2:2:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.getName():389:389 -> b
+    2:2:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):67 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:395:void com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter.<init>(java.lang.String):0:392 -> b
+    3:395:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):67 -> b
+    396:397:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):68:69 -> b
+    398:398:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):246:246 -> b
+    398:398:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    399:483:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.getHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):0:84 -> b
+    399:483:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):246 -> b
+    399:483:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    484:484:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setHasAnnotations(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,boolean):84:84 -> b
+    484:484:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):246 -> b
+    484:484:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    485:485:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):247:247 -> b
+    485:485:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    486:486:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setDeclaresDefaultValue(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,boolean):433:433 -> b
+    486:486:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):247 -> b
+    486:486:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    487:487:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isCrossinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):438:438 -> b
+    487:487:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):248 -> b
+    487:487:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    488:488:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setCrossinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,boolean):438:438 -> b
+    488:488:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):248 -> b
+    488:488:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    489:489:boolean com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.isNoinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):443:443 -> b
+    489:489:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):249 -> b
+    489:489:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    490:490:void com.android.tools.r8.jetbrains.kotlin.metadata.Attributes.setNoinline(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,boolean):443:443 -> b
+    490:490:void com.android.tools.r8.kotlin.KotlinFlagUtils.copyAllFlags(com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter,com.android.tools.r8.jetbrains.kotlin.metadata.KmValueParameter):249 -> b
+    490:490:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):69 -> b
+    491:496:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):70:75 -> b
+    497:497:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):72:72 -> b
+com.android.tools.r8.lightir.ByteArrayIterator -> com.android.tools.r8.internal.F7:
 # {"id":"sourceFile","fileName":"ByteArrayIterator.java"}
     int size -> b
     byte[] buffer -> c
@@ -223686,41 +223165,41 @@
     1:1:boolean hasNext():22:22 -> hasNext
     1:1:java.lang.Byte next():32:32 -> next
     1:1:java.lang.Object next():9 -> next
-com.android.tools.r8.lightir.ByteArrayWriter -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.lightir.ByteArrayWriter -> com.android.tools.r8.internal.G7:
 # {"id":"sourceFile","fileName":"ByteArrayWriter.java"}
     java.io.ByteArrayOutputStream buffer -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:4:void <init>():9:12 -> <init>
     1:2:void put(int):16:17 -> a
-com.android.tools.r8.lightir.ByteUtils -> com.android.tools.r8.internal.V7:
+com.android.tools.r8.lightir.ByteUtils -> com.android.tools.r8.internal.X7:
 # {"id":"sourceFile","fileName":"ByteUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:int ensureU1(int):28:28 -> a
     2:5:void writeEncodedInt(int,com.android.tools.r8.lightir.ByteWriter):42:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/X7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Z7;)V"}
     6:13:void writeEncodedLong(long,com.android.tools.r8.lightir.ByteWriter):63:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/X7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(JLcom/android/tools/r8/internal/Z7;)V"}
     14:14:int setBitAtIndex(int,int):104:104 -> a
     1:1:boolean isU2(int):87:87 -> b
-com.android.tools.r8.lightir.ByteWriter -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.lightir.ByteWriter -> com.android.tools.r8.internal.Z7:
 # {"id":"sourceFile","fileName":"ByteWriter.java"}
     void put(int) -> a
-com.android.tools.r8.lightir.IR2LirConverter -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.lightir.IR2LirConverter -> com.android.tools.r8.internal.st:
 # {"id":"sourceFile","fileName":"IR2LirConverter.java"}
     com.android.tools.r8.ir.code.IRCode irCode -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.lightir.LirEncodingStrategy strategy -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HK;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider bytecodeMetadataProvider -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e8;"}
     com.android.tools.r8.lightir.LirBuilder builder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vK;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():26:26 -> <clinit>
     1:8:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):37:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/DK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/HK;)V"}
     9:9:int com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider.size():39:39 -> <init>
     9:9:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):47 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -223735,7 +223214,7 @@
     13:13:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):47 -> <init>
     14:14:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):47:47 -> <init>
     1:1:com.android.tools.r8.lightir.LirCode translate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c8;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/DK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e8;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/HK;)Lcom/android/tools/r8/internal/CK;"}
     2:2:com.android.tools.r8.lightir.LirCode internalTranslate():76:76 -> a
     2:2:com.android.tools.r8.lightir.LirCode translate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):56 -> a
     3:3:void computeBlockAndValueTables():149:149 -> a
@@ -223872,27 +223351,27 @@
     88:88:void computeInstructions():123 -> a
     89:92:void computeInstructions():123:126 -> a
     93:99:int computePhis(com.android.tools.r8.ir.code.BasicBlock):132:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
     100:102:void permuteOperands(java.util.List,int[],com.android.tools.r8.ir.code.Value[]):170:172 -> a
     100:102:int computePhis(com.android.tools.r8.ir.code.BasicBlock):138 -> a
     103:103:int computePhis(com.android.tools.r8.ir.code.BasicBlock):139:139 -> a
     104:104:com.android.tools.r8.lightir.LirBuilder com.android.tools.r8.lightir.LirBuilder.addPhi(java.util.List):922:922 -> a
     104:104:int computePhis(com.android.tools.r8.ir.code.BasicBlock):139 -> a
     105:121:int[] computePermutation(java.util.List,com.android.tools.r8.lightir.IR2LirConverter$BlockIndexGetter):182:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/pt;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/rt;)[I"}
     122:125:boolean verifySameBlock(java.util.List,int,int):210:213 -> a
     122:125:int[] computePermutation(java.util.List,com.android.tools.r8.lightir.IR2LirConverter$BlockIndexGetter):198 -> a
     126:127:int[] computePermutation(java.util.List,com.android.tools.r8.lightir.IR2LirConverter$BlockIndexGetter):199:200 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList lambda$computePermutation$0(com.android.tools.r8.ir.code.BasicBlock):191:191 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/aA;"}
-com.android.tools.r8.lightir.IR2LirConverter$BlockIndexGetter -> com.android.tools.r8.internal.pt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/cA;"}
+com.android.tools.r8.lightir.IR2LirConverter$BlockIndexGetter -> com.android.tools.r8.internal.rt:
 # {"id":"sourceFile","fileName":"IR2LirConverter.java"}
     int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
-com.android.tools.r8.lightir.Lir2IRConverter -> com.android.tools.r8.internal.jK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
+com.android.tools.r8.lightir.Lir2IRConverter -> com.android.tools.r8.internal.nK:
 # {"id":"sourceFile","fileName":"Lir2IRConverter.java"}
     1:5:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):135:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/GK;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     6:6:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):258:258 -> a
     6:6:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     7:7:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
@@ -223901,11 +223380,11 @@
     7:7:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     8:19:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):259:270 -> a
     8:19:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
-    20:20:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    20:20:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     20:20:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
-    21:21:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> a
+    21:21:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> a
     21:21:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):271 -> a
     21:21:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     22:22:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):272:272 -> a
@@ -223930,12 +223409,12 @@
     31:31:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     32:32:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):283:283 -> a
     32:32:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
-    33:33:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    33:33:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     33:33:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):284 -> a
     33:33:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     34:35:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):285:286 -> a
     34:35:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
-    36:36:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    36:36:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     36:36:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):288 -> a
     36:36:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     37:41:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):289:293 -> a
@@ -223946,7 +223425,7 @@
     42:42:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     43:43:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):293:293 -> a
     43:43:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
-    44:44:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):167:167 -> a
+    44:44:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.getNewArgumentIndex(int,int):165:165 -> a
     44:44:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):294 -> a
     44:44:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):144 -> a
     45:46:void com.android.tools.r8.lightir.Lir2IRConverter$Parser.parseArguments(com.android.tools.r8.graph.ProgramMethod):295:296 -> a
@@ -223976,42 +223455,42 @@
     61:61:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):149 -> a
     62:62:com.android.tools.r8.ir.code.IRCode translate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):149:149 -> a
     63:63:void lambda$translate$0(com.android.tools.r8.lightir.Lir2IRConverter$Parser,com.android.tools.r8.lightir.LirInstructionView):146:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iK;Lcom/android/tools/r8/internal/FK;)V"}
-com.android.tools.r8.lightir.Lir2IRConverter$Parser -> com.android.tools.r8.internal.iK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mK;Lcom/android/tools/r8/internal/JK;)V"}
+com.android.tools.r8.lightir.Lir2IRConverter$Parser -> com.android.tools.r8.internal.mK:
 # {"id":"sourceFile","fileName":"Lir2IRConverter.java"}
     com.android.tools.r8.graph.AppView appView -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.lightir.LirCode code -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CK;"}
     com.android.tools.r8.graph.DexMethod method -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.lightir.LirDecodingStrategy strategy -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GK;"}
     com.android.tools.r8.ir.code.NumberGenerator basicBlockNumberGenerator -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription protoChanges -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/proto/j;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap blocks -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.ir.code.IRMetadata irMetadata -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kt;"}
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     int nextInstructionIndex -> l
     com.android.tools.r8.ir.code.Position entryPosition -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.Position currentPosition -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.lightir.LirCode$PositionEntry nextPositionEntry -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yK;"}
     int nextIndexInPositionsTable -> p
     com.android.tools.r8.lightir.LirCode$PositionEntry[] positionTable -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/yK;"}
     boolean buildForInlining -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():157:157 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):190:190 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/GK;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)V"}
     2:5:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):165:168 -> <init>
     6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     6:6:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):168 -> <init>
@@ -224034,14 +223513,14 @@
     50:57:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirDecodingStrategy,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):201:208 -> <init>
     1:1:boolean com.android.tools.r8.ir.code.MemberType.isObject():24:24 -> a
     1:1:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):1001 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:10:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):1003:1011 -> a
     11:11:void lambda$new$0(com.android.tools.r8.ir.code.Position):206:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     12:16:void lambda$ensureDebugInfo$1(java.lang.Object,com.android.tools.r8.graph.DebugLocalInfo):316:320 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
     17:18:com.android.tools.r8.ir.code.IRCode getIRCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):328:329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     19:19:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):88:88 -> a
     19:19:com.android.tools.r8.ir.code.IRCode getIRCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):329 -> a
     20:20:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet.size():599:599 -> a
@@ -224076,10 +223555,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.ir.code.IRCode getIRCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):349:349 -> a
     41:42:com.android.tools.r8.ir.code.BasicBlock lambda$getBasicBlock$2(java.lang.Integer):359:360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/I5;"}
     43:43:int peekNextInstructionIndex():382:382 -> a
     43:43:void addInstruction(com.android.tools.r8.ir.code.Instruction):424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)V"}
     44:44:int toInstructionIndexInIR(int):378:378 -> a
     44:44:void addInstruction(com.android.tools.r8.ir.code.Instruction):424 -> a
     45:45:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> a
@@ -224132,7 +223611,7 @@
     74:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):434:435 -> a
     76:76:int peekNextInstructionIndex():382:382 -> a
     76:76:com.android.tools.r8.ir.code.Value getOutValueForNextInstruction(com.android.tools.r8.ir.analysis.type.TypeElement):386 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     77:77:int toInstructionIndexInIR(int):378:378 -> a
     77:77:com.android.tools.r8.ir.code.Value getOutValueForNextInstruction(com.android.tools.r8.ir.analysis.type.TypeElement):386 -> a
     78:78:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> a
@@ -224143,7 +223622,7 @@
     81:81:com.android.tools.r8.ir.code.Value getOutValueForNextInstruction(com.android.tools.r8.ir.analysis.type.TypeElement):387:387 -> a
     82:82:int peekNextInstructionIndex():382:382 -> a
     82:82:com.android.tools.r8.ir.code.Phi getPhiForNextInstructionAndAdvanceState(com.android.tools.r8.ir.analysis.type.TypeElement):392 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h7;)Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j7;)Lcom/android/tools/r8/internal/xW;"}
     83:83:int toInstructionIndexInIR(int):378:378 -> a
     83:83:com.android.tools.r8.ir.code.Phi getPhiForNextInstructionAndAdvanceState(com.android.tools.r8.ir.analysis.type.TypeElement):393 -> a
     84:84:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> a
@@ -224174,9 +223653,9 @@
     104:104:com.android.tools.r8.ir.code.Phi getPhiForNextInstructionAndAdvanceState(com.android.tools.r8.ir.analysis.type.TypeElement):402:402 -> a
     105:110:com.android.tools.r8.ir.code.BasicBlock getBasicBlockOrEnsureCurrentBlock(int,int):409:414 -> a
     105:110:com.android.tools.r8.ir.code.BasicBlock lambda$getPhiForNextInstructionAndAdvanceState$3(int,int):397 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/I5;"}
     111:114:com.android.tools.r8.ir.code.Argument internalAddArgument(com.android.tools.r8.ir.code.Value,boolean):469:472 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/c3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/c3;"}
     115:115:int com.android.tools.r8.ir.code.BasicBlock.size():788:788 -> a
     115:115:com.android.tools.r8.ir.code.Argument internalAddArgument(com.android.tools.r8.ir.code.Value,boolean):472 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -224186,20 +223665,20 @@
     122:123:void onConstDouble(long):511:512 -> a
     124:124:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> a
     124:124:void onAdd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):527 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     125:127:void onAdd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):527:529 -> a
     128:128:com.android.tools.r8.ir.code.Add com.android.tools.r8.ir.code.Add.createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:29 -> a
     128:128:void onAdd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):529 -> a
     129:129:void onAdd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):528:528 -> a
     130:130:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> a
     130:130:void onNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):559 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     131:132:void onNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):559:560 -> a
     133:135:void onConstString(com.android.tools.r8.graph.DexString):607:609 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)V"}
     136:138:void onConstString(com.android.tools.r8.graph.DexString):608:610 -> a
     139:141:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):616:618 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     142:144:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):617:619 -> a
     145:147:void onConstClass(com.android.tools.r8.graph.DexType,boolean):624:626 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Z)V"}
@@ -224213,22 +223692,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)V"}
     162:165:void onConstMethodType(com.android.tools.r8.graph.DexProto):642:645 -> a
     166:168:void onNumberConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,java.lang.Object):650:652 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     169:171:void onNumberConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,java.lang.Object):651:653 -> a
     172:176:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):658:662 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;)V"}
     177:177:void closeCurrentBlock():217:217 -> a
     177:177:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):663 -> a
     178:183:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):668:673 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;Ljava/lang/Object;)V"}
     184:184:void closeCurrentBlock():217:217 -> a
     184:184:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):674 -> a
     185:186:void onIntSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):694:695 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/nK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/rK;)V"}
     187:187:com.android.tools.r8.ir.code.Instruction lambda$onIntSwitch$4(java.lang.Object,int[],int[],java.lang.Integer):698:698 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;[I[ILjava/lang/Integer;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;[I[ILjava/lang/Integer;)Lcom/android/tools/r8/internal/Kw;"}
     188:191:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):703:706 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/qK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/uK;)V"}
     192:192:com.android.tools.r8.lightir.LirConstant com.android.tools.r8.lightir.LirCode.getConstantItem(int):496:496 -> a
     192:192:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):706 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -224236,7 +223715,7 @@
     193:193:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):706 -> a
     194:196:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):706:708 -> a
     197:197:com.android.tools.r8.ir.code.Instruction lambda$onStringSwitch$5(java.lang.Object,com.android.tools.r8.graph.DexString[],int[],java.lang.Integer):711:711 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;[Lcom/android/tools/r8/graph/H2;[ILjava/lang/Integer;)Lcom/android/tools/r8/internal/Iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;[Lcom/android/tools/r8/graph/H2;[ILjava/lang/Integer;)Lcom/android/tools/r8/internal/Kw;"}
     198:204:void addSwitchInstruction(int[],java.util.function.BiFunction):716:722 -> a
     205:205:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(int):94:94 -> a
     205:205:void addSwitchInstruction(int[],java.util.function.BiFunction):722 -> a
@@ -224299,7 +223778,7 @@
     284:285:void onCmpInstruction(int,java.lang.Object,java.lang.Object):964:965 -> a
     286:311:void onCmpInstruction(int,java.lang.Object,java.lang.Object):960:985 -> a
     312:312:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):1018:1018 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
     313:313:com.android.tools.r8.ir.code.ArrayPut com.android.tools.r8.ir.code.ArrayPut.createWithoutVerification(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):48:48 -> a
     313:313:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):1017 -> a
     314:314:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):1016:1016 -> a
@@ -224325,21 +223804,21 @@
     15:16:void onConstLong(long):505:506 -> b
     17:17:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> b
     17:17:void onAnd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):589 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     18:19:void onAnd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):589:590 -> b
     20:20:com.android.tools.r8.ir.code.And com.android.tools.r8.ir.code.And.createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:29 -> b
     20:20:void onAnd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):590 -> b
     21:21:void onAnd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):590:590 -> b
     22:22:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> b
     22:22:void onNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):565 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     23:24:void onNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):565:566 -> b
     25:25:com.android.tools.r8.ir.code.Value getInvokeInstructionOutputValue(com.android.tools.r8.graph.DexMethod):802:802 -> b
     25:25:void onInvokeStatic(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):770 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;Z)V"}
     26:28:void onInvokeStatic(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):771:773 -> b
     29:32:com.android.tools.r8.ir.code.Value getInvokeInstructionOutputValue(com.android.tools.r8.graph.DexProto):806:809 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)Lcom/android/tools/r8/internal/bl0;"}
     33:33:void onStaticPut(com.android.tools.r8.graph.DexField,java.lang.Object):827:827 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Ljava/lang/Object;)V"}
     34:36:void onNewArrayEmpty(com.android.tools.r8.graph.DexType,java.lang.Object):844:846 -> b
@@ -224362,7 +223841,7 @@
     3:4:void onConstInt(int):493:494 -> c
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> c
     5:5:void onDiv(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):547 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     6:7:void onDiv(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):547:548 -> c
     8:8:com.android.tools.r8.ir.code.Value getInvokeInstructionOutputValue(com.android.tools.r8.graph.DexMethod):802:802 -> c
     8:8:void onInvokeSuper(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):754 -> c
@@ -224402,7 +223881,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> d
     16:16:void onMul(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):540 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     17:19:void onMul(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):540:542 -> d
     20:20:com.android.tools.r8.ir.code.Mul com.android.tools.r8.ir.code.Mul.createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:29 -> d
     20:20:void onMul(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):542 -> d
@@ -224411,7 +223890,7 @@
     24:24:void onMonitorExit(java.lang.Object):995:995 -> d
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> e
     1:1:void onOr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):595 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:3:void onOr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):595:596 -> e
     4:4:com.android.tools.r8.ir.code.Or com.android.tools.r8.ir.code.Or.createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> e
     4:4:void onOr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):596 -> e
@@ -224424,18 +223903,18 @@
     14:14:void onReturn(java.lang.Object):868 -> e
     15:15:void onDebugLocalRead():930:930 -> e
     1:2:com.android.tools.r8.ir.code.BasicBlock getBasicBlock(int):356:357 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/I5;"}
     3:3:com.android.tools.r8.ir.code.BasicBlock getBasicBlock(int):356:356 -> f
     4:4:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> f
     4:4:void onRem(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):553 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     5:6:void onRem(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):553:554 -> f
     7:7:void onThrow(java.lang.Object):852:852 -> f
     8:8:void closeCurrentBlock():217:217 -> f
     8:8:void onThrow(java.lang.Object):853 -> f
     9:9:void onDebugPosition():899:899 -> f
     1:1:com.android.tools.r8.ir.code.Value getValue(java.lang.Object):366:366 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:com.android.tools.r8.lightir.LirStrategyInfo com.android.tools.r8.lightir.LirCode.getStrategyInfo():476:476 -> g
     2:2:com.android.tools.r8.ir.code.Value getValue(java.lang.Object):366 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -224445,16 +223924,16 @@
     5:5:void onFallthrough():680:680 -> g
     6:6:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> g
     6:6:void onShl(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):571 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     7:8:void onShl(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):571:572 -> g
     1:1:void onInstruction():482:482 -> h
     2:2:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> h
     2:2:void onShr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):577 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     3:4:void onShr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):577:578 -> h
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> i
     1:1:void onSub(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):534 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:3:void onSub(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):534:535 -> i
     4:4:void onReturnVoid():858:858 -> i
     5:5:void closeCurrentBlock():217:217 -> i
@@ -224477,7 +223956,7 @@
     23:23:void ensureCurrentBlock():235:235 -> j
     24:24:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> j
     24:24:void onUshr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):583 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     25:26:void onUshr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):583:584 -> j
     1:1:void ensureDebugInfo():310:310 -> k
     2:2:com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable com.android.tools.r8.lightir.LirCode.getDebugLocalInfoTable():516:516 -> k
@@ -224486,40 +223965,40 @@
     3:4:void ensureDebugInfo():313:314 -> k
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement valueTypeElement(com.android.tools.r8.ir.code.NumericType):516:516 -> k
     5:5:void onXor(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):601 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     6:7:void onXor(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):601:602 -> k
     8:8:com.android.tools.r8.ir.code.Xor com.android.tools.r8.ir.code.Xor.createNonNormalized(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> k
     8:8:void onXor(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):602 -> k
     9:9:void onXor(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):602:602 -> k
-com.android.tools.r8.lightir.LirBuilder -> com.android.tools.r8.internal.rK:
+com.android.tools.r8.lightir.LirBuilder -> com.android.tools.r8.internal.vK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     boolean useDexEstimationStrategy -> a
     com.android.tools.r8.lightir.ByteArrayWriter byteWriter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G7;"}
     com.android.tools.r8.lightir.LirWriter writer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cL;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap constants -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.List positionTable -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     int argumentCount -> f
     int instructionCount -> g
     com.android.tools.r8.lightir.LirEncodingStrategy strategy -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HK;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata currentMetadata -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b8;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap metadataMap -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.ir.code.Position currentPosition -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.ir.code.Position flushedPosition -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap tryCatchRanges -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     java.util.Map debugLocals -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap debugLocalEnds -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     int FLOAT_0 -> p
     int FLOAT_1 -> q
     int FLOAT_2 -> r
@@ -224528,7 +224007,7 @@
     boolean $assertionsDisabled -> u
     1:6:void <clinit>():64:69 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):290:290 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/DK;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/HK;Lcom/android/tools/r8/internal/iB;)V"}
     2:17:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):73:88 -> <init>
     18:18:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> <init>
     18:18:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):88 -> <init>
@@ -224542,7 +224021,7 @@
     234:235:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):301:302 -> <init>
     1:1:int getConstantIndex(com.android.tools.r8.lightir.LirConstant):382:382 -> a
     1:1:void writeConstantIndex(com.android.tools.r8.lightir.LirConstant):393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;)V"}
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.size():353:353 -> a
     2:2:int getConstantIndex(com.android.tools.r8.lightir.LirConstant):382 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -224551,23 +224030,23 @@
     3:4:void writeConstantIndex(com.android.tools.r8.lightir.LirConstant):393 -> a
     5:6:void writeConstantIndex(com.android.tools.r8.lightir.LirConstant):394:395 -> a
     7:8:com.android.tools.r8.lightir.LirBuilder addArgument(int,boolean):448:449 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/vK;"}
     9:10:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> a
     9:10:com.android.tools.r8.lightir.LirBuilder addConstNull():512 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vK;"}
     11:11:com.android.tools.r8.lightir.LirBuilder addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     11:11:com.android.tools.r8.lightir.LirBuilder addConstString(com.android.tools.r8.graph.DexString):593 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)V"}
     12:12:com.android.tools.r8.lightir.LirBuilder addOneItemInstruction(int,com.android.tools.r8.lightir.LirConstant):473:473 -> a
     12:12:com.android.tools.r8.lightir.LirBuilder addNewInstance(com.android.tools.r8.graph.DexType):771 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/vK;"}
     13:13:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):478:478 -> a
     13:13:com.android.tools.r8.lightir.LirBuilder addThrow(java.lang.Object):775 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;)V"}
     14:14:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):477:477 -> a
     14:14:com.android.tools.r8.lightir.LirBuilder addThrow(java.lang.Object):775 -> a
     15:21:com.android.tools.r8.lightir.LirBuilder addInstructionTemplate(int,java.util.List,java.util.List):488:494 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/List;Ljava/util/List;)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/List;Ljava/util/List;)Lcom/android/tools/r8/internal/vK;"}
     22:22:java.lang.Object getEncodedValue(java.lang.Object):399:399 -> a
     22:22:com.android.tools.r8.lightir.LirBuilder addInstructionTemplate(int,java.util.List,java.util.List):494 -> a
     23:24:int getEncodedValueIndex(java.lang.Object,int):403:404 -> a
@@ -224595,7 +224074,7 @@
     40:41:com.android.tools.r8.lightir.LirBuilder addInstructionTemplate(int,java.util.List,java.util.List):505 -> a
     42:42:com.android.tools.r8.lightir.LirBuilder addInstructionTemplate(int,java.util.List,java.util.List):506:506 -> a
     43:43:com.android.tools.r8.lightir.LirBuilder addConstDouble(long):556:556 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/vK;"}
     44:45:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> a
     44:45:com.android.tools.r8.lightir.LirBuilder addConstDouble(long):557 -> a
     46:46:com.android.tools.r8.lightir.LirBuilder addConstDouble(long):559:559 -> a
@@ -224603,22 +224082,22 @@
     47:48:com.android.tools.r8.lightir.LirBuilder addConstDouble(long):560 -> a
     49:51:com.android.tools.r8.lightir.LirBuilder addConstDouble(long):562:564 -> a
     52:69:com.android.tools.r8.lightir.LirBuilder addNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):611:628 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;)V"}
     70:70:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):478:478 -> a
     70:70:com.android.tools.r8.lightir.LirBuilder addNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):630 -> a
     71:71:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):477:477 -> a
     71:71:com.android.tools.r8.lightir.LirBuilder addNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):630 -> a
     72:100:com.android.tools.r8.lightir.LirBuilder addDiv(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):653:681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     101:101:com.android.tools.r8.lightir.LirBuilder addDiv(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):680:680 -> a
     102:102:com.android.tools.r8.lightir.LirBuilder addInvokeInstruction(int,com.android.tools.r8.graph.DexMethod,java.util.List):726:726 -> a
     102:102:com.android.tools.r8.lightir.LirBuilder addInvokeDirect(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):737 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/List;Z)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/List;Z)Lcom/android/tools/r8/internal/vK;"}
     103:103:com.android.tools.r8.lightir.LirBuilder addInvokeInstruction(int,com.android.tools.r8.graph.DexMethod,java.util.List):726:726 -> a
     103:103:com.android.tools.r8.lightir.LirBuilder addInvokeVirtual(com.android.tools.r8.graph.DexMethod,java.util.List):747 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/List;)V"}
     104:124:com.android.tools.r8.lightir.LirBuilder addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.lang.Object,com.android.tools.r8.ir.code.BasicBlock):845:865 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/kl0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/ol0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/I5;)V"}
     125:125:com.android.tools.r8.lightir.LirBuilder addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.lang.Object,com.android.tools.r8.ir.code.BasicBlock):862:862 -> a
     126:146:com.android.tools.r8.lightir.LirBuilder addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.lang.Object,com.android.tools.r8.ir.code.BasicBlock):847:867 -> a
     147:147:int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock):416:416 -> a
@@ -224638,7 +224117,7 @@
     154:154:com.android.tools.r8.lightir.LirBuilder addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.lang.Object,com.android.tools.r8.ir.code.BasicBlock):870 -> a
     155:157:com.android.tools.r8.lightir.LirBuilder addIf(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.lang.Object,com.android.tools.r8.ir.code.BasicBlock):871:873 -> a
     158:178:com.android.tools.r8.lightir.LirBuilder addIfCmp(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.util.List,com.android.tools.r8.ir.code.BasicBlock):880:900 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;Lcom/android/tools/r8/internal/kl0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;Lcom/android/tools/r8/internal/ol0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/I5;)V"}
     179:179:com.android.tools.r8.lightir.LirBuilder addIfCmp(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.util.List,com.android.tools.r8.ir.code.BasicBlock):897:897 -> a
     180:200:com.android.tools.r8.lightir.LirBuilder addIfCmp(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.util.List,com.android.tools.r8.ir.code.BasicBlock):882:902 -> a
     201:201:int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock):416:416 -> a
@@ -224671,29 +224150,29 @@
     216:216:com.android.tools.r8.lightir.LirBuilder addIfCmp(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.util.List,com.android.tools.r8.ir.code.BasicBlock):907 -> a
     217:220:com.android.tools.r8.lightir.LirBuilder addIfCmp(com.android.tools.r8.ir.code.IfType,com.android.tools.r8.ir.code.ValueType,java.util.List,com.android.tools.r8.ir.code.BasicBlock):910:913 -> a
     221:221:void lambda$build$0(com.android.tools.r8.lightir.LirConstant[],com.android.tools.r8.lightir.LirConstant,java.lang.Integer):936:936 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/internal/AK;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/internal/EK;Ljava/lang/Integer;)V"}
     222:230:int getCmpOpcode(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias):955:963 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ed;Lcom/android/tools/r8/internal/xS;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gd;Lcom/android/tools/r8/internal/BS;)I"}
     231:231:int getCmpOpcode(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias):961:961 -> a
     232:232:int getCmpOpcode(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias):959:959 -> a
     233:261:com.android.tools.r8.lightir.LirBuilder addArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):1028:1056 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     262:291:com.android.tools.r8.lightir.LirBuilder addArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):1061:1090 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)V"}
     292:292:com.android.tools.r8.lightir.LirBuilder addArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):1089:1089 -> a
     293:297:com.android.tools.r8.lightir.LirBuilder addNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType,int):1101:1105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;)V"}
     1:2:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> b
     1:2:com.android.tools.r8.lightir.LirBuilder addConstLong(long):544 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(J)Lcom/android/tools/r8/internal/vK;"}
     3:4:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> b
     3:4:com.android.tools.r8.lightir.LirBuilder addConstLong(long):547 -> b
     5:7:com.android.tools.r8.lightir.LirBuilder addConstLong(long):549:551 -> b
     8:9:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> b
     8:9:com.android.tools.r8.lightir.LirBuilder addReturnVoid():783 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vK;"}
     10:10:com.android.tools.r8.lightir.LirBuilder addConstFloat(int):527:527 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/vK;"}
     11:12:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> b
     11:12:com.android.tools.r8.lightir.LirBuilder addConstFloat(int):528 -> b
     13:13:com.android.tools.r8.lightir.LirBuilder addConstFloat(int):530:530 -> b
@@ -224704,7 +224183,7 @@
     17:18:com.android.tools.r8.lightir.LirBuilder addConstFloat(int):534 -> b
     19:21:com.android.tools.r8.lightir.LirBuilder addConstFloat(int):536:538 -> b
     22:33:com.android.tools.r8.lightir.LirBuilder addNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):635:646 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/Xk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/bl0;)V"}
     34:34:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):478:478 -> b
     34:34:com.android.tools.r8.lightir.LirBuilder addNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):648 -> b
     35:35:com.android.tools.r8.lightir.LirBuilder addOneValueInstruction(int,java.lang.Object):477:477 -> b
@@ -224751,12 +224230,12 @@
     30:37:int advanceInstructionState():456:463 -> c
     38:39:com.android.tools.r8.lightir.LirBuilder addNoOperandInstruction(int):467:468 -> c
     38:39:com.android.tools.r8.lightir.LirBuilder addConstInt(int):517 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/vK;"}
     40:42:com.android.tools.r8.lightir.LirBuilder addConstInt(int):519:521 -> c
     1:3:com.android.tools.r8.lightir.LirBuilder addResourceConstNumber(int):586:588 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     4:4:com.android.tools.r8.lightir.LirCode build():934:934 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CK;"}
     5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.size():353:353 -> d
     5:5:com.android.tools.r8.lightir.LirCode build():934 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -224769,7 +224248,7 @@
     17:21:com.android.tools.r8.lightir.LirCode build():945:949 -> d
     1:1:void writeBlockIndex(int):424:424 -> e
     1:1:void writeEncodedValueIndex(int):412:412 -> f
-com.android.tools.r8.lightir.LirBuilder$1 -> com.android.tools.r8.internal.kK:
+com.android.tools.r8.lightir.LirBuilder$1 -> com.android.tools.r8.internal.oK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> b
@@ -224785,7 +224264,7 @@
     6:6:com.android.tools.r8.ir.code.ValueType[] com.android.tools.r8.ir.code.ValueType.values():17:17 -> <clinit>
     6:6:void <clinit>():569 -> <clinit>
     7:7:void <clinit>():569:569 -> <clinit>
-com.android.tools.r8.lightir.LirBuilder$FillArrayPayload -> com.android.tools.r8.internal.lK:
+com.android.tools.r8.lightir.LirBuilder$FillArrayPayload -> com.android.tools.r8.internal.pK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     int element_width -> b
     long size -> c
@@ -224794,25 +224273,25 @@
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():110:110 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int lambda$specify$0(com.android.tools.r8.lightir.LirBuilder$FillArrayPayload):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pK;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):133:133 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:long lambda$specify$1(com.android.tools.r8.lightir.LirBuilder$FillArrayPayload):133:133 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)J"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pK;)J"}
     2:2:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):148:148 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:short[] lambda$specify$2(com.android.tools.r8.lightir.LirBuilder$FillArrayPayload):133:133 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lK;)[S"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pK;)[S"}
     1:1:com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder():138:138 -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():129:129 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirBuilder$InstructionPayload -> com.android.tools.r8.internal.mK:
+com.android.tools.r8.lightir.LirBuilder$InstructionPayload -> com.android.tools.r8.internal.qK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     1:1:void <init>():102:102 -> <init>
-com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload -> com.android.tools.r8.internal.nK:
+com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload -> com.android.tools.r8.internal.rK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     int[] keys -> b
     int[] targets -> c
@@ -224822,39 +224301,39 @@
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():152:152 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int[] lambda$specify$0(com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nK;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)[I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):158:158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:int[] lambda$specify$1(com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):158:158 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nK;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rK;)[I"}
     2:2:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):189:189 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder():179:179 -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():174:174 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirBuilder$NameComputationPayload -> com.android.tools.r8.internal.oK:
+com.android.tools.r8.lightir.LirBuilder$NameComputationPayload -> com.android.tools.r8.internal.sK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XP;"}
     1:2:void <init>(com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):237:238 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XP;)V"}
     1:1:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):248:248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):252:252 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder():243:243 -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
-com.android.tools.r8.lightir.LirBuilder$RecordFieldValuesPayload -> com.android.tools.r8.internal.pK:
+com.android.tools.r8.lightir.LirBuilder$RecordFieldValuesPayload -> com.android.tools.r8.internal.tK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     com.android.tools.r8.graph.DexField[] fields -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/l1;"}
     1:2:void <init>(com.android.tools.r8.graph.DexField[]):266:267 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;)V"}
     1:1:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):277:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[],com.android.tools.r8.utils.structural.StructuralItem[]):35:35 -> a
     2:2:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):277 -> a
     1:1:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):282:282 -> b
@@ -224863,7 +224342,7 @@
     2:2:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):282 -> b
     1:1:com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder():272:272 -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
-com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload -> com.android.tools.r8.internal.qK:
+com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload -> com.android.tools.r8.internal.uK:
 # {"id":"sourceFile","fileName":"LirBuilder.java"}
     int[] keys -> b
     int[] targets -> c
@@ -224873,48 +224352,48 @@
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():193:193 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int[] lambda$specify$0(com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):205:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qK;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uK;)[I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):205:205 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:3:int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:int[] lambda$specify$1(com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):205:205 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qK;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uK;)[I"}
     2:2:void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):225:225 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder():220:220 -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():215:215 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirCode -> com.android.tools.r8.internal.yK:
+com.android.tools.r8.lightir.LirCode -> com.android.tools.r8.internal.CK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     com.android.tools.r8.lightir.LirStrategyInfo strategyInfo -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aL;"}
     boolean useDexEstimationStrategy -> f
     com.android.tools.r8.lightir.LirConstant[] constants -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/EK;"}
     com.android.tools.r8.lightir.LirCode$PositionEntry[] positionTable -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/yK;"}
     int argumentCount -> i
     byte[] instructions -> j
     int instructionCount -> k
     com.android.tools.r8.lightir.LirCode$TryCatchTable tryCatchTable -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BK;"}
     com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable debugLocalInfoTable -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wK;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap metadataMap -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():62:62 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.LirCode):404:404 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)V"}
     2:13:void <init>(com.android.tools.r8.lightir.LirConstant[],com.android.tools.r8.lightir.LirCode$PositionEntry[],int,byte[],int,com.android.tools.r8.lightir.LirCode$TryCatchTable,com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.lightir.LirStrategyInfo,boolean,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):428:439 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/AK;[Lcom/android/tools/r8/internal/uK;I[BILcom/android/tools/r8/internal/xK;Lcom/android/tools/r8/internal/sK;Lcom/android/tools/r8/internal/WK;ZLcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/EK;[Lcom/android/tools/r8/internal/yK;I[BILcom/android/tools/r8/internal/BK;Lcom/android/tools/r8/internal/wK;Lcom/android/tools/r8/internal/aL;ZLcom/android/tools/r8/internal/nz;)V"}
     1:1:int computeHashCode():461:461 -> G0
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():62:62 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:com.android.tools.r8.lightir.LirCode asLirCode():446:446 -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CK;"}
     1:1:void clearMetadata():541:541 -> L0
     1:3:int getEstimatedDexSizeForInliningIfLessThanOrEquals(int):688:690 -> M0
     1:3:int getEstimatedDexSizeForInlining():684 -> M0
@@ -224930,22 +224409,22 @@
     1:2:boolean hasMonitorInstructions():784:785 -> O0
     1:2:boolean isEmptyVoidMethod():773:774 -> T0
     1:1:com.android.tools.r8.lightir.LirBuilder builder(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.lightir.LirEncodingStrategy,com.android.tools.r8.utils.InternalOptions):387:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/DK;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/rK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/HK;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/vK;"}
     2:2:com.android.tools.r8.lightir.LirConstant[] lambda$specify$0(com.android.tools.r8.lightir.LirCode):393:393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)[Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)[Lcom/android/tools/r8/internal/EK;"}
     3:10:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):393:400 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     11:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.dex.code.CfOrDexInstruction):536:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Lcom/android/tools/r8/internal/b8;"}
     12:17:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):554:559 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     18:18:com.android.tools.r8.lightir.LirDecodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getDecodingStrategy(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):29:29 -> a
     18:18:com.android.tools.r8.ir.code.IRCode internalBuildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):595 -> a
     18:18:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):559 -> a
     19:19:com.android.tools.r8.ir.code.IRCode internalBuildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):592:592 -> a
     19:19:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):559 -> a
     20:29:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):572:581 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/dS;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/hS;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/Dt;"}
     30:30:com.android.tools.r8.lightir.LirDecodingStrategy com.android.tools.r8.lightir.PhiInInstructionsStrategy.getDecodingStrategy(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):29:29 -> a
     30:30:com.android.tools.r8.ir.code.IRCode internalBuildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):595 -> a
     30:30:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):575 -> a
@@ -224993,14 +224472,14 @@
     67:67:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):626 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     68:68:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):636:636 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     69:69:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):642:642 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/cz;"}
     70:70:java.lang.String toString():652:652 -> a
     70:70:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     71:73:com.android.tools.r8.lightir.LirCode$PositionEntry[] getPositionTableAsInlining(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):715:717 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)[Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)[Lcom/android/tools/r8/internal/yK;"}
     74:79:com.android.tools.r8.ir.code.Position getPreamblePosition(com.android.tools.r8.graph.DexMethod,boolean):699:704 -> a
     74:79:com.android.tools.r8.lightir.LirCode$PositionEntry[] getPositionTableAsInlining(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):719 -> a
     80:80:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> a
@@ -225029,30 +224508,30 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     105:111:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):752:758 -> a
     112:112:void lambda$getCodeAsInlining$8(com.android.tools.r8.ir.code.Position):754:754 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     113:114:void forEachPosition(com.android.tools.r8.graph.DexMethod,boolean,java.util.function.Consumer):796:797 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLjava/util/function/Consumer;)V"}
     1:1:com.android.tools.r8.lightir.LirConstant[] getConstantPool():500:500 -> a1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/EK;"}
     1:1:com.android.tools.r8.lightir.LirCode$PositionEntry[] lambda$specify$1(com.android.tools.r8.lightir.LirCode):394:394 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)[Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)[Lcom/android/tools/r8/internal/yK;"}
     1:1:com.android.tools.r8.lightir.LirIterator iterator():546:546 -> b1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KK;"}
     1:1:int lambda$specify$2(com.android.tools.r8.lightir.LirCode):395:395 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)I"}
     2:2:boolean computeEquals(java.lang.Object):466:466 -> c
     1:1:byte[] lambda$specify$3(com.android.tools.r8.lightir.LirCode):396:396 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)[B"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)[B"}
     2:2:com.android.tools.r8.graph.DebugLocalInfo getDebugLocalInfo(java.lang.Object):520:520 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/graph/j0;"}
     1:1:int lambda$specify$4(com.android.tools.r8.lightir.LirCode):397:397 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)I"}
     1:1:com.android.tools.r8.lightir.LirCode$TryCatchTable lambda$specify$5(com.android.tools.r8.lightir.LirCode):398:398 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/xK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/BK;"}
     1:1:com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable lambda$specify$6(com.android.tools.r8.lightir.LirCode):399:399 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/sK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/wK;"}
     1:1:boolean lambda$specify$7(com.android.tools.r8.lightir.LirCode):400:400 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Z"}
     1:1:java.util.Iterator iterator():62:62 -> iterator
     1:1:int getEstimatedSizeForInliningIfLessThanOrEquals(int):668:668 -> l
     2:4:int getEstimatedDexSizeForInliningIfLessThanOrEquals(int):688:690 -> l
@@ -225067,16 +224546,16 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():456:456 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
     1:1:java.lang.String toString():652:652 -> toString
-com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable -> com.android.tools.r8.internal.sK:
+com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable -> com.android.tools.r8.internal.wK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     java.util.Map valueToLocalMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap instructionToEndUseMap -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():261:261 -> <clinit>
     1:9:void <init>(java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):267:275 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Lcom/android/tools/r8/internal/nz;)V"}
     10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():317:317 -> <init>
     10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):123 -> <init>
     10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):131 -> <init>
@@ -225091,7 +224570,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void forEachLocalDefinition(java.util.function.BiConsumer):286:286 -> a
     3:24:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.utils.structural.CompareToVisitor):301:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wK;Lcom/android/tools/r8/utils/structural/a;)I"}
     25:25:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):93:93 -> a
     25:25:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.utils.structural.CompareToVisitor):322 -> a
     26:26:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.utils.structural.CompareToVisitor):323:323 -> a
@@ -225099,7 +224578,7 @@
     27:27:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.utils.structural.CompareToVisitor):323 -> a
     28:30:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$DebugLocalInfoTable,com.android.tools.r8.utils.structural.CompareToVisitor):324:326 -> a
     31:31:void lambda$acceptCompareTo$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,java.lang.Object,com.android.tools.r8.graph.DebugLocalInfo):324:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
     32:32:int lambda$acceptCompareTo$2(com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.DebugLocalInfo):327:327 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/a;Lcom/android/tools/r8/graph/j0;Lcom/android/tools/r8/graph/j0;)I"}
     33:33:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):332:332 -> a
@@ -225121,17 +224600,17 @@
     56:56:void lambda$acceptHashing$3(java.util.ArrayList,java.lang.Object,com.android.tools.r8.graph.DebugLocalInfo):334:334 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
     57:58:void lambda$acceptHashing$4(com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.IntBox,java.lang.Integer,int[]):346:347 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/Qz;Ljava/lang/Integer;[I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/Sz;Ljava/lang/Integer;[I)V"}
     1:1:void lambda$acceptCompareTo$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,java.lang.Object,com.android.tools.r8.graph.DebugLocalInfo):325:325 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Ljava/lang/Object;Lcom/android/tools/r8/graph/j0;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():296:296 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirCode$LinePositionEntry -> com.android.tools.r8.internal.tK:
+com.android.tools.r8.lightir.LirCode$LinePositionEntry -> com.android.tools.r8.internal.xK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     int line -> d
     1:2:void <init>(int,int):119:120 -> <init>
     1:2:com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean):134:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/TW;"}
     3:3:com.android.tools.r8.ir.code.Position$PositionBuilder com.android.tools.r8.ir.code.Position$PositionBuilder.setIsD8R8Synthesized(boolean):300:300 -> a
     3:3:com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean):136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -225140,7 +224619,7 @@
     5:7:com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean):136:138 -> a
     8:8:int getOrder():143:143 -> a
     9:9:int internalAcceptCompareTo(com.android.tools.r8.lightir.LirCode$PositionEntry,com.android.tools.r8.utils.structural.CompareToVisitor):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:boolean hasCallerPosition():129:129 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):153:153 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
@@ -225149,20 +224628,20 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):153 -> b
-com.android.tools.r8.lightir.LirCode$PositionEntry -> com.android.tools.r8.internal.uK:
+com.android.tools.r8.lightir.LirCode$PositionEntry -> com.android.tools.r8.internal.yK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     int fromInstructionIndex -> b
     com.android.tools.r8.lightir.LirCode$PositionEntry[] EMPTY_ARRAY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/uK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/yK;"}
     1:1:void <clinit>():67:67 -> <clinit>
     1:2:void <init>(int):71:72 -> <init>
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():65:65 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     int getOrder() -> a
     com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/TW;"}
     int internalAcceptCompareTo(com.android.tools.r8.lightir.LirCode$PositionEntry,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/x;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:6:int acceptCompareTo(com.android.tools.r8.lightir.LirCode$PositionEntry,com.android.tools.r8.utils.structural.CompareToVisitor):101:105 -> a
@@ -225180,39 +224659,39 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():96:96 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirCode$StructuredPositionEntry -> com.android.tools.r8.internal.vK:
+com.android.tools.r8.lightir.LirCode$StructuredPositionEntry -> com.android.tools.r8.internal.zK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     com.android.tools.r8.ir.code.Position position -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:2:void <init>(int,com.android.tools.r8.ir.code.Position):161:162 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;)V"}
     1:1:com.android.tools.r8.ir.code.Position getPosition(com.android.tools.r8.graph.DexMethod,boolean):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/internal/TW;"}
     2:2:int getOrder():177:177 -> a
     3:3:int internalAcceptCompareTo(com.android.tools.r8.lightir.LirCode$PositionEntry,com.android.tools.r8.utils.structural.CompareToVisitor):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/utils/structural/a;)I"}
     1:1:boolean hasCallerPosition():167:167 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):187:187 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
-com.android.tools.r8.lightir.LirCode$TryCatchTable -> com.android.tools.r8.internal.xK:
+com.android.tools.r8.lightir.LirCode$TryCatchTable -> com.android.tools.r8.internal.BK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap tryCatchHandlers -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():191:191 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):194:197 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():191:191 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:2:boolean hasHandlerThatMatches(com.android.tools.r8.utils.IntObjPredicate):201:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hA;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jA;)Z"}
     3:3:boolean hasHandlerThatMatches(com.android.tools.r8.utils.IntObjPredicate):201:201 -> a
     4:4:boolean lambda$hasHandlerThatMatches$0(com.android.tools.r8.utils.IntObjPredicate,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):203:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hA;Lcom/android/tools/r8/internal/Zy;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jA;Lcom/android/tools/r8/internal/bz;)Z"}
     5:10:com.android.tools.r8.lightir.LirCode$TryCatchTable rewriteWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):225:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/xK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/BK;"}
     11:11:com.android.tools.r8.ir.code.CatchHandlers lambda$rewriteWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,int,com.android.tools.r8.ir.code.CatchHandlers):228:228 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;ILcom/android/tools/r8/internal/r8;)Lcom/android/tools/r8/internal/r8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;ILcom/android/tools/r8/internal/t8;)Lcom/android/tools/r8/internal/t8;"}
     12:12:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):234:234 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     13:13:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withInt2CustomItemMap(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):127:127 -> a
@@ -225223,10 +224702,10 @@
     14:14:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withInt2CustomItemMap(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):154 -> a
     14:14:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):234 -> a
     15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap lambda$specify$2(com.android.tools.r8.lightir.LirCode$TryCatchTable):235:235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xK;)Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BK;)Lcom/android/tools/r8/internal/cz;"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():221:221 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.lightir.LirCode$TryCatchTable$1 -> com.android.tools.r8.internal.wK:
+com.android.tools.r8.lightir.LirCode$TryCatchTable$1 -> com.android.tools.r8.internal.AK:
 # {"id":"sourceFile","fileName":"LirCode.java"}
     1:1:void <init>():236:236 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):236:236 -> a
@@ -225258,18 +224737,18 @@
     12:12:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     12:12:void acceptHashing(com.android.tools.r8.ir.code.CatchHandlers,com.android.tools.r8.utils.structural.HashingVisitor):254 -> a
     12:12:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):236 -> a
-com.android.tools.r8.lightir.LirConstant -> com.android.tools.r8.internal.AK:
+com.android.tools.r8.lightir.LirConstant -> com.android.tools.r8.internal.EK:
 # {"id":"sourceFile","fileName":"LirConstant.java"}
     int internalLirConstantAcceptCompareTo(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/utils/structural/a;)I"}
     void internalLirConstantAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     com.android.tools.r8.lightir.LirConstant$LirConstantOrder getLirConstantOrder() -> g0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
-com.android.tools.r8.lightir.LirConstant$LirConstantStructuralAcceptor -> com.android.tools.r8.internal.zK:
+com.android.tools.r8.lightir.LirConstant$LirConstantStructuralAcceptor -> com.android.tools.r8.internal.DK:
 # {"id":"sourceFile","fileName":"LirConstant.java"}
     com.android.tools.r8.lightir.LirConstant$LirConstantStructuralAcceptor INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DK;"}
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():32:32 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):32:32 -> a
@@ -225291,48 +224770,48 @@
     12:12:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):32 -> a
     13:13:void acceptHashing(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.utils.structural.HashingVisitor):54:54 -> a
     13:13:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):32 -> a
-com.android.tools.r8.lightir.LirDecodingStrategy -> com.android.tools.r8.internal.CK:
+com.android.tools.r8.lightir.LirDecodingStrategy -> com.android.tools.r8.internal.GK:
 # {"id":"sourceFile","fileName":"LirDecodingStrategy.java"}
     boolean useValueIndex -> a
     com.android.tools.r8.ir.code.NumberGenerator valueNumberGenerator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hS;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.NumberGenerator):20:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hS;)V"}
     com.android.tools.r8.ir.code.Phi getPhiDefinitionForInstructionIndex(int,java.util.function.IntFunction,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function,com.android.tools.r8.lightir.LirStrategyInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/h7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/j7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/xW;"}
     java.lang.Object getValue(java.lang.Object,com.android.tools.r8.lightir.LirStrategyInfo) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/bl0;"}
     java.lang.Object getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/bl0;"}
     java.lang.Object internalGetFreshUnusedValue(int,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     1:5:int getValueNumber(int):39:43 -> a
-com.android.tools.r8.lightir.LirEncodingStrategy -> com.android.tools.r8.internal.DK:
+com.android.tools.r8.lightir.LirEncodingStrategy -> com.android.tools.r8.internal.HK:
 # {"id":"sourceFile","fileName":"LirEncodingStrategy.java"}
     1:1:void <init>():9:9 -> <init>
     void defineBlock(com.android.tools.r8.ir.code.BasicBlock,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
     java.lang.Object defineValue(java.lang.Object,int) -> a
     int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
     java.lang.Object getEncodedValue(java.lang.Object) -> a
     com.android.tools.r8.lightir.LirStrategyInfo getStrategyInfo() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aL;"}
     boolean isPhiInlineInstruction() -> b
     boolean verifyValueIndex(java.lang.Object,int) -> b
-com.android.tools.r8.lightir.LirInstructionCallback -> com.android.tools.r8.internal.EK:
+com.android.tools.r8.lightir.LirInstructionCallback -> com.android.tools.r8.internal.IK:
 # {"id":"sourceFile","fileName":"LirInstructionCallback.java"}
     void onInstructionView(com.android.tools.r8.lightir.LirInstructionView) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)V"}
-com.android.tools.r8.lightir.LirInstructionView -> com.android.tools.r8.internal.FK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)V"}
+com.android.tools.r8.lightir.LirInstructionView -> com.android.tools.r8.internal.JK:
 # {"id":"sourceFile","fileName":"LirInstructionView.java"}
     void accept(com.android.tools.r8.lightir.LirInstructionCallback) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IK;)V"}
     int getOpcode() -> a
     int getValueIndex(com.android.tools.r8.lightir.LirCode) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)I"}
     int getNextBlockOperand() -> b
     long getNextLongOperand() -> d
     boolean hasMoreOperands() -> e
@@ -225342,10 +224821,10 @@
     int getNextValueOperand() -> k
     int getRemainingOperandSizeInBytes() -> l
     int getNextConstantOperand() -> m
-com.android.tools.r8.lightir.LirIterator -> com.android.tools.r8.internal.GK:
+com.android.tools.r8.lightir.LirIterator -> com.android.tools.r8.internal.KK:
 # {"id":"sourceFile","fileName":"LirIterator.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.bytes.ByteIterator iterator -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F7;"}
     int currentByteIndex -> c
     int endOfCurrentInstruction -> d
     int currentInstructionIndex -> e
@@ -225353,15 +224832,15 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.bytes.ByteIterator):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F7;)V"}
     2:10:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.bytes.ByteIterator):20:28 -> <init>
     1:1:void accept(com.android.tools.r8.lightir.LirInstructionCallback):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IK;)V"}
     2:2:int getOpcode():80:80 -> a
     3:3:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> a
     3:3:int getValueIndex(com.android.tools.r8.lightir.LirCode):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)I"}
     4:4:int getValueIndex(com.android.tools.r8.lightir.LirCode):70:70 -> a
     1:1:int getNextBlockOperand():117:117 -> b
     1:1:long getNextLongOperand():101:101 -> d
@@ -225398,7 +224877,7 @@
     1:1:int getNextConstantOperand():107:107 -> m
     1:1:void skipRemainingOperands():32:32 -> n
     1:1:com.android.tools.r8.lightir.LirInstructionView next():45 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JK;"}
     2:2:int getRemainingOperandSizeInBytes():85:85 -> n
     2:2:void skipRemainingOperands():33 -> n
     2:2:com.android.tools.r8.lightir.LirInstructionView next():45 -> n
@@ -225425,7 +224904,7 @@
     1:2:int u4():136:137 -> r
     3:6:int com.android.tools.r8.lightir.ByteUtils.readEncodedInt(com.android.tools.r8.it.unimi.dsi.fastutil.bytes.ByteIterator):50:53 -> r
     3:6:int u4():137 -> r
-com.android.tools.r8.lightir.LirLensCodeRewriter -> com.android.tools.r8.internal.HK:
+com.android.tools.r8.lightir.LirLensCodeRewriter -> com.android.tools.r8.internal.LK:
 # {"id":"sourceFile","fileName":"LirLensCodeRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -225434,11 +224913,11 @@
     com.android.tools.r8.graph.DexMethod contextReference -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils helper -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BJ;"}
     int numberOfInvokeOpcodeChanges -> i
     java.util.Map constantPoolMapping -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -225446,11 +224925,11 @@
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):67:67 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xJ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/BJ;)V"}
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:73 -> <init>
     1:1:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirParsedInstructionCallback.getCode():50:50 -> a
     1:1:boolean internalHasPrunedCatchHandlers(com.android.tools.r8.lightir.LirCode):362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Z"}
     2:2:com.android.tools.r8.lightir.LirCode$TryCatchTable com.android.tools.r8.lightir.LirCode.getTryCatchTable():512:512 -> a
     2:2:boolean internalHasPrunedCatchHandlers(com.android.tools.r8.lightir.LirCode):362 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -225459,7 +224938,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalHasPrunedCatchHandlers(com.android.tools.r8.lightir.LirCode):364:364 -> a
     5:5:void onInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z)V"}
     6:6:boolean hasPotentialNonTrivialInvokeRewriting(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.MethodLookupResult):140:140 -> a
     6:6:void onInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):114 -> a
     7:7:boolean com.android.tools.r8.graph.lens.GraphLens.isHorizontalClassMergerGraphLens():0:0 -> a
@@ -225499,9 +224978,9 @@
     34:48:void onInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):115:129 -> a
     49:58:void onInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):125:134 -> a
     59:67:void addRewrittenMapping(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.lightir.LirConstant):168:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/internal/AK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/internal/EK;)V"}
     68:68:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):189:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     69:73:boolean hasPotentialNonTrivialFieldGetRewriting(com.android.tools.r8.graph.DexField):209:213 -> a
     69:73:void onFieldGet(com.android.tools.r8.graph.DexField):203 -> a
     69:73:void onInstanceGet(com.android.tools.r8.graph.DexField,java.lang.Object):194 -> a
@@ -225533,7 +225012,7 @@
     91:91:void onInvokeInterface(com.android.tools.r8.graph.DexMethod,java.util.List):271:271 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;)V"}
     92:92:boolean lambda$internalHasPrunedCatchHandlers$0(com.android.tools.r8.lightir.LirCode$TryCatchTable,int,com.android.tools.r8.ir.code.CatchHandlers):366:366 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xK;ILcom/android/tools/r8/internal/r8;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BK;ILcom/android/tools/r8/internal/t8;)Z"}
     93:93:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.lightir.LirCode$TryCatchTable.getHandlersForBlock(int):207:207 -> a
     93:93:boolean lambda$internalHasPrunedCatchHandlers$0(com.android.tools.r8.lightir.LirCode$TryCatchTable,int,com.android.tools.r8.ir.code.CatchHandlers):366 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -225541,11 +225020,11 @@
     94:94:boolean lambda$internalHasPrunedCatchHandlers$0(com.android.tools.r8.lightir.LirCode$TryCatchTable,int,com.android.tools.r8.ir.code.CatchHandlers):366 -> a
     95:95:boolean lambda$internalHasPrunedCatchHandlers$0(com.android.tools.r8.lightir.LirCode$TryCatchTable,int,com.android.tools.r8.ir.code.CatchHandlers):366:366 -> a
     96:96:com.android.tools.r8.lightir.LirConstant lambda$rewriteConstantPoolAndScanForTypeChanges$1(com.android.tools.r8.lightir.LirConstant):446:446 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;)Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EK;)Lcom/android/tools/r8/internal/EK;"}
     97:98:java.lang.Integer lambda$rewriteInstructionsWithInvokeTypeChanges$2(java.util.List,com.android.tools.r8.lightir.LirConstant[],com.android.tools.r8.graph.DexMethod):499:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;[Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/graph/w2;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;[Lcom/android/tools/r8/internal/EK;Lcom/android/tools/r8/graph/w2;)Ljava/lang/Integer;"}
     99:101:boolean lookupIsInterface(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.lens.MethodLookupResult):524:526 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ILcom/android/tools/r8/internal/YN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ILcom/android/tools/r8/internal/cO;)Z"}
     102:102:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     102:102:boolean lookupIsInterface(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.lens.MethodLookupResult):526 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -225585,7 +225064,7 @@
     12:12:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> b
     12:12:com.android.tools.r8.lightir.LirCode rewriteConstantPoolAndScanForTypeChanges(com.android.tools.r8.lightir.LirCode):404 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/CK;"}
     13:15:com.android.tools.r8.lightir.LirCode rewriteConstantPoolAndScanForTypeChanges(com.android.tools.r8.lightir.LirCode):404:406 -> b
     16:16:void onTypeReference(com.android.tools.r8.graph.DexType):83:83 -> b
     16:16:com.android.tools.r8.lightir.LirCode rewriteConstantPoolAndScanForTypeChanges(com.android.tools.r8.lightir.LirCode):406 -> b
@@ -225655,7 +225134,7 @@
     2:2:void onInvokeVirtual(com.android.tools.r8.graph.DexMethod,java.util.List):261:261 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;)V"}
     3:8:com.android.tools.r8.lightir.LirCode rewriteInstructionsWithInvokeTypeChanges(com.android.tools.r8.lightir.LirCode):450:455 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/CK;"}
     9:9:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> c
     9:9:com.android.tools.r8.lightir.LirCode rewriteInstructionsWithInvokeTypeChanges(com.android.tools.r8.lightir.LirCode):456 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -225700,30 +225179,30 @@
     117:117:com.android.tools.r8.lightir.LirCode rewriteInstructionsWithInvokeTypeChanges(com.android.tools.r8.lightir.LirCode):518 -> c
     118:118:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirCode.copyWithNewConstantsAndInstructions(com.android.tools.r8.lightir.LirConstant[],byte[]):853:853 -> c
     118:118:com.android.tools.r8.lightir.LirCode rewriteInstructionsWithInvokeTypeChanges(com.android.tools.r8.lightir.LirCode):516 -> c
-com.android.tools.r8.lightir.LirOpcodeUtils -> com.android.tools.r8.internal.IK:
+com.android.tools.r8.lightir.LirOpcodeUtils -> com.android.tools.r8.internal.MK:
 # {"id":"sourceFile","fileName":"LirOpcodeUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:boolean getInterfaceBitFromInvokeOpcode(int):28:28 -> a
-com.android.tools.r8.lightir.LirOpcodes$1 -> com.android.tools.r8.internal.JK:
+com.android.tools.r8.lightir.LirOpcodes$1 -> com.android.tools.r8.internal.NK:
 # {"id":"sourceFile","fileName":"LirOpcodes.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.lightir.LirParsedInstructionCallback -> com.android.tools.r8.internal.KK:
+com.android.tools.r8.lightir.LirParsedInstructionCallback -> com.android.tools.r8.internal.OK:
 # {"id":"sourceFile","fileName":"LirParsedInstructionCallback.java"}
     com.android.tools.r8.lightir.LirCode code -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CK;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
     1:2:void <init>(com.android.tools.r8.lightir.LirCode):45:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)V"}
     1:1:com.android.tools.r8.lightir.LirCode getCode():50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CK;"}
     2:2:void onConstDouble(long):99:99 -> a
     3:3:void onConstString(com.android.tools.r8.graph.DexString):103:103 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)V"}
     4:4:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     5:5:void onConstClass(com.android.tools.r8.graph.DexType,boolean):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Z)V"}
     6:6:void onConstMethodHandle(com.android.tools.r8.graph.DexMethodHandle):116:116 -> a
@@ -225731,18 +225210,18 @@
     7:7:void onConstMethodType(com.android.tools.r8.graph.DexProto):120:120 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)V"}
     8:8:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;)V"}
     9:9:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
     10:10:void onBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):145:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)V"}
     11:11:void onArithmeticBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):149:149 -> a
     11:11:void onAdd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     12:12:void onNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     13:53:void onLogicalBinopInternal(int,com.android.tools.r8.lightir.LirInstructionView):261:301 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/FK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/JK;)V"}
     54:54:void onLogicalBinopInternal(int,com.android.tools.r8.lightir.LirInstructionView):298:298 -> a
     55:55:void onLogicalBinopInternal(int,com.android.tools.r8.lightir.LirInstructionView):295:295 -> a
     56:56:void onLogicalBinopInternal(int,com.android.tools.r8.lightir.LirInstructionView):292:292 -> a
@@ -225762,15 +225241,15 @@
     70:70:void onNumberConversion(int,java.lang.Object):337 -> a
     71:71:void onNumberConversion(int,java.lang.Object):337:337 -> a
     72:72:void onNumberConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,java.lang.Object):341:341 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     73:73:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):351:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;)V"}
     74:74:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):362:362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;Ljava/lang/Object;)V"}
     75:75:void onIntSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):370:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/nK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/rK;)V"}
     76:76:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):374:374 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/qK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/uK;)V"}
     77:77:void onInvokeMultiNewArray(com.android.tools.r8.graph.DexType,java.util.List):394:394 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/ArrayList;)V"}
     78:78:void onNewArrayFilledData(int,long,short[],java.lang.Object):402:402 -> a
@@ -225808,14 +225287,14 @@
     95:95:void onOriginalFieldWitness(com.android.tools.r8.graph.OriginalFieldWitness,java.lang.Object):531:531 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t5;Ljava/lang/Object;)V"}
     96:96:com.android.tools.r8.lightir.LirConstant getConstantItem(int):535:535 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/EK;"}
     97:97:com.android.tools.r8.lightir.LirConstant com.android.tools.r8.lightir.LirCode.getConstantItem(int):496:496 -> a
     97:97:com.android.tools.r8.lightir.LirConstant getConstantItem(int):535 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:98:com.android.tools.r8.lightir.LirConstant com.android.tools.r8.lightir.LirCode.getConstantItem(int):496:496 -> a
     98:98:com.android.tools.r8.lightir.LirConstant getConstantItem(int):535 -> a
     99:864:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):540:1305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)V"}
     865:867:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):1299:1301 -> a
     868:869:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):1292:1293 -> a
     870:872:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):1021:1023 -> a
@@ -226060,10 +225539,10 @@
     1:1:void onConstFloat(int):91:91 -> b
     2:2:void onConstLong(long):95:95 -> b
     3:3:void onNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):257:257 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     4:4:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> b
     4:4:void onAnd(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):322 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     5:5:void onMoveException(com.android.tools.r8.graph.DexType):382:382 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     6:6:void onDebugLocalWrite(java.lang.Object):386:386 -> b
@@ -226079,9 +225558,9 @@
     11:11:void onNewArrayEmpty(com.android.tools.r8.graph.DexType,java.lang.Object):462:462 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;)V"}
     12:14:java.util.List getInvokeInstructionArguments(com.android.tools.r8.lightir.LirInstructionView):1314:1316 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)Ljava/util/ArrayList;"}
     1:1:java.lang.Object getNextValueOperand(com.android.tools.r8.lightir.LirInstructionView):65:65 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)Ljava/lang/Object;"}
     2:2:java.lang.Object getActualValueIndex(int):61:61 -> c
     2:2:java.lang.Object getNextValueOperand(com.android.tools.r8.lightir.LirInstructionView):65 -> c
     3:3:java.lang.Object com.android.tools.r8.lightir.LirCode.decodeValueIndex(int,int):470:470 -> c
@@ -226095,7 +225574,7 @@
     7:7:void onConstInt(int):83:83 -> c
     8:8:void onArithmeticBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):149:149 -> c
     8:8:void onDiv(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):213 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     9:9:void onInvokeSuper(com.android.tools.r8.graph.DexMethod,java.util.List,boolean):414:414 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;Z)V"}
     10:10:void onInvokeVirtual(com.android.tools.r8.graph.DexMethod,java.util.List):418:418 -> c
@@ -226111,52 +225590,52 @@
     2:2:void onConstResourceNumber(int):87:87 -> d
     3:3:void onArithmeticBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):149:149 -> d
     3:3:void onMul(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):193 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     4:4:void onMonitorInstruction(java.lang.Object):507:507 -> d
     4:4:void onMonitorExit(java.lang.Object):515 -> d
     1:1:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> e
     1:1:void onOr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):326 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:2:void onGoto(int):366:366 -> e
     3:3:void onDebugLocalRead():390:390 -> e
     4:4:void onReturn(java.lang.Object):474:474 -> e
     1:1:void onArithmeticBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):149:149 -> f
     1:1:void onRem(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):233 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:2:void onThrow(java.lang.Object):466:466 -> f
     3:3:void onDebugPosition():494:494 -> f
     1:1:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> g
     1:1:void onShl(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):310 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:2:void onFallthrough():378:378 -> g
     1:1:void onInstruction():72:72 -> h
     2:2:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> h
     2:2:void onShr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):314 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     1:1:void onArithmeticBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):149:149 -> i
     1:1:void onSub(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):173 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     2:2:void onReturnVoid():470:470 -> i
     1:1:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> j
     1:1:void onUshr(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):318 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
     1:1:void onLogicalBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):306:306 -> k
     1:1:void onXor(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):330 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;Ljava/lang/Object;)V"}
-com.android.tools.r8.lightir.LirPrinter -> com.android.tools.r8.internal.LK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;Ljava/lang/Object;)V"}
+com.android.tools.r8.lightir.LirPrinter -> com.android.tools.r8.internal.PK:
 # {"id":"sourceFile","fileName":"LirPrinter.java"}
     com.android.tools.r8.lightir.LirCode code -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CK;"}
     java.lang.StringBuilder builder -> d
     int instructionIndexPadding -> e
     int instructionNamePadding -> f
     int valueIndex -> g
     com.android.tools.r8.lightir.LirInstructionView view -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JK;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.LirCode):40:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)V"}
     2:12:void <init>(com.android.tools.r8.lightir.LirCode):31:41 -> <init>
     13:13:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> <init>
     13:13:void <init>(com.android.tools.r8.lightir.LirCode):44 -> <init>
@@ -226184,7 +225663,7 @@
     14:18:void addInstructionHeader(java.lang.String,int):129:133 -> a
     19:20:void appendValueArguments(java.util.List):80:81 -> a
     21:22:void lambda$prettyPrint$0(java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):97:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Lcom/android/tools/r8/internal/r8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Lcom/android/tools/r8/internal/t8;)V"}
     23:23:java.util.Iterator com.android.tools.r8.ir.code.CatchHandlers.iterator():152:152 -> a
     23:23:void lambda$prettyPrint$0(java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):98 -> a
     24:25:void lambda$prettyPrint$0(java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):98:99 -> a
@@ -226196,7 +225675,7 @@
     29:29:void lambda$prettyPrint$0(java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):102 -> a
     30:31:void lambda$prettyPrint$0(java.lang.Integer,com.android.tools.r8.ir.code.CatchHandlers):102:103 -> a
     32:33:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):112:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)V"}
     34:34:int getCurrentValueIndex():55:55 -> a
     34:34:int com.android.tools.r8.lightir.LirParsedInstructionCallback.getCurrentInstructionIndex():57 -> a
     34:34:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):113 -> a
@@ -226213,7 +225692,7 @@
     45:45:void onConstString(com.android.tools.r8.graph.DexString):178:178 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)V"}
     46:46:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     47:47:void onConstClass(com.android.tools.r8.graph.DexType,boolean):189:189 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Z)V"}
     48:48:void onConstMethodHandle(com.android.tools.r8.graph.DexMethodHandle):194:194 -> a
@@ -226225,28 +225704,28 @@
     52:52:void appendValueArguments(java.lang.Object[]):76:76 -> a
     52:52:void onBinop(com.android.tools.r8.ir.code.NumericType,java.lang.Object,java.lang.Object):205 -> a
     53:54:void onNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):210:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     55:55:void appendValueArguments(java.lang.Object[]):76:76 -> a
     55:55:void onNeg(com.android.tools.r8.ir.code.NumericType,java.lang.Object):211 -> a
     56:57:void onNumberConversion(int,java.lang.Object):222:223 -> a
     58:58:void appendValueArguments(java.lang.Object[]):76:76 -> a
     58:58:void onNumberConversion(int,java.lang.Object):223 -> a
     59:59:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):228:228 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;)V"}
     60:60:void appendValueArguments(java.lang.Object[]):76:76 -> a
     60:60:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):228 -> a
     61:61:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):229:229 -> a
     62:62:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):234:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;Ljava/lang/Object;)V"}
     63:63:void appendValueArguments(java.lang.Object[]):76:76 -> a
     63:63:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):234 -> a
     64:64:void onIfCmp(com.android.tools.r8.ir.code.IfType,int,java.lang.Object,java.lang.Object):235:235 -> a
     65:65:void onIntSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):245:245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/nK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/rK;)V"}
     66:66:void appendValueArguments(java.lang.Object[]):76:76 -> a
     66:66:void onIntSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):245 -> a
     67:67:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):251:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/qK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/uK;)V"}
     68:68:void appendValueArguments(java.lang.Object[]):76:76 -> a
     68:68:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):251 -> a
     69:71:void onInvokeMultiNewArray(com.android.tools.r8.graph.DexType,java.util.List):277:279 -> a
@@ -226281,12 +225760,12 @@
     95:95:void onInstanceOf(com.android.tools.r8.graph.DexType,java.lang.Object):389 -> a
     96:96:void onInstanceOf(com.android.tools.r8.graph.DexType,java.lang.Object):390:390 -> a
     97:98:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):395:396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;)V"}
     99:99:void appendValueArguments(java.lang.Object[]):76:76 -> a
     99:99:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):396 -> a
     100:100:void onArrayGet(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object):397:397 -> a
     101:101:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):402:402 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sN;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"}
     102:102:void appendValueArguments(java.lang.Object[]):76:76 -> a
     102:102:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):402 -> a
     103:103:void onArrayPut(com.android.tools.r8.ir.code.MemberType,java.lang.Object,java.lang.Object,java.lang.Object):403:403 -> a
@@ -226309,7 +225788,7 @@
     2:2:void onConstFloat(int):163:163 -> b
     3:3:void onConstLong(long):168:168 -> b
     4:5:void onNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):216:217 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xS;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BS;Ljava/lang/Object;)V"}
     6:6:void appendValueArguments(java.lang.Object[]):76:76 -> b
     6:6:void onNot(com.android.tools.r8.ir.code.NumericType,java.lang.Object):217 -> b
     7:7:void onMoveException(com.android.tools.r8.graph.DexType):262:262 -> b
@@ -226381,22 +225860,22 @@
     14:14:void com.android.tools.r8.lightir.LirCode$TryCatchTable.forEachHandler(java.util.function.BiConsumer):211:211 -> k
     14:14:java.lang.String prettyPrint():95 -> k
     15:15:java.lang.String prettyPrint():107:107 -> k
-com.android.tools.r8.lightir.LirSizeEstimation -> com.android.tools.r8.internal.MK:
+com.android.tools.r8.lightir.LirSizeEstimation -> com.android.tools.r8.internal.QK:
 # {"id":"sourceFile","fileName":"LirSizeEstimation.java"}
     int sizeEstimate -> c
     1:1:void <init>(com.android.tools.r8.lightir.LirCode):48:48 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;)V"}
     2:2:void <init>(com.android.tools.r8.lightir.LirCode):45:45 -> <init>
     1:1:void onInstructionView(com.android.tools.r8.lightir.LirInstructionView):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JK;)V"}
     2:2:void onIntSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$IntSwitchPayload):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/nK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/rK;)V"}
     3:13:void onStringSwitch(java.lang.Object,com.android.tools.r8.lightir.LirBuilder$StringSwitchPayload):84:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/qK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/uK;)V"}
     14:14:void onNewArrayFilledData(int,long,short[],java.lang.Object):99:99 -> a
     1:1:int getCurrentValueIndex():54:54 -> b
     2:2:int instructionSize(int,com.android.tools.r8.lightir.LirInstructionView):359:359 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/FK;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/JK;)I"}
     3:3:int instructionSize(int,com.android.tools.r8.lightir.LirInstructionView):108:108 -> b
     1:1:boolean com.android.tools.r8.lightir.LirOpcodes.isOneByteInstruction(int):16:16 -> f
     1:1:java.lang.String com.android.tools.r8.lightir.LirOpcodes.toString(int):560:560 -> g
@@ -226554,16 +226033,16 @@
     153:153:java.lang.String com.android.tools.r8.lightir.LirOpcodes.toString(int):224:224 -> g
     154:384:java.lang.String com.android.tools.r8.lightir.LirOpcodes.toString(int):222:452 -> g
     385:385:java.lang.String com.android.tools.r8.lightir.LirOpcodes.toString(int):254:254 -> g
-com.android.tools.r8.lightir.LirSsaValueStrategy -> com.android.tools.r8.internal.OK:
+com.android.tools.r8.lightir.LirSsaValueStrategy -> com.android.tools.r8.internal.SK:
 # {"id":"sourceFile","fileName":"LirSsaValueStrategy.java"}
     com.android.tools.r8.lightir.LirSsaValueStrategy INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RK;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     java.lang.Object decodeValueIndex(int,int) -> a
     int encodeValueIndex(java.lang.Object,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/Object;)I"}
-com.android.tools.r8.lightir.LirSsaValueStrategy$RelativeStrategy -> com.android.tools.r8.internal.NK:
+com.android.tools.r8.lightir.LirSsaValueStrategy$RelativeStrategy -> com.android.tools.r8.internal.RK:
 # {"id":"sourceFile","fileName":"LirSsaValueStrategy.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():25:25 -> <clinit>
@@ -226574,31 +226053,31 @@
     2:3:int encodeValueIndex(java.lang.Object,int):25 -> a
     4:4:java.lang.Integer decodeValueIndex(int,int):35:35 -> a
     4:4:java.lang.Object decodeValueIndex(int,int):25 -> a
-com.android.tools.r8.lightir.LirStrategy -> com.android.tools.r8.internal.VK:
+com.android.tools.r8.lightir.LirStrategy -> com.android.tools.r8.internal.ZK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     1:1:void <init>():32:32 -> <init>
     com.android.tools.r8.lightir.LirDecodingStrategy getDecodingStrategy(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/dS;)Lcom/android/tools/r8/internal/CK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/hS;)Lcom/android/tools/r8/internal/GK;"}
     1:1:com.android.tools.r8.lightir.LirStrategy getDefaultStrategy():35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CW;"}
     com.android.tools.r8.lightir.LirEncodingStrategy getEncodingStrategy() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DK;"}
-com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy -> com.android.tools.r8.internal.TK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HK;"}
+com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy -> com.android.tools.r8.internal.XK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     1:1:void <init>():141:141 -> <init>
     1:1:com.android.tools.r8.lightir.LirDecodingStrategy getDecodingStrategy(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):151:151 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/dS;)Lcom/android/tools/r8/internal/CK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/hS;)Lcom/android/tools/r8/internal/GK;"}
     1:1:com.android.tools.r8.lightir.LirEncodingStrategy getEncodingStrategy():145:145 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DK;"}
-com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$DecodingStrategy -> com.android.tools.r8.internal.PK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HK;"}
+com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$DecodingStrategy -> com.android.tools.r8.internal.TK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     com.android.tools.r8.ir.code.Value[] values -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/bl0;"}
     int firstPhiValueIndex -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():240:240 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):246:246 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/dS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/hS;)V"}
     2:2:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> <init>
     2:2:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):247 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -226611,7 +226090,7 @@
     15:17:void com.android.tools.r8.lightir.LirDecodingStrategy.reserveValueIndexes(int):27:29 -> <init>
     15:17:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):256 -> <init>
     1:1:java.lang.Object getValue(java.lang.Object,com.android.tools.r8.lightir.LirStrategyInfo):240:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/bl0;"}
     2:2:boolean com.android.tools.r8.lightir.LirStrategy$PhiOrValue.isNonPhi():94:94 -> a
     2:2:int decode(com.android.tools.r8.lightir.LirStrategy$PhiOrValue,com.android.tools.r8.lightir.LirStrategyInfo):260 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -226651,10 +226130,10 @@
     20:22:java.lang.Object getValue(java.lang.Object,com.android.tools.r8.lightir.LirStrategyInfo):240 -> a
     23:23:com.android.tools.r8.ir.code.Value internalGetFreshUnusedValue(int,com.android.tools.r8.ir.analysis.type.TypeElement):291:291 -> a
     23:23:java.lang.Object internalGetFreshUnusedValue(int,com.android.tools.r8.ir.analysis.type.TypeElement):240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     24:25:com.android.tools.r8.ir.code.Value getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):298:299 -> a
     24:25:java.lang.Object getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/bl0;"}
     26:26:boolean com.android.tools.r8.lightir.LirStrategy$PhiOrValue.isNonPhi():94:94 -> a
     26:26:com.android.tools.r8.ir.code.Value getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):299 -> a
     26:26:java.lang.Object getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):240 -> a
@@ -226662,7 +226141,7 @@
     27:38:java.lang.Object getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):240 -> a
     39:45:com.android.tools.r8.lightir.LirStrategy$PhiOrValue getEncodedPhiForAbsoluteValueIndex(int,com.android.tools.r8.lightir.LirStrategyInfo):341:347 -> a
     39:45:com.android.tools.r8.ir.code.Phi getPhiDefinitionForInstructionIndex(int,java.util.function.IntFunction,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function,com.android.tools.r8.lightir.LirStrategyInfo):322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/h7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/tW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/j7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/xW;"}
     46:46:int com.android.tools.r8.lightir.ByteUtils.ensureU2(int):95:95 -> a
     46:46:int com.android.tools.r8.lightir.LirStrategy$PhiOrValue.ensure15bit(int):77 -> a
     46:46:com.android.tools.r8.lightir.LirStrategy$PhiOrValue com.android.tools.r8.lightir.LirStrategy$PhiOrValue.forPhi(int,int):65 -> a
@@ -226684,12 +226163,12 @@
     64:64:com.android.tools.r8.ir.code.Phi getPhiDefinitionForInstructionIndex(int,java.util.function.IntFunction,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function,com.android.tools.r8.lightir.LirStrategyInfo):322 -> a
     65:65:com.android.tools.r8.lightir.LirStrategy$PhiOrValue getEncodedPhiForAbsoluteValueIndex(int,com.android.tools.r8.lightir.LirStrategyInfo):354:354 -> a
     65:65:com.android.tools.r8.ir.code.Phi getPhiDefinitionForInstructionIndex(int,java.util.function.IntFunction,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function,com.android.tools.r8.lightir.LirStrategyInfo):322 -> a
-com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$EncodingStrategy -> com.android.tools.r8.internal.QK:
+com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$EncodingStrategy -> com.android.tools.r8.internal.UK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     java.util.Map values -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap blocks -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.ArrayList phiTable -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():169:169 -> <clinit>
@@ -226706,7 +226185,7 @@
     10:10:com.android.tools.r8.lightir.LirStrategy$PhiOrValue getEncodedValue(com.android.tools.r8.ir.code.Value):218:218 -> a
     10:10:java.lang.Object getEncodedValue(java.lang.Object):169 -> a
     11:18:void defineBlock(com.android.tools.r8.ir.code.BasicBlock,int):181:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
     19:19:int com.android.tools.r8.lightir.ByteUtils.ensureU2(int):95:95 -> a
     19:19:int com.android.tools.r8.lightir.LirStrategy$PhiOrValue.ensure15bit(int):77 -> a
     19:19:com.android.tools.r8.lightir.LirStrategy$PhiOrValue com.android.tools.r8.lightir.LirStrategy$PhiOrValue.forPhi(int,int):65 -> a
@@ -226722,9 +226201,9 @@
     24:24:void defineBlock(com.android.tools.r8.ir.code.BasicBlock,int):188 -> a
     25:26:void defineBlock(com.android.tools.r8.ir.code.BasicBlock,int):191:192 -> a
     27:28:int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock):223:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
     29:36:com.android.tools.r8.lightir.LirStrategyInfo getStrategyInfo():229:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aL;"}
     1:1:boolean verifyValueIndex(java.lang.Object,int):169:169 -> b
     2:3:boolean verifyValueIndex(com.android.tools.r8.ir.code.Value,int):210:211 -> b
     2:3:boolean verifyValueIndex(java.lang.Object,int):169 -> b
@@ -226752,10 +226231,10 @@
     10:10:boolean verifyValueIndex(com.android.tools.r8.ir.code.Value,int):212:212 -> b
     10:10:boolean verifyValueIndex(java.lang.Object,int):169 -> b
     11:11:boolean isPhiInlineInstruction():176:176 -> b
-com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$ReferenceStrategy -> com.android.tools.r8.internal.RK:
+com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$ReferenceStrategy -> com.android.tools.r8.internal.VK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$ReferenceStrategy INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VK;"}
     1:1:void <clinit>():361:361 -> <clinit>
     1:1:void <init>():359:359 -> <init>
     1:1:int encodeValueIndex(java.lang.Object,int):359:359 -> a
@@ -226766,16 +226245,16 @@
     2:2:int encodeValueIndex(java.lang.Object,int):359 -> a
     3:3:com.android.tools.r8.lightir.LirStrategy$PhiOrValue decodeValueIndex(int,int):370:370 -> a
     3:3:java.lang.Object decodeValueIndex(int,int):359 -> a
-com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$StrategyInfo -> com.android.tools.r8.internal.SK:
+com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$StrategyInfo -> com.android.tools.r8.internal.WK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     int[] phiTable -> a
     com.android.tools.r8.lightir.LirStrategy$ExternalPhisStrategy$StrategyInfo EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WK;"}
     1:1:void <clinit>():155:155 -> <clinit>
     1:2:void <init>(int[]):159:160 -> <init>
     1:1:com.android.tools.r8.lightir.LirSsaValueStrategy getReferenceStrategy():165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OK;"}
-com.android.tools.r8.lightir.LirStrategy$PhiOrValue -> com.android.tools.r8.internal.UK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SK;"}
+com.android.tools.r8.lightir.LirStrategy$PhiOrValue -> com.android.tools.r8.internal.YK:
 # {"id":"sourceFile","fileName":"LirStrategy.java"}
     int value -> a
     boolean $assertionsDisabled -> b
@@ -226798,28 +226277,28 @@
     9:10:int getDecodedValue():102:103 -> toString
     9:10:java.lang.String toString():121 -> toString
     11:11:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.lightir.LirStrategyInfo -> com.android.tools.r8.internal.WK:
+com.android.tools.r8.lightir.LirStrategyInfo -> com.android.tools.r8.internal.aL:
 # {"id":"sourceFile","fileName":"LirStrategyInfo.java"}
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.lightir.LirSsaValueStrategy getReferenceStrategy() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OK;"}
-com.android.tools.r8.lightir.LirUseRegistryCallback -> com.android.tools.r8.internal.XK:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SK;"}
+com.android.tools.r8.lightir.LirUseRegistryCallback -> com.android.tools.r8.internal.bL:
 # {"id":"sourceFile","fileName":"LirUseRegistryCallback.java"}
     com.android.tools.r8.graph.UseRegistry registry -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/a6;"}
     com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata currentMetadata -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b8;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.graph.UseRegistry):31:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/graph/a6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/graph/a6;)V"}
     1:1:void onConstString(com.android.tools.r8.graph.DexString):63:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)V"}
     2:2:void onPhi(java.util.List):93:93 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     3:3:void onCmpInstruction(int,java.lang.Object,java.lang.Object):103:103 -> a
     4:4:void onIf(com.android.tools.r8.ir.code.IfType,int,java.lang.Object):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bu;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/du;ILjava/lang/Object;)V"}
     5:5:void onCheckCast(com.android.tools.r8.graph.DexType,java.lang.Object,boolean):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/lang/Object;Z)V"}
     6:6:void onConstClass(com.android.tools.r8.graph.DexType,boolean):123:123 -> a
@@ -226829,7 +226308,7 @@
     8:8:void onConstMethodType(com.android.tools.r8.graph.DexProto):133:133 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E2;)V"}
     9:10:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):139:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/TP;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/internal/XP;)V"}
     11:11:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     11:11:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):140 -> a
     12:13:void onDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):140:141 -> a
@@ -226888,34 +226367,34 @@
     1:1:void onFallthrough():58:58 -> g
     1:1:void onInstruction():50:50 -> h
     1:1:void onReturnVoid():78:78 -> i
-com.android.tools.r8.lightir.LirWriter -> com.android.tools.r8.internal.YK:
+com.android.tools.r8.lightir.LirWriter -> com.android.tools.r8.internal.cL:
 # {"id":"sourceFile","fileName":"LirWriter.java"}
     com.android.tools.r8.lightir.ByteWriter writer -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G7;"}
     int pendingOperandBytes -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.ByteWriter):17:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G7;)V"}
     2:5:void <init>(com.android.tools.r8.lightir.ByteWriter):15:18 -> <init>
     1:3:void writeOneByteInstruction(int):22:24 -> a
     4:13:void writeInstruction(int,int):28:37 -> a
     1:3:void writeOperand(int):41:43 -> b
-com.android.tools.r8.lightir.PhiInInstructionsStrategy -> com.android.tools.r8.internal.yW:
+com.android.tools.r8.lightir.PhiInInstructionsStrategy -> com.android.tools.r8.internal.CW:
 # {"id":"sourceFile","fileName":"PhiInInstructionsStrategy.java"}
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.lightir.LirDecodingStrategy getDecodingStrategy(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/dS;)Lcom/android/tools/r8/internal/CK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/hS;)Lcom/android/tools/r8/internal/GK;"}
     1:1:com.android.tools.r8.lightir.LirEncodingStrategy getEncodingStrategy():23:23 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DK;"}
-com.android.tools.r8.lightir.PhiInInstructionsStrategy$DecodingStrategy -> com.android.tools.r8.internal.vW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HK;"}
+com.android.tools.r8.lightir.PhiInInstructionsStrategy$DecodingStrategy -> com.android.tools.r8.internal.zW:
 # {"id":"sourceFile","fileName":"PhiInInstructionsStrategy.java"}
     com.android.tools.r8.ir.code.Value[] values -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):100:100 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yK;Lcom/android/tools/r8/internal/dS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CK;Lcom/android/tools/r8/internal/hS;)V"}
     2:2:int com.android.tools.r8.lightir.LirCode.getArgumentCount():480:480 -> <init>
     2:2:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):101 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -226925,25 +226404,25 @@
     5:7:void com.android.tools.r8.lightir.LirDecodingStrategy.reserveValueIndexes(int):27:29 -> <init>
     5:7:void <init>(com.android.tools.r8.lightir.LirCode,com.android.tools.r8.ir.code.NumberGenerator):102 -> <init>
     1:1:java.lang.Object getValue(java.lang.Object,com.android.tools.r8.lightir.LirStrategyInfo):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/bl0;"}
     2:6:com.android.tools.r8.ir.code.Value getValue(java.lang.Integer,com.android.tools.r8.lightir.LirStrategyInfo):107:111 -> a
     2:6:java.lang.Object getValue(java.lang.Object,com.android.tools.r8.lightir.LirStrategyInfo):95 -> a
     7:7:com.android.tools.r8.ir.code.Value internalGetFreshUnusedValue(int,com.android.tools.r8.ir.analysis.type.TypeElement):118:118 -> a
     7:7:java.lang.Object internalGetFreshUnusedValue(int,com.android.tools.r8.ir.analysis.type.TypeElement):95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/bl0;"}
     8:19:com.android.tools.r8.ir.code.Value getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):125:136 -> a
     8:19:java.lang.Object getValueDefinitionForInstructionIndex(int,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function):95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Wi0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/bl0;"}
     20:32:com.android.tools.r8.ir.code.Phi getPhiDefinitionForInstructionIndex(int,java.util.function.IntFunction,com.android.tools.r8.ir.analysis.type.TypeElement,java.util.function.Function,com.android.tools.r8.lightir.LirStrategyInfo):149:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/h7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/WK;)Lcom/android/tools/r8/internal/tW;"}
-com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy -> com.android.tools.r8.internal.wW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/IntFunction;Lcom/android/tools/r8/internal/j7;Ljava/util/function/Function;Lcom/android/tools/r8/internal/aL;)Lcom/android/tools/r8/internal/xW;"}
+com.android.tools.r8.lightir.PhiInInstructionsStrategy$EncodingStrategy -> com.android.tools.r8.internal.AW:
 # {"id":"sourceFile","fileName":"PhiInInstructionsStrategy.java"}
     com.android.tools.r8.lightir.LirSsaValueStrategy referenceStrategy -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RK;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap values -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap blocks -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():32:32 -> <clinit>
     1:8:void <init>():32:39 -> <init>
@@ -226954,32 +226433,32 @@
     5:5:java.lang.Integer getEncodedValue(com.android.tools.r8.ir.code.Value):66:66 -> a
     5:5:java.lang.Object getEncodedValue(java.lang.Object):32 -> a
     6:7:void defineBlock(com.android.tools.r8.ir.code.BasicBlock,int):48:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;I)V"}
     8:9:int getBlockIndex(com.android.tools.r8.ir.code.BasicBlock):71:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)I"}
     10:10:com.android.tools.r8.lightir.LirStrategyInfo getStrategyInfo():77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aL;"}
     1:1:boolean verifyValueIndex(java.lang.Object,int):32:32 -> b
     2:2:boolean verifyValueIndex(com.android.tools.r8.ir.code.Value,int):60:60 -> b
     2:2:boolean verifyValueIndex(java.lang.Object,int):32 -> b
     3:3:boolean isPhiInlineInstruction():43:43 -> b
-com.android.tools.r8.lightir.PhiInInstructionsStrategy$StrategyInfo -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.lightir.PhiInInstructionsStrategy$StrategyInfo -> com.android.tools.r8.internal.BW:
 # {"id":"sourceFile","fileName":"PhiInInstructionsStrategy.java"}
     com.android.tools.r8.lightir.LirSsaValueStrategy referenceStrategy -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RK;"}
     1:2:void <init>(com.android.tools.r8.lightir.LirSsaValueStrategy):85:86 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RK;)V"}
     1:1:com.android.tools.r8.lightir.LirSsaValueStrategy getReferenceStrategy():91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/SK;"}
 com.android.tools.r8.naming.ApplyMappingError -> com.android.tools.r8.naming.a:
 # {"id":"sourceFile","fileName":"ApplyMappingError.java"}
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):27:27 -> <init>
 com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.naming.b:
 # {"id":"sourceFile","fileName":"ClassNameMapper.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.utils.BiMapContainer nameMapping -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T5;"}
     java.util.Map signatureMap -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.LinkedHashSet mapVersions -> d
@@ -226989,7 +226468,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():46:46 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.LinkedHashSet,java.util.Map,java.util.List):237:237 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Ljava/util/LinkedHashSet;Ljava/util/HashMap;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Ljava/util/LinkedHashSet;Ljava/util/HashMap;Ljava/util/List;)V"}
     2:15:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.LinkedHashSet,java.util.Map,java.util.List):228:241 -> <init>
     1:1:com.android.tools.r8.naming.LineReader com.android.tools.r8.naming.LineReader.fromBufferedReader(java.io.BufferedReader):18:18 -> a
     1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean,boolean):196 -> a
@@ -227022,7 +226501,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/lang/String;Lcom/android/tools/r8/naming/k;)V"}
     31:35:java.lang.String deobfuscateClassName(java.lang.String):298:302 -> a
     36:37:void lambda$combine$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper):333:334 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Ljava/lang/String;Lcom/android/tools/r8/naming/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Ljava/lang/String;Lcom/android/tools/r8/naming/k;)V"}
     38:38:boolean isEmpty():371:371 -> a
     38:38:com.android.tools.r8.naming.ClassNameMapper combine(com.android.tools.r8.naming.ClassNameMapper):314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;)Lcom/android/tools/r8/naming/b;"}
@@ -227041,7 +226520,7 @@
     72:72:java.lang.String lambda$sorted$4(com.android.tools.r8.naming.ClassNamingForNameMapper):376:376 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;)Ljava/lang/String;"}
     73:73:void write(com.android.tools.r8.utils.ChainableStringConsumer):399:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;)V"}
     74:74:java.util.Map getClassNameMappings():245:245 -> a
     74:74:boolean verifyIsSorted():384 -> a
     74:74:void write(com.android.tools.r8.utils.ChainableStringConsumer):399 -> a
@@ -227101,7 +226580,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/naming/b$a;)V"}
     2:2:java.util.Map getClassNameMappings():245:245 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     3:3:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):367:367 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/k;"}
     1:3:com.android.tools.r8.com.google.common.io.CharSource com.android.tools.r8.com.google.common.io.CharSource.wrap(java.lang.CharSequence):491:493 -> c
@@ -227124,7 +226603,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/HashSet;"}
     1:2:boolean equals(java.lang.Object):426:427 -> equals
     1:1:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():413:413 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/T5;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap.builder():290:290 -> f
     2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():414 -> f
     3:4:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():415:416 -> f
@@ -227173,7 +226652,7 @@
     8:8:com.android.tools.r8.naming.ClassNamingForNameMapper com.android.tools.r8.naming.ClassNamingForNameMapper$Builder.build():91:91 -> a
     8:8:void lambda$buildClassNameMappings$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Ljava/lang/String;Lcom/android/tools/r8/naming/k$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Ljava/lang/String;Lcom/android/tools/r8/naming/k$a;)V"}
     9:18:com.android.tools.r8.naming.ClassNamingForNameMapper com.android.tools.r8.naming.ClassNamingForNameMapper$Builder.build():91:100 -> a
     9:18:void lambda$buildClassNameMappings$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):101 -> a
     19:19:void lambda$buildClassNameMappings$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):101:101 -> a
@@ -227185,7 +226664,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/naming/x0;"}
     1:1:boolean hasMapping(java.lang.String):89:89 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():99:100 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> b
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():102 -> b
 com.android.tools.r8.naming.ClassNameMapper$MissingFileAction -> com.android.tools.r8.naming.b$b:
@@ -227234,7 +226713,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     31:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,java.lang.Iterable):65:69 -> <init>
     1:10:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):90:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/naming/d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/naming/d;"}
     11:11:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.graph.AppInfoWithClassHierarchy.getMissingClasses():152:152 -> a
     11:11:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -227324,10 +226803,10 @@
 com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> com.android.tools.r8.naming.d:
 # {"id":"sourceFile","fileName":"ClassNameMinifier.java"}
     java.util.Map packageRenaming -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map classRenaming -> b
     1:3:void <init>(java.util.Map,java.util.Map):82:84 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Du;)V"}
 com.android.tools.r8.naming.ClassNameMinifier$Namespace -> com.android.tools.r8.naming.e:
 # {"id":"sourceFile","fileName":"ClassNameMinifier.java"}
     java.lang.String packageName -> b
@@ -227368,11 +226847,11 @@
     com.android.tools.r8.position.Position position -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/F0;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap qualifiedMethodMembers -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:7:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,java.util.Map,java.util.Map,java.util.Map):151:157 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/naming/F0;Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)V"}
     com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature) -> a
@@ -227388,7 +226867,7 @@
     com.android.tools.r8.position.Position position -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/F0;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     java.util.Map qualifiedMethodMembers -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map methodMembers -> f
@@ -227396,7 +226875,7 @@
     java.util.Map fieldMembers -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/naming/F0;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/naming/F0;Lcom/android/tools/r8/internal/d50;)V"}
     2:10:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.utils.Reporter):48:56 -> <init>
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/N0;Ljava/lang/String;)Lcom/android/tools/r8/naming/k$b;"}
@@ -227423,9 +226902,9 @@
     java.lang.String originalName -> a
     java.lang.String renamedName -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap methodMembers -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap fieldMembers -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map mappedRangesByRenamedName -> e
     java.util.Map mappedFieldNamingsByName -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -227464,7 +226943,7 @@
     46:47:void lambda$visitAllFullyQualifiedReferences$2(java.util.function.Consumer,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):492:493 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/naming/k$b;)V"}
     48:56:void write(com.android.tools.r8.utils.ChainableStringConsumer):520:528 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;)V"}
     57:57:void forAllFieldNamingSorted(com.android.tools.r8.utils.ThrowingConsumer):466:466 -> a
     57:57:void write(com.android.tools.r8.utils.ChainableStringConsumer):528 -> a
     58:59:java.util.Collection com.android.tools.r8.utils.CollectionUtils.sort(java.util.Collection):67:68 -> a
@@ -227474,9 +226953,9 @@
     60:61:void write(com.android.tools.r8.utils.ChainableStringConsumer):528 -> a
     62:70:void write(com.android.tools.r8.utils.ChainableStringConsumer):538:546 -> a
     71:71:void lambda$write$4(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):525:525 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     72:74:void lambda$write$5(com.android.tools.r8.utils.ChainableStringConsumer,java.lang.String,com.android.tools.r8.naming.MemberNaming):530:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Ljava/lang/String;Lcom/android/tools/r8/naming/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Ljava/lang/String;Lcom/android/tools/r8/naming/V;)V"}
     75:75:int lambda$write$6(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):542:542 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)I"}
     1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):415:425 -> b
@@ -227580,7 +227059,7 @@
     1:4:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):648:651 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     5:11:java.util.List filter(java.util.function.Predicate,java.util.function.Function):657:663 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/xu;"}
     12:15:int getFirstPositionOfOriginalRange(int):707:710 -> a
     16:16:com.android.tools.r8.naming.MemberNaming$MethodSignature getOriginalSignature():720:720 -> a
     16:16:com.android.tools.r8.naming.MemberNaming$Signature getOriginalSignature():604 -> a
@@ -227602,10 +227081,10 @@
     1:1:com.android.tools.r8.naming.MemberNaming$MethodSignature getOriginalSignature():720:720 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/V$b;"}
     1:1:java.util.List getOutlineCallsiteInformation():667:667 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:7:int hashCode():806:812 -> hashCode
     1:6:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation getOutlineMappingInformation():679:684 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oV;"}
     1:4:com.android.tools.r8.naming.MemberNaming$MethodSignature getResidualSignature():754:757 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/V$b;"}
     5:5:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.asRenamed(java.lang.String):440:440 -> j
@@ -227617,7 +227096,7 @@
     7:7:com.android.tools.r8.naming.MemberNaming$MethodSignature getResidualSignature():757 -> j
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature getResidualSignature():757:757 -> j
     1:1:java.util.List getRewriteFrameMappingInformation():673:673 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:boolean isOriginalRangePreamble():846:846 -> l
     2:2:boolean com.android.tools.r8.naming.Range.isPreamble():75:75 -> l
     2:2:boolean isOriginalRangePreamble():846 -> l
@@ -227666,7 +227145,7 @@
     com.android.tools.r8.naming.ComposingBuilder$ComposingData current -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/s;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.naming.Range EMPTY_RANGE -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/N0;"}
     1:1:void <clinit>():56:56 -> <clinit>
@@ -227674,7 +227153,7 @@
     2:2:void <clinit>():56 -> <clinit>
     3:3:void <clinit>():56:56 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):83:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:28:void <init>(com.android.tools.r8.utils.InternalOptions):58:84 -> <init>
     1:25:void compose(com.android.tools.r8.naming.ClassNameMapper):88:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;)V"}
@@ -227716,16 +227195,16 @@
     com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder committedPreviousClassBuilder -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/r;"}
     com.android.tools.r8.utils.InternalOptions options -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():432:432 -> <clinit>
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ComposingBuilder$ComposingData,com.android.tools.r8.naming.ComposingBuilder$ComposingData,com.android.tools.r8.utils.InternalOptions):457:457 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/naming/s;Lcom/android/tools/r8/naming/s;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/naming/s;Lcom/android/tools/r8/naming/s;Lcom/android/tools/r8/internal/iB;)V"}
     2:27:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ComposingBuilder$ComposingData,com.android.tools.r8.naming.ComposingBuilder$ComposingData,com.android.tools.r8.utils.InternalOptions):439:464 -> <init>
     1:1:com.android.tools.r8.references.MethodReference com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation.getOutline():83:83 -> a
     1:1:java.lang.String lambda$fixupOutlineCallsiteInformation$6(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):860 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iV;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mV;)Ljava/lang/String;"}
     2:2:java.lang.String lambda$fixupOutlineCallsiteInformation$6(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):860:860 -> a
     3:3:java.lang.String getOriginalName():468:468 -> a
     4:9:void compose(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper):477:482 -> a
@@ -227756,7 +227235,7 @@
     42:75:java.util.List getExistingMappedRanges(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):540:573 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)Ljava/util/List;"}
     76:76:com.android.tools.r8.utils.SegmentTree lambda$composeMethodNamings$3(com.android.tools.r8.naming.MemberNaming$MethodSignature):666:666 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$b;)Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$b;)Lcom/android/tools/r8/internal/Aa0;"}
     77:117:java.util.List fixupInlinedOutlines(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$ComputedOutlineInformation,java.util.List):695:735 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/o;Ljava/util/ArrayList;)Ljava/util/List;"}
     118:136:java.util.List fixupInlinedOutlines(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$ComputedOutlineInformation,java.util.List):733:751 -> a
@@ -227806,7 +227285,7 @@
     370:370:void com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation.setPositionsInternal(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap):136:136 -> a
     370:370:void fixupOutlineCallsiteInformation(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$ComputedOutlineInformation,java.util.List):902 -> a
     371:372:void lambda$fixupOutlineCallsiteInformation$7(com.android.tools.r8.utils.IntBox,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges):876:877 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/naming/k$b;Ljava/util/List;Lcom/android/tools/r8/internal/cx;Lcom/android/tools/r8/naming/q;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/naming/k$b;Ljava/util/List;Lcom/android/tools/r8/internal/ex;Lcom/android/tools/r8/naming/q;)V"}
     373:373:void com.android.tools.r8.naming.Range.<init>(int,int):22:22 -> a
     373:373:void lambda$fixupOutlineCallsiteInformation$7(com.android.tools.r8.utils.IntBox,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges):877 -> a
     374:374:void lambda$fixupOutlineCallsiteInformation$7(com.android.tools.r8.utils.IntBox,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges):879:879 -> a
@@ -227838,7 +227317,7 @@
     400:400:void lambda$fixupOutlineCallsiteInformation$7(com.android.tools.r8.utils.IntBox,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges):900 -> a
     401:401:void lambda$fixupOutlineCallsiteInformation$7(com.android.tools.r8.utils.IntBox,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges):900:900 -> a
     402:402:void visitOutlineMappedPositions(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.util.function.Consumer):939:939 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iV;Lcom/android/tools/r8/naming/V$b;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mV;Lcom/android/tools/r8/naming/V$b;Ljava/util/function/Consumer;)V"}
     403:405:com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder getExistingClassBuilder(com.android.tools.r8.naming.MemberNaming$MethodSignature):1050:1052 -> a
     403:405:void visitOutlineMappedPositions(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.util.function.Consumer):940 -> a
     406:408:void visitOutlineMappedPositions(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.util.function.Consumer):945:947 -> a
@@ -227848,7 +227327,7 @@
     443:443:void visitOutlineMappedPositions(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.util.function.Consumer):949:949 -> a
     444:444:void visitOutlineMappedPositions(com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.util.function.Consumer):942:942 -> a
     445:446:void lambda$registerMappingInformationFromMappedRanges$8(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):1066:1067 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U90;Lcom/android/tools/r8/internal/T90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y90;Lcom/android/tools/r8/internal/X90;)V"}
     447:452:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange composeOnMethodSignature(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1211:1216 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/r;Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/naming/k$b;"}
     453:453:boolean com.android.tools.r8.naming.Range.isSingleLine():62:62 -> a
@@ -227917,7 +227396,7 @@
     549:549:void lambda$composeMappingInformation$13(java.util.Set,java.util.function.Consumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):1388 -> a
     550:550:void lambda$composeMappingInformation$13(java.util.Set,java.util.function.Consumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):1389:1389 -> a
     551:551:void write(com.android.tools.r8.utils.ChainableStringConsumer):1395:1395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eb;)V"}
     552:552:com.android.tools.r8.utils.ChainableStringConsumer com.android.tools.r8.utils.ChainableStringConsumer$1.accept(java.lang.String):18:18 -> a
     552:552:void write(com.android.tools.r8.utils.ChainableStringConsumer):1395 -> a
     553:553:void write(com.android.tools.r8.utils.ChainableStringConsumer):1395:1395 -> a
@@ -227931,18 +227410,18 @@
     558:558:void write(com.android.tools.r8.utils.ChainableStringConsumer):1395 -> a
     559:561:void write(com.android.tools.r8.utils.ChainableStringConsumer):1396:1398 -> a
     562:562:void lambda$write$14(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):1396:1396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     563:563:void lambda$writeFields$15(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):1405:1405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Lcom/android/tools/r8/naming/V;)V"}
     564:564:void lambda$writeMethods$16(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1411:1411 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/k$b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/k$b;)V"}
     565:565:java.util.List com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getAdditionalMappingInformation():817:817 -> a
     565:565:void lambda$writeMethods$16(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1412 -> a
     566:567:void lambda$writeMethods$16(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1412:1413 -> a
     568:568:void lambda$writeMethods$18(com.android.tools.r8.utils.ChainableStringConsumer,java.util.List):1423:1423 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Ljava/util/List;)V"}
     569:569:void lambda$writeMethods$17(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1425:1425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/naming/k$b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fb;Lcom/android/tools/r8/naming/k$b;)V"}
     570:570:java.util.List com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getAdditionalMappingInformation():817:817 -> a
     570:570:void lambda$writeMethods$17(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1427 -> a
     571:576:void lambda$writeMethods$17(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1427:1432 -> a
@@ -227954,9 +227433,9 @@
     616:616:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange lambda$commit$20(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):1463:1463 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/naming/k$b;"}
     617:617:com.android.tools.r8.utils.SegmentTree lambda$commit$21(com.android.tools.r8.utils.SegmentTree,com.android.tools.r8.utils.SegmentTree):1477:1477 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wa0;Lcom/android/tools/r8/internal/wa0;)Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aa0;Lcom/android/tools/r8/internal/Aa0;)Lcom/android/tools/r8/internal/Aa0;"}
     618:622:void putAll(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction):1487:1491 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;Lcom/android/tools/r8/internal/Sg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;Lcom/android/tools/r8/internal/Wg0;)V"}
     623:623:void putAll(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction):1490:1490 -> a
     624:626:com.android.tools.r8.naming.MemberNaming$MethodSignature potentiallyQualifySignature(com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.MemberNaming$MethodSignature,java.lang.String):1497:1499 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/V$b;Ljava/lang/String;)Lcom/android/tools/r8/naming/V$b;"}
@@ -227974,7 +227453,7 @@
     32:32:void lambda$composeOnMethodSignature$9(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):1232:1232 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     33:35:void writeFields(com.android.tools.r8.utils.ChainableStringConsumer):1402:1404 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eb;)V"}
     1:34:void composeMethodNamings(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNameMapper):586:619 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/naming/k;)V"}
     35:36:void com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$RangeBuilder.addRange(com.android.tools.r8.naming.Range):1510:1511 -> c
@@ -228140,7 +227619,7 @@
     215:217:void composeMethodNamings(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNameMapper):661 -> c
     218:227:void composeMethodNamings(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNameMapper):662:671 -> c
     228:240:void writeMethods(com.android.tools.r8.utils.ChainableStringConsumer):1409:1421 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eb;)V"}
 com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$1 -> com.android.tools.r8.naming.m:
 # {"id":"sourceFile","fileName":"ComposingBuilder.java"}
     int val$outlinePosition -> a
@@ -228189,7 +227668,7 @@
     25:26:java.util.List getPreviousRanges(int):1278:1279 -> a
 com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$OutlineCallSitePositionWithMappedRanges -> com.android.tools.r8.naming.q:
 # {"id":"sourceFile","fileName":"ComposingBuilder.java"}
-com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$RangeBuilder -> R8$$REMOVED$$CLASS$$205:
+com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder$RangeBuilder -> R8$$REMOVED$$CLASS$$193:
 # {"id":"sourceFile","fileName":"ComposingBuilder.java"}
 com.android.tools.r8.naming.ComposingBuilder$ComposingData -> com.android.tools.r8.naming.s:
 # {"id":"sourceFile","fileName":"ComposingBuilder.java"}
@@ -228228,14 +227707,14 @@
     16:16:void addSignatureToRemove(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder,com.android.tools.r8.naming.MemberNaming$Signature):247:247 -> a
     17:19:void addSignatureToRemove(com.android.tools.r8.naming.ComposingBuilder$ComposingClassBuilder,com.android.tools.r8.naming.MemberNaming$Signature):246:248 -> a
     20:20:void lambda$commitRewriteFrameInformation$1(java.util.Map,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):260:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/T90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/X90;)V"}
     21:21:com.android.tools.r8.references.ClassReference com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition.getClassReference():198:198 -> a
     21:21:void lambda$commitRewriteFrameInformation$1(java.util.Map,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):263 -> a
     22:22:void lambda$commitRewriteFrameInformation$1(java.util.Map,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):263:263 -> a
     23:23:void com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition.setClassReferenceInternal(com.android.tools.r8.references.ClassReference):194:194 -> a
     23:23:void lambda$commitRewriteFrameInformation$1(java.util.Map,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):262 -> a
     24:25:void lambda$commitOutlineCallsiteInformation$4(com.android.tools.r8.naming.ComposingBuilder$ComposingData,java.util.Map,java.util.Map,com.android.tools.r8.naming.ComposingBuilder$ClassTypeNameAndMethodName,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):279:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/s;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/naming/l;Lcom/android/tools/r8/internal/iV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/s;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/naming/l;Lcom/android/tools/r8/internal/mV;)V"}
     26:26:com.android.tools.r8.references.MethodReference com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation.getOutline():83:83 -> a
     26:26:void lambda$commitOutlineCallsiteInformation$4(com.android.tools.r8.naming.ComposingBuilder$ComposingData,java.util.Map,java.util.Map,com.android.tools.r8.naming.ComposingBuilder$ClassTypeNameAndMethodName,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -228261,14 +227740,14 @@
     54:54:void lambda$commitOutlineCallsiteInformation$4(com.android.tools.r8.naming.ComposingBuilder$ComposingData,java.util.Map,java.util.Map,com.android.tools.r8.naming.ComposingBuilder$ClassTypeNameAndMethodName,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):310:310 -> a
     55:55:void lambda$commitOutlineCallsiteInformation$4(com.android.tools.r8.naming.ComposingBuilder$ComposingData,java.util.Map,java.util.Map,com.android.tools.r8.naming.ComposingBuilder$ClassTypeNameAndMethodName,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):308:308 -> a
     56:56:void lambda$commitOutlineCallsiteInformation$3(com.android.tools.r8.naming.ComposingBuilder$MappedRangeOriginalToMinifiedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):293:293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/t;Lcom/android/tools/r8/internal/cx;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/t;Lcom/android/tools/r8/internal/ex;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
     57:57:void lambda$commitOutlineCallsiteInformation$3(com.android.tools.r8.naming.ComposingBuilder$MappedRangeOriginalToMinifiedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):292:292 -> a
     58:58:void lambda$commitOutlineCallsiteInformation$2(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):294:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
     59:61:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Integer,java.lang.Integer):97:99 -> a
     59:61:void lambda$commitOutlineCallsiteInformation$2(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):294 -> a
     62:64:void addNewOutlineCallsiteInformation(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):319:321 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/iV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/mV;)V"}
     65:65:void addNewOutlineCallsiteInformation(com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation):319:319 -> a
     66:66:com.android.tools.r8.naming.ComposingBuilder$UpdateOutlineCallsiteInformation getUpdateOutlineCallsiteInformation(java.lang.String,java.lang.String,java.lang.String):327:327 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/naming/u;"}
@@ -228297,9 +227776,9 @@
 com.android.tools.r8.naming.ComposingBuilder$MappedRangeOriginalToMinifiedMap -> com.android.tools.r8.naming.t:
 # {"id":"sourceFile","fileName":"ComposingBuilder.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap originalToMinified -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):405:406 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
     1:1:com.android.tools.r8.naming.ComposingBuilder$MappedRangeOriginalToMinifiedMap build(java.util.List):410:410 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/naming/t;"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> a
@@ -228319,9 +227798,9 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(java.nio.file.Path):27:29 -> <init>
     1:40:java.lang.String readName(com.android.tools.r8.utils.Reporter):33:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Ljava/lang/String;"}
     41:54:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):85:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/xu;"}
     55:71:com.android.tools.r8.com.google.common.collect.ImmutableList readAllNames(java.nio.file.Path,com.android.tools.r8.utils.Reporter):87:103 -> a
     1:2:void close():77:78 -> close
 com.android.tools.r8.naming.FieldNameMinifier -> com.android.tools.r8.naming.z:
@@ -228388,7 +227867,7 @@
     65:67:void patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.naming.ReservedFieldNamingState):163:165 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/naming/R0;)V"}
     68:75:com.android.tools.r8.utils.TraversalContinuation lambda$patchUpAllIndirectlyImplementingInterfacesFromLibraryAndClassPath$2(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):168:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/R0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/R0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     76:77:void renameFieldsInClasses():180:181 -> a
     78:78:com.android.tools.r8.graph.TopDownClassHierarchyTraversal com.android.tools.r8.graph.TopDownClassHierarchyTraversal.forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     78:78:void renameFieldsInClasses():181 -> a
@@ -228832,7 +228311,7 @@
 com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.naming.E:
 # {"id":"sourceFile","fileName":"IdentifierNameStringMarker.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():57:57 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):62:63 -> <init>
@@ -228855,7 +228334,7 @@
     114:114:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):109:109 -> a
     114:114:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):90 -> a
     115:115:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Ljava/util/Set;)Lcom/android/tools/r8/internal/Id;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Ljava/util/Set;)Lcom/android/tools/r8/internal/Kd;"}
     116:116:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     116:116:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):117 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -228885,12 +228364,12 @@
     207:207:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     207:207:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     208:208:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveConstString():119:119 -> a
     208:208:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     209:210:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236:237 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/K5;Lcom/android/tools/r8/internal/Lw;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/Lw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/M5;Lcom/android/tools/r8/internal/Nw;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/Nw;"}
     211:212:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):178:179 -> a
     211:212:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237 -> a
     213:214:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):184:185 -> a
@@ -228965,15 +228444,15 @@
     470:470:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):364 -> a
     471:471:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):363:363 -> a
     472:472:boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$1(com.android.tools.r8.ir.code.ConstString,com.android.tools.r8.ir.code.Instruction):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/internal/Kw;)Z"}
     473:473:boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction):275:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/Kw;)Z"}
     474:474:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):361:361 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;J)Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;J)Lcom/android/tools/r8/internal/bl0;"}
     475:501:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):396:422 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/H2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/H2;)V"}
     1:1:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):71:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Ge;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Ie;)Lcom/android/tools/r8/internal/Ld;"}
     2:2:java.lang.String getRewriterId():81:81 -> b
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.F:
 # {"id":"sourceFile","fileName":"IdentifierNameStringUtils.java"}
@@ -228983,7 +228462,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Z"}
     90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):117:123 -> a
     97:97:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Rt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Tt;"}
     98:98:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     98:98:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -229103,7 +228582,7 @@
     282:285:com.android.tools.r8.graph.DexField inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):386:389 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/lang/String;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/l1;"}
     286:289:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):418:421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/graph/I2;"}
     290:290:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     290:290:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):421 -> a
     291:291:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):422:422 -> a
@@ -229122,14 +228601,14 @@
     299:357:com.android.tools.r8.graph.DexTypeList evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):435:493 -> a
     299:357:com.android.tools.r8.graph.DexTypeList evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.internal.NewArrayEmpty,java.util.ArrayList,com.android.tools.r8.internal.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/K2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mQ;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/K2;"}
     358:358:com.android.tools.r8.graph.DexTypeList evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.internal.NewArrayEmpty,java.util.ArrayList,com.android.tools.r8.internal.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
     359:362:com.android.tools.r8.graph.DexTypeList evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):500:503 -> a
     359:362:com.android.tools.r8.graph.DexTypeList evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.internal.NewArrayEmpty,java.util.ArrayList,com.android.tools.r8.internal.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):0 -> a
     363:363:boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction):455:455 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;Lcom/android/tools/r8/internal/Iw;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mQ;Lcom/android/tools/r8/internal/Kw;)Z"}
     1:6:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):190:195 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/bl0;)Z"}
     7:7:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> b
     7:7:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):195 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -229158,7 +228637,7 @@
     3:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.SubtypingInfo):391:400 -> <init>
     1:1:java.util.Comparator getDefaultInterfaceMethodOrdering():414:414 -> a
     2:4:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):429:431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Ljava/util/List;)V"}
     5:7:void reserveNamesInInterfaces(java.lang.Iterable):418:420 -> a
     5:7:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):432 -> a
     8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):118:118 -> a
@@ -229253,7 +228732,7 @@
     234:235:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):616 -> a
     236:238:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.lang.Iterable):619:621 -> a
     239:243:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):470:474 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dm;Lcom/android/tools/r8/graph/D0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fm;Lcom/android/tools/r8/graph/D0;)V"}
     244:244:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     244:244:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):475 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -229328,7 +228807,7 @@
     318:318:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
     318:318:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):516 -> a
     319:319:void lambda$assignNamesToInterfaceMethods$3(com.android.tools.r8.utils.collections.DexClassAndMethodMap,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):529:529 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bl;Lcom/android/tools/r8/internal/mo;Lcom/android/tools/r8/internal/mo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dl;Lcom/android/tools/r8/internal/po;Lcom/android/tools/r8/internal/po;)V"}
     320:320:void lambda$assignNamesToInterfaceMethods$4(com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):532:532 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Ljava/util/Set;)V"}
     321:321:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
@@ -229464,17 +228943,17 @@
     1:1:void <init>(java.util.Map):404:404 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMethod):408:408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/po;"}
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMethod):408 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):404:404 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/po;"}
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.I:
 # {"id":"sourceFile","fileName":"InterfaceMethodNameMinifier.java"}
     java.util.Set callSites -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.utils.collections.DexClassAndMethodMap methodStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dl;"}
     java.util.List callSiteCollidingMethods -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.naming.InterfaceMethodNameMinifier this$0 -> e
@@ -229545,7 +229024,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/naming/J;)Ljava/lang/Object;"}
     44:56:java.lang.Object forAnyState(java.util.function.BiFunction):332:344 -> a
     57:58:com.android.tools.r8.utils.TraversalContinuation lambda$forAnyState$5(java.util.function.BiFunction,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):335:336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/H0;Ljava/util/Set;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/H0;Ljava/util/Set;)Lcom/android/tools/r8/internal/Oh0;"}
     59:59:com.android.tools.r8.utils.TraversalContinuation$Break com.android.tools.r8.utils.TraversalContinuation.doBreak(java.lang.Object):152:152 -> a
     59:59:com.android.tools.r8.utils.TraversalContinuation lambda$forAnyState$5(java.util.function.BiFunction,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):338 -> a
     60:60:com.android.tools.r8.utils.TraversalContinuation lambda$forAnyState$5(java.util.function.BiFunction,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):341:341 -> a
@@ -229678,43 +229157,47 @@
     9:9:java.util.List synthesizeKotlinModuleFiles():57 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:13:java.util.List synthesizeKotlinModuleFiles():58:61 -> a
-    14:14:java.lang.String com.android.tools.r8.kotlin.KotlinFileFacadeInfo.getModuleName():72:72 -> a
+    14:14:java.lang.String com.android.tools.r8.kotlin.KotlinFileFacadeInfo.getModuleName():71:71 -> a
     14:14:java.util.List synthesizeKotlinModuleFiles():61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:java.lang.String com.android.tools.r8.kotlin.KotlinPackageInfo.getModuleName():97:97 -> a
-    15:15:java.lang.String com.android.tools.r8.kotlin.KotlinFileFacadeInfo.getModuleName():72 -> a
+    15:15:java.lang.String com.android.tools.r8.kotlin.KotlinFileFacadeInfo.getModuleName():71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:java.util.List synthesizeKotlinModuleFiles():61 -> a
     16:16:java.util.List synthesizeKotlinModuleFiles():61:61 -> a
     17:23:java.util.List synthesizeKotlinModuleFiles():60:66 -> a
-    24:24:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():93:93 -> a
+    24:24:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():83:83 -> a
     24:24:java.util.List synthesizeKotlinModuleFiles():68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:25:java.util.List synthesizeKotlinModuleFiles():68:68 -> a
-    26:26:java.util.List synthesizeKotlinModuleFiles():67:67 -> a
-    27:27:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():79:79 -> a
-    27:27:java.util.List synthesizeKotlinModuleFiles():72 -> a
-    28:28:java.lang.String com.android.tools.r8.kotlin.KotlinPackageInfo.getModuleName():97:97 -> a
-    28:28:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():79 -> a
+    25:25:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():296:296 -> a
+    25:25:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    25:25:java.util.List synthesizeKotlinModuleFiles():68 -> a
+    26:26:java.util.List synthesizeKotlinModuleFiles():68:68 -> a
+    27:27:java.util.List synthesizeKotlinModuleFiles():67:67 -> a
+    28:28:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():69:69 -> a
     28:28:java.util.List synthesizeKotlinModuleFiles():72 -> a
-    29:29:java.util.List synthesizeKotlinModuleFiles():72:72 -> a
-    30:36:java.util.List synthesizeKotlinModuleFiles():71:77 -> a
-    37:37:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
-    37:37:java.util.List synthesizeKotlinModuleFiles():78 -> a
+    29:29:java.lang.String com.android.tools.r8.kotlin.KotlinPackageInfo.getModuleName():97:97 -> a
+    29:29:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:57:java.util.List synthesizeKotlinModuleFiles():79:98 -> a
-    58:58:com.android.tools.r8.naming.KotlinModuleSynthesizer$KotlinModuleInfoBuilder lambda$synthesizeKotlinModuleFiles$0(java.lang.String):62:62 -> a
+    29:29:java.util.List synthesizeKotlinModuleFiles():72 -> a
+    30:30:java.util.List synthesizeKotlinModuleFiles():72:72 -> a
+    31:37:java.util.List synthesizeKotlinModuleFiles():71:77 -> a
+    38:38:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
+    38:38:java.util.List synthesizeKotlinModuleFiles():78 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    39:58:java.util.List synthesizeKotlinModuleFiles():79:98 -> a
+    59:59:com.android.tools.r8.naming.KotlinModuleSynthesizer$KotlinModuleInfoBuilder lambda$synthesizeKotlinModuleFiles$0(java.lang.String):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/M;"}
-    59:59:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():79:79 -> a
-    59:59:java.lang.String lambda$synthesizeKotlinModuleFiles$1(com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo,java.lang.String):69 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/e0;Ljava/lang/String;)Ljava/lang/String;"}
-    60:60:java.lang.String com.android.tools.r8.kotlin.KotlinPackageInfo.getModuleName():97:97 -> a
-    60:60:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():79 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    60:60:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():69:69 -> a
     60:60:java.lang.String lambda$synthesizeKotlinModuleFiles$1(com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo,java.lang.String):69 -> a
-    61:61:void lambda$synthesizeKotlinModuleFiles$3(java.util.List,com.android.tools.r8.naming.KotlinModuleSynthesizer$KotlinModuleInfoBuilder):98:98 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/kotlin/f0;Ljava/lang/String;)Ljava/lang/String;"}
+    61:61:java.lang.String com.android.tools.r8.kotlin.KotlinPackageInfo.getModuleName():97:97 -> a
+    61:61:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getModuleName():69 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    61:61:java.lang.String lambda$synthesizeKotlinModuleFiles$1(com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo,java.lang.String):69 -> a
+    62:62:void lambda$synthesizeKotlinModuleFiles$3(java.util.List,com.android.tools.r8.naming.KotlinModuleSynthesizer$KotlinModuleInfoBuilder):98:98 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/naming/M;)V"}
     1:1:com.android.tools.r8.naming.KotlinModuleSynthesizer$KotlinModuleInfoBuilder lambda$synthesizeKotlinModuleFiles$2(java.lang.String):73:73 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/M;"}
@@ -229722,7 +229205,7 @@
 # {"id":"sourceFile","fileName":"KotlinModuleSynthesizer.java"}
     java.lang.String moduleName -> a
     com.android.tools.r8.graph.lens.GraphLens graphLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.naming.NamingLens namingLens -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/r0;"}
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -229734,7 +229217,7 @@
     java.util.Map multiClassPartToOriginal -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.utils.Box metadataVersion -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():102:102 -> <clinit>
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.AppView):115:115 -> <init>
@@ -229745,17 +229228,21 @@
     2:2:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
     2:2:void add(com.android.tools.r8.graph.DexProgramClass):124 -> a
     3:19:void add(com.android.tools.r8.graph.DexProgramClass):125:141 -> a
-    20:20:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():93:93 -> a
+    20:20:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():83:83 -> a
     20:20:void add(com.android.tools.r8.graph.DexProgramClass):142 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:22:void add(com.android.tools.r8.graph.DexProgramClass):142:143 -> a
-    23:55:java.util.Optional build():150:182 -> a
-    56:66:java.util.Optional build():179:189 -> a
-    67:67:java.util.Optional build():185:185 -> a
-    68:68:java.util.Optional build():184:184 -> a
-    69:73:void lambda$build$1(java.util.Map,com.android.tools.r8.utils.Pair):171:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/IV;)V"}
-    74:74:void lambda$build$0(java.util.Map,java.lang.String,java.lang.String):175:175 -> a
+    21:21:java.lang.String com.android.tools.r8.jetbrains.kotlin.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():296:296 -> a
+    21:21:java.lang.String com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo.getFacadeClassName():83 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:21:void add(com.android.tools.r8.graph.DexProgramClass):142 -> a
+    22:23:void add(com.android.tools.r8.graph.DexProgramClass):142:143 -> a
+    24:56:java.util.Optional build():150:182 -> a
+    57:67:java.util.Optional build():179:189 -> a
+    68:68:java.util.Optional build():185:185 -> a
+    69:69:java.util.Optional build():184:184 -> a
+    70:74:void lambda$build$1(java.util.Map,com.android.tools.r8.utils.Pair):171:175 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/MV;)V"}
+    75:75:void lambda$build$0(java.util.Map,java.lang.String,java.lang.String):175:175 -> a
 com.android.tools.r8.naming.LineReader -> com.android.tools.r8.naming.P:
 # {"id":"sourceFile","fileName":"LineReader.java"}
     java.lang.String readLine() -> a
@@ -229902,7 +229389,7 @@
     11:18:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):384:391 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Z)Lcom/android/tools/r8/naming/V$b;"}
     19:19:java.lang.String lambda$fromSignature$0(com.android.tools.r8.org.objectweb.asm.Type):402:402 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bi0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fi0;)Ljava/lang/String;"}
     20:24:com.android.tools.r8.naming.MemberNaming$MethodSignature fromMethodReference(com.android.tools.r8.references.MethodReference):406:410 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/naming/V$b;"}
     25:33:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):423:431 -> a
@@ -229983,7 +229470,7 @@
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/Y;"}
     com.android.tools.r8.com.google.common.collect.BiMap reservationStates -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     java.util.Map namingStates -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map frontiers -> g
@@ -230032,7 +229519,7 @@
     12:12:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     12:12:java.util.Map computeBridgesThatAreReserved(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Dl;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Fl;)Ljava/util/Map;"}
     13:13:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     13:13:java.util.Map computeBridgesThatAreReserved(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):350 -> a
     14:14:java.util.Map computeBridgesThatAreReserved(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):351:351 -> a
@@ -230104,10 +229591,10 @@
     116:116:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):427:427 -> a
     116:116:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):324 -> a
     117:121:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):325:329 -> a
-    122:122:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    122:122:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     122:122:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):329 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    123:123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     123:123:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):329 -> a
     124:124:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):330:330 -> a
     125:125:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticBridgeMethod():604:604 -> a
@@ -230129,14 +229616,14 @@
     139:139:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):341 -> a
     140:140:void allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):341:341 -> a
     141:143:void lambda$computeBridgesThatAreReserved$7(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):370:372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/I2;)V"}
     144:158:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):405:419 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/naming/e0;"}
     1:1:java.util.function.Function getNamingKeyTransform():166:166 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     2:2:java.util.function.Function getNamingKeyTransform():166 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> b
     3:3:java.util.function.Function getNamingKeyTransform():166 -> b
     4:5:java.util.function.Function getNamingKeyTransform():167:168 -> b
     6:18:void lambda$reserveNamesInClasses$4(com.android.tools.r8.graph.DexClass):285:297 -> b
@@ -230302,13 +229789,13 @@
     7:7:void reserveName(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexString):101 -> a
     8:9:void reserveName(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexString):102:103 -> a
     10:10:java.util.Set lambda$reserveName$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Ljava/util/Set;"}
 com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.f0:
 # {"id":"sourceFile","fileName":"MinifiedRenaming.java"}
     com.android.tools.r8.graph.AppView appView -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map packageRenaming -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Map renaming -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> g
@@ -230324,7 +229811,7 @@
     4:4:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     5:20:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):57:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     21:29:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):71:79 -> a
     30:35:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):78:83 -> a
     36:39:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):82:85 -> a
@@ -230344,7 +229831,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):54:55 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:18:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     19:19:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming.empty():180:180 -> a
     19:19:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
     20:20:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming.empty():80:80 -> a
@@ -230403,15 +229890,15 @@
 com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.h0:
 # {"id":"sourceFile","fileName":"Minifier.java"}
     java.util.List obfuscationDictionary -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Set obfuscationDictionaryForLookup -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing mixedCasing -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gg0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kg0$a;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():178:178 -> <clinit>
     1:6:void <init>(java.util.List,boolean):186:191 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Z)V"}
     1:4:java.lang.String nextName(char[],com.android.tools.r8.naming.InternalNamingState):196:199 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([CLcom/android/tools/r8/naming/L;)Ljava/lang/String;"}
     1:9:java.lang.String nextString(char[],com.android.tools.r8.naming.InternalNamingState):205:213 -> b
@@ -230575,7 +230062,7 @@
     1:1:boolean lambda$lookupMethodName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/H2;)Z"}
     com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod) -> a
@@ -230632,7 +230119,7 @@
     2:2:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):227:227 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     3:3:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):237:237 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/H2;"}
     5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):242:242 -> a
@@ -230706,7 +230193,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     7:7:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):60:60 -> a
     8:8:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     9:10:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):41:42 -> a
     9:10:boolean isRenamed(com.android.tools.r8.graph.DexType):36 -> a
     9:10:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):65 -> a
@@ -230781,7 +230268,7 @@
     1:18:java.util.List toPreamble():44:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
     19:19:java.util.List toPreamble():60:60 -> a
-com.android.tools.r8.naming.ProguardMapMarkerInfo$Builder -> R8$$REMOVED$$CLASS$$206:
+com.android.tools.r8.naming.ProguardMapMarkerInfo$Builder -> R8$$REMOVED$$CLASS$$194:
 # {"id":"sourceFile","fileName":"ProguardMapMarkerInfo.java"}
 com.android.tools.r8.naming.ProguardMapMinifier -> com.android.tools.r8.naming.E0:
 # {"id":"sourceFile","fileName":"ProguardMapMinifier.java"}
@@ -230792,7 +230279,7 @@
     com.android.tools.r8.naming.SeedMapper seedMapper -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/T0;"}
     com.android.tools.r8.com.google.common.collect.BiMap mappedNames -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     java.util.Set mappedClasses -> e
     java.util.Map memberNames -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -230823,7 +230310,7 @@
     17:17:void <init>(com.android.tools.r8.graph.AppView):94 -> <init>
     18:19:void <init>(com.android.tools.r8.graph.AppView):94:95 -> <init>
     1:12:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):99:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/naming/D0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/naming/D0;"}
     13:13:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):199:199 -> a
     13:13:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):110 -> a
     14:17:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):118:121 -> a
@@ -231013,13 +230500,13 @@
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.B0:
 # {"id":"sourceFile","fileName":"ProguardMapMinifier.java"}
     java.util.Map mappings -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     java.util.Set mappedNames -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():385:385 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Set):394:396 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gs;Ljava/util/HashSet;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Is;Ljava/util/HashSet;)V"}
     1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):402:404 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;[CLcom/android/tools/r8/naming/e;Ljava/util/function/Predicate;)Lcom/android/tools/r8/graph/H2;"}
     4:4:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.graph.AppView.getKeepInfo(com.android.tools.r8.graph.DexProgramClass):805:805 -> a
@@ -231270,7 +230757,7 @@
     344:344:com.android.tools.r8.naming.MemberNaming$Signature parseSignature():772 -> a
     344:344:void parseMemberMappings(com.android.tools.r8.naming.ProguardMap$Builder,com.android.tools.r8.naming.ClassNaming$Builder):453 -> a
     345:345:void lambda$parseMemberMappings$5(com.android.tools.r8.utils.BooleanBox,java.lang.String,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.mappinginformation.MappingInformation):372:372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Ljava/lang/String;Lcom/android/tools/r8/naming/g;Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/naming/V;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Ljava/lang/String;Lcom/android/tools/r8/naming/g;Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/naming/V;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     346:346:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isGlobalMappingInformation():0:0 -> a
     346:346:void lambda$parseMemberMappings$5(com.android.tools.r8.utils.BooleanBox,java.lang.String,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.mappinginformation.MappingInformation):372 -> a
     347:371:void lambda$parseMemberMappings$5(com.android.tools.r8.utils.BooleanBox,java.lang.String,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.mappinginformation.MappingInformation):372:396 -> a
@@ -231300,7 +230787,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     412:412:void lambda$parseMemberMappings$2(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation):377:377 -> a
     413:431:com.android.tools.r8.naming.MemberNaming addMemberEntryOrCopyInformation(com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,int,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.ClassNaming$Builder):555:573 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V;Lcom/android/tools/r8/naming/V$c;Ljava/lang/String;ILcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/g;)Lcom/android/tools/r8/naming/V;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V;Lcom/android/tools/r8/naming/V$c;Ljava/lang/String;ILcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/g;)Lcom/android/tools/r8/naming/V;"}
     432:433:void com.android.tools.r8.naming.MemberNaming.addAllMappingInformation(java.util.List):148:149 -> a
     432:433:com.android.tools.r8.naming.MemberNaming addMemberEntryOrCopyInformation(com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,int,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.ClassNaming$Builder):573 -> a
     434:437:void com.android.tools.r8.naming.MemberNaming.addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation$ReferentialMappingInformation,java.util.function.Consumer):140:143 -> a
@@ -231333,7 +230820,7 @@
     471:471:void com.android.tools.r8.utils.Box.clear():27 -> a
     471:471:com.android.tools.r8.naming.MemberNaming addMemberEntryOrCopyInformation(com.android.tools.r8.naming.MemberNaming,com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String,int,com.android.tools.r8.utils.Box,com.android.tools.r8.utils.Box,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.ClassNaming$Builder):569 -> a
     472:472:com.android.tools.r8.naming.MemberNaming$Signature getResidualSignatureFromMappingInformation(com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation,java.lang.String):582:582 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/lang/String;)Lcom/android/tools/r8/naming/V$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h50;Ljava/lang/String;)Lcom/android/tools/r8/naming/V$c;"}
     473:473:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isResidualMethodSignatureMappingInformation():0:0 -> a
     473:473:com.android.tools.r8.naming.MemberNaming$Signature getResidualSignatureFromMappingInformation(com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation,java.lang.String):582 -> a
     474:475:com.android.tools.r8.naming.MemberNaming$Signature getResidualSignatureFromMappingInformation(com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation,java.lang.String):584:585 -> a
@@ -231488,27 +230975,27 @@
     3:3:void accept(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.naming.ClassNameMapper):31 -> a
     4:5:void accept(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.naming.ClassNameMapper):31:32 -> a
     6:7:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):37:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/db;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fb;"}
     8:8:com.android.tools.r8.StringConsumer getStringConsumer():43:43 -> a
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):48:48 -> finished
-com.android.tools.r8.naming.ProguardMapStringConsumer$Builder -> R8$$REMOVED$$CLASS$$207:
+com.android.tools.r8.naming.ProguardMapStringConsumer$Builder -> R8$$REMOVED$$CLASS$$195:
 # {"id":"sourceFile","fileName":"ProguardMapStringConsumer.java"}
 com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.naming.M0:
 # {"id":"sourceFile","fileName":"ProguardMapSupplier.java"}
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/b;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.naming.MapConsumer consumer -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/Q;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.dex.Marker$Tool compiler -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W$b;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():18:18 -> <clinit>
     1:9:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.utils.InternalOptions):51:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/dex/W$b;Lcom/android/tools/r8/internal/iB;)V"}
     1:3:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId computeProguardMapId():89:91 -> a
     1:3:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():69 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/J0;"}
@@ -231523,10 +231010,10 @@
     7:8:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId computeProguardMapId():91 -> a
     7:8:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():69 -> a
     9:13:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():71:75 -> a
-    14:14:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2483 -> a
+    14:14:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2489 -> a
     14:14:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:17:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2485 -> a
+    15:17:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2491 -> a
     15:17:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():76 -> a
     18:18:com.android.tools.r8.naming.ProguardMapMarkerInfo com.android.tools.r8.naming.ProguardMapMarkerInfo$Builder.build():103:103 -> a
     18:18:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():77 -> a
@@ -231553,7 +231040,7 @@
 com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.naming.L0:
 # {"id":"sourceFile","fileName":"ProguardMapSupplier.java"}
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ns;"}
     1:3:void <init>():95:97 -> <init>
     4:4:com.android.tools.r8.com.google.common.hash.HashFunction com.android.tools.r8.com.google.common.hash.Hashing.sha256():253:253 -> <init>
     4:4:void <init>():97 -> <init>
@@ -231562,7 +231049,7 @@
     2:2:java.lang.String lambda$getProviderOrDefault$0(com.android.tools.r8.MapIdEnvironment):102:102 -> a
     3:3:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder accept(java.lang.String):116:116 -> a
     3:3:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/db;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fb;"}
     4:4:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):61:61 -> a
     4:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder accept(java.lang.String):116 -> a
     4:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):95 -> a
@@ -231589,7 +231076,7 @@
 com.android.tools.r8.naming.RecordInvokeDynamicInvokeCustomRewriter -> com.android.tools.r8.naming.O0:
 # {"id":"sourceFile","fileName":"RecordInvokeDynamicInvokeCustomRewriter.java"}
     com.android.tools.r8.ir.desugar.records.RecordRewriter recordRewriter -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g20;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):41:41 -> <init>
@@ -231598,7 +231085,7 @@
     2:3:void <init>(com.android.tools.r8.graph.AppView):42 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView):42:42 -> <init>
     1:2:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):52:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;)Z"}
     3:3:com.android.tools.r8.ir.code.IRMetadata com.android.tools.r8.ir.code.IRCode.metadata():163:163 -> a
     3:3:boolean shouldRewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):54 -> a
     4:4:boolean com.android.tools.r8.ir.code.IRMetadata.mayHaveInvokeCustom():182:182 -> a
@@ -231606,7 +231093,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:java.lang.String getRewriterId():47:47 -> b
     2:4:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):60:62 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/Jd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/Ld;"}
     5:6:com.android.tools.r8.ir.code.InvokeCustom rewriteRecordInvokeCustom(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeCustom):76:77 -> b
     5:6:com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult rewriteCode(com.android.tools.r8.ir.code.IRCode):64 -> b
     7:7:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.ir.code.InvokeCustom.getCallSite():114:114 -> b
@@ -231742,7 +231229,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     11:11:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):55:55 -> a
     12:12:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     13:14:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):46:47 -> a
     13:14:boolean isRenamed(com.android.tools.r8.graph.DexType):41 -> a
     13:14:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):60 -> a
@@ -231783,13 +231270,13 @@
 com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.T0:
 # {"id":"sourceFile","fileName":"SeedMapper.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.Set mappedToDescriptorNames -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     1:5:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):120:124 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Ljava/util/HashSet;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Ljava/util/HashSet;Lcom/android/tools/r8/internal/d50;)V"}
     6:6:com.android.tools.r8.naming.ClassNamingForMapApplier com.android.tools.r8.naming.ClassNamingForMapApplier$Builder.build():96:96 -> <init>
     6:6:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):124 -> <init>
     7:7:com.android.tools.r8.naming.ClassNamingForMapApplier com.android.tools.r8.naming.ClassNamingForMapApplier$Builder.build():96:96 -> <init>
@@ -231809,7 +231296,7 @@
     25:48:void verifyMappingsAreConflictFree():137:160 -> <init>
     25:48:void <init>(java.util.Map,java.util.Set,com.android.tools.r8.utils.Reporter):128 -> <init>
     1:1:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Ljava/nio/file/Path;)Lcom/android/tools/r8/naming/T0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/nio/file/Path;)Lcom/android/tools/r8/naming/T0;"}
     2:2:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):99:99 -> a
     2:2:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):110 -> a
     3:3:com.android.tools.r8.naming.LineReader com.android.tools.r8.naming.LineReader.fromBufferedReader(java.io.BufferedReader):18:18 -> a
@@ -231844,9 +231331,9 @@
     java.util.Set mappedToDescriptorNames -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     1:1:void <init>(com.android.tools.r8.utils.Reporter):47:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     2:7:void <init>(com.android.tools.r8.utils.Reporter):43:48 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMap$Builder addFileName(java.lang.String,java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/naming/x0;"}
@@ -231869,7 +231356,7 @@
 com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.naming.V0:
 # {"id":"sourceFile","fileName":"SourceFileRewriter.java"}
     1:2:boolean isDefaultOrEmpty(java.lang.String,com.android.tools.r8.utils.InternalOptions):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/lang/String;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/lang/String;)Z"}
     3:3:com.android.tools.r8.SourceFileProvider rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/naming/U0;"}
     4:4:com.android.tools.r8.SourceFileProvider rewriteTo(java.lang.String,boolean):65:65 -> a
@@ -231933,7 +231420,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     80:80:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):116:116 -> a
     81:81:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     82:84:com.android.tools.r8.graph.DexString getRenaming(com.android.tools.r8.graph.DexType):108:110 -> a
     82:84:boolean isRenamed(com.android.tools.r8.graph.DexType):103 -> a
     82:84:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):121 -> a
@@ -231946,42 +231433,42 @@
     1:1:boolean hasPrefixRewritingLogic():139:139 -> b
     1:1:com.android.tools.r8.graph.DexString prefixRewrittenType(com.android.tools.r8.graph.DexType):144:144 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.Mc:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.Oc:
 # {"id":"sourceFile","fileName":"ClassNameComputationInfo.java"}
     int arrayDepth -> b
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo CANONICAL_NAME_INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo NAME_INSTANCE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo NONE_INSTANCE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo SIMPLE_NAME_INSTANCE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo TYPE_NAME_INSTANCE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
     1:13:void <clinit>():94:106 -> <clinit>
     1:3:void <init>(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,int):120:122 -> <init>
     1:3:void <init>(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):117 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc;)V"}
     4:6:void <init>(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,int):120:122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc;I)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():25:25 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int lambda$specify$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mc;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc;)I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:15:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):132:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lc;)Lcom/android/tools/r8/internal/Mc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc;)Lcom/android/tools/r8/internal/Oc;"}
     16:16:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):140:140 -> a
     17:25:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):134:142 -> a
     26:28:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo getInstance(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):136:138 -> a
     29:29:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):209:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/XP;"}
     1:1:int lambda$specify$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo):113:113 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mc;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc;)I"}
     2:2:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo$Order getOrder():164:164 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):174:174 -> b
@@ -231996,18 +231483,18 @@
     1:1:int hashCode():224:224 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():159:159 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.Nc:
 # {"id":"sourceFile","fileName":"ClassNameComputationInfo.java"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping TYPE_NAME -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping CANONICAL_NAME -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping SIMPLE_NAME -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
     boolean $assertionsDisabled -> g
     1:6:void <clinit>():28:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
@@ -232018,27 +231505,27 @@
     50:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):67:69 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):60:60 -> a
     54:92:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):52:90 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.np:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.qp:
 # {"id":"sourceFile","fileName":"FieldNameComputationInfo.java"}
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo FIELD_NAME_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/np;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qp;"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/XP;"}
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo$Order getOrder():36:36 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):48:48 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:boolean needsToComputeName():52:52 -> d
     1:1:boolean needsToRegisterReference():57:57 -> e
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.TP:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.XP:
 # {"id":"sourceFile","fileName":"NameComputationInfo.java"}
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/XP;"}
     1:1:com.android.tools.r8.graph.DexString computeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):28:28 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/graph/H2;"}
     2:2:com.android.tools.r8.graph.DexString computeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):33:33 -> a
@@ -232089,7 +231576,7 @@
     30:30:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):64 -> a
     31:31:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):65:65 -> a
     32:32:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo asRecordFieldNamesComputationInfo():97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d20;"}
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo$Order getOrder() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
@@ -232097,7 +231584,7 @@
     1:1:boolean isRecordFieldNamesComputationInfo():93:93 -> c
     boolean needsToComputeName() -> d
     boolean needsToRegisterReference() -> e
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.Z10:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.d20:
 # {"id":"sourceFile","fileName":"RecordFieldNamesComputationInfo.java"}
     com.android.tools.r8.graph.DexField[] fields -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/graph/l1;"}
@@ -232106,7 +231593,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexField[]):48:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;)V"}
     1:4:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo forFieldNamesAndFields(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[]):196:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;[Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/Z10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;[Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/d20;"}
     5:6:boolean fieldsMatchNames(java.lang.String[],com.android.tools.r8.graph.DexField[]):208:209 -> a
     5:6:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo forFieldNamesAndFields(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[]):200 -> a
     7:7:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo forFieldNamesAndFields(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField[]):203:203 -> a
@@ -232127,11 +231614,11 @@
     21:21:com.android.tools.r8.graph.DexString dexStringFromFieldNames(java.util.List,com.android.tools.r8.graph.DexItemFactory):191:191 -> a
     21:21:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.IntFunction):229 -> a
     22:22:com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo asRecordFieldNamesComputationInfo():249:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d20;"}
     1:1:boolean isRecordFieldNamesComputationInfo():244:244 -> c
     1:1:boolean needsToComputeName():234:234 -> d
     1:1:boolean needsToRegisterReference():239:239 -> e
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.W10:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.a20:
 # {"id":"sourceFile","fileName":"RecordFieldNamesComputationInfo.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexField[]):134:134 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/graph/l1;)V"}
@@ -232140,7 +231627,7 @@
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/graph/H2;"}
     2:2:com.android.tools.r8.graph.DexField[] lambda$specify$0(com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W10;)[Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a20;)[Lcom/android/tools/r8/graph/l1;"}
     3:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):139:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:java.lang.String lambda$internalComputeNameFor$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):150:150 -> a
@@ -232151,9 +231638,9 @@
     9:9:java.lang.String lambda$internalComputeNameFor$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):150 -> a
     10:10:java.lang.String lambda$internalComputeNameFor$1(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):150:150 -> a
     11:15:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):181:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/XP;"}
     16:16:com.android.tools.r8.graph.DexField lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):147:147 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/graph/H2;"}
     2:2:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo$Order getOrder():155:155 -> b
@@ -232162,7 +231649,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():165:165 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.Y10:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.c20:
 # {"id":"sourceFile","fileName":"RecordFieldNamesComputationInfo.java"}
     java.lang.String[] fieldNames -> d
     1:2:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[]):59:60 -> <init>
@@ -232172,7 +231659,7 @@
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):52:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/graph/H2;"}
     2:2:com.android.tools.r8.graph.DexField[] lambda$specify$0(com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y10;)[Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c20;)[Lcom/android/tools/r8/graph/l1;"}
     3:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     4:4:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):46:46 -> a
@@ -232180,11 +231667,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.lang.String lambda$internalComputeNameFor$2(int):89:89 -> a
     6:10:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):120:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/TP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/XP;"}
     11:11:com.android.tools.r8.graph.DexField lambda$rewrittenWithLens$3(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexField):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
     1:1:java.lang.String[] lambda$specify$1(com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo):67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y10;)[Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c20;)[Ljava/lang/String;"}
     2:2:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.naming.NamingLens):89:89 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/graph/H2;"}
     3:3:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo$Order getOrder():94:94 -> b
@@ -232193,7 +231680,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/o;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():104:104 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo$1 -> com.android.tools.r8.internal.X10:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo$1 -> com.android.tools.r8.internal.b20:
 # {"id":"sourceFile","fileName":"RecordFieldNamesComputationInfo.java"}
     1:1:void <init>():68:68 -> <init>
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
@@ -232204,34 +231691,34 @@
     3:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):68 -> a
     5:5:int acceptCompareTo(java.lang.String[],java.lang.String[],com.android.tools.r8.utils.structural.CompareToVisitor):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/String;[Ljava/lang/String;)I"}
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.bc:
 # {"id":"sourceFile","fileName":"ClassForNameIdentifierNameStringLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
     1:1:boolean isTypeInitializedFromUse():19:19 -> c
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Mc:
 # {"id":"sourceFile","fileName":"ClassNameComparisonIdentifierNameStringLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
     1:1:boolean isTypeInitializedFromUse():19:19 -> c
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Pl:
 # {"id":"sourceFile","fileName":"DexMemberBasedConstStringIdentifierNameStringLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)V"}
-com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Zl:
 # {"id":"sourceFile","fileName":"DexTypeBasedConstStringIdentifierNameStringLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
     1:1:boolean isTypeInitializedFromUse():19:19 -> c
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Tt:
 # {"id":"sourceFile","fileName":"IdentifierNameStringLookupResult.java"}
     com.android.tools.r8.graph.DexReference reference -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/F2;"}
@@ -232240,40 +231727,40 @@
     1:3:void <init>(com.android.tools.r8.graph.DexReference):17:19 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)V"}
     1:1:com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult fromClassForName(com.android.tools.r8.graph.DexType):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Zb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/bc;"}
     2:2:com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult fromDexMemberBasedConstString(com.android.tools.r8.graph.DexMember):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/Nl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/Pl;"}
     3:3:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult():52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vt;"}
     1:1:com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult fromClassNameComparison(com.android.tools.r8.graph.DexType):28:28 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Kc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Mc;"}
     2:2:com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult fromUncategorized(com.android.tools.r8.graph.DexMember):44:44 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/Cj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/Gj0;"}
     3:3:boolean isTypeResult():48:48 -> b
     1:1:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Xl;"}
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.St:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Zl;"}
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Ut:
 # {"id":"sourceFile","fileName":"IdentifierNameStringMemberLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)V"}
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Vt:
 # {"id":"sourceFile","fileName":"IdentifierNameStringTypeLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
     1:1:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult():28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Vt;"}
     1:1:boolean isTypeResult():23:23 -> b
     boolean isTypeInitializedFromUse() -> c
-com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Cj0:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Gj0:
 # {"id":"sourceFile","fileName":"UncategorizedMemberIdentifierNameStringLookupResult.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;)V"}
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Oe:
 # {"id":"sourceFile","fileName":"CompilerSynthesizedMappingInformation.java"}
     com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Me;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oe;"}
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> b
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -232302,7 +231789,7 @@
     4:4:com.android.tools.r8.naming.mappinginformation.FileNameInformation build(java.lang.String):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/mappinginformation/a;"}
     5:5:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/DiagnosticsHandler;ILjava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/DiagnosticsHandler;ILjava/util/function/Consumer;)V"}
     6:6:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.get(java.lang.String):185:185 -> a
     6:6:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.naming.mappinginformation.MappingInformation.getJsonElementFromObject(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.lang.String,java.lang.String):235 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -232335,7 +231822,7 @@
     1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Z"}
     2:2:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,int,java.util.function.Consumer):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;ILjava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;ILjava/util/function/Consumer;)V"}
     3:3:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.get(java.lang.String):185:185 -> a
     3:3:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,int,java.util.function.Consumer):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -232365,7 +231852,7 @@
     1:1:com.android.tools.r8.naming.mappinginformation.FileNameInformation asFileNameInformation():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/mappinginformation/a;"}
     2:2:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/VC;Lcom/android/tools/r8/DiagnosticsHandler;ILjava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/XC;Lcom/android/tools/r8/DiagnosticsHandler;ILjava/util/function/Consumer;)V"}
     3:3:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.get(java.lang.String):185:185 -> a
     3:3:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):136 -> a
     4:4:void fromJsonObject(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.DiagnosticsHandler,int,java.util.function.Consumer):139:139 -> a
@@ -232390,23 +231877,23 @@
     com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation asOutlineCallsiteInformation():94:94 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mV;"}
     1:1:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation asOutlineMappingInformation():90:90 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oV;"}
     1:1:com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation asPartitionFileNameInformation():110:110 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jW;"}
     com.android.tools.r8.naming.mappinginformation.MappingInformation$ReferentialMappingInformation asReferentialMappingInformation() -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/mappinginformation/d;"}
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation asResidualFieldSignatureMappingInformation():106:106 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f50;"}
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation asResidualMethodSignatureMappingInformation():102:102 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/g50;"}
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation asResidualSignatureMappingInformation():98:98 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h50;"}
     1:1:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation asRewriteFrameMappingInformation():86:86 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/U90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y90;"}
     1:1:com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation asUnknownJsonMappingInformation():82:82 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fk0;"}
     boolean isCompilerSynthesizedMappingInformation() -> l
     boolean isOutlineCallsiteInformation() -> m
     boolean isOutlineMappingInformation() -> n
@@ -232446,25 +231933,25 @@
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics invalidResidualSignatureType(java.lang.String,int):112:112 -> invalidResidualSignatureType
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):98:98 -> notAllowedCombination
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;Lcom/android/tools/r8/naming/mappinginformation/e;I)Lcom/android/tools/r8/naming/mappinginformation/MappingInformationDiagnostics;"}
-com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.iV:
+com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.mV:
 # {"id":"sourceFile","fileName":"OutlineCallsiteMappingInformation.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap positions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ex;"}
     com.android.tools.r8.references.MethodReference outline -> b
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> c
     com.android.tools.r8.naming.MapVersion SUPPORTED_WITH_OUTLINE_VERSION -> d
     1:2:void <clinit>():22:23 -> <clinit>
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.references.MethodReference):32:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;Lcom/android/tools/r8/references/MethodReference;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;Lcom/android/tools/r8/references/MethodReference;)V"}
     1:1:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonObject,java.lang.Integer,java.lang.Integer):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
     2:2:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Z"}
     3:3:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isOutlineCallsiteInformation():0:0 -> a
     3:3:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):60 -> a
     4:4:boolean isSupported(com.android.tools.r8.naming.MapVersion):92:92 -> a
     4:4:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)V"}
     5:27:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):98:120 -> a
     28:28:com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation create(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,com.android.tools.r8.references.MethodReference):88:88 -> a
     28:28:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):123 -> a
@@ -232472,11 +231959,11 @@
     30:30:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):121:121 -> a
     31:31:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):100:100 -> a
     32:37:void lambda$deserialize$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.util.Map$Entry):108:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;Ljava/util/Map$Entry;)V"}
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):75:75 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation asOutlineCallsiteInformation():70:70 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mV;"}
     1:2:java.lang.String serialize():44:45 -> r
     3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
     3:3:java.lang.String serialize():45 -> r
@@ -232489,8 +231976,8 @@
     14:14:java.lang.String serialize():55:55 -> r
     1:1:com.android.tools.r8.references.MethodReference getOutline():83:83 -> s
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap getPositions():132:132 -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cx;"}
-com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.kV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ex;"}
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.oV:
 # {"id":"sourceFile","fileName":"OutlineMappingInformation.java"}
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -232503,14 +231990,14 @@
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):38:38 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation asOutlineMappingInformation():32:32 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oV;"}
     1:2:java.lang.String serialize():25:26 -> r
     3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
     3:3:java.lang.String serialize():26 -> r
     4:4:java.lang.String serialize():27:27 -> r
-com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder -> R8$$REMOVED$$CLASS$$208:
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder -> R8$$REMOVED$$CLASS$$196:
 # {"id":"sourceFile","fileName":"OutlineMappingInformation.java"}
-com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation -> com.android.tools.r8.internal.fW:
+com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation -> com.android.tools.r8.internal.jW:
 # {"id":"sourceFile","fileName":"PartitionFileNameInformation.java"}
     java.util.Map typeNameToFileNameMapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -232521,7 +232008,7 @@
     2:2:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isPartitionFileNameInformation():0:0 -> a
     2:2:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):52 -> a
     3:3:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)V"}
     4:4:com.android.tools.r8.com.google.gson.JsonObject com.android.tools.r8.com.google.gson.JsonObject.getAsJsonObject(java.lang.String):221:221 -> a
     4:4:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -232539,7 +232026,7 @@
     11:11:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):77 -> a
     12:12:void deserialize(com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):77:77 -> a
     13:13:void lambda$deserialize$0(com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.util.Map$Entry):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eW;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iW;Ljava/util/Map$Entry;)V"}
     14:14:com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder.addClassToFileNameMapping(java.lang.String,java.lang.String):85:85 -> a
     14:14:void lambda$deserialize$0(com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.util.Map$Entry):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -232548,7 +232035,7 @@
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):47:47 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation asPartitionFileNameInformation():42:42 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jW;"}
     1:2:java.lang.String serialize():61:62 -> r
     3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
     3:3:java.lang.String serialize():62 -> r
@@ -232556,23 +232043,23 @@
     7:7:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
     7:7:java.lang.String serialize():65 -> r
     8:8:java.lang.String serialize():66:66 -> r
-com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder -> com.android.tools.r8.internal.eW:
+com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder -> com.android.tools.r8.internal.iW:
 # {"id":"sourceFile","fileName":"PartitionFileNameInformation.java"}
     java.util.Map typeNameToFileNameMapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:3:void <init>():80:82 -> <init>
-com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation -> com.android.tools.r8.internal.d50:
+com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation -> com.android.tools.r8.internal.h50:
 # {"id":"sourceFile","fileName":"ResidualSignatureMappingInformation.java"}
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:1:boolean isSupported(com.android.tools.r8.naming.MapVersion):45:45 -> a
     2:10:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):50:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)V"}
     11:14:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):57:60 -> a
     15:15:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):53:53 -> a
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation asResidualSignatureMappingInformation():74:74 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h50;"}
     1:1:boolean isResidualSignatureMappingInformation():69:69 -> p
     1:2:java.lang.String serialize():36:37 -> r
     3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
@@ -232583,16 +232070,16 @@
     6:6:java.lang.String serialize():39:39 -> r
     boolean isValid() -> s
     java.lang.String serializeInternal() -> t
-com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation -> com.android.tools.r8.internal.b50:
+com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation -> com.android.tools.r8.internal.f50:
 # {"id":"sourceFile","fileName":"ResidualSignatureMappingInformation.java"}
     java.lang.String type -> b
     com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation INVALID_FIELD_SIGNATURE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f50;"}
     boolean $assertionsDisabled -> d
     1:4:void <clinit>():161:164 -> <clinit>
     1:3:void <init>(java.lang.String):169:171 -> <init>
     1:3:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation deserialize(java.lang.String):193:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/b50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/f50;"}
     4:4:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):217:217 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Z"}
     5:5:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isResidualFieldSignatureMappingInformation():0:0 -> a
@@ -232608,24 +232095,24 @@
     2:2:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):211 -> b
     3:3:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):211:211 -> b
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualFieldSignatureMappingInformation asResidualFieldSignatureMappingInformation():205:205 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/b50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/f50;"}
     1:1:boolean isValid():189:189 -> s
     1:1:java.lang.String serializeInternal():184:184 -> t
-com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation -> com.android.tools.r8.internal.c50:
+com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation -> com.android.tools.r8.internal.g50:
 # {"id":"sourceFile","fileName":"ResidualSignatureMappingInformation.java"}
     java.lang.String returnType -> b
     java.lang.String[] parameters -> c
     com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation INVALID_METHOD_SIGNATURE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g50;"}
     boolean $assertionsDisabled -> e
     1:4:void <clinit>():77:80 -> <clinit>
     1:3:void <init>(java.lang.String[],java.lang.String):86:88 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[Ljava/lang/String;)V"}
     4:7:void <init>(java.lang.String[],java.lang.String):87:90 -> <init>
     1:3:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation fromDexMethod(com.android.tools.r8.graph.DexMethod):95:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/c50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/g50;"}
     4:15:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation deserialize(java.lang.String):111:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/c50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/g50;"}
     16:16:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):152:152 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Z"}
     17:17:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isResidualMethodSignatureMappingInformation():0:0 -> a
@@ -232637,10 +232124,10 @@
     2:2:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):146 -> b
     3:3:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):146:146 -> b
     1:1:com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation$ResidualMethodSignatureMappingInformation asResidualMethodSignatureMappingInformation():140:140 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/c50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/g50;"}
     1:1:boolean isValid():107:107 -> s
     1:1:java.lang.String serializeInternal():102:102 -> t
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.U90:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.Y90:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
     java.util.List conditions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
@@ -232650,16 +232137,16 @@
     1:1:void <clinit>():31:31 -> <clinit>
     1:3:void <init>(java.util.List,java.util.List):39:41 -> <init>
     1:1:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;Lcom/android/tools/r8/internal/T90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;Lcom/android/tools/r8/internal/X90;)V"}
     2:2:void com.android.tools.r8.com.google.gson.JsonArray.add(com.android.tools.r8.com.google.gson.JsonElement):128:128 -> a
     2:2:void lambda$serialize$0(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):62 -> a
     3:3:void lambda$serialize$1(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RC;Lcom/android/tools/r8/internal/S90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TC;Lcom/android/tools/r8/internal/W90;)V"}
     4:4:void com.android.tools.r8.com.google.gson.JsonArray.add(com.android.tools.r8.com.google.gson.JsonElement):128:128 -> a
     4:4:void lambda$serialize$1(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction):65 -> a
     5:5:boolean isSupported(com.android.tools.r8.naming.MapVersion):71:71 -> a
     5:5:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)V"}
     6:7:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):84:85 -> a
     8:8:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonObject.get(java.lang.String):185:185 -> a
     8:8:void deserialize(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):86 -> a
@@ -232675,13 +232162,13 @@
     22:22:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isRewriteFrameMappingInformation():0:0 -> a
     22:22:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):76 -> a
     23:23:void lambda$deserialize$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/internal/SC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/internal/UC;)V"}
     1:1:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/internal/SC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/internal/UC;)V"}
     2:2:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):112:112 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation asRewriteFrameMappingInformation():107:107 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/U90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y90;"}
     1:2:java.lang.String serialize():59:60 -> r
     3:3:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> r
     3:3:java.lang.String serialize():60 -> r
@@ -232693,11 +232180,11 @@
     11:11:java.lang.String serialize():66 -> r
     12:12:java.lang.String serialize():67:67 -> r
     1:1:java.util.List getConditions():45:45 -> s
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> R8$$REMOVED$$CLASS$$209:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> R8$$REMOVED$$CLASS$$197:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> R8$$REMOVED$$CLASS$$210:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> R8$$REMOVED$$CLASS$$198:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.S90:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.W90:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
     int numberOfFrames -> a
     boolean com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.$assertionsDisabled -> b
@@ -232706,18 +232193,18 @@
     1:1:void <init>(int):255 -> <init>
     2:2:void <init>(int):256:256 -> <init>
     1:13:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):223:235 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SC;)Lcom/android/tools/r8/internal/S90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UC;)Lcom/android/tools/r8/internal/W90;"}
     14:14:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):227:227 -> a
     15:15:com.android.tools.r8.com.google.gson.JsonElement serialize():265:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aD;"}
     16:16:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction deserialize(java.lang.String):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/S90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/W90;"}
     17:17:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction create(int):284:284 -> a
     17:17:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction deserialize(java.lang.String):289 -> a
     18:18:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction deserialize(java.lang.String):291:291 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> R8$$REMOVED$$CLASS$$211:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> R8$$REMOVED$$CLASS$$199:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.T90:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.X90:
 # {"id":"sourceFile","fileName":"RewriteFrameMappingInformation.java"}
     com.android.tools.r8.references.ClassReference classReference -> a
     1:1:void com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition.<init>():139:139 -> <init>
@@ -232726,18 +232213,18 @@
     1:6:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition.deserialize(com.android.tools.r8.com.google.gson.JsonElement):144:149 -> a
     1:6:com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition.deserialize(com.android.tools.r8.internal.JsonElement):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SC;)Lcom/android/tools/r8/internal/T90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UC;)Lcom/android/tools/r8/internal/X90;"}
     7:7:com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition.deserialize(com.android.tools.r8.internal.JsonElement):0:0 -> a
     8:11:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition.deserialize(com.android.tools.r8.com.google.gson.JsonElement):151:154 -> a
     8:11:com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition.deserialize(com.android.tools.r8.internal.JsonElement):0 -> a
     12:12:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition.deserialize(com.android.tools.r8.com.google.gson.JsonElement):147:147 -> a
     12:12:com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition com.android.tools.r8.internal.RewriteFrameMappingInformation$ThrowsCondition.deserialize(com.android.tools.r8.internal.JsonElement):0 -> a
     13:13:com.android.tools.r8.com.google.gson.JsonPrimitive serialize():180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aD;"}
     14:17:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):207:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/T90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/X90;"}
     18:18:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):208:208 -> a
-com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.bk0:
+com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.fk0:
 # {"id":"sourceFile","fileName":"UnknownJsonMappingInformation.java"}
     java.lang.String id -> a
     java.lang.String payload -> b
@@ -232745,36 +232232,36 @@
     1:1:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):38:38 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Z"}
     2:2:void deserialize(java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/VC;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/XC;Ljava/util/function/Consumer;)V"}
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformation compose(com.android.tools.r8.naming.mappinginformation.MappingInformation):53:53 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/mappinginformation/e;)Lcom/android/tools/r8/naming/mappinginformation/e;"}
     1:1:com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation asUnknownJsonMappingInformation():48:48 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fk0;"}
     1:1:java.lang.String serialize():33:33 -> r
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.ds:
 # {"id":"sourceFile","fileName":"GenericSignatureAction.java"}
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bs$a;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ds$a;)Ljava/lang/Object;"}
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.bs$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.ds$a:
 # {"id":"sourceFile","fileName":"GenericSignatureAction.java"}
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ds$a;"}
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ds$a;"}
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ds$a;"}
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.es:
 # {"id":"sourceFile","fileName":"GenericSignatureParser.java"}
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ds;"}
     char symbol -> b
     java.lang.String identifier -> c
     boolean eof -> d
@@ -232783,7 +232270,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():54:54 -> <clinit>
     1:2:void <init>(com.android.tools.r8.naming.signature.GenericSignatureAction):76:77 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ds;)V"}
     1:1:void parseClassSignature(java.lang.String):82:82 -> a
     2:7:void setInput(java.lang.String):129:134 -> a
     2:7:void parseClassSignature(java.lang.String):83 -> a
@@ -232817,7 +232304,7 @@
     70:78:void parseMethodTypeSignature():340 -> a
     79:81:void parseMethodTypeSignature():342:344 -> a
     82:96:void parseClassTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):218:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bs$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ds$a;)V"}
     97:99:void updateOptTypeArguments():252:254 -> a
     97:99:void parseClassTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):234 -> a
     100:112:void updateTypeArgument():268:280 -> a
@@ -232854,7 +232341,7 @@
     8:16:void parseFieldSignature(java.lang.String):116:124 -> b
     17:17:void parseFieldSignature(java.lang.String):119:119 -> b
     18:25:void parseFieldTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):197:204 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bs$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ds$a;)V"}
     26:40:void updateTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):298:312 -> b
     26:40:void parseFieldTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):205 -> b
     41:42:void updateTypeSignature(com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition):307:308 -> b
@@ -232875,7 +232362,7 @@
     17:17:void parseMethodSignature(java.lang.String):103:103 -> c
     18:28:void scanSymbol():364:374 -> c
     1:17:void updateFormalTypeParameter():175:191 -> d
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.fs:
 # {"id":"sourceFile","fileName":"GenericSignatureRewriter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -232933,7 +232420,7 @@
     199:199:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
     200:201:void com.android.tools.r8.graph.DexEncodedMethod.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1381:1382 -> a
     200:201:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass -> com.android.tools.r8.internal.B7:
 # {"id":"sourceFile","fileName":"BridgeHoistingToSharedSyntheticSuperClass.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -232942,9 +232429,9 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):51:52 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:13:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):58:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     14:14:void lambda$run$0(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     15:15:void internalRun(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):79:79 -> a
     15:15:void lambda$run$0(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):74 -> a
     16:18:java.util.Collection refineGroups(java.util.Collection):107:109 -> a
@@ -232995,7 +232482,7 @@
     47:47:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setAbstract():95:95 -> a
     47:47:void lambda$rewriteApplication$7(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):193 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/y7;Lcom/android/tools/r8/synthesis/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/A7;Lcom/android/tools/r8/synthesis/V;)V"}
     48:49:com.android.tools.r8.synthesis.SyntheticClassBuilder com.android.tools.r8.synthesis.SyntheticClassBuilder.setAbstract():96:97 -> a
     48:49:void lambda$rewriteApplication$7(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):193 -> a
     50:51:void lambda$rewriteApplication$7(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):193:194 -> a
@@ -233021,7 +232508,7 @@
     61:61:void com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification.forEach(java.util.function.BiConsumer):314 -> a
     61:61:void lambda$rewriteApplication$7(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):198 -> a
     62:62:java.lang.Iterable refineGroup(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y7;)Lcom/android/tools/r8/internal/gC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A7;)Lcom/android/tools/r8/internal/iC;"}
     63:63:java.util.Iterator com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group.iterator():292:292 -> a
     63:63:java.lang.Iterable refineGroup(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233066,7 +232553,7 @@
     85:85:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):577:577 -> a
     85:85:java.lang.Iterable refineGroup(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):137 -> a
     86:86:boolean lambda$refineGroup$1(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y7;Lcom/android/tools/r8/internal/y7;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A7;Lcom/android/tools/r8/internal/A7;)Z"}
     87:87:int com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group.size():296:296 -> a
     87:87:boolean lambda$refineGroup$1(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):138 -> a
     88:88:int com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group.size():296:296 -> a
@@ -233075,11 +232562,11 @@
     89:89:int com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group.size():296:296 -> a
     89:89:boolean lambda$refineGroup$1(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group):138 -> a
     90:91:com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification getBridgeSpecification(com.android.tools.r8.graph.DexProgramClass):143:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/x7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/z7;"}
     92:95:void lambda$getBridgeSpecification$2(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):147:150 -> a
     92:95:void com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass.lambda$getBridgeSpecification$2(com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x7;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z7;Lcom/android/tools/r8/graph/C5;)V"}
     96:96:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.setBridgeInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):155:155 -> a
     96:96:void lambda$getBridgeSpecification$2(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):150 -> a
     96:96:void com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass.lambda$getBridgeSpecification$2(com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):0 -> a
@@ -233104,7 +232591,7 @@
     101:101:void com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass.lambda$getBridgeSpecification$2(com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):0 -> a
     102:102:void lambda$getBridgeSpecification$2(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
     102:102:void com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass.lambda$getBridgeSpecification$2(com.android.tools.r8.internal.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification,com.android.tools.r8.graph.ProgramMethod):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     103:103:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.put(com.android.tools.r8.graph.DexMethodSignature,java.lang.Object):48:48 -> a
     103:103:void com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification.addBridge(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo):306 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233188,9 +232675,9 @@
     151:151:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setProto(com.android.tools.r8.graph.DexProto):84:84 -> a
     151:151:void lambda$rewriteApplication$5(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.synthesis.SyntheticMethodBuilder):213 -> a
     152:152:void lambda$updateArtProfiles$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):236:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     153:153:void lambda$updateArtProfiles$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):241:241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/B2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/B2;)V"}
     154:154:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexMethodSignature):199:199 -> a
     154:154:void lambda$updateArtProfiles$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):241 -> a
     155:155:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):195:195 -> a
@@ -233199,7 +232686,7 @@
     156:156:void lambda$updateArtProfiles$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):244:244 -> a
     157:157:void lambda$updateArtProfiles$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):243:243 -> a
     158:158:void lambda$updateArtProfiles$9(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):247:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     159:159:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70:70 -> a
     159:159:void lambda$updateArtProfiles$9(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):247 -> a
     160:160:void lambda$updateArtProfiles$9(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):246:246 -> a
@@ -233220,17 +232707,17 @@
     14:14:void com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification.forEach(java.util.function.BiConsumer):314:314 -> b
     14:14:void updateArtProfiles(java.util.Collection):239 -> b
     15:15:void updateArtProfiles(java.util.Collection):252:252 -> b
-com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification -> com.android.tools.r8.internal.z7:
 # {"id":"sourceFile","fileName":"BridgeHoistingToSharedSyntheticSuperClass.java"}
     com.android.tools.r8.utils.collections.DexMethodSignatureMap bridges -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rl;"}
     1:1:void <init>():300:300 -> <init>
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureMap com.android.tools.r8.utils.collections.DexMethodSignatureMap.create():31:31 -> <init>
     2:2:void <init>():303 -> <init>
     3:3:void <init>():303:303 -> <init>
     1:1:int size():336:336 -> a
     1:1:boolean lessThanOrEquals(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x7;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z7;)Z"}
     2:2:int com.android.tools.r8.utils.collections.DexMethodSignatureMap.size():263:263 -> a
     2:2:int size():336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233266,25 +232753,25 @@
     15:15:boolean lessThanOrEquals(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):328 -> a
     16:16:boolean containsBridgeWithTarget(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):310:310 -> a
     16:16:boolean lessThanOrEquals(com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):328 -> a
-com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$Group -> com.android.tools.r8.internal.A7:
 # {"id":"sourceFile","fileName":"BridgeHoistingToSharedSyntheticSuperClass.java"}
     java.util.List classes -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification bridgeSpecification -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z7;"}
     1:3:void <init>():260:262 -> <init>
     4:5:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):265:266 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/x7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/z7;)V"}
     6:7:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object):195:196 -> <init>
     6:7:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):266 -> <init>
     8:9:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.BridgeHoistingToSharedSyntheticSuperClass$BridgeSpecification):266:267 -> <init>
     1:1:int size():296:296 -> a
     1:1:boolean isSingleton():287 -> a
     1:1:java.util.Iterator iterator():292:292 -> iterator
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.SB:
 # {"id":"sourceFile","fileName":"InvokeSingleTargetExtractor.java"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.graph.DexMethod target -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     boolean $assertionsDisabled -> g
@@ -233293,7 +232780,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:17 -> <init>
     1:7:void setTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind):25:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/PB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/RB;)V"}
     8:9:void invalid():36:37 -> a
     8:9:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):92 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
@@ -233340,29 +232827,29 @@
     11:12:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):81 -> g
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):55:55 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.RB:
 # {"id":"sourceFile","fileName":"InvokeSingleTargetExtractor.java"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind DIRECT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind STATIC -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind SUPER -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind ILLEGAL -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind NONE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RB;"}
     1:6:void <clinit>():121:126 -> <clinit>
     1:1:void <init>(java.lang.String,int):120:120 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.eN:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.iN:
 # {"id":"sourceFile","fileName":"MemberRebindingAnalysis.java"}
     com.android.tools.r8.optimize.MemberRebindingEventConsumer eventConsumer -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kN;"}
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qN;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():35:35 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
@@ -233392,7 +232879,7 @@
     17:18:void lambda$computeNonReboundMethodAccessCollections$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass):57:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;)V"}
     19:20:void lambda$computeNonReboundMethodAccessCollections$0(java.util.Map,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection):61:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/cN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/gN;)V"}
     21:23:void lambda$computeNonReboundMethodAccessCollections$0(java.util.Map,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection):61:63 -> a
     24:26:java.util.Map computeNonReboundMethodAccessCollections(com.android.tools.r8.graph.DexProgramClass):72:74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/util/IdentityHashMap;"}
@@ -233401,7 +232888,7 @@
     28:28:void computeMethodRebinding(java.util.Map):153:153 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;)V"}
     29:84:void computeMethodRebinding(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection):158:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/cN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/gN;)V"}
     85:86:void lambda$computeMethodRebinding$4(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):163:164 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/H0;)V"}
     87:93:void lambda$computeMethodRebinding$8(com.android.tools.r8.graph.DexProgramClass,java.util.List):217:223 -> a
@@ -233443,7 +232930,7 @@
     147:147:void lambda$computeMethodRebinding$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     148:148:void lambda$computeMethodRebinding$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):237:237 -> a
-    149:149:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    149:149:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     149:149:void lambda$computeMethodRebinding$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     150:150:void lambda$computeMethodRebinding$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):243:243 -> a
@@ -233463,7 +232950,7 @@
     189:189:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     189:189:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/CY;)V"}
     190:190:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
     190:190:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):170 -> a
     191:191:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getInitialResolutionHolder():450:450 -> a
@@ -233471,11 +232958,11 @@
     192:192:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):173:173 -> a
     193:193:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):265:265 -> a
     193:193:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):180 -> a
-    194:194:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    194:194:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     194:194:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     194:194:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):180 -> a
-    195:195:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    195:195:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     195:195:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):265 -> a
     195:195:void lambda$computeMethodRebinding$6(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):180 -> a
     196:199:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):265:268 -> a
@@ -233511,17 +232998,17 @@
     13:13:com.android.tools.r8.optimize.MemberRebindingLens com.android.tools.r8.optimize.MemberRebindingLens$Builder.build():97:97 -> b
     13:13:void run(java.util.concurrent.ExecutorService):368 -> b
     14:17:void run(java.util.concurrent.ExecutorService):369:372 -> b
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.bN:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.fN:
 # {"id":"sourceFile","fileName":"MemberRebindingAnalysis.java"}
     com.android.tools.r8.graph.AppView appViewWithLiveness -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map val$nonReboundMethodAccessCollections -> f
     1:3:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Map):78:80 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eN;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iN;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Ljava/util/Map;)V"}
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     2:3:void registerInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):138:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;)V"}
     4:4:boolean com.android.tools.r8.graph.DexMethod.isNotIdenticalTo(com.android.tools.r8.graph.DexMethod):35:35 -> a
     4:4:void registerInvoke(com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233554,14 +233041,14 @@
     10:11:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):128 -> h
     12:12:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):129:129 -> h
     13:13:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):123:123 -> h
-com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection -> com.android.tools.r8.internal.cN:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection -> com.android.tools.r8.internal.gN:
 # {"id":"sourceFile","fileName":"MemberRebindingAnalysis.java"}
     java.util.Map nonReboundMethodReferences -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
     1:2:void <init>(java.util.Map):380:381 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/AbstractMap;)V"}
     1:1:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection create():385:385 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gN;"}
     2:4:void add(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):394:396 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;)V"}
     5:5:void add(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):395:395 -> a
@@ -233571,13 +233058,13 @@
     7:7:void com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.addContext(com.android.tools.r8.graph.ProgramMethod):440:440 -> a
     7:7:void add(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):397 -> a
     8:8:void forEach(com.android.tools.r8.utils.TriConsumer):402:402 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;)V"}
     9:9:void lambda$forEach$1(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo):403:403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/dN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/hN;)V"}
     10:10:void mergeThreadLocalIntoShared(com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection):408:408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gN;)V"}
     11:13:void lambda$mergeThreadLocalIntoShared$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):411:413 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/CY;)V"}
     14:14:void lambda$mergeThreadLocalIntoShared$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):411:411 -> a
     15:15:void com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.addContexts(com.android.tools.r8.utils.collections.ProgramMethodSet):444:444 -> a
     15:15:void lambda$mergeThreadLocalIntoShared$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):415 -> a
@@ -233591,47 +233078,47 @@
     17:17:void lambda$mergeThreadLocalIntoShared$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):415 -> a
     18:18:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.create(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):431:431 -> a
     18:18:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo lambda$add$0(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):396 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;)Lcom/android/tools/r8/internal/dN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;)Lcom/android/tools/r8/internal/hN;"}
     1:1:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessCollection createConcurrent():389:389 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gN;"}
     2:2:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.createConcurrent(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):436:436 -> b
     2:2:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo lambda$mergeThreadLocalIntoShared$2(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):414 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;)Lcom/android/tools/r8/internal/dN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;)Lcom/android/tools/r8/internal/hN;"}
     3:3:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> b
     3:3:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.createConcurrent(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):436 -> b
     3:3:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo lambda$mergeThreadLocalIntoShared$2(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):414 -> b
     4:4:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo.createConcurrent(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):436:436 -> b
     4:4:com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo lambda$mergeThreadLocalIntoShared$2(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult):414 -> b
-com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo -> com.android.tools.r8.internal.dN:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$NonReboundMethodAccessInfo -> com.android.tools.r8.internal.hN:
 # {"id":"sourceFile","fileName":"MemberRebindingAnalysis.java"}
     com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult resolutionResult -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/U4$c;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet contexts -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     1:3:void <init>(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):425:427 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/yY;)V"}
-com.android.tools.r8.optimize.MemberRebindingEventConsumer -> com.android.tools.r8.internal.gN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/CY;)V"}
+com.android.tools.r8.optimize.MemberRebindingEventConsumer -> com.android.tools.r8.internal.kN:
 # {"id":"sourceFile","fileName":"MemberRebindingEventConsumer.java"}
     void acceptMemberRebindingBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     1:1:void finished(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.MemberRebindingLens):19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nN;)V"}
-com.android.tools.r8.optimize.MemberRebindingEventConsumer$EmptyMemberRebindingEventConsumer -> com.android.tools.r8.internal.fN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rN;)V"}
+com.android.tools.r8.optimize.MemberRebindingEventConsumer$EmptyMemberRebindingEventConsumer -> com.android.tools.r8.internal.jN:
 # {"id":"sourceFile","fileName":"MemberRebindingEventConsumer.java"}
     com.android.tools.r8.optimize.MemberRebindingEventConsumer$EmptyMemberRebindingEventConsumer INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jN;"}
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>():34:34 -> <init>
     1:1:void acceptMemberRebindingBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):44:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
-com.android.tools.r8.optimize.MemberRebindingHelper -> com.android.tools.r8.internal.hN:
+com.android.tools.r8.optimize.MemberRebindingHelper -> com.android.tools.r8.internal.lN:
 # {"id":"sourceFile","fileName":"MemberRebindingHelper.java"}
     com.android.tools.r8.androidapi.AndroidApiLevelCompute androidApiLevelCompute -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/androidapi/a;"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
@@ -233647,14 +233134,14 @@
     11:18:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):162:169 -> a
     19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.LibraryMethod.getHolder():7:7 -> a
     19:19:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v4;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/yY;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/v4;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/CY;)Z"}
     20:23:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):137:140 -> a
     24:24:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     25:25:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     25:25:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):45 -> a
     26:32:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):45:51 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeBug():3175:3175 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeBug():3181:3181 -> a
     33:33:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):51 -> a
     34:37:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):55:58 -> a
     38:54:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):54:70 -> a
@@ -233675,7 +233162,7 @@
     62:62:boolean isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):150:150 -> a
     62:62:boolean canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):128 -> a
     62:62:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):77 -> a
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeToAbstractMethodBug():3183:3183 -> a
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.canHaveSuperInvokeToAbstractMethodBug():3189:3189 -> a
     63:63:boolean isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.InvokeType):150 -> a
     63:63:boolean canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):128 -> a
     63:63:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.DexMethod):77 -> a
@@ -233709,7 +233196,7 @@
     126:131:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):181 -> a
     132:156:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):189:213 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.jN:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.nN:
 # {"id":"sourceFile","fileName":"MemberRebindingIdentityLens.java"}
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
@@ -233718,9 +233205,9 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:3:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):42:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/AbstractMap;Ljava/util/AbstractMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/AbstractMap;Ljava/util/AbstractMap;)V"}
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReboundReference():57:57 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):92 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233748,7 +233235,7 @@
     16:17:com.android.tools.r8.graph.lens.MethodLookupResult com.android.tools.r8.graph.lens.MethodLookupResult$Builder.build():85:86 -> a
     16:17:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):98 -> a
     18:18:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/jN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/nN;"}
     19:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):53:53 -> a
     19:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):135 -> a
     20:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):136:136 -> a
@@ -233762,7 +233249,7 @@
     27:27:com.android.tools.r8.optimize.MemberRebindingIdentityLens com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.build():250:250 -> a
     27:27:com.android.tools.r8.optimize.MemberRebindingIdentityLens toRewrittenMemberRebindingIdentityLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):180 -> a
     28:32:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):139:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/iN;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/mN;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     33:33:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):142:142 -> a
     34:34:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):141:141 -> a
     35:35:boolean com.android.tools.r8.graph.DexField.isNotIdenticalTo(com.android.tools.r8.graph.DexField):37:37 -> a
@@ -233783,7 +233270,7 @@
     41:41:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):211:211 -> a
     41:41:void lambda$toRewrittenMemberRebindingIdentityLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):146 -> a
     42:43:void lambda$toRewrittenMemberRebindingIdentityLens$1(java.util.Deque,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):155:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Deque;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/iN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Deque;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/mN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     44:44:boolean com.android.tools.r8.graph.lens.GraphLens.isVerticalClassMergerLens():0:0 -> a
     44:44:void lambda$toRewrittenMemberRebindingIdentityLens$1(java.util.Deque,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):156 -> a
     45:55:void lambda$toRewrittenMemberRebindingIdentityLens$1(java.util.Deque,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):162:172 -> a
@@ -233807,7 +233294,7 @@
     64:64:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):217:217 -> a
     64:64:void lambda$toRewrittenMemberRebindingIdentityLens$1(java.util.Deque,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):176 -> a
     1:2:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):77:78 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     3:3:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> b
     3:3:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):80 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233817,13 +233304,13 @@
     7:7:com.android.tools.r8.graph.lens.FieldLookupResult com.android.tools.r8.graph.lens.FieldLookupResult$Builder.build():85:85 -> b
     7:7:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):82 -> b
     1:1:com.android.tools.r8.optimize.MemberRebindingIdentityLens asMemberRebindingIdentityLens():118:118 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jN;"}
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.iN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nN;"}
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.mN:
 # {"id":"sourceFile","fileName":"MemberRebindingIdentityLens.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens previousLens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
@@ -233831,11 +233318,11 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():183:183 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,java.util.Map,java.util.Map):195:199 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Ljava/util/AbstractMap;Ljava/util/AbstractMap;)V"}
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.lN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Ljava/util/AbstractMap;Ljava/util/AbstractMap;)V"}
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.pN:
 # {"id":"sourceFile","fileName":"MemberRebindingIdentityLensFactory.java"}
     1:1:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/jN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/nN;"}
     2:2:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.concurrentBuilder(com.android.tools.r8.graph.AppView):57:57 -> a
     2:2:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):26 -> a
     3:3:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.concurrentBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):62:62 -> a
@@ -233844,13 +233331,13 @@
     4:21:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):27:44 -> a
     22:22:com.android.tools.r8.optimize.MemberRebindingIdentityLens com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.build():250:250 -> a
     22:22:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):45 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$1 -> com.android.tools.r8.internal.kN:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$1 -> com.android.tools.r8.internal.oN:
 # {"id":"sourceFile","fileName":"MemberRebindingIdentityLensFactory.java"}
     java.util.Set val$seen -> a
     com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder val$builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mN;"}
     1:1:void <init>(java.util.Set,com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder):29:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/iN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/mN;)V"}
     1:2:void onFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):32:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     3:3:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordFieldAccess(com.android.tools.r8.graph.DexField):222:222 -> a
@@ -233890,7 +233377,7 @@
     29:30:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):216:217 -> a
     29:30:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordMethodAccess(com.android.tools.r8.graph.DexMethod):240 -> a
     29:30:void onMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):40 -> a
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.nN:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.rN:
 # {"id":"sourceFile","fileName":"MemberRebindingLens.java"}
     java.util.Map methodMaps -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -233899,7 +233386,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):27:28 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.graph.lens.MethodLookupResult.getType():39:39 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):54 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -233926,11 +233413,11 @@
     27:28:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):64 -> a
     1:1:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> b
     1:1:boolean isIdentityLensForFields(com.android.tools.r8.graph.lens.GraphLens):72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     2:2:boolean isIdentityLensForFields(com.android.tools.r8.graph.lens.GraphLens):72:72 -> b
     3:3:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):47:47 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.mN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.qN:
 # {"id":"sourceFile","fileName":"MemberRebindingLens.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -233942,9 +233429,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppView):78:81 -> <init>
     1:7:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):87:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)V"}
     8:8:java.util.Map lambda$map$0(com.android.tools.r8.ir.code.InvokeType):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aC;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cC;)Ljava/util/Map;"}
 com.android.tools.r8.optimize.accessmodification.AccessModifier -> com.android.tools.r8.internal.N1:
 # {"id":"sourceFile","fileName":"AccessModifier.java"}
     com.android.tools.r8.graph.AppView appView -> a
@@ -233954,9 +233441,9 @@
     com.android.tools.r8.optimize.accessmodification.AccessModifierLens$Builder lensBuilder -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O1;"}
     com.android.tools.r8.optimize.utils.NonProgramMethodsCollection nonProgramMethodsCollection -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Af;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cf;"}
     com.android.tools.r8.utils.InternalOptions options -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
@@ -233972,7 +233459,7 @@
     12:12:void <init>(com.android.tools.r8.graph.AppView):56 -> <init>
     13:14:void <init>(com.android.tools.r8.graph.AppView):56:57 -> <init>
     1:5:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     6:6:void installLens(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):100:100 -> a
     6:6:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):68 -> a
     7:7:boolean com.android.tools.r8.optimize.accessmodification.AccessModifierLens$Builder.isEmpty():121:121 -> a
@@ -234053,16 +233540,16 @@
     49:58:void publicizeMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):149:158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/internal/S1;)V"}
     59:59:void lambda$publicizeMethods$1(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/graph/C5;)V"}
     60:61:boolean isRenamingAllowed(com.android.tools.r8.graph.ProgramMethod):303:304 -> a
     60:61:void lambda$publicizeMethods$1(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.ProgramMethod):152 -> a
     62:62:void lambda$publicizeMethods$1(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.ProgramMethod):153:153 -> a
     63:63:com.android.tools.r8.graph.DexEncodedMethod lambda$publicizeMethods$2(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState,com.android.tools.r8.graph.ProgramMethod):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/internal/S1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/internal/S1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/j1;"}
     64:65:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):218:219 -> a
     64:65:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/Q1;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/Q1;)Lcom/android/tools/r8/graph/w2;"}
     66:67:boolean isRenamingAllowed(com.android.tools.r8.graph.ProgramMethod):303:304 -> a
     66:67:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):221 -> a
     66:67:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
@@ -234126,7 +233613,7 @@
     108:108:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
     109:109:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):0:0 -> a
     109:109:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":168,"2":169,"3":170},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":168,"2":169,"3":170},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     110:110:void com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState.addBlockedMethodSignature(com.android.tools.r8.graph.DexMethodSignature):71:71 -> a
     110:110:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):263 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234144,7 +233631,7 @@
     113:113:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
     114:114:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):0:0 -> a
     114:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.AccessModifier.getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.internal.BiMap,com.android.tools.r8.internal.AccessModifierNamingState):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":171,"2":172,"3":173},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":171,"2":172,"3":173},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     115:115:void com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState.addRenaming(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):75:75 -> a
     115:115:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234195,18 +233682,18 @@
     173:173:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     173:173:com.android.tools.r8.graph.DexMethod getAndReserveNewMethodReference(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):265 -> a
     174:175:boolean lambda$getAndReserveNewMethodReference$3(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.graph.DexMethod):239:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/graph/w2;)Z"}
     176:176:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> a
     176:176:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     176:176:boolean lambda$getAndReserveNewMethodReference$3(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.graph.DexMethod):240 -> a
     177:177:boolean lambda$getAndReserveNewMethodReference$3(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.graph.DexMethod):240:240 -> a
     178:178:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):273:273 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/S1;)Z"}
-    179:179:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
+    179:179:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
     179:179:boolean com.android.tools.r8.shaking.KeepInfo.isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):225 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     179:179:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):273 -> a
-    180:180:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
+    180:180:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
     180:180:boolean com.android.tools.r8.shaking.KeepInfo.isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):225 -> a
     180:180:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):273 -> a
     181:181:boolean com.android.tools.r8.shaking.KeepInfo.internalIsAccessModificationAllowed():230:230 -> a
@@ -234305,7 +233792,7 @@
     234:237:com.android.tools.r8.graph.DexEncodedMethod commitMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):329 -> a
     238:240:com.android.tools.r8.graph.DexEncodedMethod commitMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):330:332 -> a
     1:6:com.android.tools.r8.graph.DexEncodedMethod publicizeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):168:173 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/internal/S1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/internal/S1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/j1;"}
     7:7:com.android.tools.r8.graph.DexEncodedMethod commitMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):312:312 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod publicizeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):174 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod commitMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):311:311 -> b
@@ -234351,7 +233838,7 @@
     56:56:com.android.tools.r8.graph.DexEncodedMethod commitMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState):311:311 -> b
     56:56:com.android.tools.r8.graph.DexEncodedMethod publicizeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.optimize.accessmodification.AccessModifierTraversal$BottomUpTraversalState):170 -> b
     57:58:boolean lambda$getAndReserveNewMethodReference$4(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.graph.DexMethod):259:260 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S5;Lcom/android/tools/r8/internal/Q1;Lcom/android/tools/r8/graph/w2;)Z"}
     59:59:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> b
     59:59:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> b
     59:59:boolean lambda$getAndReserveNewMethodReference$4(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState,com.android.tools.r8.graph.DexMethod):260 -> b
@@ -234359,17 +233846,17 @@
 com.android.tools.r8.optimize.accessmodification.AccessModifierLens -> com.android.tools.r8.internal.P1:
 # {"id":"sourceFile","fileName":"AccessModifierLens.java"}
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap methodMap -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
     java.util.Set publicizedPrivateInterfaceMethods -> g
     java.util.Set publicizedPrivateVirtualMethods -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Set,java.util.Set):38:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Ljava/util/Set;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Ljava/util/Set;Ljava/util/Set;)V"}
     1:1:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReboundReference():57:57 -> a
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):66:66 -> a
     3:3:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):55:55 -> a
     3:3:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):66 -> a
@@ -234410,7 +233897,7 @@
 com.android.tools.r8.optimize.accessmodification.AccessModifierLens$Builder -> com.android.tools.r8.internal.O1:
 # {"id":"sourceFile","fileName":"AccessModifierLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap methodMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Set publicizedPrivateInterfaceMethods -> b
     java.util.Set publicizedPrivateVirtualMethods -> c
     boolean $assertionsDisabled -> d
@@ -234419,20 +233906,20 @@
 com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState -> com.android.tools.r8.internal.Q1:
 # {"id":"sourceFile","fileName":"AccessModifierNamingState.java"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet blockedMethodSignatures -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureBiMap reservedMethodSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ol;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
     1:1:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):32:32 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;)V"}
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):25 -> <init>
     3:11:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):25:33 -> <init>
     1:28:com.android.tools.r8.optimize.accessmodification.AccessModifierNamingState createInitialNamingState(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.optimize.utils.NonProgramMethodsCollection):40:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/Af;)Lcom/android/tools/r8/internal/Q1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/Cf;)Lcom/android/tools/r8/internal/Q1;"}
     29:29:boolean lambda$createInitialNamingState$0(com.android.tools.r8.graph.DexEncodedMethod):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     30:33:void lambda$createInitialNamingState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):48:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
     34:34:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.put(com.android.tools.r8.graph.DexMethodSignature,java.lang.Object):48:48 -> a
     34:34:void lambda$createInitialNamingState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.graph.ProgramMethod):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234441,7 +233928,7 @@
     36:37:boolean lambda$createInitialNamingState$2(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):60:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)Z"}
     38:38:void lambda$createInitialNamingState$3(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.optimize.utils.NonProgramMethodsCollection,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;Lcom/android/tools/r8/internal/Af;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Cf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     39:39:void lambda$createInitialNamingState$3(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.optimize.utils.NonProgramMethodsCollection,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):64:64 -> a
     40:40:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.getOrComputeNonProgramMethods(com.android.tools.r8.graph.ClasspathOrLibraryClass):28:28 -> a
     40:40:void lambda$createInitialNamingState$3(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap,com.android.tools.r8.optimize.utils.NonProgramMethodsCollection,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):64 -> a
@@ -234474,9 +233961,9 @@
 # {"id":"sourceFile","fileName":"AccessModifierOptions.java"}
     boolean forceModifyPackagePrivateAndProtectedMethods -> a
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:7:void <init>(com.android.tools.r8.utils.InternalOptions):12:17 -> <init>
     1:1:boolean isAccessModificationRulePresent():35:35 -> a
     1:1:boolean isAccessModificationEnabled():25 -> a
@@ -234564,7 +234051,7 @@
 # {"id":"sourceFile","fileName":"AccessModifierTraversal.java"}
     boolean isKeptOrHasKeptSubclass -> a
     com.android.tools.r8.utils.collections.DexMethodSignatureMap nonPrivateVirtualMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rl;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():141:141 -> <clinit>
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureMap com.android.tools.r8.utils.collections.DexMethodSignatureMap.empty():43:43 -> <clinit>
@@ -234606,24 +234093,24 @@
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner codeScanner -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g3;"}
     com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis effectivelyUnusedArgumentsAnalysis -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lm;"}
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x3;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():41:41 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):64:67 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1669:1669 -> <init>
+    5:5:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1675:1675 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView):67 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:9:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1669:1672 -> <init>
+    6:9:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isEnabled():1675:1678 -> <init>
     6:9:void <init>(com.android.tools.r8.graph.AppView):67 -> <init>
     10:11:void <init>(com.android.tools.r8.graph.AppView):67:68 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$tearDownCodeScanner$2(java.util.Set):201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/Sl;"}
     2:2:void initializeCodeScanner(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     3:3:void initializeCodeScanner(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234681,7 +234168,7 @@
     98:98:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.initializeVirtualRootMethods(java.util.Collection,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner):51:51 -> a
     98:98:void lambda$initializeCodeScanner$0(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Set):107 -> a
     99:106:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):126:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/ph0;)V"}
     107:107:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis.scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):113:113 -> a
     107:107:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234732,7 +234219,7 @@
     197:197:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):140 -> a
     198:198:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):140:140 -> a
     199:199:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$scan$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
     200:200:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
     200:200:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$scan$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):129 -> a
     201:201:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.code.Value.getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):907:907 -> a
@@ -234745,7 +234232,7 @@
     205:206:void com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection.publishDelayedReprocessingCriteria():54:55 -> a
     205:206:void publishDelayedReprocessingCriteria():159 -> a
     207:207:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):177:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     208:208:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     208:208:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -234823,7 +234310,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):46:48 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/o3;)V"}
     1:10:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     11:19:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):64:72 -> a
     20:20:void com.android.tools.r8.graph.AppView.rewriteWithLens(com.android.tools.r8.graph.lens.NonIdentityGraphLens,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1047:1047 -> a
     20:20:void fixupApplication(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72 -> a
@@ -234843,75 +234330,68 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):45:45 -> a
     27:27:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):110 -> a
-    28:29:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):111:112 -> a
-    30:30:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
-    30:30:java.util.function.Consumer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):87 -> a
-    30:30:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):114 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    31:31:java.util.function.Consumer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    31:31:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):114 -> a
-    32:33:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):114:115 -> a
-    34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
-    34:34:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):115 -> a
-    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():542:542 -> a
-    35:35:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):116 -> a
+    28:32:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):111:115 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
+    33:33:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):115 -> a
+    34:34:boolean com.android.tools.r8.graph.DexEncodedMethod.isInstance():542:542 -> a
+    34:34:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):116 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
+    35:35:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
+    35:35:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):117 -> a
+    36:36:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     36:36:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):117 -> a
-    37:37:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    37:37:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):96:96 -> a
     37:37:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):117 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:38:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
-    38:38:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):117 -> a
-    39:40:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):118:119 -> a
-    41:41:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.unsetIsLibraryMethodOverride():1555:1555 -> a
-    41:41:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):120 -> a
-    42:42:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):119:119 -> a
+    38:39:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):118:119 -> a
+    40:40:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.unsetIsLibraryMethodOverride():1555:1555 -> a
+    40:40:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):120 -> a
+    41:41:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):119:119 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)V"}
-    43:43:void com.android.tools.r8.graph.AccessFlags.promote(int):307:307 -> a
-    43:43:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():273 -> a
-    43:43:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):119 -> a
-    44:44:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):130:130 -> a
-    44:44:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    45:45:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
-    45:45:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):130 -> a
+    42:42:void com.android.tools.r8.graph.AccessFlags.promote(int):307:307 -> a
+    42:42:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():273 -> a
+    42:42:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):119 -> a
+    43:43:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):130:130 -> a
+    43:43:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
+    44:44:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
+    44:44:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    44:44:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
+    45:45:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131:131 -> a
     45:45:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    46:46:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131:131 -> a
+    46:46:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59:59 -> a
+    46:46:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131 -> a
     46:46:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    47:47:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59:59 -> a
+    47:47:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.setPrunedApp(com.android.tools.r8.graph.DexApplication):180:180 -> a
+    47:47:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59 -> a
     47:47:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131 -> a
     47:47:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    48:48:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.setPrunedApp(com.android.tools.r8.graph.DexApplication):180:180 -> a
-    48:48:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59 -> a
+    48:48:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59:59 -> a
     48:48:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131 -> a
     48:48:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    49:49:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59:59 -> a
-    49:49:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):131 -> a
-    49:49:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    50:53:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):132:135 -> a
-    50:53:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    54:54:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):133:133 -> a
+    49:52:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):132:135 -> a
+    49:52:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
+    53:53:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):133:133 -> a
+    53:53:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
+    54:54:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):61:61 -> a
+    54:54:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):133 -> a
     54:54:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    55:55:void com.android.tools.r8.ir.optimize.info.OptimizationFeedback.fixupOptimizationInfos(com.android.tools.r8.graph.AppView,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):61:61 -> a
-    55:55:void fixupOptimizationInfos(java.util.concurrent.ExecutorService):133 -> a
-    55:55:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):69 -> a
-    56:56:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):169:169 -> a
+    55:55:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):169:169 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/l1;"}
+    56:56:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.NestedGraphLens.getNextFieldSignature(com.android.tools.r8.graph.DexField):237:237 -> a
+    56:56:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):169 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.NestedGraphLens.getNextFieldSignature(com.android.tools.r8.graph.DexField):237:237 -> a
     57:57:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):169 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:58:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.NestedGraphLens.getNextFieldSignature(com.android.tools.r8.graph.DexField):237:237 -> a
-    58:58:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):169 -> a
-    59:59:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):174:174 -> a
+    58:58:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):174:174 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-    60:60:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):179:179 -> a
+    59:59:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):179:179 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-    61:61:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):190:190 -> a
+    60:60:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):190:190 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
-    62:62:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):195:195 -> a
+    61:61:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):195:195 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-    63:63:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):199:199 -> a
+    62:62:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):199:199 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     1:2:void fixupClass(com.android.tools.r8.graph.DexProgramClass):77:78 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
@@ -234956,13 +234436,13 @@
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.e3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorApplicationFixer.java"}
     com.android.tools.r8.graph.lens.GraphLens val$codeLens -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.PrunedItems val$prunedItems -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/J5;"}
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer this$0 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f3;"}
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.PrunedItems):137:137 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f3;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/J5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f3;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/J5;)V"}
     1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):141:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;Lcom/android/tools/r8/ir/optimize/info/v;)V"}
     2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo.fixupAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):114:114 -> a
@@ -234999,18 +234479,18 @@
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScannerModeling modeling -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i3;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValueFactory fieldValueFactory -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory methodParameterFactory -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nO;"}
     java.util.Set monomorphicVirtualMethods -> e
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x3;"}
     java.util.Map virtualRootMethods -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection):134:134 -> <init>
@@ -235025,7 +234505,7 @@
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeFieldState(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/CR;"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeFieldState(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod):284 -> a
     3:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeFieldState(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod):284:286 -> a
@@ -235067,7 +234547,7 @@
     39:39:void addVirtualRootMethods(java.util.Map):145:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;)V"}
     40:40:boolean isMethodParameterAlreadyUnknown(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/iO;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/mO;Lcom/android/tools/r8/graph/C5;)Z"}
     41:41:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter.getMethod():39:39 -> a
     41:41:boolean isMethodParameterAlreadyUnknown(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -235108,7 +234588,7 @@
     72:72:boolean isMonomorphicVirtualMethod(com.android.tools.r8.graph.ProgramMethod):200 -> a
     73:73:boolean isMonomorphicVirtualMethod(com.android.tools.r8.graph.ProgramMethod):201:201 -> a
     74:77:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.utils.Timing):214:217 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/internal/ph0;)V"}
     78:78:void scan(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):232:232 -> a
     78:78:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.utils.Timing):217 -> a
     79:79:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.ir.code.FieldInstruction.resolveField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
@@ -235132,9 +234612,9 @@
     92:99:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.utils.Timing):221 -> a
     100:100:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.utils.Timing):224:224 -> a
     101:118:void addTemporaryFieldState(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):246:263 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;)V"}
     119:119:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):253:253 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/sf;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/uf;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/CR;"}
     120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     120:120:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -235144,9 +234624,9 @@
     122:122:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):260 -> a
     123:130:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):254:261 -> a
     131:131:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState lambda$computeFieldState$2(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramMethod):304:304 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/uU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yU;"}
     132:132:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow computeInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):321:321 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/pv;"}
     133:133:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):236:236 -> a
     133:133:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow computeInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):321 -> a
     134:136:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow computeInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):322:324 -> a
@@ -235168,13 +234648,13 @@
     155:160:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow computeInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):337:342 -> a
     161:161:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow computeInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):341:341 -> a
     162:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow castBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.ir.code.Value):348:357 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/pv;"}
     172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.CheckCast.getType():95:95 -> a
     172:172:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow castBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.ir.code.Value):357 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     173:173:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow castBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.ir.code.Value):357:357 -> a
     174:175:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow widenBaseInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.ProgramMethod):361:362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/A5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/pv;"}
     176:176:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue.getField():19:19 -> a
     176:176:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow widenBaseInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.ProgramMethod):362 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -235201,7 +234681,7 @@
     182:182:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow widenBaseInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.ProgramMethod):362 -> a
     183:188:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow widenBaseInFlow(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.ProgramMethod):363:368 -> a
     189:189:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState narrowFieldState(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):394:394 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/yR;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/CR;)Lcom/android/tools/r8/internal/CR;"}
     190:191:com.android.tools.r8.ir.analysis.value.AbstractValue getFallbackAbstractValueForField(com.android.tools.r8.graph.ProgramField,java.util.function.Supplier):421:422 -> a
     190:191:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState narrowFieldState(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):395 -> a
     192:192:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
@@ -235226,14 +234706,14 @@
     213:213:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue):22:22 -> a
     213:213:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState narrowFieldState(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):413 -> a
     214:280:void scan(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):434:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;)V"}
     281:298:void scan(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):491:508 -> a
     299:302:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):517:520 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;)V"}
     303:315:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):518:530 -> a
     316:322:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):540:546 -> a
     316:322:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addTemporaryMethodState$3(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):522 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/tO;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/xO;)Lcom/android/tools/r8/internal/xO;"}
     323:323:boolean shouldUsePolymorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):837:837 -> a
     323:323:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):548 -> a
     323:323:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addTemporaryMethodState$3(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):522 -> a
@@ -235318,14 +234798,14 @@
     394:394:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):568:568 -> a
     394:394:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addTemporaryMethodState$3(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):522 -> a
     395:395:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound computeBoundsForPolymorphicMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):633:633 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Hm;)Lcom/android/tools/r8/internal/Hm;"}
     396:404:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound computeBoundsForPolymorphicMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):632:640 -> a
     405:405:com.android.tools.r8.graph.DexMethod getVirtualRootMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
     405:405:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound computeBoundsForPolymorphicMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):644 -> a
     406:412:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound computeBoundsForPolymorphicMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):646:652 -> a
     413:416:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound computeBoundsForPolymorphicMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):651:654 -> a
     417:417:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):687:687 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/jf;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/kf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lf;Lcom/android/tools/r8/internal/Hm;)Lcom/android/tools/r8/internal/mf;"}
     418:418:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
     418:418:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):687 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -235431,7 +234911,7 @@
     525:527:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.create(boolean,java.util.List):33:35 -> a
     525:527:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):721 -> a
     528:528:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):813:813 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/graph/w2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/graph/w2;"}
     529:529:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
     529:529:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):813 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -235452,15 +234932,15 @@
     546:548:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):829:831 -> a
     549:549:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):830:830 -> a
     550:550:void dump(com.android.tools.r8.utils.DeterminismChecker):856:856 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl;)V"}
     551:560:void dump(com.android.tools.r8.utils.DeterminismChecker$LineCallback):860:869 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hl;)V"}
     561:561:void dump(com.android.tools.r8.utils.DeterminismChecker$LineCallback):868:868 -> a
     1:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeFieldState(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):272:275 -> b
     1:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$0(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):249 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/CR;"}
     5:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeInFlowState(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):376:385 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/CR;"}
     15:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeInFlowState(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):383:383 -> b
     16:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState.create(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):44:45 -> b
     16:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState computeInFlowState(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):386 -> b
@@ -235501,14 +234981,14 @@
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.m3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorEventConsumer.java"}
     void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer andThen(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m3;)Lcom/android/tools/r8/internal/m3;"}
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.k3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorEventConsumer.java"}
     1:1:void <init>():12:12 -> <init>
     1:1:void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.l3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorEventConsumer.java"}
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer val$self -> a
@@ -235520,7 +235000,7 @@
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer):25:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m3;Lcom/android/tools/r8/internal/m3;Lcom/android/tools/r8/internal/m3;)V"}
     1:2:void acceptCodeScannerResult(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):28:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.o3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorGraphLens.java"}
     java.util.Map prototypeChanges -> n
@@ -235528,7 +235008,7 @@
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):31:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Lcom/android/tools/r8/internal/PP;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Lcom/android/tools/r8/internal/TP;Ljava/util/IdentityHashMap;)V"}
     2:2:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):31 -> <init>
     3:3:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():96:96 -> <init>
@@ -235540,12 +235020,12 @@
     5:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):32:32 -> <init>
     1:1:boolean hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):45:45 -> a
     1:1:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)Lcom/android/tools/r8/internal/cC;"}
     2:2:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):94:94 -> a
     3:3:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
     3:3:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):95 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():171:171 -> a
+    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():169:169 -> a
     4:4:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):97:97 -> a
@@ -235557,7 +235037,7 @@
     8:11:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):83:86 -> a
     12:12:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):84:84 -> a
     1:1:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lp;)Lcom/android/tools/r8/internal/lp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/op;)Lcom/android/tools/r8/internal/op;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> b
     2:2:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):62 -> b
     3:3:com.android.tools.r8.graph.lens.FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.lens.FieldLookupResult):62:62 -> b
@@ -235592,9 +235072,9 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Map prototypeChanges -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> e
@@ -235609,7 +235089,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:12:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):44:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/ir/optimize/info/b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/ir/optimize/info/b;)V"}
     13:13:int com.android.tools.r8.ir.code.Argument.getIndex():53:53 -> a
     13:13:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):61 -> a
     14:17:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):61:64 -> a
@@ -235652,9 +235132,9 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection):55:57 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/x3;)V"}
     1:4:void enqueueAffectedCallees(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):98:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/cX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/gX;)V"}
     5:11:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod):104:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/C5;)V"}
     12:12:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getNextMethodSignature(com.android.tools.r8.graph.DexMethod):247:247 -> a
     12:12:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.ProgramMethod):110 -> a
     13:13:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):45:45 -> a
@@ -235711,7 +235191,7 @@
     48:48:boolean com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):122:122 -> a
     48:48:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/o3;Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/o3;Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
     49:49:boolean com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):122:122 -> a
     49:49:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):150 -> a
     50:50:boolean com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
@@ -235738,12 +235218,12 @@
     56:56:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):153 -> a
     57:59:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):153:155 -> a
     60:80:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):141:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/cX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/internal/gX;Ljava/util/concurrent/ExecutorService;)V"}
     81:101:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):143:163 -> a
     102:103:java.util.List lambda$enqueueAffectedCallers$2(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.graph.DexProgramClass):146:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/o3;Lcom/android/tools/r8/graph/D2;)Ljava/util/List;"}
     104:104:void lambda$enqueueAffectedCallers$3(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.lens.GraphLens,java.util.List):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cX;Lcom/android/tools/r8/internal/ls;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gX;Lcom/android/tools/r8/internal/ns;Ljava/util/List;)V"}
     105:106:void eliminateDeadFieldAccesses(java.util.concurrent.ExecutorService):170:171 -> a
     105:106:void com.android.tools.r8.internal.ArgumentPropagatorMethodReprocessingEnqueuer.eliminateDeadFieldAccesses(java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -235767,7 +235247,7 @@
     299:299:void eliminateDeadFieldAccesses(com.android.tools.r8.graph.ProgramMethod):190:190 -> a
     300:303:boolean isDeadFieldAccess(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.graph.ProgramMethod):240:243 -> a
     300:303:boolean lambda$eliminateDeadFieldAccesses$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirConstant):197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/AK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/EK;)Z"}
     304:304:boolean isDeadFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):248:248 -> a
     304:304:boolean isDeadFieldAccess(com.android.tools.r8.lightir.LirConstant,com.android.tools.r8.graph.ProgramMethod):244 -> a
     304:304:boolean lambda$eliminateDeadFieldAccesses$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirConstant):197 -> a
@@ -235790,7 +235270,7 @@
     309:309:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> a
     309:309:com.android.tools.r8.lightir.LirCode eliminateDeadFieldAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):197 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yK;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CK;)Lcom/android/tools/r8/internal/CK;"}
     310:310:com.android.tools.r8.lightir.LirCode eliminateDeadFieldAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):197:197 -> a
     311:311:boolean com.android.tools.r8.utils.ArrayUtils.none(java.lang.Object[],java.util.function.Predicate):32:32 -> a
     311:311:com.android.tools.r8.lightir.LirCode eliminateDeadFieldAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.lightir.LirCode):196 -> a
@@ -235874,19 +235354,19 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.PrimaryR8IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PX;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     com.android.tools.r8.utils.InternalOptions options -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gX;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():53:53 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):67:73 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/internal/wO;Lcom/android/tools/r8/internal/cX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/AO;Lcom/android/tools/r8/internal/gX;)V"}
     1:1:com.android.tools.r8.graph.PrunedItems setOptimizationInfo(java.util.concurrent.ExecutorService):93:93 -> a
     1:1:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.internal.ArgumentPropagatorOptimizationInfoPopulator.setOptimizationInfo(java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -235955,14 +235435,14 @@
     29:29:com.android.tools.r8.graph.PrunedItems setOptimizationInfo(java.util.concurrent.ExecutorService):97:97 -> a
     30:30:com.android.tools.r8.graph.PrunedItems setOptimizationInfo(java.util.concurrent.ExecutorService):94:94 -> a
     31:31:void lambda$setOptimizationInfo$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/D2;)V"}
     32:32:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     32:32:void lambda$setOptimizationInfo$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     33:33:void lambda$setOptimizationInfo$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass):96 -> a
     34:35:com.android.tools.r8.utils.collections.ProgramMethodSet setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):112:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/CY;"}
     36:36:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> a
     36:36:com.android.tools.r8.utils.collections.ProgramMethodSet setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):113 -> a
     37:38:com.android.tools.r8.utils.collections.ProgramMethodSet setOptimizationInfo(com.android.tools.r8.graph.DexProgramClass):114:115 -> a
@@ -236023,7 +235503,7 @@
     84:84:void setAbstractValue(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue):154:154 -> a
     84:84:void setOptimizationInfo(com.android.tools.r8.graph.ProgramField):149 -> a
     85:87:void setDynamicType(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.DynamicType):158:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/Dm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/Fm;)V"}
     88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     88:88:void setDynamicType(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.DynamicType):162 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236038,7 +235518,7 @@
     95:95:void setDynamicType(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.type.DynamicType):168 -> a
     96:96:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):172:172 -> a
     96:96:void lambda$setOptimizationInfo$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/C5;)V"}
     97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):107:107 -> a
     97:97:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):172 -> a
     97:97:void lambda$setOptimizationInfo$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):114 -> a
@@ -236056,7 +235536,7 @@
     100:100:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):172:172 -> a
     100:100:void lambda$setOptimizationInfo$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):114 -> a
     101:110:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):177:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/xO;)V"}
     111:111:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
     111:111:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236075,14 +235555,14 @@
     124:124:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.remove(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):136:136 -> a
     124:124:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):194 -> a
     125:125:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):200:200 -> a
-    126:126:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131:131 -> a
+    126:126:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):133:133 -> a
     126:126:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):200 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:127:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():135:135 -> a
-    127:127:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131 -> a
+    127:127:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():137:137 -> a
+    127:127:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):133 -> a
     127:127:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):200 -> a
     128:131:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):201:204 -> a
-    132:132:boolean com.android.tools.r8.shaking.KeepMethodInfo.isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):111:111 -> a
+    132:132:boolean com.android.tools.r8.shaking.KeepMethodInfo.isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):113:113 -> a
     132:132:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     133:142:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205:214 -> a
@@ -236243,12 +235723,12 @@
     264:264:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):109:109 -> a
     264:264:void setOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):257 -> a
     265:266:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):264:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;)Lcom/android/tools/r8/internal/tO;"}
-    267:267:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131:131 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;)Lcom/android/tools/r8/internal/xO;"}
+    267:267:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):133:133 -> a
     267:267:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    268:268:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():135:135 -> a
-    268:268:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131 -> a
+    268:268:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():137:137 -> a
+    268:268:boolean com.android.tools.r8.shaking.KeepMethodInfo.isConstantArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):133 -> a
     268:268:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):265 -> a
     269:269:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     270:270:int com.android.tools.r8.graph.DexEncodedMethod.getNumberOfArguments():206:206 -> a
@@ -236267,7 +235747,7 @@
     279:281:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):279 -> a
     282:299:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):281:298 -> a
     300:307:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$getMethodStateAfterUninstantiatedParameterRemoval$2(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):285:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
     308:308:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     308:308:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$getMethodStateAfterUninstantiatedParameterRemoval$2(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236281,20 +235761,20 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.PrimaryR8IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PX;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     java.util.List stronglyConnectedProgramComponents -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.function.BiConsumer interfaceDispatchOutsideProgram -> g
     1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,java.util.List,java.util.function.BiConsumer):51:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/internal/wO;Ljava/util/ArrayList;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/AO;Ljava/util/ArrayList;Ljava/util/function/BiConsumer;)V"}
     1:5:void propagateOptimizationInfo(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):67:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     6:15:void propagateOptimizationInfo(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):68:77 -> a
     16:17:void com.android.tools.r8.optimize.argumentpropagation.propagation.InFlowPropagator.run(java.util.concurrent.ExecutorService):69:70 -> a
     16:17:void propagateOptimizationInfo(java.util.Set,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):83 -> a
@@ -236321,14 +235801,14 @@
     java.util.Map interfaceDispatchOutsideProgram -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.optimize.utils.NonProgramMethodsCollection nonProgramMethodsCollection -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Af;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cf;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):183:186 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Ljava/util/IdentityHashMap;)V"}
     5:5:com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection.createVirtualMethodsCollection(com.android.tools.r8.graph.AppView):20:20 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):188 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Map):188:188 -> <init>
     1:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/o3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/o3;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer.create(com.android.tools.r8.graph.AppView):20:20 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200 -> a
     4:5:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingArgumentPropagatorSyntheticEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer):29:30 -> a
@@ -236397,7 +235877,7 @@
     63:63:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):222 -> a
     64:64:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens run(java.util.List,java.util.function.Consumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):223:223 -> a
     65:65:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):206:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z3;Lcom/android/tools/r8/internal/He;Ljava/util/function/Consumer;Ljava/util/Set;)Lcom/android/tools/r8/internal/n3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z3;Lcom/android/tools/r8/internal/Je;Ljava/util/function/Consumer;Ljava/util/Set;)Lcom/android/tools/r8/internal/n3;"}
     66:66:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.empty():49:49 -> a
     66:66:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):210 -> a
     67:67:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder lambda$run$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext,java.util.function.Consumer,java.util.Set):209:209 -> a
@@ -236416,14 +235896,14 @@
     boolean $assertionsDisabled -> f
     1:4:void <clinit>():86:89 -> <clinit>
     1:5:void <init>(boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):100:104 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/oA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/qA;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):109:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/proto/j;)Lcom/android/tools/r8/internal/u3;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges empty():149:149 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):110 -> a
     3:3:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):112 -> a
-    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():171:171 -> a
+    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isConvertedToStaticMethod():169:169 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:6:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):114:115 -> a
@@ -236444,7 +235924,7 @@
     21:21:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):122 -> a
     22:40:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):123:141 -> a
     41:41:void lambda$create$0(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.proto.ArgumentInfo):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oA;Lcom/android/tools/r8/internal/az;ILcom/android/tools/r8/graph/proto/b;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qA;Lcom/android/tools/r8/internal/cz;ILcom/android/tools/r8/graph/proto/b;)V"}
     42:42:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRemovedReceiverInfo():0:0 -> a
     42:42:void lambda$create$0(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.proto.ArgumentInfo):125 -> a
     43:46:void lambda$create$0(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.proto.ArgumentInfo):127:130 -> a
@@ -236472,13 +235952,13 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$c;"}
     java.util.Map allowedPrototypeChangesForVirtualMethods -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap returnValuesForVirtualMethods -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     java.util.Map newMethodSignatures -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map newMethodSignatureSuffixes -> g
@@ -236488,19 +235968,19 @@
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer eventConsumer -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z3;"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer this$0 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w3;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():228:228 -> <clinit>
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):259:259 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w3;Lcom/android/tools/r8/internal/z3;Lcom/android/tools/r8/internal/He;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w3;Lcom/android/tools/r8/internal/z3;Lcom/android/tools/r8/internal/Je;)V"}
     2:33:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer,com.android.tools.r8.contexts.CompilationContext$ProcessorContext):230:261 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():62 -> a
     1:1:boolean isReturnValueUnusedForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):557 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;)Z"}
     2:2:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     2:2:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.getFirst():62 -> a
     2:2:boolean isReturnValueUnusedForVirtualMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):557 -> a
@@ -236512,7 +235992,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;)V"}
     8:8:void lambda$reservePinnedMethodSignatures$4(com.android.tools.r8.graph.DexMethodSignature):334:334 -> a
     9:21:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):282:294 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/n3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Sl;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/n3;"}
     22:22:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.builder(com.android.tools.r8.graph.AppView):36:36 -> a
     22:22:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):294 -> a
     23:26:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder optimize(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.function.Consumer):295:298 -> a
@@ -236522,7 +236002,7 @@
     33:34:boolean lambda$reservePinnedMethodSignatures$2(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):325:326 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)Z"}
     35:37:void lambda$reservePinnedMethodSignatures$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):328:330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     38:38:void lambda$reservePinnedMethodSignatures$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):329:329 -> a
     39:39:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.getOrComputeNonProgramMethods(com.android.tools.r8.graph.ClasspathOrLibraryClass):28:28 -> a
     39:39:void lambda$reservePinnedMethodSignatures$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):329 -> a
@@ -236538,9 +236018,9 @@
     47:54:void reserveMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):343:350 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/u3;)V"}
     55:56:void computePrototypeChangesForVirtualMethods(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):360:361 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Sl;)V"}
     57:57:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):365:365 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/CY;)V"}
     58:58:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     58:58:boolean containsImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.utils.collections.ProgramMethodSet):475 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236677,7 +236157,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     193:195:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):430:432 -> a
     196:198:boolean isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):439:441 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)Z"}
     199:199:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):614:614 -> a
     199:199:boolean isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):441 -> a
     200:200:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isBootstrapMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
@@ -236690,7 +236170,7 @@
     203:203:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexClassAndMethod):111 -> a
     203:203:boolean isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):442 -> a
     204:218:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):593:607 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/n3;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/n3;)Z"}
     219:219:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     219:219:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):617 -> a
     220:221:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):619:620 -> a
@@ -236700,7 +236180,7 @@
     255:255:boolean lambda$visitClass$11(com.android.tools.r8.graph.DexEncodedField):608:608 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
     256:258:void lambda$visitClass$12(java.util.Set,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):611:613 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/internal/n3;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/A5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Map;Lcom/android/tools/r8/internal/n3;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/A5;)V"}
     259:260:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):131:132 -> a
     259:260:void lambda$visitClass$12(java.util.Set,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):613 -> a
     261:261:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.put(java.lang.Object,java.lang.Object):148:148 -> a
@@ -236714,7 +236194,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     263:263:void lambda$visitClass$12(java.util.Set,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramField):614:614 -> a
     264:267:void lambda$visitClass$13(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):623:626 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
     268:268:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> a
     268:268:void lambda$visitClass$13(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):626 -> a
     269:269:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
@@ -236723,7 +236203,7 @@
     270:270:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
     270:270:void lambda$visitClass$13(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):628 -> a
     271:283:void lambda$visitClass$15(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):632:644 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/n3;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/n3;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/C5;)V"}
     284:284:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexClassAndMethod):111:111 -> a
     284:284:void lambda$visitClass$15(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.ProgramMethod):644 -> a
     285:285:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> a
@@ -236780,7 +236260,7 @@
     346:347:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):0 -> a
     348:348:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):0:0 -> a
     348:348:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1159,"2":1160,"3":1161},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1159,"2":1160,"3":1161},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     1114:1128:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):766:780 -> a
     1114:1128:com.android.tools.r8.graph.DexMethod com.android.tools.r8.internal.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):0 -> a
     1129:1137:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):779:787 -> a
@@ -236812,14 +236292,14 @@
     1161:1161:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     1161:1161:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):763 -> a
     1162:1164:boolean lambda$getNewMethodSignature$16(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):794:796 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/u3;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/u3;Lcom/android/tools/r8/graph/w2;)Z"}
     1165:1165:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> a
     1165:1165:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     1165:1165:boolean lambda$getNewMethodSignature$16(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):796 -> a
     1166:1172:boolean isMethodSignatureFresh(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges):817:823 -> a
     1166:1172:boolean lambda$getNewMethodSignature$16(com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges,com.android.tools.r8.graph.DexMethod):795 -> a
     1173:1173:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):830:830 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;)Lcom/android/tools/r8/graph/proto/j;"}
     1174:1174:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
     1174:1174:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):830 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236830,8 +236310,8 @@
     1180:1180:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):834 -> a
     1181:1183:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForDirectMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):835:837 -> a
     1184:1188:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):847:851 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/graph/proto/j;"}
-    1189:1189:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isForceSyntheticsForInstanceInitializersEnabled():1676:1676 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/internal/Sl;)Lcom/android/tools/r8/graph/proto/j;"}
+    1189:1189:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isForceSyntheticsForInstanceInitializersEnabled():1682:1682 -> a
     1189:1189:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):851 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1190:1195:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):853:858 -> a
@@ -236855,7 +236335,7 @@
     1223:1223:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$selectInitArgumentTypeForInstanceInitializer$17(com.android.tools.r8.synthesis.SyntheticNaming):869:869 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;)Lcom/android/tools/r8/synthesis/Q$b;"}
     1224:1225:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):921:922 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/oA;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/qA;)Lcom/android/tools/r8/graph/proto/j;"}
     1226:1226:int com.android.tools.r8.graph.DexEncodedMethod.getNumberOfArguments():206:206 -> a
     1226:1226:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):922 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -236870,7 +236350,7 @@
     1235:1237:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):944:946 -> a
     1238:1238:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForAbstractVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):943:943 -> a
     1239:1239:void lambda$computePrototypeChangesForAbstractVirtualMethod$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.DexType):928:928 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/oA;Lcom/android/tools/r8/graph/proto/c$a;Lcom/android/tools/r8/internal/az;ILcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qA;Lcom/android/tools/r8/graph/proto/c$a;Lcom/android/tools/r8/internal/cz;ILcom/android/tools/r8/graph/I2;)V"}
     1240:1240:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
     1240:1240:int com.android.tools.r8.graph.DexEncodedMethod.getArgumentIndexFromParameterIndex(int):194 -> a
     1240:1240:void lambda$computePrototypeChangesForAbstractVirtualMethod$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.DexType):928 -> a
@@ -236884,13 +236364,13 @@
     1255:1255:void lambda$computePrototypeChangesForAbstractVirtualMethod$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,int,com.android.tools.r8.graph.DexType):934:934 -> a
     1256:1256:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):951:951 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/proto/j;"}
-    1257:1257:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):182:182 -> a
+    1257:1257:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):184:184 -> a
     1257:1257:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):951 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1258:1259:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):183:184 -> a
+    1258:1259:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):185:186 -> a
     1258:1259:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):951 -> a
-    1260:1260:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():189:189 -> a
-    1260:1260:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):185 -> a
+    1260:1260:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():191:191 -> a
+    1260:1260:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):187 -> a
     1260:1260:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):951 -> a
     1261:1262:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod):952:953 -> a
     1263:1263:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod):964:964 -> a
@@ -236902,20 +236382,20 @@
     1267:1267:com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$20(int):953:953 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/I2;"}
     1268:1276:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):970:978 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/QU;Lcom/android/tools/r8/internal/cc0;)Lcom/android/tools/r8/graph/I2;"}
-    1277:1277:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):235:235 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/internal/gc0;)Lcom/android/tools/r8/graph/I2;"}
+    1277:1277:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):237:237 -> a
     1277:1277:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):978 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1278:1279:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):236:237 -> a
+    1278:1279:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):238:239 -> a
     1278:1279:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):978 -> a
-    1280:1280:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():242:242 -> a
-    1280:1280:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):238 -> a
+    1280:1280:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():244:244 -> a
+    1280:1280:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):240 -> a
     1280:1280:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):978 -> a
     1281:1284:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):978:981 -> a
-    1285:1287:boolean com.android.tools.r8.shaking.KeepMethodInfo.isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):203:205 -> a
+    1285:1287:boolean com.android.tools.r8.shaking.KeepMethodInfo.isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):205:207 -> a
     1285:1287:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):981 -> a
-    1288:1288:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():210:210 -> a
-    1288:1288:boolean com.android.tools.r8.shaking.KeepMethodInfo.isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):206 -> a
+    1288:1288:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():212:212 -> a
+    1288:1288:boolean com.android.tools.r8.shaking.KeepMethodInfo.isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):208 -> a
     1288:1288:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):981 -> a
     1289:1292:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):986:989 -> a
     1293:1293:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
@@ -236929,13 +236409,13 @@
     1302:1317:com.android.tools.r8.graph.DexType getNewReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.ir.analysis.value.SingleValue):992:1007 -> a
     1318:1318:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):1032:1032 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)Lcom/android/tools/r8/graph/I2;"}
-    1319:1319:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):182:182 -> a
+    1319:1319:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):184:184 -> a
     1319:1319:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):1032 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1320:1321:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):183:184 -> a
+    1320:1321:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):185:186 -> a
     1320:1321:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):1032 -> a
-    1322:1322:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():189:189 -> a
-    1322:1322:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):185 -> a
+    1322:1322:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():191:191 -> a
+    1322:1322:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):187 -> a
     1322:1322:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):1032 -> a
     1323:1327:com.android.tools.r8.graph.DexType getNewParameterType(com.android.tools.r8.graph.ProgramMethod,int):1035:1039 -> a
     1328:1328:int com.android.tools.r8.graph.DexEncodedMethod.getFirstNonReceiverArgumentIndex():202:202 -> a
@@ -236972,8 +236452,8 @@
     1368:1368:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1082 -> a
     1369:1369:com.android.tools.r8.graph.proto.ArgumentInfoCollection computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,boolean,java.util.function.IntFunction,java.util.function.IntPredicate):1102:1102 -> a
     1369:1369:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1082 -> a
-    1370:1370:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):281:281 -> a
-    1370:1370:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():277 -> a
+    1370:1370:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):279:279 -> a
+    1370:1370:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():275 -> a
     1370:1370:com.android.tools.r8.graph.proto.ArgumentInfoCollection computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,boolean,java.util.function.IntFunction,java.util.function.IntPredicate):1104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1370:1370:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1082 -> a
@@ -237018,11 +236498,11 @@
     1:1:void reservePinnedMethodSignatures(java.util.Set):309 -> b
     2:24:void reservePinnedMethodSignatures(java.util.Set):310:332 -> b
     25:25:boolean lambda$computePrototypeChangesForVirtualMethods$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):367:367 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)Z"}
     26:26:boolean lambda$visitClass$9(com.android.tools.r8.graph.DexEncodedField):597:597 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
     27:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lambda$visitClass$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):636:636 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;)Lcom/android/tools/r8/graph/proto/j;"}
     28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> b
     28:28:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lambda$visitClass$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet):636 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -237063,10 +236543,10 @@
     120:120:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> b
     120:120:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):909 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    121:121:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> b
+    121:121:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> b
     121:121:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):909 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    122:122:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():120:120 -> b
+    122:122:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedArguments():118:118 -> b
     122:122:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):909 -> b
     123:123:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):910:910 -> b
     124:124:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):909:909 -> b
@@ -237074,14 +236554,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)Lcom/android/tools/r8/graph/I2;"}
     126:126:boolean lambda$computePrototypeChangesForMethod$21(int):959:959 -> b
     1:4:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):315:318 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)V"}
     5:5:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethodSignature):54:54 -> c
     5:5:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):318 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethodSignature):54:54 -> c
     6:6:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):318 -> c
     7:8:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):1015:1016 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/cc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/gc0;"}
     9:9:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> c
     9:9:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):1016 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -237100,13 +236580,13 @@
     18:24:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):1020:1026 -> c
     1:1:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):562:562 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):235:235 -> d
+    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):237:237 -> d
     2:2:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):562 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):236:237 -> d
+    3:4:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):238:239 -> d
     3:4:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):562 -> d
-    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():242:242 -> d
-    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):238 -> d
+    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():244:244 -> d
+    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):240 -> d
     5:5:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):562 -> d
     6:6:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):563:563 -> d
 com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer -> com.android.tools.r8.internal.z3:
@@ -237132,13 +236612,13 @@
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():23:23 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):34:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/AO;)V"}
     1:2:void initializeUnoptimizableFieldStates(java.util.Collection):48:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     3:3:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> a
@@ -237196,27 +236676,27 @@
     java.lang.Iterable getBaseInFlow() -> A0
     1:1:boolean hasSingleInFlow():46:46 -> O
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:1:boolean isIdentity():60:60 -> j0
     1:1:boolean isAbstractFunction():51:51 -> m
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction asAbstractFunction():56:56 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow -> com.android.tools.r8.internal.A5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow -> com.android.tools.r8.internal.C5:
 # {"id":"sourceFile","fileName":"BaseInFlow.java"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow asBaseInFlow():19:19 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C5;"}
     1:1:boolean isBaseInFlow():14:14 -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeValueState -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeValueState -> com.android.tools.r8.internal.a7:
 # {"id":"sourceFile","fileName":"BottomArrayTypeValueState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeValueState INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a7;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():13:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):34 -> a
     3:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):37:40 -> a
@@ -237224,15 +236704,15 @@
     7:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):40 -> a
     8:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):41:47 -> a
     1:1:java.lang.String toString():52:52 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeValueState -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeValueState -> com.android.tools.r8.internal.c7:
 # {"id":"sourceFile","fileName":"BottomClassTypeValueState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeValueState INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c7;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):36 -> a
     3:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):39:43 -> a
@@ -237257,33 +236737,33 @@
     15:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):44:49 -> a
     21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):48:48 -> a
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.b7:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.d7:
 # {"id":"sourceFile","fileName":"BottomMethodState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d7;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/xO;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/xO;"}
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):49:49 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom():30:30 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom():35:35 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeValueState -> com.android.tools.r8.internal.f7:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeValueState -> com.android.tools.r8.internal.h7:
 # {"id":"sourceFile","fileName":"BottomPrimitiveTypeValueState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeValueState INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h7;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():12:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):30:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     3:3:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):34 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):37:37 -> a
@@ -237291,15 +236771,15 @@
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):37 -> a
     6:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):37:38 -> a
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverValueState -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverValueState -> com.android.tools.r8.internal.i7:
 # {"id":"sourceFile","fileName":"BottomReceiverValueState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverValueState INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i7;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():13:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):34 -> a
     3:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):37:40 -> a
@@ -237307,45 +236787,45 @@
     7:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):40 -> a
     8:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):41:47 -> a
     1:1:java.lang.String toString():52:52 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState -> com.android.tools.r8.internal.j7:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState -> com.android.tools.r8.internal.l7:
 # {"id":"sourceFile","fileName":"BottomValueState.java"}
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17:17 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/B1;"}
     1:1:boolean isBottom():22:22 -> h
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():27:27 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.CastAbstractFunction -> com.android.tools.r8.internal.o8:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.CastAbstractFunction -> com.android.tools.r8.internal.q8:
 # {"id":"sourceFile","fileName":"CastAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow inFlow -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C5;"}
     com.android.tools.r8.graph.DexType type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:3:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.DexType):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:java.lang.Iterable getBaseInFlow():37:37 -> A0
     1:1:boolean isCastAbstractFunction():56:56 -> Y
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:5:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):47:51 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:5:boolean equals(java.lang.Object):69:73 -> equals
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():42:42 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:int hashCode():78:78 -> hashCode
     1:1:java.lang.String toString():83:83 -> toString
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.CastAbstractFunction asCastAbstractFunction():61:61 -> z0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o8;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeValueState -> com.android.tools.r8.internal.ef:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q8;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeValueState -> com.android.tools.r8.internal.gf:
 # {"id":"sourceFile","fileName":"ConcreteArrayTypeValueState.java"}
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):32:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;Ljava/util/Set;)V"}
     4:4:boolean isEffectivelyUnknown():92:92 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):35 -> <init>
     5:5:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> <init>
@@ -237354,11 +236834,11 @@
     5:5:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):35 -> <init>
     6:6:void <init>(com.android.tools.r8.ir.analysis.type.Nullability,java.util.Set):35:35 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState create(com.android.tools.r8.ir.analysis.type.Nullability):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/CR;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState create(com.android.tools.r8.ir.analysis.type.Nullability):39:39 -> a
     4:4:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):28:28 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState create(com.android.tools.r8.ir.analysis.type.Nullability):39 -> a
@@ -237371,9 +236851,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):50:52 -> a
     11:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeValueState asArrayState():82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ef;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gf;"}
     12:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):116:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/CR;"}
     14:15:boolean mutableJoinNullability(com.android.tools.r8.ir.analysis.type.Nullability):132:133 -> a
     14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):117 -> a
     16:16:boolean com.android.tools.r8.ir.analysis.type.Nullability.isUnknown():53:53 -> a
@@ -237382,9 +236862,9 @@
     16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):118 -> a
     17:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):119:126 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():97:97 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState getCorrespondingBottom():62:62 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l7;"}
     1:1:boolean isEffectivelyBottom():87:87 -> s
     2:2:boolean com.android.tools.r8.ir.analysis.type.Nullability.isBottom():33:33 -> s
     2:2:boolean isEffectivelyBottom():87 -> s
@@ -237395,23 +236875,23 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:java.lang.String toString():139:140 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():57:57 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():72:72 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState -> com.android.tools.r8.internal.gf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState -> com.android.tools.r8.internal.if:
 # {"id":"sourceFile","fileName":"ConcreteClassTypeValueState.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():20:20 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,java.util.Set):35:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Dm;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Fm;Ljava/util/Set;)V"}
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState create(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,java.util.Set):48:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Dm;Ljava/util/Set;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Lcom/android/tools/r8/internal/Fm;Ljava/util/Set;)Lcom/android/tools/r8/internal/CR;"}
     4:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):55:63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ml0;"}
     13:13:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():84:84 -> a
     13:13:com.android.tools.r8.ir.analysis.type.Nullability getNullability():89 -> a
     13:13:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):68 -> a
@@ -237431,7 +236911,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:27:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):72:74 -> a
     28:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):144:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/CR;"}
     31:31:boolean mutableJoinAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):164:164 -> a
     31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):146 -> a
     32:32:com.android.tools.r8.ir.analysis.value.AbstractValueJoiner$AbstractValueParameterJoiner com.android.tools.r8.graph.AppView.getAbstractValueParameterJoiner():355:355 -> a
@@ -237458,11 +236938,11 @@
     46:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):148 -> a
     48:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):149:157 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState asClassState():104:104 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/if;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():119:119 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState getCorrespondingBottom():79:79 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l7;"}
     1:1:boolean isEffectivelyBottom():109:109 -> s
     2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> s
     2:2:boolean isEffectivelyBottom():109 -> s
@@ -237470,18 +236950,18 @@
     1:1:boolean isEffectivelyUnknown():114:114 -> t
     1:2:java.lang.String toString():192:193 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():84:84 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():84:84 -> v
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():89 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():89:89 -> v
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.jf:
 # {"id":"sourceFile","fileName":"ConcreteMethodState.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):30:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/xO;"}
     8:8:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
     8:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):53 -> a
     8:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):36 -> a
@@ -237615,11 +237095,11 @@
     65:65:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
     65:65:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):36 -> a
     66:66:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/xO;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete():21:21 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
     1:1:boolean isConcrete():16:16 -> e
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.if:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.kf:
 # {"id":"sourceFile","fileName":"ConcreteMonomorphicMethodState.java"}
     boolean isReturnValueUsed -> b
     java.util.List parameterStates -> c
@@ -237635,14 +237115,14 @@
     10:10:void <init>(boolean,java.util.List):28 -> <init>
     11:11:void <init>(boolean,java.util.List):28:28 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Z"}
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isReceiverState():0:0 -> a
     2:2:boolean lambda$new$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):25 -> a
     3:3:boolean isEffectivelyUnknown(boolean,java.util.List):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Z)Z"}
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():65:65 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy():16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
     5:5:int size():139:139 -> a
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():65 -> a
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy():16 -> a
@@ -237655,7 +237135,7 @@
     8:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy():16 -> a
     12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():65:65 -> a
     12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
     13:13:int size():139:139 -> a
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():65 -> a
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():16 -> a
@@ -237667,13 +237147,13 @@
     16:19:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():66:69 -> a
     16:19:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():16 -> a
     20:22:void setParameterState(int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):132:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ml0;)V"}
     23:23:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isReceiverState():0:0 -> a
     23:23:void setParameterState(int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):134 -> a
     24:27:void setParameterState(int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):132:135 -> a
     28:28:int size():139:139 -> a
     28:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/if;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/kf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/kf;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/mf;"}
     29:29:int size():139:139 -> a
     29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -237729,17 +237209,17 @@
     72:72:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):113 -> a
     73:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):113:113 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic():123:123 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/if;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom():128:128 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
     1:1:boolean isEffectivelyBottom():51:51 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.lf:
 # {"id":"sourceFile","fileName":"ConcreteMonomorphicMethodStateOrBottom.java"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.mf:
 # {"id":"sourceFile","fileName":"ConcreteMonomorphicMethodStateOrUnknown.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.mf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.of:
 # {"id":"sourceFile","fileName":"ConcretePolymorphicMethodState.java"}
     java.util.Map receiverBoundsToState -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -237754,12 +237234,12 @@
     6:6:void <init>(java.util.Map):30 -> <init>
     7:7:void <init>(java.util.Map):30:30 -> <init>
     8:11:void <init>(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):35:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/kf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/internal/mf;)V"}
     12:12:boolean isEffectivelyUnknown():117:117 -> <init>
     12:12:void <init>(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):38 -> <init>
     13:13:void <init>(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):38:38 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/kf;Lcom/android/tools/r8/internal/kf;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/kf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/mf;Lcom/android/tools/r8/internal/mf;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/mf;"}
     4:4:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
@@ -237772,9 +237252,9 @@
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89:89 -> a
     14:14:void forEach(java.util.function.BiConsumer):100:100 -> a
     15:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateForBounds(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):104:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;)Lcom/android/tools/r8/internal/xO;"}
     21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
     22:22:boolean isEffectivelyBottom():113:113 -> a
     22:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():122 -> a
     23:23:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():122:122 -> a
@@ -237785,9 +237265,9 @@
     29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():126 -> a
     30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():127:127 -> a
     31:31:void lambda$mutableCopy$0(java.util.Map,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):126:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/kf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/internal/mf;)V"}
     32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Lcom/android/tools/r8/graph/z2;)Lcom/android/tools/r8/internal/uO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;Lcom/android/tools/r8/graph/z2;)Lcom/android/tools/r8/internal/yO;"}
     33:33:boolean isEffectivelyBottom():113:113 -> a
     33:33:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135 -> a
     34:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:135 -> a
@@ -237799,12 +237279,12 @@
     53:53:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):150 -> a
     54:60:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):151:157 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom():198:198 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic():193:193 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.nf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/of;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.pf:
 # {"id":"sourceFile","fileName":"ConcretePolymorphicMethodStateOrBottom.java"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState -> com.android.tools.r8.internal.of:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState -> com.android.tools.r8.internal.qf:
 # {"id":"sourceFile","fileName":"ConcretePrimitiveTypeValueState.java"}
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B1;"}
@@ -237816,41 +237296,41 @@
     4:4:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Set):29 -> <init>
     5:5:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Set):29:29 -> <init>
     6:6:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)V"}
     7:8:java.util.HashSet com.android.tools.r8.utils.SetUtils.newHashSet(java.lang.Object):41:42 -> <init>
     7:8:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):33 -> <init>
     9:9:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):33:33 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState create(com.android.tools.r8.ir.analysis.value.AbstractValue,java.util.Set):41:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Ljava/util/Set;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B1;Ljava/util/Set;)Lcom/android/tools/r8/internal/CR;"}
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):97:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/B1;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState asPrimitiveState():127:127 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/of;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState mutableCopy():48:48 -> m
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():17 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState getCorrespondingBottom():102:102 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l7;"}
     1:1:boolean isEffectivelyBottom():112:112 -> s
     2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> s
     2:2:boolean isEffectivelyBottom():112 -> s
     3:3:boolean isEffectivelyBottom():112:112 -> s
     1:1:boolean isEffectivelyUnknown():117:117 -> t
     1:2:java.lang.String toString():132:133 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverValueState -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverValueState -> com.android.tools.r8.internal.sf:
 # {"id":"sourceFile","fileName":"ConcreteReceiverValueState.java"}
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fm;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():18:18 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.analysis.type.DynamicType,java.util.Set):27:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Ljava/util/Set;)V"}
     1:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):36:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ml0;"}
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):49:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/B1;"}
     11:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):108:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/CR;"}
     14:16:boolean mutableJoinDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:131 -> a
     14:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):110 -> a
     17:17:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.widenDynamicNonReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):34:34 -> a
@@ -237864,29 +237344,29 @@
     19:25:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):110 -> a
     26:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):111:119 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverValueState asReceiverState():91:91 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():96:96 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState getCorrespondingBottom():54:54 -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l7;"}
     1:1:boolean isEffectivelyBottom():75:75 -> s
     1:2:boolean isEffectivelyUnknown():80:81 -> t
     1:2:java.lang.String toString():150:151 -> toString
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():59:60 -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():65:65 -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState -> com.android.tools.r8.internal.rf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState -> com.android.tools.r8.internal.tf:
 # {"id":"sourceFile","fileName":"ConcreteReferenceTypeValueState.java"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.Set):21:21 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/ml0;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tf;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/CR;"}
     1:11:com.android.tools.r8.ir.analysis.type.DynamicType cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.DynamicType):28:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
     12:12:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):97:97 -> a
     12:12:com.android.tools.r8.ir.analysis.type.DynamicType cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.DynamicType):38 -> a
     13:22:com.android.tools.r8.ir.analysis.type.DynamicType cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.DynamicType):40:49 -> a
@@ -237900,22 +237380,22 @@
     28:28:com.android.tools.r8.ir.analysis.type.DynamicType cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.DynamicType):34 -> a
     29:29:com.android.tools.r8.ir.analysis.type.DynamicType cast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.DynamicType):34:34 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState asReferenceState():68:68 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tf;"}
     1:1:boolean isReferenceState():63:63 -> k
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fm;"}
     com.android.tools.r8.ir.analysis.type.Nullability getNullability() -> v
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState -> com.android.tools.r8.internal.sf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState -> com.android.tools.r8.internal.uf:
 # {"id":"sourceFile","fileName":"ConcreteValueState.java"}
     java.util.Set inFlow -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(java.util.Set):28:29 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/CR;"}
     3:3:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):115 -> a
     4:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):116:124 -> a
@@ -237950,44 +237430,44 @@
     34:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState.mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action):69:76 -> a
     34:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):130 -> a
     42:42:boolean mutableJoinInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uf;)Z"}
     43:50:boolean mutableJoinInFlow(java.util.Set):138:145 -> a
     43:50:boolean mutableJoinInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):134 -> a
     1:2:boolean widenInFlow(com.android.tools.r8.graph.AppView):153:154 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState asConcrete():101:101 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uf;"}
     1:1:boolean isConcrete():96:96 -> i
     1:5:java.util.Set copyInFlow():70:74 -> o
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState getCorrespondingBottom() -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l7;"}
     1:2:java.util.Set getInFlow():82:83 -> q
     1:1:boolean hasInFlow():78:78 -> r
     boolean isEffectivelyBottom() -> s
     boolean isEffectivelyUnknown() -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection -> com.android.tools.r8.internal.Dp:
 # {"id":"sourceFile","fileName":"FieldStateCollection.java"}
     com.android.tools.r8.utils.collections.ProgramFieldMap fieldStates -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uY;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.collections.ProgramFieldMap):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uY;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState addTemporaryFieldState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramField,java.util.function.Supplier,com.android.tools.r8.utils.Timing):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/A5;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/A5;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/sf;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/uf;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/CR;"}
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):44 -> a
     4:4:com.android.tools.r8.utils.Action com.android.tools.r8.utils.Action.empty():13:13 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):46 -> a
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):40:40 -> a
     6:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState addTemporaryFieldState(com.android.tools.r8.graph.ProgramField,java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction):59:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/lh0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/ph0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/CR;"}
     31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/lh0;Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/yR;)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/ph0;Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/CR;)Lcom/android/tools/r8/internal/CR;"}
     32:32:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):67 -> a
     33:34:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):70:71 -> a
@@ -237995,7 +237475,7 @@
     35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):71 -> a
     36:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$addTemporaryFieldState$1(java.util.function.Supplier,com.android.tools.r8.utils.Timing,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState):74:79 -> a
     42:42:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState get(com.android.tools.r8.graph.ProgramField):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/ml0;"}
     43:43:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
     43:43:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState get(com.android.tools.r8.graph.ProgramField):91 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238004,7 +237484,7 @@
     45:45:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState get(com.android.tools.r8.graph.ProgramField):91:91 -> a
     46:46:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.bottom(com.android.tools.r8.graph.ProgramField):18:18 -> a
     46:46:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState get(com.android.tools.r8.graph.ProgramField):92 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue -> com.android.tools.r8.internal.Gp:
 # {"id":"sourceFile","fileName":"FieldValue.java"}
     com.android.tools.r8.graph.DexField field -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
@@ -238013,7 +237493,7 @@
     1:1:boolean isFieldValue(com.android.tools.r8.graph.DexField):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Z"}
     1:1:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     2:2:com.android.tools.r8.graph.DexField getField():19:19 -> b
     2:2:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):29 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238025,78 +237505,78 @@
     1:1:int hashCode():62:62 -> hashCode
     1:1:java.lang.String toString():67:67 -> toString
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue asFieldValue():44:44 -> y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dp;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValueFactory -> com.android.tools.r8.internal.Gp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gp;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValueFactory -> com.android.tools.r8.internal.Jp:
 # {"id":"sourceFile","fileName":"FieldValueFactory.java"}
     java.util.Map fieldValues -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     1:3:void <init>():15:17 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue create(com.android.tools.r8.graph.ProgramField):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/Dp;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider -> com.android.tools.r8.internal.Bq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/Gp;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider -> com.android.tools.r8.internal.Dq:
 # {"id":"sourceFile","fileName":"FlowGraphStateProvider.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$1 -> com.android.tools.r8.internal.yq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$1 -> com.android.tools.r8.internal.Aq:
 # {"id":"sourceFile","fileName":"FlowGraphStateProvider.java"}
     1:1:void <init>():25:25 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$2 -> com.android.tools.r8.internal.zq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$2 -> com.android.tools.r8.internal.Bq:
 # {"id":"sourceFile","fileName":"FlowGraphStateProvider.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction val$abstractFunction -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r;"}
     com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph val$flowGraph -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vq;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):41:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r;Lcom/android/tools/r8/internal/tq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r;Lcom/android/tools/r8/internal/vq;)V"}
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier):51:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$3 -> com.android.tools.r8.internal.Aq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider$3 -> com.android.tools.r8.internal.Cq:
 # {"id":"sourceFile","fileName":"FlowGraphStateProvider.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
-com.android.tools.r8.optimize.argumentpropagation.codescanner.IdentityAbstractFunction -> com.android.tools.r8.internal.Vt:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.IdentityAbstractFunction -> com.android.tools.r8.internal.Xt:
 # {"id":"sourceFile","fileName":"IdentityAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.IdentityAbstractFunction INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xt;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():10:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.lang.Iterable getBaseInFlow():35:35 -> A0
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:1:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):45:45 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():40:40 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:boolean isIdentity():51:51 -> j0
-com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow -> com.android.tools.r8.internal.pv:
 # {"id":"sourceFile","fileName":"InFlow.java"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InstanceFieldReadAbstractFunction asInstanceFieldReadAbstractFunction():65:65 -> B0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kw;"}
     1:1:boolean isMethodParameter():69:69 -> L
     1:1:boolean isUpdateChangedFlagsAbstractFunction():89:89 -> W
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.OrAbstractFunction asOrAbstractFunction():81:81 -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cV;"}
     1:1:boolean isCastAbstractFunction():41:41 -> Y
     1:1:boolean isInstanceFieldReadAbstractFunction():61:61 -> Z
     1:4:int compareTo(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):14:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     5:5:boolean isFieldValue(com.android.tools.r8.graph.DexField):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Z"}
     1:1:com.android.tools.r8.optimize.compose.UpdateChangedFlagsAbstractFunction asUpdateChangedFlagsAbstractFunction():93:93 -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pk0;"}
     int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:1:boolean isFieldValue():49:49 -> c0
     1:1:int compareTo(java.lang.Object):10:10 -> compareTo
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow asBaseInFlow():37:37 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/C5;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind() -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:boolean isBaseInFlow():33:33 -> j
@@ -238105,30 +237585,30 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r;"}
     1:1:boolean isUnknownAbstractFunction():85:85 -> s
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter asMethodParameter():77:77 -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mO;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue asFieldValue():57:57 -> y0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gp;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.CastAbstractFunction asCastAbstractFunction():45:45 -> z0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o8;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.InstanceFieldReadAbstractFunction -> com.android.tools.r8.internal.iw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/q8;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.InstanceFieldReadAbstractFunction -> com.android.tools.r8.internal.kw:
 # {"id":"sourceFile","fileName":"InstanceFieldReadAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow receiver -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/A5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C5;"}
     com.android.tools.r8.graph.DexField field -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.graph.DexField):17:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Lcom/android/tools/r8/graph/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Lcom/android/tools/r8/graph/l1;)V"}
     1:1:java.lang.Iterable getBaseInFlow():56:56 -> A0
     2:4:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):107:109 -> A0
     2:4:java.lang.Iterable getBaseInFlow():56 -> A0
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InstanceFieldReadAbstractFunction asInstanceFieldReadAbstractFunction():92:92 -> B0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kw;"}
     1:1:boolean hasSingleInFlow():72:72 -> O
     1:1:boolean isInstanceFieldReadAbstractFunction():87:87 -> Z
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):27:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     4:4:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isClassState():0:0 -> a
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):31 -> a
     5:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):32:34 -> a
@@ -238154,17 +237634,17 @@
     29:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState.create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.AbstractValue):39 -> a
     29:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):46 -> a
     32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState lambda$apply$0():27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     33:33:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     34:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getFallbackState(com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bq;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dq;)Lcom/android/tools/r8/internal/ml0;"}
     1:4:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):77:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():67:67 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.iO:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.mO:
 # {"id":"sourceFile","fileName":"MethodParameter.java"}
     com.android.tools.r8.graph.DexMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
@@ -238178,64 +237658,64 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)V"}
     1:1:boolean isMethodParameter():67:67 -> L
     1:9:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):52:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:5:boolean equals(java.lang.Object):83:87 -> equals
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():35:35 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:int hashCode():92:92 -> hashCode
     1:1:java.lang.String toString():97:97 -> toString
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter asMethodParameter():77:77 -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iO;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.jO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mO;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.nO:
 # {"id":"sourceFile","fileName":"MethodParameterFactory.java"}
     java.util.Map methodParameters -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     1:3:void <init>():12:14 -> <init>
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter create(com.android.tools.r8.graph.ProgramMethod,int):17:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)Lcom/android/tools/r8/internal/iO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)Lcom/android/tools/r8/internal/mO;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter create(com.android.tools.r8.graph.ProgramMethod,int):17:17 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.tO:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.xO:
 # {"id":"sourceFile","fileName":"MethodState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/xO;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/xO;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/if;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
     boolean isPolymorphic() -> c
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
     boolean isConcrete() -> e
     boolean isMonomorphic() -> f
     boolean isBottom() -> g
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
     boolean isUnknown() -> isUnknown
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.uO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/of;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.yO:
 # {"id":"sourceFile","fileName":"MethodStateBase.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic():39:39 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/if;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
     1:1:boolean isPolymorphic():0:0 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete():29:29 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
     1:1:boolean isConcrete():24:24 -> e
     1:1:boolean isMonomorphic():0:0 -> f
     1:1:boolean isBottom():0:0 -> g
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom():44:44 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom():59:59 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
     1:1:boolean isUnknown():0:0 -> isUnknown
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic():54:54 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection -> com.android.tools.r8.internal.vO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/of;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection -> com.android.tools.r8.internal.zO:
 # {"id":"sourceFile","fileName":"MethodStateCollection.java"}
     java.util.Map methodStates -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
@@ -238246,34 +237726,34 @@
     java.lang.Object getKey(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Ljava/lang/Object;"}
     1:4:void addMethodState(com.android.tools.r8.graph.AppView,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):37:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Lcom/android/tools/r8/internal/xO;)V"}
     5:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addMethodState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.graph.AppView,java.lang.Object,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):45:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/tO;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/xO;)Lcom/android/tools/r8/internal/xO;"}
     10:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addMethodState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.graph.AppView,java.lang.Object,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):48:51 -> a
     14:14:void addTemporaryMethodState(com.android.tools.r8.graph.AppView,java.lang.Object,java.util.function.Function,com.android.tools.r8.utils.Timing):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Ljava/util/function/Function;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Ljava/util/function/Function;Lcom/android/tools/r8/internal/ph0;)V"}
     15:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addTemporaryMethodState$1(java.util.function.Function,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,java.lang.Object,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):70:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/tO;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/internal/xO;)Lcom/android/tools/r8/internal/xO;"}
     23:26:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$addTemporaryMethodState$1(java.util.function.Function,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,java.lang.Object,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):76:79 -> a
     27:27:void addMethodStates(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/BO;)V"}
     28:28:void forEach(java.util.function.BiConsumer):91:91 -> a
     29:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(java.lang.Object):99:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/xO;"}
     30:30:void set(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;)V"}
     31:34:void set(java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):120:123 -> a
     31:34:void set(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):116 -> a
     com.android.tools.r8.graph.DexMethodSignature getSignature(java.lang.Object) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/graph/B2;"}
     1:1:void lambda$addMethodStates$2(com.android.tools.r8.graph.AppView,java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):87:87 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Lcom/android/tools/r8/internal/tO;)V"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference -> com.android.tools.r8.internal.wO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Object;Lcom/android/tools/r8/internal/xO;)V"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference -> com.android.tools.r8.internal.AO:
 # {"id":"sourceFile","fileName":"MethodStateCollectionByReference.java"}
     1:1:void <init>(java.util.Map):16:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(java.lang.Object):13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/xO;"}
     2:2:com.android.tools.r8.graph.DexMethod getKey(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     2:2:java.lang.Object getKey(com.android.tools.r8.graph.ProgramMethod):13 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Ljava/lang/Object;"}
@@ -238283,7 +237763,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/graph/B2;"}
     2:2:com.android.tools.r8.graph.DexMethodSignature getSignature(java.lang.Object):0:0 -> b
     2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.internal.MethodStateCollectionByReference.getSignature(java.lang.Object):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     3:3:com.android.tools.r8.graph.DexMethodSignature getSignature(com.android.tools.r8.graph.DexMethod):30:30 -> b
     3:3:com.android.tools.r8.graph.DexMethodSignature getSignature(java.lang.Object):13 -> b
     4:4:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> b
@@ -238294,45 +237774,45 @@
     5:5:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> b
     5:5:com.android.tools.r8.graph.DexMethodSignature getSignature(com.android.tools.r8.graph.DexMethod):30 -> b
     5:5:com.android.tools.r8.graph.DexMethodSignature getSignature(java.lang.Object):13 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature -> com.android.tools.r8.internal.xO:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature -> com.android.tools.r8.internal.BO:
 # {"id":"sourceFile","fileName":"MethodStateCollectionBySignature.java"}
     1:1:void <init>(java.util.Map):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature create():19:19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BO;"}
     2:2:com.android.tools.r8.graph.DexMethodSignature getKey(com.android.tools.r8.graph.ProgramMethod):24:24 -> a
     2:2:java.lang.Object getKey(com.android.tools.r8.graph.ProgramMethod):12 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.graph.DexMethodSignature getSignature(java.lang.Object):12:12 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/graph/B2;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState -> com.android.tools.r8.internal.yR:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState -> com.android.tools.r8.internal.CR:
 # {"id":"sourceFile","fileName":"NonEmptyValueState.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState asNonEmpty():16:16 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CR;"}
     1:1:boolean isNonEmpty():11:11 -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.OrAbstractFunction -> com.android.tools.r8.internal.YU:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.OrAbstractFunction -> com.android.tools.r8.internal.cV:
 # {"id":"sourceFile","fileName":"OrAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow inFlow -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gp;"}
     com.android.tools.r8.ir.analysis.value.SingleNumberValue constant -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zb0;"}
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,com.android.tools.r8.ir.analysis.value.SingleNumberValue):24:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/Vb0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gp;Lcom/android/tools/r8/internal/Zb0;)V"}
     1:4:java.lang.Iterable getBaseInFlow():56:59 -> A0
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.OrAbstractFunction asOrAbstractFunction():31:31 -> X
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cV;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState.getAbstractValue():92:92 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):41:42 -> a
     5:9:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):47:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:4:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):69:72 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     5:5:int com.android.tools.r8.ir.analysis.value.SingleNumberValue.getIntValue():119:119 -> b
     5:5:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):72 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238344,77 +237824,77 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():64:64 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:int hashCode():92:92 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.Jd0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.Nd0:
 # {"id":"sourceFile","fileName":"StateCloner.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner CLONER -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ld0;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner IDENTITY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Id0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Md0;"}
     1:14:void <clinit>():23:36 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kf;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mf;)Lcom/android/tools/r8/internal/xO;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.Hd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.Ld0:
 # {"id":"sourceFile","fileName":"StateCloner.java"}
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kf;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mf;)Lcom/android/tools/r8/internal/xO;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.Id0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.Md0:
 # {"id":"sourceFile","fileName":"StateCloner.java"}
     1:1:void <init>():37:37 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kf;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mf;)Lcom/android/tools/r8/internal/xO;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/il0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownAbstractFunction -> com.android.tools.r8.internal.Sj0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/ml0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownAbstractFunction -> com.android.tools.r8.internal.Wj0:
 # {"id":"sourceFile","fileName":"UnknownAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownAbstractFunction INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wj0;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():10:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.lang.Iterable getBaseInFlow():35:35 -> A0
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     2:2:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:1:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):45:45 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():40:40 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:boolean isUnknownAbstractFunction():51:51 -> s
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.ck0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.gk0:
 # {"id":"sourceFile","fileName":"UnknownMethodState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ck0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gk0;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy():13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mf;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xO;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/internal/Jd0;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/internal/Nd0;)Lcom/android/tools/r8/internal/xO;"}
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/tO;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownValueState -> com.android.tools.r8.internal.hk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/B2;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/xO;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownValueState -> com.android.tools.r8.internal.lk0:
 # {"id":"sourceFile","fileName":"UnknownValueState.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownValueState INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lk0;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/B1;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy():14:14 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:java.lang.String toString():52:52 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState -> com.android.tools.r8.internal.il0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState -> com.android.tools.r8.internal.ml0:
 # {"id":"sourceFile","fileName":"ValueState.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -238422,33 +237902,33 @@
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/B1;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/il0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Jd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ml0;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Nd0;Lcom/android/tools/r8/internal/Y1;)Lcom/android/tools/r8/internal/ml0;"}
     1:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomValueState bottom(com.android.tools.r8.graph.DexField):22:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/j7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/internal/l7;"}
     9:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeValueState asArrayState():60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ef;"}
-    1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState asClassState():72:72 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gf;"}
+    1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState asClassState():72:72 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/if;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState asConcrete():80:80 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState asNonEmpty():88:88 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CR;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState asPrimitiveState():96:96 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/of;"}
-    1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverValueState asReceiverState():104:104 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qf;"}
+    1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverValueState asReceiverState():104:104 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sf;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState asReferenceState():112:112 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tf;"}
     1:1:boolean isBottom():64:64 -> h
     1:1:boolean isConcrete():76:76 -> i
     1:1:boolean isNonEmpty():84:84 -> j
     1:1:boolean isReferenceState():108:108 -> k
     1:1:boolean isUnknown():0:0 -> l
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState mutableCopy() -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownValueState unknown():50:50 -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hk0;"}
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.Tl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lk0;"}
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.Xl0:
 # {"id":"sourceFile","fileName":"VirtualRootMethodsAnalysis.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):32:32 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
@@ -238492,7 +237972,7 @@
     16:16:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):64:64 -> a
     17:19:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):78:80 -> a
     17:19:void acceptVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Yl0;)V"}
     20:20:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod.hasOverrides():118:118 -> a
     20:20:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):81 -> a
     20:20:void acceptVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):55 -> a
@@ -238502,14 +237982,14 @@
     21:21:void acceptVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):55 -> a
     22:24:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):81:83 -> a
     22:24:void acceptVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):55 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase -> com.android.tools.r8.internal.Vl0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase -> com.android.tools.r8.internal.Zl0:
 # {"id":"sourceFile","fileName":"VirtualRootMethodsAnalysisBase.java"}
     java.util.Map virtualRootMethodsPerClass -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet monomorphicVirtualRootMethods -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet monomorphicVirtualNonRootMethods -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     java.util.Map virtualRootMethods -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> j
@@ -238518,9 +237998,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):134:140 -> <init>
     1:3:void lambda$computeVirtualRootMethodsState$2(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):160:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
     4:49:void lambda$computeVirtualRootMethodsState$1(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):164:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Yl0;)V"}
     50:50:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethodSignature):920:920 -> a
     50:50:void lambda$computeVirtualRootMethodsState$1(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):209 -> a
     51:51:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethodSignature):920:920 -> a
@@ -238537,7 +238017,7 @@
     57:57:void lambda$computeVirtualRootMethodsState$1(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):213 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     58:58:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ul0;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ul0;)Lcom/android/tools/r8/internal/Ul0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yl0;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Yl0;)Lcom/android/tools/r8/internal/Yl0;"}
     59:59:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod.getMethod():90:90 -> a
     59:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238563,15 +238043,15 @@
     73:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):200 -> a
     77:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):201:201 -> a
     78:78:void lambda$computeVirtualRootMethodsState$4(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.ProgramMethod):220:220 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/C5;)V"}
     79:79:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ul0;)Lcom/android/tools/r8/internal/Ul0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Yl0;)Lcom/android/tools/r8/internal/Yl0;"}
     80:80:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod.<init>(com.android.tools.r8.graph.ProgramMethod):41:41 -> a
     80:80:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):224 -> a
     81:82:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod lambda$computeVirtualRootMethodsState$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):226:227 -> a
     83:83:void setRootMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):274:274 -> a
     83:83:void lambda$prune$5(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ul0;Lcom/android/tools/r8/internal/Ul0;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yl0;Lcom/android/tools/r8/internal/Yl0;Lcom/android/tools/r8/internal/Yl0;)V"}
     84:84:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod.getMethod():90:90 -> a
     84:84:void setRootMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):275 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238585,7 +238065,7 @@
     88:89:void lambda$prune$5(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):258 -> a
     90:90:void setRootMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):274:274 -> a
     90:90:void lambda$prune$6(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ul0;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yl0;Lcom/android/tools/r8/internal/Yl0;)V"}
     91:91:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod.getMethod():90:90 -> a
     91:91:void setRootMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):275 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238598,9 +238078,9 @@
     95:96:void setRootMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):276:277 -> a
     95:96:void lambda$prune$6(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):264 -> a
     97:97:void acceptVirtualMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Yl0;)V"}
     1:1:void lambda$prune$7(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.ProgramMethod):242:242 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:java.lang.Object com.android.tools.r8.utils.collections.DexMethodSignatureMap.remove(com.android.tools.r8.graph.DexMethodSignature):254:254 -> b
     2:2:void lambda$prune$7(com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.ProgramMethod):242 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238661,17 +238141,17 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap com.android.tools.r8.utils.collections.DexMethodSignatureMap.create():31:31 -> m
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):156 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Rl;"}
     2:2:com.android.tools.r8.utils.collections.DexMethodSignatureMap computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157:157 -> m
     3:3:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):99:99 -> m
     3:3:com.android.tools.r8.utils.collections.DexMethodSignatureMap computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157 -> m
     4:4:com.android.tools.r8.utils.collections.DexMethodSignatureMap computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):218:218 -> m
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> m
     5:5:com.android.tools.r8.utils.collections.DexMethodSignatureMap computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):218 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod -> com.android.tools.r8.internal.Ul0:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod -> com.android.tools.r8.internal.Yl0:
 # {"id":"sourceFile","fileName":"VirtualRootMethodsAnalysisBase.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ul0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yl0;"}
     com.android.tools.r8.graph.ProgramMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     java.util.Set overrides -> c
@@ -238680,10 +238160,10 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Yl0;)V"}
     2:13:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):36:47 -> <init>
     1:1:void addOverride(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ul0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yl0;)V"}
     2:2:com.android.tools.r8.graph.ProgramMethod getMethod():90:90 -> a
     2:2:void addOverride(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238697,47 +238177,47 @@
     11:11:void addOverride(com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod):58:58 -> a
     12:12:boolean hasParent():74:74 -> a
     12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod getRoot():86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ul0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Yl0;"}
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysisBase$VirtualRootMethod getRoot():86:86 -> a
     14:15:void forEach(java.util.function.Consumer):113:114 -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.PR:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.TR:
 # {"id":"sourceFile","fileName":"NullCheckInserter.java"}
     1:1:void <init>():32:32 -> <init>
     void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;)V"}
     void processWorklist() -> a
     1:2:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):39:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/PR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/TR;"}
     3:3:boolean com.android.tools.r8.graph.lens.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):43 -> a
     4:6:com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):44:46 -> a
     7:7:boolean lambda$create$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;)Z"}
     8:8:boolean com.android.tools.r8.graph.lens.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens):40 -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.NR:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.RR:
 # {"id":"sourceFile","fileName":"NullCheckInserter.java"}
     1:1:void <init>():208:208 -> <init>
     1:1:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;)V"}
     2:2:void processWorklist():219:219 -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.OR:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.SR:
 # {"id":"sourceFile","fileName":"NullCheckInserter.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.lens.NonIdentityGraphLens graphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     java.util.Map worklist -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens):63:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/DR;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens):60:66 -> <init>
     1:1:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;)V"}
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.lens.MethodLookupResult.getPrototypeChanges():43:43 -> a
     2:2:void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238786,25 +238266,25 @@
     91:91:void processWorklist():161 -> a
     92:96:void processWorklist():162:166 -> a
     97:97:boolean lambda$processWorklist$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;)Z"}
     98:105:boolean isReadOfEffectivelyUnreadField(com.android.tools.r8.ir.code.Instruction):195:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;)Z"}
-com.android.tools.r8.optimize.argumentpropagation.propagation.DefaultFieldValueJoiner -> com.android.tools.r8.internal.Zh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;)Z"}
+com.android.tools.r8.optimize.argumentpropagation.propagation.DefaultFieldValueJoiner -> com.android.tools.r8.internal.bi:
 # {"id":"sourceFile","fileName":"DefaultFieldValueJoiner.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Set classesWithSingleCallerInlinedInstanceInitializers -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     java.util.List flowGraphs -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():48:48 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,java.util.List):59:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/Ap;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/Dp;Ljava/util/List;)V"}
     1:1:com.android.tools.r8.graph.ProgramField com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode.getField():22:22 -> a
     1:1:void lambda$updateFlowGraphs$7(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rY;Ljava/util/Deque;Lcom/android/tools/r8/internal/vq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vY;Ljava/util/Deque;Lcom/android/tools/r8/internal/xq;)V"}
     2:2:void lambda$updateFlowGraphs$7(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):263:263 -> a
     3:3:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.remove(com.android.tools.r8.graph.ProgramField):92:92 -> a
     3:3:void lambda$updateFlowGraphs$7(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):263 -> a
@@ -238827,7 +238307,7 @@
     36:36:boolean com.android.tools.r8.optimize.argumentpropagation.propagation.FieldReadBeforeWriteAnalysis.isInstanceFieldMaybeReadBeforeWrite(com.android.tools.r8.graph.ProgramField):50:50 -> a
     36:36:boolean lambda$analyzeInstanceInitializerAssignments$5(com.android.tools.r8.optimize.argumentpropagation.propagation.FieldReadBeforeWriteAnalysis,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer,com.android.tools.r8.graph.ProgramField):231 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rp;Lcom/android/tools/r8/internal/rY;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/up;Lcom/android/tools/r8/internal/vY;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/A5;)Z"}
     37:38:boolean lambda$analyzeInstanceInitializerAssignments$5(com.android.tools.r8.optimize.argumentpropagation.propagation.FieldReadBeforeWriteAnalysis,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer,com.android.tools.r8.graph.ProgramField):232:233 -> a
     39:45:java.util.Map joinDefaultFieldValuesForFieldsWithReadBeforeWrite(java.util.concurrent.ExecutorService):71:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Ljava/util/IdentityHashMap;"}
@@ -238845,7 +238325,7 @@
     71:71:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.isEmpty():74:74 -> a
     71:71:void analyzeClassInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/rY;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vY;Ljava/util/function/Consumer;)V"}
     72:72:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.isEmpty():74:74 -> a
     72:72:void analyzeClassInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):204 -> a
     73:73:void analyzeClassInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):207:207 -> a
@@ -238853,7 +238333,7 @@
     74:74:void analyzeClassInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):210 -> a
     75:80:void analyzeClassInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):210:215 -> a
     81:84:void lambda$joinDefaultFieldValuesForFieldsWithReadBeforeWrite$0(java.util.Map,com.android.tools.r8.utils.collections.ProgramFieldSet,com.android.tools.r8.graph.ProgramField):82:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/rY;Lcom/android/tools/r8/graph/A5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/vY;Lcom/android/tools/r8/graph/A5;)V"}
     85:89:void lambda$joinDefaultFieldValuesForFieldsWithReadBeforeWrite$0(java.util.Map,com.android.tools.r8.utils.collections.ProgramFieldSet,com.android.tools.r8.graph.ProgramField):84:88 -> a
     90:92:java.util.Map getFieldsOfInterest():103:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/IdentityHashMap;"}
@@ -238875,7 +238355,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;)V"}
     153:153:void analyzeInitializers(java.util.Map,java.util.function.Consumer,java.util.concurrent.ExecutorService):171:171 -> a
     154:179:java.util.Map updateFlowGraphs(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.concurrent.ExecutorService):255:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rY;Ljava/util/concurrent/ExecutorService;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vY;Ljava/util/concurrent/ExecutorService;)Ljava/util/IdentityHashMap;"}
     180:180:java.util.Map updateFlowGraphs(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.concurrent.ExecutorService):256:256 -> a
     181:181:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
     181:181:java.util.Map updateFlowGraphs(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.concurrent.ExecutorService):284 -> a
@@ -238885,19 +238365,19 @@
     183:185:java.util.Map updateFlowGraphs(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.concurrent.ExecutorService):284:286 -> a
     186:189:java.util.Map updateFlowGraphs(com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.concurrent.ExecutorService):285:288 -> a
     190:208:com.android.tools.r8.utils.Pair lambda$updateFlowGraphs$8(com.android.tools.r8.utils.collections.ProgramFieldSet,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):259:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rY;Lcom/android/tools/r8/internal/tq;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vY;Lcom/android/tools/r8/internal/vq;)Lcom/android/tools/r8/internal/MV;"}
     209:209:void lambda$updateFlowGraphs$6(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode,java.util.Deque):270:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xq;Ljava/util/Deque;)V"}
     210:213:void com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.clearPredecessors():86:89 -> a
     210:213:void lambda$updateFlowGraphs$6(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode,java.util.Deque):271 -> a
     214:214:void lambda$updateFlowGraphs$6(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode,java.util.Deque):273:273 -> a
     215:215:boolean lambda$updateFlowGraphs$9(com.android.tools.r8.utils.Pair):279:279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;)Z"}
     216:216:void lambda$updateFlowGraphs$11(java.util.IdentityHashMap,com.android.tools.r8.utils.Pair):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/IV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/MV;)V"}
     217:217:void lambda$updateFlowGraphs$12(java.util.Collection,java.util.IdentityHashMap):289:289 -> a
     218:218:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState getDefaultValueState(com.android.tools.r8.graph.ProgramField):293:293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/sf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/uf;"}
     219:219:com.android.tools.r8.ir.analysis.value.AbstractValueFactory com.android.tools.r8.graph.AppView.abstractValueFactory():343:343 -> a
     219:219:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState getDefaultValueState(com.android.tools.r8.graph.ProgramField):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -238941,7 +238421,7 @@
     1:1:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.isEmpty():74:74 -> b
     1:1:void analyzeInstanceInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):222 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/rY;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/vY;Ljava/util/function/Consumer;)V"}
     2:2:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.isEmpty():74:74 -> b
     2:2:void analyzeInstanceInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):222 -> b
     3:3:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.create():32:32 -> b
@@ -238955,26 +238435,26 @@
     7:7:void analyzeInstanceInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):226 -> b
     8:11:void analyzeInstanceInitializerAssignments(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramFieldSet,java.util.function.Consumer):226:229 -> b
     12:12:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$updateFlowGraphs$10(com.android.tools.r8.graph.ProgramField):286:286 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/yR;"}
-com.android.tools.r8.optimize.argumentpropagation.propagation.FieldReadBeforeWriteAnalysis -> com.android.tools.r8.internal.rp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Lcom/android/tools/r8/internal/CR;"}
+com.android.tools.r8.optimize.argumentpropagation.propagation.FieldReadBeforeWriteAnalysis -> com.android.tools.r8.internal.up:
 # {"id":"sourceFile","fileName":"FieldReadBeforeWriteAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.ProgramMethod context -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.utils.LazyBox lazyDominatorTree -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dJ;"}
     java.util.List returnBlocks -> e
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():31:31 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$new$0(com.android.tools.r8.ir.code.IRCode):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Lcom/android/tools/r8/internal/lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Lcom/android/tools/r8/internal/nm;"}
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
     2:2:com.android.tools.r8.ir.code.DominatorTree lambda$new$0(com.android.tools.r8.ir.code.IRCode):45 -> a
     3:6:boolean isInstanceFieldNeverReadBeforeWrite(com.android.tools.r8.graph.ProgramField):54:57 -> a
@@ -238994,7 +238474,7 @@
     26:27:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
     26:27:boolean isInstanceFieldNeverReadBeforeWrite(com.android.tools.r8.graph.ProgramField):71 -> a
     28:28:boolean isFieldMaybeReadBeforeInstructionInInitializer(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Instruction):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/kp;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/np;)Z"}
     29:29:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.BasicBlock):120:120 -> a
     29:29:boolean isFieldMaybeReadBeforeInstructionInInitializer(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.code.Instruction):98 -> a
     30:33:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():133:136 -> a
@@ -239063,7 +238543,7 @@
     103:103:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():199 -> a
     104:118:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():207:221 -> a
     119:119:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/q;"}
     1:15:boolean isStaticFieldNeverReadBeforeWrite(com.android.tools.r8.graph.ProgramField):75:89 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Z"}
     16:16:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> b
@@ -239074,7 +238554,7 @@
     18:18:boolean isStaticFieldNeverReadBeforeWrite(com.android.tools.r8.graph.ProgramField):90:90 -> b
     19:20:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> b
     19:20:boolean isStaticFieldNeverReadBeforeWrite(com.android.tools.r8.graph.ProgramField):90 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph -> com.android.tools.r8.internal.vq:
 # {"id":"sourceFile","fileName":"FlowGraph.java"}
     java.util.LinkedHashMap fieldNodes -> b
     java.util.LinkedHashMap parameterNodes -> c
@@ -239125,9 +238605,9 @@
     10:10:void forEachNode(java.util.function.Consumer):90 -> a
     11:11:void forEachNode(java.util.function.Consumer):91:91 -> a
     12:12:void lambda$forEachNode$1(java.util.function.Consumer,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/cz;)V"}
     13:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier):101:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;Ljava/util/function/Supplier;)Lcom/android/tools/r8/internal/ml0;"}
     15:15:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue.getField():19:19 -> a
     15:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239147,30 +238627,30 @@
     24:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow,java.util.function.Supplier):110:114 -> a
     1:1:void forEachFieldNode(java.util.function.Consumer):73:73 -> b
     2:2:void lambda$forEachParameterNode$0(java.util.function.Consumer,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):79:79 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/az;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/cz;)V"}
     1:3:void forEachParameterNode(java.util.function.Consumer):77:79 -> c
-com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphBuilder -> com.android.tools.r8.internal.uq:
+com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphBuilder -> com.android.tools.r8.internal.wq:
 # {"id":"sourceFile","fileName":"FlowGraphBuilder.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     java.util.LinkedHashMap fieldNodes -> e
     java.util.LinkedHashMap parameterNodes -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):54:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/AO;)V"}
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):46:58 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter.getMethod():39:39 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getEnclosingMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):316 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):216 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iO;Lcom/android/tools/r8/internal/wq;Lcom/android/tools/r8/internal/r;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mO;Lcom/android/tools/r8/internal/yq;Lcom/android/tools/r8/internal/r;)Lcom/android/tools/r8/internal/Oh0;"}
     2:3:com.android.tools.r8.graph.ProgramMethod getEnclosingMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):317:318 -> a
     2:3:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):216 -> a
     4:4:com.android.tools.r8.graph.ProgramMethod getEnclosingMethod(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):317:317 -> a
@@ -239215,7 +238695,7 @@
     36:36:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):242 -> a
     37:39:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):242:244 -> a
     40:40:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphBuilder addClasses():62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wq;"}
     41:41:void add(com.android.tools.r8.graph.DexProgramClass):76:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     42:42:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> a
@@ -239262,7 +238742,7 @@
     95:95:void addMethodParameter(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):148:148 -> a
     95:95:void addMethodParameters(com.android.tools.r8.graph.ProgramMethod):121 -> a
     96:97:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):156:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;Lcom/android/tools/r8/internal/wq;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;Lcom/android/tools/r8/internal/yq;)Lcom/android/tools/r8/internal/Oh0;"}
     98:104:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):168:174 -> a
     98:104:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):157 -> a
     105:105:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
@@ -239278,7 +238758,7 @@
     112:112:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):161 -> a
     113:113:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):163:163 -> a
     114:116:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):189:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/wq;Lcom/android/tools/r8/internal/r;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gp;Lcom/android/tools/r8/internal/yq;Lcom/android/tools/r8/internal/r;)Lcom/android/tools/r8/internal/Oh0;"}
     117:117:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue.getField():19:19 -> a
     117:117:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239300,16 +238780,16 @@
     134:134:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):201 -> a
     135:140:com.android.tools.r8.utils.TraversalContinuation addInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldValue,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):202:207 -> a
     141:142:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode getOrCreateFieldNode(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):291:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/vq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/xq;"}
     143:143:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode getOrCreateFieldNode(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):291:291 -> a
     144:146:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):303:305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/tO;)Lcom/android/tools/r8/internal/xq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/xO;)Lcom/android/tools/r8/internal/zq;"}
     147:150:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):304:307 -> a
     151:151:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):306:306 -> a
     152:153:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,int,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode):311:312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;ILjava/lang/Integer;Lcom/android/tools/r8/internal/xq;)Lcom/android/tools/r8/internal/xq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;ILjava/lang/Integer;Lcom/android/tools/r8/internal/zq;)Lcom/android/tools/r8/internal/zq;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphBuilder clearInFlow():67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wq;"}
     2:2:void clearInFlow(com.android.tools.r8.graph.DexProgramClass):248:248 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     3:3:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> b
@@ -239386,21 +238866,21 @@
     48:48:void clearInFlow(com.android.tools.r8.graph.ProgramMethod):277 -> b
     49:50:void clearInFlow(com.android.tools.r8.graph.ProgramMethod):278:279 -> b
     51:51:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode lambda$getOrCreateFieldNode$0(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):292:292 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/il0;)Lcom/android/tools/r8/internal/vq;"}
-com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode -> com.android.tools.r8.internal.vq:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/ml0;)Lcom/android/tools/r8/internal/xq;"}
+com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode -> com.android.tools.r8.internal.xq:
 # {"id":"sourceFile","fileName":"FlowGraphFieldNode.java"}
     com.android.tools.r8.graph.ProgramField field -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/A5;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState fieldState -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ml0;"}
     1:3:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):16:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/ml0;)V"}
     1:1:void setState(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)V"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode asFieldNode():52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xq;"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState():37:37 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     1:1:com.android.tools.r8.graph.DexType getStaticType():32:32 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> e
@@ -239409,7 +238889,7 @@
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> e
     3:3:com.android.tools.r8.graph.DexType getStaticType():32 -> e
     1:1:java.lang.String toString():57:57 -> toString
-com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode -> com.android.tools.r8.internal.yq:
 # {"id":"sourceFile","fileName":"FlowGraphNode.java"}
     java.util.LinkedHashSet predecessors -> a
     java.util.LinkedHashMap successors -> b
@@ -239418,57 +238898,57 @@
     1:1:void <clinit>():26:26 -> <clinit>
     1:9:void <init>():26:34 -> <init>
     void setState(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)V"}
     1:5:void addPredecessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.AbstractFunction):78:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wq;Lcom/android/tools/r8/internal/r;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yq;Lcom/android/tools/r8/internal/r;)V"}
     6:6:java.util.Set getPredecessors():102:102 -> a
     6:6:boolean lambda$clearDanglingSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wq;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yq;)Z"}
     7:7:boolean lambda$clearDanglingSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):111:111 -> a
     8:8:void forEachSuccessor(java.util.function.BiConsumer):120:120 -> a
     9:9:boolean lambda$removeSuccessorIf$1(java.util.function.BiPredicate,java.util.Map$Entry):124:124 -> a
     10:10:void removeSuccessorIf(java.util.function.BiPredicate):124:124 -> a
     11:11:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode asFieldNode():140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xq;"}
     12:12:void addToWorkList(java.util.Deque):166:166 -> a
     13:13:boolean hasSuccessors():128:128 -> a
     13:13:void addToWorkList(java.util.Deque):166 -> a
     14:15:void addToWorkList(java.util.Deque):167:168 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode asParameterNode():148:148 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zq;"}
     1:2:void clearDanglingSuccessors():110:111 -> c
     3:5:void clearDanglingSuccessors():110:112 -> c
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     com.android.tools.r8.graph.DexType getStaticType() -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean isReceiverNode():152:152 -> f
     1:1:boolean isUnknown():160:160 -> g
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> g
     2:2:boolean isUnknown():160 -> g
-com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode -> com.android.tools.r8.internal.zq:
 # {"id":"sourceFile","fileName":"FlowGraphParameterNode.java"}
     com.android.tools.r8.graph.ProgramMethod method -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState methodState -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xO;"}
     int parameterIndex -> g
     com.android.tools.r8.graph.DexType parameterType -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():13:13 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,int,com.android.tools.r8.graph.DexType):21:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;ILcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;ILcom/android/tools/r8/graph/I2;)V"}
     1:4:void setState(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):56:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ml0;)V"}
     5:5:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isUnknown():0:0 -> a
     5:5:void setState(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):59 -> a
     6:6:void setState(com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):59:59 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode asParameterNode():70:70 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zq;"}
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState():49:50 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ml0;"}
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.getParameterState(int):39:39 -> d
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState getState():50 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239479,25 +238959,25 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean isReceiverNode():75:75 -> f
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.optimize.argumentpropagation.propagation.InFlowPropagator -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InFlowPropagator -> com.android.tools.r8.internal.qv:
 # {"id":"sourceFile","fileName":"InFlowPropagator.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Set classesWithSingleCallerInlinedInstanceInitializers -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection fieldStates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dp;"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():44:44 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):57:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/Gt;Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Lcom/android/tools/r8/internal/It;Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/internal/AO;)V"}
     1:1:com.android.tools.r8.graph.ProgramField com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode.getField():22:22 -> a
     1:1:void lambda$updateFieldStates$4(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):338 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xq;)V"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode.getState():37:37 -> a
     2:2:void lambda$updateFieldStates$4(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):339 -> a
     3:3:void lambda$updateFieldStates$4(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):340:340 -> a
@@ -239560,9 +239040,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/concurrent/ExecutorService;)V"}
     38:38:void processWorklists(java.util.Map,java.util.concurrent.ExecutorService):131:131 -> a
     39:41:void process(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):137:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;)V"}
     42:43:void process(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,java.util.Deque):149:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Ljava/util/Deque;)V"}
     44:44:void com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.unsetInWorklist():173:173 -> a
     44:44:void process(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,java.util.Deque):151 -> a
     45:45:void com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.unsetInWorklist():173:173 -> a
@@ -239584,7 +239064,7 @@
     50:53:void process(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,java.util.Deque):152 -> a
     54:55:void propagateUnknownStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set,java.util.Deque):183:184 -> a
     54:55:void lambda$propagateUnknownNode$1(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set):172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Lcom/android/tools/r8/internal/wq;Ljava/util/Deque;Lcom/android/tools/r8/internal/wq;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Lcom/android/tools/r8/internal/yq;Ljava/util/Deque;Lcom/android/tools/r8/internal/yq;Ljava/util/Set;)V"}
     56:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState narrowUnknownState(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):209:212 -> a
     56:59:void propagateUnknownStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set,java.util.Deque):185 -> a
     56:59:void lambda$propagateUnknownNode$1(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set):172 -> a
@@ -239646,11 +239126,11 @@
     95:95:void propagateUnknownStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set,java.util.Deque):203:203 -> a
     95:95:void lambda$propagateUnknownNode$1(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set):172 -> a
     96:97:void propagateConcreteNode(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque):229:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Lcom/android/tools/r8/internal/wq;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Lcom/android/tools/r8/internal/yq;Ljava/util/Deque;)V"}
     98:98:boolean lambda$propagateConcreteNode$2(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Set):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Lcom/android/tools/r8/internal/wq;Lcom/android/tools/r8/internal/sf;Ljava/util/Deque;Lcom/android/tools/r8/internal/wq;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Lcom/android/tools/r8/internal/yq;Lcom/android/tools/r8/internal/uf;Ljava/util/Deque;Lcom/android/tools/r8/internal/yq;Ljava/util/Set;)Z"}
     99:99:void lambda$propagateConcreteStateToSuccessor$3(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque):261:261 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wq;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yq;Ljava/util/Deque;)V"}
     100:101:void postProcessMethodStates(java.util.concurrent.ExecutorService):309:310 -> a
     100:101:void com.android.tools.r8.internal.InFlowPropagator.postProcessMethodStates(java.util.concurrent.ExecutorService):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -239684,13 +239164,13 @@
     434:435:void updateFieldStates(java.util.Collection):335:336 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
     1:1:void propagateUnknownNode(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque):169:169 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Lcom/android/tools/r8/internal/wq;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Lcom/android/tools/r8/internal/yq;Ljava/util/Deque;)V"}
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.hasPredecessors():106:106 -> b
     2:2:void propagateUnknownNode(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque):169 -> b
     3:8:void propagateUnknownNode(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,java.util.Deque):169:174 -> b
     9:10:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState narrowConcreteState(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):288:289 -> b
     9:10:boolean propagateConcreteStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,java.util.Set,java.util.Deque):243 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;Lcom/android/tools/r8/internal/wq;Lcom/android/tools/r8/internal/sf;Ljava/util/Deque;Lcom/android/tools/r8/internal/wq;Ljava/util/Set;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;Lcom/android/tools/r8/internal/yq;Lcom/android/tools/r8/internal/uf;Ljava/util/Deque;Lcom/android/tools/r8/internal/yq;Ljava/util/Set;)Z"}
     11:11:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> b
     11:11:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState narrowConcreteState(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):289 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239759,25 +239239,25 @@
     109:109:boolean com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.isEffectivelyUnknown():156:156 -> b
     109:109:boolean propagateConcreteStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,java.util.Set,java.util.Deque):280 -> b
     110:110:boolean propagateConcreteStateToSuccessor(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState,java.util.Set,java.util.Deque):280:280 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InFlowPropagatorDebugUtils -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InFlowPropagatorDebugUtils -> com.android.tools.r8.internal.rv:
 # {"id":"sourceFile","fileName":"InFlowPropagatorDebugUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void lambda$setEnableLoggingBits$0(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphFieldNode):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xq;)V"}
     2:3:void setEnableLoggingBits(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):41:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vq;)V"}
     4:4:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
     4:4:void setEnableLoggingBits(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):46 -> a
     5:14:void setEnableLoggingBits(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraph):47:56 -> a
     15:15:void lambda$setEnableLoggingBits$1(com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphParameterNode):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zq;)V"}
     16:16:boolean com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.getDebug():59:59 -> a
     16:16:void lambda$setEnableLoggingBits$2(com.android.tools.r8.utils.WorkList,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/yq;)V"}
     1:1:void lambda$setEnableLoggingBits$3(com.android.tools.r8.utils.WorkList,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):58:58 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/internal/wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/internal/yq;)V"}
     2:2:java.util.Set com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode.getPredecessors():102:102 -> b
     2:2:void lambda$setEnableLoggingBits$3(com.android.tools.r8.utils.WorkList,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):59 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239790,7 +239270,7 @@
     6:6:void lambda$setEnableLoggingBits$3(com.android.tools.r8.utils.WorkList,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):58 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void lambda$setEnableLoggingBits$3(com.android.tools.r8.utils.WorkList,com.android.tools.r8.optimize.argumentpropagation.propagation.FlowGraphNode):58:58 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.CA:
 # {"id":"sourceFile","fileName":"InterfaceMethodArgumentPropagator.java"}
     java.util.Map methodStatesToPropagate -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -239798,7 +239278,7 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,java.util.function.Consumer):55:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/wO;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/AO;Ljava/util/function/Consumer;)V"}
     2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference,java.util.function.Consumer):46:56 -> <init>
     1:2:void run(java.util.Collection):61:62 -> a
     3:3:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):67:67 -> a
@@ -239810,9 +239290,9 @@
     5:5:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):67 -> a
     6:8:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):67:69 -> a
     9:12:void lambda$computeInterfaceState$0(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.DexProgramClass):98:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;Lcom/android/tools/r8/graph/D2;)V"}
     13:13:void lambda$computeInterfaceState$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.ProgramMethod):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;Lcom/android/tools/r8/graph/C5;)V"}
     14:14:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):95:95 -> a
     14:14:void lambda$computeInterfaceState$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.ProgramMethod):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239838,7 +239318,7 @@
     33:33:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
     33:33:void lambda$computeInterfaceState$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.ProgramMethod):119 -> a
     34:35:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):136:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;)V"}
     36:36:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClassLegacy(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethodSignature):824:824 -> a
     36:36:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):137 -> a
     37:37:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClassLegacy(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethodSignature):824:824 -> a
@@ -239862,7 +239342,7 @@
     66:66:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
     66:66:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):160 -> a
     67:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):172:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;Lcom/android/tools/r8/internal/wO;)Lcom/android/tools/r8/internal/tO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/internal/AO;)Lcom/android/tools/r8/internal/xO;"}
     74:113:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):177:216 -> a
     114:114:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):188:188 -> a
     115:115:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):95:95 -> a
@@ -239892,7 +239372,7 @@
     125:125:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):227 -> a
     126:126:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):227:227 -> a
     127:146:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):192:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Hm;)Lcom/android/tools/r8/internal/Hm;"}
     147:149:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):210:212 -> a
     150:150:com.android.tools.r8.ir.analysis.type.ExactDynamicType com.android.tools.r8.ir.analysis.type.DynamicType.createExact(com.android.tools.r8.ir.analysis.type.ClassTypeElement):66:66 -> a
     150:150:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):209 -> a
@@ -239902,18 +239382,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     155:155:boolean verifyAllInterfacesFinished(java.util.Collection):235:235 -> a
     1:1:void lambda$propagateInterfaceStateToClassHierarchy$4(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.DexProgramClass):134:134 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):76:76 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     2:2:void propagateInterfaceStateToClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):130:130 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xO;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:void prune(com.android.tools.r8.graph.DexProgramClass):88:88 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     1:3:void visit(com.android.tools.r8.graph.DexProgramClass):81:83 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature.create():19:19 -> m
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):94 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/xO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/BO;"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):95:95 -> m
     3:3:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):99:99 -> m
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):95 -> m
@@ -239923,20 +239403,20 @@
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):122:122 -> m
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):132:132 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.ON:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.SN:
 # {"id":"sourceFile","fileName":"MethodArgumentPropagator.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/wO;)V"}
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.Pl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/AO;)V"}
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.Tl0:
 # {"id":"sourceFile","fileName":"VirtualDispatchMethodArgumentPropagator.java"}
     java.util.Map propagationStates -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):292:292 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/wO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/AO;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):286:286 -> <init>
     1:2:void run(java.util.Collection):297:298 -> a
     3:4:boolean verifyAllClassesFinished(java.util.Collection):418:419 -> a
@@ -239945,7 +239425,7 @@
     6:6:boolean verifyStatePruned():425:425 -> a
     6:6:void run(java.util.Collection):299 -> a
     7:7:void lambda$computePropagationState$1(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):314:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl0;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     8:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):95:95 -> a
     8:8:void lambda$computePropagationState$1(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):314 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239961,7 +239441,7 @@
     25:25:void lambda$computePropagationState$1(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):328 -> a
     26:27:void lambda$computePropagationState$1(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):335:336 -> a
     28:29:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):338:339 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/kf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/internal/mf;)V"}
     30:30:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
     30:30:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):339 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -239990,12 +239470,12 @@
     53:56:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):359:362 -> a
     57:61:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):359:363 -> a
     62:62:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):388:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Ol0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Sl0;)V"}
     63:63:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> a
     63:63:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):388 -> a
     64:65:void computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):392:393 -> a
     64:65:void lambda$computeFinalMethodStates$2(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod):388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl0;Lcom/android/tools/r8/graph/C5;)V"}
     66:66:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.removeOrElse(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):111:111 -> a
     66:66:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.remove(com.android.tools.r8.graph.ProgramMethod):107 -> a
     66:66:void computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):393 -> a
@@ -240219,20 +239699,20 @@
     16:16:boolean com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState.verifyActiveUntilLowerBoundRelevance(com.android.tools.r8.graph.DexProgramClass):274:274 -> m
     16:16:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):370 -> m
     17:17:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):371:371 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.Ol0:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.Sl0:
 # {"id":"sourceFile","fileName":"VirtualDispatchMethodArgumentPropagator.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature active -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BO;"}
     java.util.Map activeUntilLowerBound -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map inactiveUntilUpperBound -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tl0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator,com.android.tools.r8.graph.DexProgramClass):57:57 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pl0;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tl0;Lcom/android/tools/r8/graph/D2;)V"}
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature.create():19:19 -> <init>
     2:2:void <init>(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator,com.android.tools.r8.graph.DexProgramClass):45 -> <init>
     3:12:void <init>(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator,com.android.tools.r8.graph.DexProgramClass):45:54 -> <init>
@@ -240247,7 +239727,7 @@
     6:6:void addParentState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):73 -> a
     7:22:void addParentState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):73:88 -> a
     23:23:void lambda$addParentState$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BO;)V"}
     24:24:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$2400(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     24:24:void lambda$addParentState$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):78 -> a
     25:26:void lambda$addParentState$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):78:79 -> a
@@ -240258,7 +239738,7 @@
     30:30:void lambda$addParentState$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):80 -> a
     31:32:void lambda$addParentState$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):80:81 -> a
     33:33:void lambda$addParentState$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/xO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/internal/BO;)V"}
     34:34:boolean shouldActivateMethodStateGuardedByBounds(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):252:252 -> a
     34:34:void lambda$addParentState$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):91 -> a
     35:35:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$1100(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
@@ -240304,7 +239784,7 @@
     91:91:void lambda$addParentState$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):120 -> a
     92:95:void lambda$addParentState$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):120:123 -> a
     96:96:void lambda$addParentState$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):125:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/xO;)V"}
     97:97:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$2200(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     97:97:void lambda$addParentState$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):126 -> a
     98:98:void lambda$addParentState$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):127:127 -> a
@@ -240352,7 +239832,7 @@
     126:139:void lambda$addParentState$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):139:152 -> a
     140:140:void lambda$addParentState$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):150:150 -> a
     141:142:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):161:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xO;)V"}
     143:143:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$200(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     143:143:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):163 -> a
     144:144:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
@@ -240366,12 +239846,12 @@
     146:146:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
     146:146:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):163 -> a
     147:148:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):168:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BO;)V"}
     149:149:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$300(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     149:149:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):170 -> a
     150:150:void addActiveUntilLowerBound(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):170:170 -> a
     151:152:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):175:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/kf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/mf;)V"}
     153:153:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$400(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     153:153:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):177 -> a
     154:154:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
@@ -240385,7 +239865,7 @@
     156:156:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.addMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):32:32 -> a
     156:156:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):177 -> a
     157:158:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):182:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/internal/xO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hm;Lcom/android/tools/r8/internal/BO;)V"}
     159:159:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.access$500(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):39:39 -> a
     159:159:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):184 -> a
     160:160:void addInactiveUntilUpperBound(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):184:184 -> a
@@ -240422,12 +239902,12 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:9:void <init>(com.android.tools.r8.graph.AppView):38:45 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.qO:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.uO:
 # {"id":"sourceFile","fileName":"MethodReprocessingCriteria.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap reproccesingCriteria -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria ALWAYS_REPROCESS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uO;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():16:18 -> <clinit>
     1:2:void <init>():23:24 -> <init>
@@ -240435,8 +239915,8 @@
     3:3:void <init>():24 -> <init>
     4:4:void <init>():24:24 -> <init>
     5:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):28:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;)V"}
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.DR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;)V"}
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.HR:
 # {"id":"sourceFile","fileName":"NonTrivialParameterReprocessingCriteria.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -240464,22 +239944,22 @@
     21:21:boolean shouldReprocessPrimitiveParameter(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int):63:63 -> a
     21:21:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):42 -> a
     22:22:boolean shouldReprocessDueToDynamicType():53:53 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.MV:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.QV:
 # {"id":"sourceFile","fileName":"ParameterReprocessingCriteria.java"}
     1:1:void <init>():15:15 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/ir/optimize/info/b;ILcom/android/tools/r8/graph/I2;)Z"}
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> R8$$REMOVED$$CLASS$$212:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> R8$$REMOVED$$CLASS$$200:
 # {"id":"sourceFile","fileName":"ParameterReprocessingCriteria.java"}
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.Lm:
 # {"id":"sourceFile","fileName":"EffectivelyUnusedArgumentsAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Map constraints -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet optimizableVirtualMethods -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():67:67 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):82:82 -> <init>
@@ -240496,7 +239976,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     7:9:void lambda$initializeOptimizableVirtualMethods$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):93:95 -> a
     10:10:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):132:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/c3;Lcom/android/tools/r8/internal/Xk0;)Ljava/util/HashSet;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/c3;Lcom/android/tools/r8/internal/bl0;)Ljava/util/HashSet;"}
     11:11:boolean com.android.tools.r8.ir.code.Value.isThis():1016:1016 -> a
     11:11:java.util.Set computeEffectivelyUnusedConstraints(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.code.Value):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -240511,7 +239991,7 @@
     40:40:int com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.size():145:145 -> a
     40:40:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/CY;)V"}
     41:41:int com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.size():145:145 -> a
     41:41:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):101 -> a
     42:42:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
@@ -240521,7 +240001,7 @@
     43:43:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):102 -> a
     44:46:void lambda$initializeOptimizableVirtualMethods$1(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):102:104 -> a
     47:47:boolean lambda$computeEffectivelyUnusedConstraints$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):156:156 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/bl0;)Z"}
     48:49:void computeEffectivelyUnusedArguments(com.android.tools.r8.graph.PrunedItems):174:175 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)V"}
     50:50:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
@@ -240587,7 +240067,7 @@
     100:100:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.contains(com.android.tools.r8.graph.DexClassAndMethod):83:83 -> a
     100:100:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):209 -> a
     101:101:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):210:210 -> a
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.Mm:
 # {"id":"sourceFile","fileName":"EffectivelyUnusedArgumentsGraph.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -240601,7 +240081,7 @@
     1:1:boolean com.android.tools.r8.utils.dfs.DFSStack.contains(java.lang.Object):28:28 -> a
     1:1:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zh;Lcom/android/tools/r8/internal/Lm;Ljava/util/function/Consumer;Ljava/util/Deque;Lcom/android/tools/r8/internal/Lm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bh;Lcom/android/tools/r8/internal/Nm;Ljava/util/function/Consumer;Ljava/util/Deque;Lcom/android/tools/r8/internal/Nm;)Z"}
     2:2:boolean com.android.tools.r8.utils.dfs.DFSStack.contains(java.lang.Object):28:28 -> a
     2:2:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):145 -> a
     3:7:java.util.Deque com.android.tools.r8.utils.dfs.DFSStack.getCycleStartingAt(java.lang.Object):32:36 -> a
@@ -240615,16 +240095,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:22:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):153:161 -> a
     23:24:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph create(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.PrunedItems):43:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/Km;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/Mm;"}
     25:25:java.util.Set com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.getSuccessors():72:72 -> a
     25:25:boolean lambda$removeClosedCycles$2(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):149 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)Z"}
     26:26:boolean lambda$removeClosedCycles$2(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):149:149 -> a
     27:27:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):105:105 -> a
     27:27:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Km;Ljava/util/Map;Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/iO;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mm;Ljava/util/Map;Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/mO;Ljava/util/Set;)V"}
     28:28:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter.getMethod():39:39 -> a
     28:28:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):105 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -240689,7 +240169,7 @@
     72:75:void addConstraintEdge(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Map,com.android.tools.r8.graph.PrunedItems):96 -> a
     72:75:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):48 -> a
     76:76:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/iO;)Lcom/android/tools/r8/internal/Lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/mO;)Lcom/android/tools/r8/internal/Nm;"}
     77:77:void removeClosedCycles(java.util.function.Consumer):125:125 -> a
     78:78:java.util.Collection getNodes():101:101 -> a
     78:78:void removeClosedCycles(java.util.function.Consumer):126 -> a
@@ -240740,13 +240220,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     109:110:void removeClosedCycles(java.util.function.Consumer):142:143 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):112:112 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/iO;)Lcom/android/tools/r8/internal/Lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/mO;)Lcom/android/tools/r8/internal/Nm;"}
     2:2:int com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter.getIndex():43:43 -> b
     2:2:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):112 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):112:112 -> b
     4:4:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):116:116 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)V"}
     5:5:java.util.Set com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.getSuccessors():72:72 -> b
     5:5:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):116 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -240761,7 +240241,7 @@
     11:11:int com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode.getArgumentIndex():60:60 -> b
     11:11:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):119 -> b
     12:14:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):119:121 -> b
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.Nm:
 # {"id":"sourceFile","fileName":"EffectivelyUnusedArgumentsGraphNode.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -240781,7 +240261,7 @@
     11:11:boolean isUnused():89:89 -> a
     11:11:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)Z"}
     12:13:boolean isUnused():89:90 -> a
     12:13:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):96 -> a
     14:15:boolean lambda$removeUnusedSuccessors$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):97:98 -> a
@@ -240796,7 +240276,7 @@
     8:10:void setUnused():114:116 -> c
     11:11:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):232:232 -> c
     11:11:void setUnused():116 -> c
-com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.V5:
 # {"id":"sourceFile","fileName":"BidirectedGraph.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -240811,14 +240291,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
     6:11:void lambda$computeStronglyConnectedComponents$0(java.util.Set,java.util.List,java.lang.Object):29:34 -> a
     12:12:java.util.Set computeStronglyConnectedComponent(java.lang.Object,com.android.tools.r8.utils.WorkList):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/xm0;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/internal/Bm0;)Ljava/util/Set;"}
     13:13:boolean com.android.tools.r8.utils.WorkList.isEmpty():141:141 -> a
     13:13:java.util.Set computeStronglyConnectedComponent(java.lang.Object,com.android.tools.r8.utils.WorkList):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:18:java.util.Set computeStronglyConnectedComponent(java.lang.Object,com.android.tools.r8.utils.WorkList):44:48 -> a
     19:19:java.util.Set com.android.tools.r8.utils.WorkList.getMutableSeenSet():179:179 -> a
     19:19:java.util.Set computeStronglyConnectedComponent(java.lang.Object,com.android.tools.r8.utils.WorkList):50 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.ui:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.wi:
 # {"id":"sourceFile","fileName":"DepthFirstTopDownClassHierarchyTraversal.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -240881,28 +240361,28 @@
     13:15:void traverse(com.android.tools.r8.graph.DexProgramClass):132 -> k
     void visit(com.android.tools.r8.graph.DexProgramClass) -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.vi:
 # {"id":"sourceFile","fileName":"DepthFirstTopDownClassHierarchyTraversal.java"}
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState SEEN -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ti;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vi;"}
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState FINISHED -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ti;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vi;"}
     1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.LV:
+com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.PV:
 # {"id":"sourceFile","fileName":"ParameterRemovalUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:6:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:22 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)Z"}
-    7:7:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):224:224 -> a
+    7:7:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):226:226 -> a
     7:7:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):225:226 -> a
+    8:9:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):227:228 -> a
     8:9:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22 -> a
-    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():231:231 -> a
-    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):227 -> a
+    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():233:233 -> a
+    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):229 -> a
     10:10:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22 -> a
     11:11:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     12:17:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):30:35 -> a
@@ -240911,24 +240391,24 @@
     18:18:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:23:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):36:40 -> a
-    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):147:147 -> a
+    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):149:149 -> a
     24:24:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:26:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):148:149 -> a
+    25:26:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):150:151 -> a
     25:26:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):41 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():895:895 -> a
-    27:27:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):150 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():901:901 -> a
+    27:27:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):152 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):41 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isMethodStaticizingEnabled():1680:1680 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():895 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.isMethodStaticizingEnabled():1686:1686 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():901 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):150 -> a
+    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):152 -> a
     28:28:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):41 -> a
-    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():155:155 -> a
-    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151 -> a
+    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():157:157 -> a
+    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):153 -> a
     29:29:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):41 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.nY:
+com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.rY:
 # {"id":"sourceFile","fileName":"ProgramClassesBidirectedGraph.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -240955,12 +240435,12 @@
     7:7:void forEachNeighbor(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):28:28 -> a
     7:7:void forEachNeighbor(java.lang.Object,java.util.function.Consumer):13 -> a
     8:8:void forEachNode(java.util.function.Consumer):33:33 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.hm0:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.lm0:
 # {"id":"sourceFile","fileName":"WideningUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:12:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):50:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dm;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/TR;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fm;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/XR;)Lcom/android/tools/r8/internal/Fm;"}
     13:13:boolean com.android.tools.r8.ir.analysis.type.Nullability.strictlyLessThan(com.android.tools.r8.ir.analysis.type.Nullability):87:87 -> a
     13:13:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241007,12 +240487,12 @@
     46:46:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:101 -> a
     46:46:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82 -> a
     47:47:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82:82 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.w7:
 # {"id":"sourceFile","fileName":"BridgeHoisting.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult result -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y7;"}
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/C;"}
     boolean $assertionsDisabled -> d
@@ -241020,7 +240500,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView):73:75 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):79:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     3:3:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.create(com.android.tools.r8.graph.AppView):38:38 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):81 -> a
     4:4:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82:82 -> a
@@ -241190,13 +240670,13 @@
     165:165:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.List):247 -> a
     166:169:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.List):253:256 -> a
     170:170:java.util.List lambda$hoistBridgeIfPossible$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):194:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Ljava/util/List;"}
     171:172:com.android.tools.r8.lightir.LirCode createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):306:307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/yK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/CK;"}
     173:177:com.android.tools.r8.lightir.LirCode com.android.tools.r8.lightir.LirCode.newCodeWithRewrittenConstantPool(java.util.function.Function):802:806 -> a
     173:177:com.android.tools.r8.lightir.LirCode createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):307 -> a
     178:179:com.android.tools.r8.lightir.LirConstant lambda$createCodeForVirtualBridge$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.lightir.LirConstant):309:310 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/AK;)Lcom/android/tools/r8/internal/AK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/EK;)Lcom/android/tools/r8/internal/EK;"}
     1:1:java.util.List com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.getSubclasses(com.android.tools.r8.graph.DexProgramClass):129:129 -> b
     1:1:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):98 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241234,22 +240714,22 @@
     23:23:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):106 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):106:106 -> b
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.x7:
 # {"id":"sourceFile","fileName":"BridgeHoistingLens.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap bridgeToHoistedBridgeMap -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Y5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/a6;)V"}
     1:1:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):33:33 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):27:28 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.y7:
 # {"id":"sourceFile","fileName":"BridgeHoistingResult.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
@@ -241258,13 +240738,13 @@
 com.android.tools.r8.optimize.compose.ArgumentPropagatorCodeScannerForComposableFunctions -> com.android.tools.r8.internal.h3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorCodeScannerForComposableFunctions.java"}
     com.android.tools.r8.optimize.compose.ComposableCallGraph callGraph -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pe;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Re;"}
     1:1:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.<init>(com.android.tools.r8.graph.AppView):129:129 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.compose.ComposableCallGraph):23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Pe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Re;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.compose.ComposableCallGraph):24:24 -> <init>
     1:1:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/J1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:com.android.tools.r8.utils.collections.ProgramMethodMap com.android.tools.r8.optimize.compose.ComposableCallGraph.getNodes():46:46 -> a
     2:2:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241278,13 +240758,13 @@
     6:6:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):35 -> a
     7:7:void addTemporaryMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.AbstractValueSupplier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):36:36 -> a
     8:8:boolean isMethodParameterAlreadyUnknown(com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/iO;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/mO;Lcom/android/tools/r8/graph/C5;)Z"}
 com.android.tools.r8.optimize.compose.ArgumentPropagatorComposeModeling -> com.android.tools.r8.internal.j3:
 # {"id":"sourceFile","fileName":"ArgumentPropagatorComposeModeling.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.compose.ComposeReferences rewrittenComposeReferences -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Te;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ve;"}
     com.android.tools.r8.graph.DexType rewrittenFunction2Type -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.graph.DexString invokeName -> d
@@ -241304,7 +240784,7 @@
     22:29:void <init>(com.android.tools.r8.graph.AppView):49:56 -> <init>
     30:33:void <init>(com.android.tools.r8.graph.AppView):54:57 -> <init>
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState modelParameterStateForChangedOrDefaultArgumentToComposableFunction(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):103:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/of;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qf;"}
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     3:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState modelParameterStateForChangedOrDefaultArgumentToComposableFunction(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):104 -> a
     4:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState modelParameterStateForChangedOrDefaultArgumentToComposableFunction(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):104:108 -> a
@@ -241337,25 +240817,25 @@
     112:133:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState modelParameterStateForChangedOrDefaultArgumentToComposableFunction(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):207:228 -> a
     134:134:boolean lambda$modelParameterStateForChangedOrDefaultArgumentToComposableFunction$0(com.android.tools.r8.graph.DexEncodedField):109:109 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
-com.android.tools.r8.optimize.compose.ComposableCallGraph -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.optimize.compose.ComposableCallGraph -> com.android.tools.r8.internal.Re:
 # {"id":"sourceFile","fileName":"ComposableCallGraph.java"}
     com.android.tools.r8.utils.collections.ProgramMethodMap nodes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     1:2:void <init>(com.android.tools.r8.utils.collections.ProgramMethodMap):29:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;)V"}
-com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder -> com.android.tools.r8.internal.Oe:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;)V"}
+com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder -> com.android.tools.r8.internal.Qe:
 # {"id":"sourceFile","fileName":"ComposableCallGraph.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap nodes -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():53:53 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:5:void <init>(com.android.tools.r8.graph.AppView):56:59 -> <init>
     1:1:boolean lambda$createCallGraphNodesForComposableFunctions$0(com.android.tools.r8.optimize.compose.ComposeReferences,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Te;Lcom/android/tools/r8/graph/j1;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ve;Lcom/android/tools/r8/graph/j1;)Z"}
     2:2:boolean com.android.tools.r8.graph.DexAnnotationSet.hasAnnotation(com.android.tools.r8.graph.DexType):156:156 -> a
     2:2:boolean lambda$createCallGraphNodesForComposableFunctions$0(com.android.tools.r8.optimize.compose.ComposeReferences,com.android.tools.r8.graph.DexEncodedMethod):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241394,16 +240874,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:17:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> b
     17:17:void lambda$createCallGraphNodesForComposableFunctions$1(com.android.tools.r8.graph.ProgramMethod):82 -> b
-com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder$1 -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder$1 -> com.android.tools.r8.internal.Pe:
 # {"id":"sourceFile","fileName":"ComposableCallGraph.java"}
     com.android.tools.r8.graph.AppView appViewWithLiveness -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oe;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qe;"}
     1:4:void <init>(com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):109:112 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oe;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qe;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.optimize.compose.ComposableCallGraphNode lambda$registerInvokeStatic$0(com.android.tools.r8.graph.ProgramMethod):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Qe;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Se;"}
     2:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):141:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     3:3:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):153:153 -> a
@@ -241446,7 +240926,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):150:150 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.optimize.compose.ComposableCallGraphNode -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.optimize.compose.ComposableCallGraphNode -> com.android.tools.r8.internal.Se:
 # {"id":"sourceFile","fileName":"ComposableCallGraphNode.java"}
     com.android.tools.r8.graph.ProgramMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
@@ -241463,12 +240943,12 @@
     3:3:void forEachComposableCallee(java.util.function.Consumer):32:32 -> a
     4:4:boolean isComposable():46:46 -> a
     1:1:java.lang.String toString():51:51 -> toString
-com.android.tools.r8.optimize.compose.ComposableOptimizationPass -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.optimize.compose.ComposableOptimizationPass -> com.android.tools.r8.internal.Te:
 # {"id":"sourceFile","fileName":"ComposableOptimizationPass.java"}
     1:1:com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder com.android.tools.r8.optimize.compose.ComposableCallGraph.builder(com.android.tools.r8.graph.AppView):34:34 -> a
     1:1:void processWaves(java.util.concurrent.ExecutorService):44 -> a
     1:1:void lambda$run$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,java.util.concurrent.ExecutorService):39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;)V"}
     2:3:com.android.tools.r8.optimize.compose.ComposableCallGraph com.android.tools.r8.optimize.compose.ComposableCallGraph$Builder.build():63:64 -> a
     2:3:void processWaves(java.util.concurrent.ExecutorService):44 -> a
     2:3:void lambda$run$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,java.util.concurrent.ExecutorService):39 -> a
@@ -241487,7 +240967,7 @@
     9:15:void processWaves(java.util.concurrent.ExecutorService):45:51 -> a
     9:15:void lambda$run$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,java.util.concurrent.ExecutorService):39 -> a
     16:16:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/LX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     17:17:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> a
     17:17:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):36 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241497,14 +240977,14 @@
     20:20:java.util.Set com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getCallers():38:38 -> a
     20:20:void lambda$createNextWave$3(java.util.Set,java.util.List,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/List;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/List;Lcom/android/tools/r8/internal/Se;)V"}
     21:25:boolean com.android.tools.r8.utils.SetUtils.containsAnyOf(java.util.Set,java.lang.Iterable) -> a
     21:25:void lambda$createNextWave$3(java.util.Set,java.util.List,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):97 -> a
     26:26:void lambda$createNextWave$3(java.util.Set,java.util.List,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):98:98 -> a
     27:27:boolean com.android.tools.r8.optimize.compose.ComposableCallGraphNode.isComposable():46:46 -> a
     27:27:void lambda$computeComposableRoots$1(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
     28:28:java.util.Set com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getCallers():38:38 -> a
     28:28:void lambda$computeComposableRoots$1(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):62 -> a
     29:29:void lambda$computeComposableRoots$1(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):62:62 -> a
@@ -241512,53 +240992,53 @@
     30:30:void lambda$computeComposableRoots$1(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):66 -> a
     31:36:void lambda$computeComposableRoots$1(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):66:71 -> a
     37:38:java.util.Set computeComposableRoots(com.android.tools.r8.optimize.compose.ComposableCallGraph):58:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pe;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re;)Ljava/util/Set;"}
     39:39:void com.android.tools.r8.optimize.compose.ComposableCallGraph.forEachNode(java.util.function.Consumer):42:42 -> a
     39:39:java.util.Set computeComposableRoots(com.android.tools.r8.optimize.compose.ComposableCallGraph):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:void com.android.tools.r8.optimize.compose.ComposableCallGraph.forEachNode(java.util.function.Consumer):42:42 -> a
     40:40:java.util.Set computeComposableRoots(com.android.tools.r8.optimize.compose.ComposableCallGraph):59 -> a
     41:63:java.util.Set createNextWave(com.android.tools.r8.optimize.compose.ComposeMethodProcessor,java.util.Set):89:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Se;Ljava/util/Set;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ue;Ljava/util/Set;)Ljava/util/Set;"}
     1:1:java.util.Set com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getCallers():38:38 -> b
     1:1:void lambda$createInitialWave$2(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):79 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
     2:2:void lambda$createInitialWave$2(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):79:79 -> b
     3:5:java.util.Set createInitialWave(com.android.tools.r8.optimize.compose.ComposableCallGraph):77:79 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pe;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Re;)Ljava/util/Set;"}
     1:1:java.util.Set com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getCallers():38:38 -> c
     1:1:void lambda$createNextWave$4(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):109 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
     2:2:void lambda$createNextWave$4(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):109:109 -> c
     1:1:void lambda$createNextWave$5(java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):108:108 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
-com.android.tools.r8.optimize.compose.ComposeMethodProcessor -> com.android.tools.r8.internal.Se:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
+com.android.tools.r8.optimize.compose.ComposeMethodProcessor -> com.android.tools.r8.internal.Ue:
 # {"id":"sourceFile","fileName":"ComposeMethodProcessor.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner codeScanner -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h3;"}
     com.android.tools.r8.ir.conversion.PrimaryR8IRConverter converter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PX;"}
     java.util.Set processed -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.compose.ComposableCallGraph,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Pe;Lcom/android/tools/r8/internal/LX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Re;Lcom/android/tools/r8/internal/PX;)V"}
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.compose.ComposableCallGraph,com.android.tools.r8.ir.conversion.PrimaryR8IRConverter):56:64 -> <init>
     1:1:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$scan$7(com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.Value):205 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZI;Lcom/android/tools/r8/internal/Xk0;)Lcom/android/tools/r8/internal/B1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dJ;Lcom/android/tools/r8/internal/bl0;)Lcom/android/tools/r8/internal/B1;"}
     2:2:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$scan$7(com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.Value):205 -> a
     3:4:com.android.tools.r8.ir.analysis.value.AbstractValue lambda$scan$7(com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.Value):205:206 -> a
     5:5:java.util.Set com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getCallers():38:38 -> a
     5:5:void lambda$optimizeComposableFunctionsCalledFromWave$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):105 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s3;Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s3;Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
     6:6:void lambda$optimizeComposableFunctionsCalledFromWave$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):105:105 -> a
     7:7:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getMethod():42:42 -> a
     7:7:void lambda$optimizeComposableFunctionsCalledFromWave$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):107 -> a
@@ -241595,7 +241075,7 @@
     17:17:void lambda$optimizeComposableFunctionsCalledFromWave$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):107 -> a
     18:21:void lambda$optimizeComposableFunctionsCalledFromWave$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):106:109 -> a
     22:23:void lambda$processWave$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):74:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/internal/Se;)V"}
     24:24:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.compose.ComposableCallGraphNode.getMethod():42:42 -> a
     24:24:void lambda$processWave$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241627,10 +241107,10 @@
     53:61:java.util.Set optimizeComposableFunctionsCalledFromWave(java.util.Set,java.util.concurrent.ExecutorService):96 -> a
     62:65:java.util.Set optimizeComposableFunctionsCalledFromWave(java.util.Set,java.util.concurrent.ExecutorService):98:101 -> a
     66:67:void lambda$prepareForInFlowPropagator$3(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):122:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ap;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dp;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/ml0;)V"}
     68:68:void lambda$prepareForInFlowPropagator$3(com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState):122:122 -> a
     69:73:void lambda$prepareForInFlowPropagator$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):130:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/tO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/xO;)V"}
     74:74:int com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState.size():139:139 -> a
     74:74:void lambda$prepareForInFlowPropagator$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -241640,7 +241120,7 @@
     76:76:void lambda$prepareForInFlowPropagator$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):138 -> a
     77:79:void lambda$prepareForInFlowPropagator$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):139:141 -> a
     80:97:void prepareParameterStateForInFlowPropagator(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):153:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/if;ILcom/android/tools/r8/internal/sf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/kf;ILcom/android/tools/r8/internal/uf;)V"}
     98:98:java.lang.Object com.android.tools.r8.utils.IterableUtils.first(java.lang.Iterable):90:90 -> a
     98:98:void prepareParameterStateForInFlowPropagator(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):171 -> a
     99:103:void prepareParameterStateForInFlowPropagator(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):171:175 -> a
@@ -241666,34 +241146,34 @@
     118:125:void prepareParameterStateForInFlowPropagator(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):185:192 -> a
     126:126:void prepareParameterStateForInFlowPropagator(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):186:186 -> a
     127:127:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$prepareParameterStateForInFlowPropagator$5(com.android.tools.r8.graph.DexMethod,int):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)Lcom/android/tools/r8/internal/yR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;I)Lcom/android/tools/r8/internal/CR;"}
     128:128:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter.createStatic(com.android.tools.r8.graph.DexMethod,int):30:30 -> a
     128:128:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$prepareParameterStateForInFlowPropagator$5(com.android.tools.r8.graph.DexMethod,int):191 -> a
     129:129:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState lambda$prepareParameterStateForInFlowPropagator$5(com.android.tools.r8.graph.DexMethod,int):191:191 -> a
     130:138:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):201:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/ph0;)V"}
     139:139:java.util.Map lambda$scan$6(com.android.tools.r8.ir.code.IRCode):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;)Ljava/util/Map;"}
     140:140:java.util.Map com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.analyze(com.android.tools.r8.ir.code.IRCode):62:62 -> a
     140:140:java.util.Map lambda$scan$6(com.android.tools.r8.ir.code.IRCode):202 -> a
     141:141:boolean isProcessed(com.android.tools.r8.optimize.compose.ComposableCallGraphNode):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qe;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Se;)Z"}
     142:142:com.android.tools.r8.optimize.compose.ComposeMethodProcessor asComposeMethodProcessor():233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Se;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ue;"}
     143:143:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):238:238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     1:13:java.util.Set processWave(java.util.Set,java.util.concurrent.ExecutorService):70:82 -> b
     14:28:java.util.Set processWave(java.util.Set,java.util.concurrent.ExecutorService):71:85 -> b
     29:29:void lambda$optimizeComposableFunctionsCalledFromWave$2(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator,java.util.Set,com.android.tools.r8.optimize.compose.ComposableCallGraphNode):103:103 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s3;Ljava/util/Set;Lcom/android/tools/r8/internal/Qe;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s3;Ljava/util/Set;Lcom/android/tools/r8/internal/Se;)V"}
     30:30:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):243:243 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):248:248 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():218:218 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l8;"}
     1:1:com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer getEventConsumer():223:223 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rO;"}
     1:1:void prepareForInFlowPropagator():116:116 -> h
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.getFieldStates():149:149 -> h
     2:2:void prepareForInFlowPropagator():116 -> h
@@ -241709,7 +241189,7 @@
     7:7:void prepareForInFlowPropagator():127 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void prepareForInFlowPropagator():128:128 -> h
-com.android.tools.r8.optimize.compose.ComposeReferences -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.optimize.compose.ComposeReferences -> com.android.tools.r8.internal.Ve:
 # {"id":"sourceFile","fileName":"ComposeReferences.java"}
     com.android.tools.r8.graph.DexString changedFieldName -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
@@ -241724,18 +241204,18 @@
     11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):28:28 -> <init>
     12:16:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):38:42 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.optimize.compose.ComposeUtils -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.optimize.compose.ComposeUtils -> com.android.tools.r8.internal.We:
 # {"id":"sourceFile","fileName":"ComposeUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
-com.android.tools.r8.optimize.compose.JetpackComposeOptions -> com.android.tools.r8.internal.NC:
+com.android.tools.r8.optimize.compose.JetpackComposeOptions -> com.android.tools.r8.internal.PC:
 # {"id":"sourceFile","fileName":"JetpackComposeOptions.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean enableComposableOptimizationPass -> b
     boolean enableModelingOfChangedArguments -> c
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions):13:13 -> <init>
     3:3:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyOrDefault(java.lang.String,boolean):62:62 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.InternalOptions):14 -> <init>
@@ -241749,18 +241229,18 @@
     11:15:void <init>(com.android.tools.r8.utils.InternalOptions):18:22 -> <init>
     1:2:void enableAllOptimizations(boolean):26:27 -> a
     3:3:boolean isModelingChangedArgumentsToComposableFunctions():40:40 -> a
-com.android.tools.r8.optimize.compose.UpdateChangedFlagsAbstractFunction -> com.android.tools.r8.internal.Lk0:
+com.android.tools.r8.optimize.compose.UpdateChangedFlagsAbstractFunction -> com.android.tools.r8.internal.Pk0:
 # {"id":"sourceFile","fileName":"UpdateChangedFlagsAbstractFunction.java"}
     com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow inFlow -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pv;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):32:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)V"}
     1:5:java.lang.Iterable getBaseInFlow():119:123 -> A0
     1:1:boolean isUpdateChangedFlagsAbstractFunction():138:138 -> W
     1:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):42:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bq;Lcom/android/tools/r8/internal/sf;)Lcom/android/tools/r8/internal/il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dq;Lcom/android/tools/r8/internal/uf;)Lcom/android/tools/r8/internal/ml0;"}
     9:9:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState.isPrimitiveState():0:0 -> a
     9:9:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):49 -> a
     10:10:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):50:50 -> a
@@ -241806,31 +241286,31 @@
     45:45:com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState.create(com.android.tools.r8.ir.analysis.value.AbstractValue):37:37 -> a
     45:45:com.android.tools.r8.optimize.argumentpropagation.codescanner.ValueState apply(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.FlowGraphStateProvider,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState):54 -> a
     46:50:boolean containsBaseInFlow(com.android.tools.r8.optimize.argumentpropagation.codescanner.BaseInFlow):110:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/A5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C5;)Z"}
     1:1:com.android.tools.r8.optimize.compose.UpdateChangedFlagsAbstractFunction asUpdateChangedFlagsAbstractFunction():143:143 -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pk0;"}
     1:1:int internalCompareToSameKind(com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlow):133:133 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nv;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pv;)I"}
     1:5:boolean equals(java.lang.Object):152:156 -> equals
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.InFlowKind getKind():128:128 -> getKind
       # {"id":"com.android.tools.r8.residualsignature","signature":"()I"}
     1:1:int hashCode():161:161 -> hashCode
-com.android.tools.r8.optimize.fields.FieldFinalizer -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.optimize.fields.FieldFinalizer -> com.android.tools.r8.internal.jp:
 # {"id":"sourceFile","fileName":"FieldFinalizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):38:38 -> a
     2:2:void lambda$run$0(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
     3:3:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void lambda$run$0(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):32 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
     4:4:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):38 -> a
     4:4:void lambda$run$0(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):32 -> a
     5:7:void run(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):39:41 -> a
@@ -241850,47 +241330,47 @@
     63:63:void processClass(com.android.tools.r8.graph.DexProgramClass):54 -> a
     64:66:void processField(com.android.tools.r8.graph.ProgramField):58:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
-com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState -> com.android.tools.r8.internal.b7:
 # {"id":"sourceFile","fileName":"BottomCfFrameState.java"}
     com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b7;"}
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/s8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/u8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType[]):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/l9;"}
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ca;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ea;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;ILcom/android/tools/r8/internal/kl0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;ILcom/android/tools/r8/internal/ol0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     12:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):40:40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):45:45 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:boolean equals(java.lang.Object):132:132 -> equals
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear():50:50 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView):77:77 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:int hashCode():137:137 -> hashCode
-com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig -> com.android.tools.r8.internal.u8:
 # {"id":"sourceFile","fileName":"CfAnalysisConfig.java"}
     int getMaxStack() -> a
     boolean isImmediateSuperClassOfCurrentContext(com.android.tools.r8.graph.DexType) -> a
@@ -241900,38 +241380,38 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     int getMaxLocals() -> d
     com.android.tools.r8.cf.code.CfAssignability getAssignability() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F8;"}
-com.android.tools.r8.optimize.interfaces.analysis.CfFrameState -> com.android.tools.r8.internal.j9:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H8;"}
+com.android.tools.r8.optimize.interfaces.analysis.CfFrameState -> com.android.tools.r8.internal.l9:
 # {"id":"sourceFile","fileName":"CfFrameState.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>():31:31 -> <init>
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:boolean isError():0:0 -> a
     1:1:boolean isFailedTransferResult():107 -> a
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/s8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/u8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType[]) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ca;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ea;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;ILcom/android/tools/r8/internal/kl0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;ILcom/android/tools/r8/internal/ol0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     2:2:boolean isGreaterThanOrEquals(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):31:31 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/z1;)Z"}
     3:3:boolean isGreaterThanOrEquals(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):83:83 -> a
@@ -241946,22 +241426,22 @@
     6:9:boolean isGreaterThanOrEquals(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):83:86 -> a
     6:9:boolean isGreaterThanOrEquals(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):31 -> a
     10:10:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(java.lang.String):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ro;"}
     11:11:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedLocal(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType,int):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;Lcom/android/tools/r8/internal/kl0;I)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;Lcom/android/tools/r8/internal/ol0;I)Lcom/android/tools/r8/internal/ro;"}
     12:12:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedLocal(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType,int):43:43 -> a
     13:13:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/ro;"}
     14:14:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(java.lang.String):38:38 -> a
     14:14:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):68 -> a
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):136:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType):165:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/kl0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/ol0;)Lcom/android/tools/r8/internal/l9;"}
     17:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):173:173 -> a
     17:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType):165 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     19:19:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):152:152 -> a
     19:19:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):59 -> a
     19:19:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):179 -> a
@@ -241973,7 +241453,7 @@
     21:21:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):59 -> a
     21:21:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):179 -> a
     22:25:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):192:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F8;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H8;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     26:26:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):194:194 -> a
     27:31:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):193:197 -> a
     32:32:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):39:39 -> a
@@ -241987,21 +241467,21 @@
     34:34:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):49 -> a
     34:34:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):198 -> a
     35:35:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$2(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     36:36:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingles(com.android.tools.r8.utils.TriFunction):215:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;)Lcom/android/tools/r8/internal/l9;"}
     37:37:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleOrWide(java.util.function.BiFunction,java.util.function.BiFunction):223:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     38:38:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleOrWide$6(java.util.function.BiFunction,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     39:39:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleSingleOrWide(com.android.tools.r8.utils.TriFunction,java.util.function.BiFunction):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     40:40:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$7(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     41:41:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$8(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):232:232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     42:42:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):343:343 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/j9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/l9;)Lcom/android/tools/r8/internal/l9;"}
     43:43:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> a
     43:43:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):343 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242010,9 +241490,9 @@
     45:47:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):343:345 -> a
     48:48:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):344:344 -> a
     49:49:com.android.tools.r8.cf.code.frame.FrameType lambda$join$9(com.android.tools.r8.cf.code.frame.FrameType):347:347 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/internal/Sq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)Lcom/android/tools/r8/internal/Uq;"}
     50:50:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):354:354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/j9;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/l9;Ljava/util/function/UnaryOperator;)Lcom/android/tools/r8/internal/l9;"}
     51:51:boolean isBottom():0:0 -> a
     51:51:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):354 -> a
     52:52:boolean isError():0:0 -> a
@@ -242163,15 +241643,15 @@
     146:146:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):386:386 -> a
     146:146:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):362 -> a
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):31:31 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/z1;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(java.util.function.BiFunction):177:177 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     3:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,java.util.function.BiFunction):188:190 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/s8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/u8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     6:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):208:210 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     9:9:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.cf.code.frame.FrameType):58:58 -> b
     9:9:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):54 -> b
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):210 -> b
@@ -242183,36 +241663,36 @@
     11:11:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):54 -> b
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):210 -> b
     12:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$4(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):217:217 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$5(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):217:217 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():31:31 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/z1;"}
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle(java.util.function.BiFunction):206:206 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState asConcrete():98:98 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ff;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hf;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState asError():111:111 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ro;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView) -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle():202:202 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.ga:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.ia:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysis.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.cf.code.CfAssignability assignability -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ua;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wa;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set openInterfaces -> d
     com.android.tools.r8.utils.collections.ProgramMethodMap unverifiableCodeDiagnostics -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):62:62 -> <init>
@@ -242402,7 +241882,7 @@
     171:171:void lambda$reportUnverifiableCodeDiagnostics$2(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.UnverifiableCfCodeDiagnostic):266:266 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/utils/UnverifiableCfCodeDiagnostic;)V"}
     172:172:void lambda$reportUnverifiableCodeDiagnostics$3(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.ProgramMethod):268:268 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/graph/C5;)V"}
     173:173:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
     173:173:void lambda$reportUnverifiableCodeDiagnostics$3(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.ProgramMethod):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242425,10 +241905,10 @@
     9:9:void reportUnverifiableCodeDiagnostics():265 -> b
     10:13:void reportUnverifiableCodeDiagnostics():265:268 -> b
     1:3:void setClosedInterfaces():229:231 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions.isOpenInterfacesAllowed():1986:1986 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions.isOpenInterfacesAllowed():1992:1992 -> c
     4:4:void setClosedInterfaces():231 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions.hasSuppressions():1990:1990 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions.hasSuppressions():1996:1996 -> c
     5:5:void setClosedInterfaces():232 -> c
     6:7:void setClosedInterfaces():232:233 -> c
     8:8:void setClosedInterfaces():231:231 -> c
@@ -242442,16 +241922,16 @@
     18:23:void setClosedInterfaces():238:243 -> c
     24:24:void setClosedInterfaces():242:242 -> c
     25:25:void setClosedInterfaces():238:238 -> c
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$1 -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$1 -> com.android.tools.r8.internal.ea:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysis.java"}
     com.android.tools.r8.graph.ProgramMethod val$method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.graph.CfCode val$code -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/G;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ga;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ia;"}
     1:1:void <init>(com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.CfCode):109:109 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ga;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/G;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/G;)V"}
     1:1:int getMaxStack():128:128 -> a
     2:2:int com.android.tools.r8.graph.CfCode.getMaxStack():250:250 -> a
     2:2:int getMaxStack():128 -> a
@@ -242463,13 +241943,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:int getMaxLocals():123:123 -> d
     1:1:com.android.tools.r8.cf.code.CfAssignability getAssignability():113:113 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F8;"}
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$2 -> com.android.tools.r8.internal.da:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/H8;"}
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$2 -> com.android.tools.r8.internal.fa:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysis.java"}
     com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper val$helper -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ha;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ja;"}
     1:1:void <init>(com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis,com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper):150:150 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ha;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ja;)V"}
     1:1:void acceptError(com.android.tools.r8.graph.CfCodeDiagnostics):154:154 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H;)V"}
     2:2:void com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper.registerUnverifiableCodeWithFrames(com.android.tools.r8.graph.CfCodeDiagnostics):195:195 -> a
@@ -242477,7 +241957,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper.registerUnverifiableCodeWithFrames(com.android.tools.r8.graph.CfCodeDiagnostics):195:195 -> a
     3:3:void acceptError(com.android.tools.r8.graph.CfCodeDiagnostics):154 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnverifiableCodeReportingEnabled():1710:1710 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnverifiableCodeReportingEnabled():1716:1716 -> a
     4:4:void com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper.registerUnverifiableCodeWithFrames(com.android.tools.r8.graph.CfCodeDiagnostics):195 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void acceptError(com.android.tools.r8.graph.CfCodeDiagnostics):154 -> a
@@ -242508,27 +241988,27 @@
     16:16:void com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper.registerUnverifiableCodeWithFrames(com.android.tools.r8.graph.CfCodeDiagnostics):204:204 -> a
     16:16:void acceptError(com.android.tools.r8.graph.CfCodeDiagnostics):154 -> a
     17:17:void acceptInstructionState(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)V"}
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$FailedCfAnalysisResult -> com.android.tools.r8.internal.ea:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)V"}
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$FailedCfAnalysisResult -> com.android.tools.r8.internal.ga:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysis.java"}
     com.android.tools.r8.cf.code.CfInstruction instruction -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B9;"}
     com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorState -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ro;"}
     1:3:void <init>(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):276:278 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/oo;)V"}
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$TransferFunction -> com.android.tools.r8.internal.fa:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/ro;)V"}
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis$TransferFunction -> com.android.tools.r8.internal.ha:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysis.java"}
     com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig config -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ca;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ea;"}
     com.android.tools.r8.graph.ProgramMethod context -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ga;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ia;"}
     1:3:void <init>(com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysis,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.ProgramMethod):288:290 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ga;Lcom/android/tools/r8/internal/ca;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ia;Lcom/android/tools/r8/internal/ea;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):282:282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/zh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/z1;)Lcom/android/tools/r8/internal/Dh0;"}
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):303:303 -> a
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):282 -> a
     3:3:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):282:282 -> a
@@ -242550,10 +242030,10 @@
     18:28:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState computeInitialState(com.android.tools.r8.ir.analysis.framework.intraprocedural.cf.CfBlock,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):315:325 -> a
     18:28:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeInitialState(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):282 -> a
     29:29:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult createFailedAnalysisResult(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult):282:282 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/zh0;)Lcom/android/tools/r8/internal/Dh;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/H;Lcom/android/tools/r8/internal/Dh0;)Lcom/android/tools/r8/internal/Fh;"}
     30:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult createFailedAnalysisResult(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult):296:297 -> a
     30:31:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult createFailedAnalysisResult(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult):282 -> a
-com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.optimize.interfaces.analysis.CfOpenClosedInterfacesAnalysisHelper -> com.android.tools.r8.internal.ja:
 # {"id":"sourceFile","fileName":"CfOpenClosedInterfacesAnalysisHelper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -242562,17 +242042,17 @@
     com.android.tools.r8.graph.ProgramMethod method -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set openInterfaces -> e
     com.android.tools.r8.utils.collections.ProgramMethodMap unverifiableCodeDiagnostics -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():31:31 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/xY;)V"}
     2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):38:49 -> <init>
     1:1:void processInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/j9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B9;Lcom/android/tools/r8/internal/l9;)V"}
     2:2:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isError():0:0 -> a
     2:2:void processInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):57 -> a
     3:4:void processInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):57:58 -> a
@@ -242596,7 +242076,7 @@
     21:21:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.cf.code.CfArrayLoadOrStore.getType():58:58 -> a
     21:21:void processArrayStore(com.android.tools.r8.cf.code.CfArrayStore,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B8;Lcom/android/tools/r8/internal/ff;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D8;Lcom/android/tools/r8/internal/hf;)V"}
     22:22:void processArrayStore(com.android.tools.r8.cf.code.CfArrayStore,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):78:78 -> a
     23:23:boolean com.android.tools.r8.ir.code.MemberType.isObject():24:24 -> a
     23:23:void processArrayStore(com.android.tools.r8.cf.code.CfArrayStore,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):78 -> a
@@ -242608,33 +242088,33 @@
     35:35:void lambda$processArrayStore$0(java.util.Deque):90 -> a
     36:39:void lambda$processArrayStore$0(java.util.Deque):92:95 -> a
     40:40:void processInstanceFieldPut(com.android.tools.r8.cf.code.CfInstanceFieldWrite,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x9;Lcom/android/tools/r8/internal/ff;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/hf;)V"}
     41:41:void lambda$processInstanceFieldPut$1(com.android.tools.r8.cf.code.CfInstanceFieldWrite,com.android.tools.r8.cf.code.frame.PreciseFrameType):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x9;Lcom/android/tools/r8/internal/fX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z9;Lcom/android/tools/r8/internal/jX;)V"}
     42:44:void processInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):108:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/ff;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I9;Lcom/android/tools/r8/internal/hf;)V"}
     45:45:void processInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):109:109 -> a
     46:49:void lambda$processInvoke$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.cf.code.CfInvoke,java.util.Deque):113:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/G9;Ljava/util/Deque;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/I9;Ljava/util/Deque;)V"}
     50:50:void lambda$processReturn$3(com.android.tools.r8.cf.code.frame.PreciseFrameType):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jX;)V"}
     51:51:void processReturn(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):124:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ff;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hf;)V"}
     52:52:void processStaticFieldPut(com.android.tools.r8.cf.code.CfStaticFieldWrite,com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/ff;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ta;Lcom/android/tools/r8/internal/hf;)V"}
     53:53:void lambda$processStaticFieldPut$4(com.android.tools.r8.cf.code.CfStaticFieldWrite,com.android.tools.r8.cf.code.frame.PreciseFrameType):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ra;Lcom/android/tools/r8/internal/fX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ta;Lcom/android/tools/r8/internal/jX;)V"}
     54:56:void processAssignment(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):134:136 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;Lcom/android/tools/r8/graph/I2;)V"}
     57:57:void processAssignment(com.android.tools.r8.ir.analysis.type.ReferenceTypeElement,com.android.tools.r8.graph.DexType):150:150 -> a
     57:57:void processAssignment(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):135 -> a
     58:66:void processAssignment(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):157:165 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G30;Lcom/android/tools/r8/internal/Wi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K30;Lcom/android/tools/r8/internal/aj0;)V"}
     67:76:void lambda$processAssignment$5(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):167:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/I2;)V"}
     77:77:void registerUnverifiableCode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):182:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/oo;)V"}
-    78:78:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnverifiableCodeReportingEnabled():1710:1710 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/internal/ro;)V"}
+    78:78:boolean com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions.isUnverifiableCodeReportingEnabled():1716:1716 -> a
     78:78:void registerUnverifiableCode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):182 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     79:82:void registerUnverifiableCode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):183:186 -> a
@@ -242651,20 +242131,20 @@
     87:87:void registerUnverifiableCode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):183 -> a
     88:88:void registerUnverifiableCode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState):191:191 -> a
     89:91:boolean verifyOpenInterfaceWitnessIsSuppressed(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):209:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)V"}
-com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState -> com.android.tools.r8.internal.ff:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)V"}
+com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState -> com.android.tools.r8.internal.hf:
 # {"id":"sourceFile","fileName":"ConcreteCfFrameState.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap locals -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gx;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ix;"}
     java.util.ArrayDeque stack -> d
     int stackHeight -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():44:44 -> <clinit>
     1:1:void <init>():51:51 -> <init>
     2:6:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,java.util.ArrayDeque,int):55:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gx;Ljava/util/ArrayDeque;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ix;Ljava/util/ArrayDeque;I)V"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.cf.code.CfFrame$Builder com.android.tools.r8.cf.code.CfFrame$Builder.setLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):419:419 -> a
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242699,7 +242179,7 @@
     22:23:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):90 -> a
     24:24:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):90:90 -> a
     25:25:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     26:26:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isInitialized():0:0 -> a
     26:26:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):121 -> a
     27:27:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):122:122 -> a
@@ -242723,18 +242203,18 @@
     54:54:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):138:138 -> a
     55:61:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):136:142 -> a
     62:65:void peekStackElement(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):146:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     66:75:void peekStackElements(int,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):155:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     76:77:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):176:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     78:78:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):38:38 -> a
     78:78:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):177 -> a
     79:81:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):179:181 -> a
     82:82:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):188:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     83:88:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):190:195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     89:95:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):194:200 -> a
     96:107:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState popAndInitializeConstructorMismatchError(com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):211:222 -> a
     96:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):203 -> a
@@ -242749,11 +242229,11 @@
     111:111:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):203 -> a
     112:112:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):205:205 -> a
     113:113:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/ro;"}
     114:115:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):263:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/s8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/u8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     116:122:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popInitialized$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):266:272 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/F8;Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/H8;Lcom/android/tools/r8/graph/I2;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     123:123:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.cf.code.frame.FrameType):58:58 -> a
     123:123:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):54 -> a
     123:123:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popInitialized$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):272 -> a
@@ -242765,11 +242245,11 @@
     125:125:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):54 -> a
     125:125:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popInitialized$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfAssignability,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):272 -> a
     126:127:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType[]):280:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     128:128:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):288:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     129:129:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):293:293 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/l9;"}
     130:131:com.android.tools.r8.cf.code.frame.InitializedFrameType com.android.tools.r8.cf.code.frame.FrameType.initialized(com.android.tools.r8.ir.analysis.type.TypeElement):70:71 -> a
     130:131:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):293 -> a
     132:132:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement):108:108 -> a
@@ -242793,9 +242273,9 @@
     137:138:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):293 -> a
     139:139:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):293:293 -> a
     140:145:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):298:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     146:146:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):319:319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ca;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ea;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     147:147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.comparator():1134:1134 -> a
     147:147:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):130 -> a
     147:147:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):319 -> a
@@ -242803,9 +242283,9 @@
     148:149:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):319 -> a
     150:153:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):320:323 -> a
     154:167:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):333:346 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;ILcom/android/tools/r8/internal/kl0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;ILcom/android/tools/r8/internal/ol0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     168:169:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):351:352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     170:173:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState storeLocalError(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):361:364 -> a
     170:173:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):353 -> a
     174:174:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatActual(com.android.tools.r8.cf.code.frame.FrameType):54:54 -> a
@@ -242818,13 +242298,13 @@
     182:182:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):353 -> a
     183:183:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):355:355 -> a
     184:189:void acceptWidePrimitiveHigh(int,com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):499:504 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fm0;Lcom/android/tools/r8/internal/ZT;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jm0;Lcom/android/tools/r8/internal/dU;)V"}
     190:201:void joinLocalOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):531:542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZT;Lcom/android/tools/r8/internal/Lx;Lcom/android/tools/r8/internal/i9$a;Ljava/util/function/UnaryOperator;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dU;Lcom/android/tools/r8/internal/Nx;Lcom/android/tools/r8/internal/k9$a;Ljava/util/function/UnaryOperator;)V"}
     202:205:void setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):547:550 -> a
     202:205:void joinLocalOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):540 -> a
     206:206:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):555:555 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/i9$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/k9$a;)V"}
     207:207:boolean com.android.tools.r8.cf.code.CfFrame$Builder.hasLocal(int):404:404 -> a
     207:207:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):555 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242832,13 +242312,13 @@
     208:208:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):555 -> a
     209:210:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):555:556 -> a
     211:224:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState joinStack(com.android.tools.r8.graph.AppView,java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):570:583 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/ArrayDeque;Lcom/android/tools/r8/internal/i9$a;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/ArrayDeque;Lcom/android/tools/r8/internal/k9$a;)Lcom/android/tools/r8/internal/ro;"}
     225:253:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState joinStack(com.android.tools.r8.graph.AppView,java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):577:605 -> a
     254:256:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):616:618 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/ro;"}
     257:257:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):612:612 -> a
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.cf.code.CfFrame.getLocals():136:136 -> b
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):96 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242853,7 +242333,7 @@
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):98 -> b
     8:13:boolean isArrayTypeOrNull(com.android.tools.r8.cf.code.frame.FrameType):238:243 -> b
     8:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popArray$1(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):234 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j9;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l9;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     14:14:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement com.android.tools.r8.cf.code.frame.InitializedNonNullReferenceFrameTypeWithInterfaces.getInitializedTypeWithInterfaces():54:54 -> b
     14:14:boolean isArrayTypeOrNull(com.android.tools.r8.cf.code.frame.FrameType):244 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242873,10 +242353,10 @@
     24:24:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String):63:63 -> b
     24:24:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popArray$1(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):234 -> b
     25:27:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):310:312 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/ro;"}
     28:28:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):308:308 -> b
     29:29:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):560:560 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/i9$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/k9$a;)V"}
     30:30:boolean com.android.tools.r8.cf.code.CfFrame$Builder.hasLocal(int):404:404 -> b
     30:30:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):560 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242890,7 +242370,7 @@
     34:34:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):561 -> b
     35:37:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):561:563 -> b
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):106:106 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     2:2:java.util.Deque com.android.tools.r8.cf.code.CfFrame.getStack():145:145 -> c
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):106 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242909,7 +242389,7 @@
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clone():64:64 -> clone
     2:2:java.lang.Object clone():44 -> clone
     1:1:com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState asConcrete():74:74 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ff;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hf;"}
     1:5:boolean equals(java.lang.Object):628:632 -> equals
     6:13:boolean com.android.tools.r8.com.google.common.collect.Iterables.elementsEqual(java.lang.Iterable,java.lang.Iterable):231:238 -> equals
     6:13:boolean equals(java.lang.Object):632 -> equals
@@ -242917,11 +242397,11 @@
     14:24:boolean com.android.tools.r8.com.google.common.collect.Iterables.elementsEqual(java.lang.Iterable,java.lang.Iterable):238 -> equals
     14:24:boolean equals(java.lang.Object):632 -> equals
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear():115:115 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView):232:232 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:int hashCode():637:637 -> hashCode
-com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState -> com.android.tools.r8.internal.ro:
 # {"id":"sourceFile","fileName":"ErroneousCfFrameState.java"}
     java.lang.String message -> c
     boolean $assertionsDisabled -> d
@@ -242931,9 +242411,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/String;"}
     8:8:java.lang.String format(com.android.tools.r8.graph.DexType):44:44 -> a
     9:54:java.lang.String format(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState$FormatKind):62:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Sq;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Uq;)Ljava/lang/String;"}
     55:60:java.lang.String format(com.android.tools.r8.ir.analysis.type.TypeElement):113:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;)Ljava/lang/String;"}
     61:61:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> a
     61:61:java.lang.String format(com.android.tools.r8.ir.analysis.type.TypeElement):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -242950,61 +242430,61 @@
     88:88:java.lang.String format(com.android.tools.r8.ir.analysis.type.TypeElement):143 -> a
     89:92:java.lang.String format(com.android.tools.r8.ir.analysis.type.TypeElement):144:147 -> a
     93:96:java.lang.String format(com.android.tools.r8.ir.code.ValueType):156:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)Ljava/lang/String;"}
     97:97:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     98:98:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):200:200 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oj0;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     99:99:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     100:100:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):216:216 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     101:101:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):230:230 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/s8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/u8;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     102:102:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType[]):236:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;[Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     103:103:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):241:241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     104:104:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.analysis.type.TypeElement):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/Wi0;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/aj0;)Lcom/android/tools/r8/internal/l9;"}
     105:105:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):251:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/fX;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/jX;)Lcom/android/tools/r8/internal/l9;"}
     106:106:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pushException(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):256:256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ca;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ea;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/l9;"}
     107:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):266:266 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/s8;ILcom/android/tools/r8/internal/kl0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/u8;ILcom/android/tools/r8/internal/ol0;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/l9;"}
     108:108:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/fX;Lcom/android/tools/r8/internal/s8;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/u8;)Lcom/android/tools/r8/internal/l9;"}
     1:1:java.lang.String formatActual(com.android.tools.r8.cf.code.frame.FrameType):54:54 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uq;)Ljava/lang/String;"}
     2:2:java.lang.String formatExpected(com.android.tools.r8.ir.code.ValueType):152:152 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ol0;)Ljava/lang/String;"}
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):184:184 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.CfFrame):189:189 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s8;Lcom/android/tools/r8/internal/i9;)Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/u8;Lcom/android/tools/r8/internal/k9;)Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState asError():174:174 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ro;"}
     1:5:boolean equals(java.lang.Object):280:284 -> equals
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear():194:194 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView):221:221 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/j9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l9;"}
     1:1:int hashCode():289:289 -> hashCode
-com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection -> com.android.tools.r8.internal.ii:
 # {"id":"sourceFile","fileName":"DefaultOpenClosedInterfacesCollection.java"}
     com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ii;"}
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:boolean isDefinitelyClosed(com.android.tools.r8.graph.DexClass):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     2:2:boolean isEmpty():31:31 -> a
     3:3:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
     4:4:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
-com.android.tools.r8.optimize.interfaces.collection.NonEmptyOpenClosedInterfacesCollection -> com.android.tools.r8.internal.tR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
+com.android.tools.r8.optimize.interfaces.collection.NonEmptyOpenClosedInterfacesCollection -> com.android.tools.r8.internal.xR:
 # {"id":"sourceFile","fileName":"NonEmptyOpenClosedInterfacesCollection.java"}
     java.util.Set openInterfaceTypes -> b
     boolean $assertionsDisabled -> c
@@ -243014,21 +242494,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     3:3:boolean isEmpty():31:31 -> a
     4:4:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
     5:8:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):41:44 -> a
     5:8:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/QU;"}
     9:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     9:10:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):44 -> a
     9:10:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):37 -> a
     11:13:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):44:46 -> a
     11:13:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):37 -> a
     14:19:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):51:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
     20:20:boolean com.android.tools.r8.graph.PrunedItems.isRemoved(com.android.tools.r8.graph.DexType):93:93 -> a
     20:20:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):57 -> a
     21:26:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):58:63 -> a
-com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection -> com.android.tools.r8.internal.MU:
+com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection -> com.android.tools.r8.internal.QU:
 # {"id":"sourceFile","fileName":"OpenClosedInterfacesCollection.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -243037,16 +242517,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Z"}
     boolean isEmpty() -> a
     com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
     com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/MU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/QU;"}
     1:2:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):44:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xk0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/bl0;)Z"}
     3:3:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):44:44 -> a
     4:4:com.android.tools.r8.ir.analysis.type.DynamicType lambda$isDefinitelyInstanceOfStaticType$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Fm;"}
     5:10:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,java.util.function.Supplier,com.android.tools.r8.ir.analysis.type.TypeElement):51:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/Wi0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/aj0;)Z"}
     11:11:com.android.tools.r8.ir.analysis.type.Nullability com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.nullability():74:74 -> a
     11:11:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,java.util.function.Supplier,com.android.tools.r8.ir.analysis.type.TypeElement):60 -> a
     12:18:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,java.util.function.Supplier,com.android.tools.r8.ir.analysis.type.TypeElement):60:66 -> a
@@ -243058,14 +242538,14 @@
     22:42:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,java.util.function.Supplier,com.android.tools.r8.ir.analysis.type.TypeElement):75:95 -> a
     43:44:boolean lambda$isDefinitelyInstanceOfStaticType$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):69:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Z"}
-com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.M00:
+com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.Q00:
 # {"id":"sourceFile","fileName":"ProtoNormalizer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():50:50 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):56:59 -> <init>
@@ -243111,12 +242591,12 @@
     38:38:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37:37 -> a
     38:38:void lambda$computeGlobalReservationState$1(com.android.tools.r8.graph.DexMethodSignature,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature):210 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/B2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/B2;)V"}
     39:39:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37:37 -> a
     39:39:void lambda$computeGlobalReservationState$1(com.android.tools.r8.graph.DexMethodSignature,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature):210 -> a
     40:40:void lambda$computeGlobalReservationState$1(com.android.tools.r8.graph.DexMethodSignature,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature):208:208 -> a
     41:47:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     48:48:com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens.builder(com.android.tools.r8.graph.AppView):40:40 -> a
     48:48:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):69 -> a
     49:133:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70:154 -> a
@@ -243141,28 +242621,28 @@
     146:146:int com.android.tools.r8.utils.collections.DexMethodSignatureSet.size():167:167 -> a
     146:146:void lambda$computeGlobalReservationState$2(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):205 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Sl;)V"}
     147:147:int com.android.tools.r8.utils.collections.DexMethodSignatureSet.size():167:167 -> a
     147:147:void lambda$computeGlobalReservationState$2(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):205 -> a
     148:148:void lambda$computeGlobalReservationState$2(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):206:206 -> a
     149:149:int com.android.tools.r8.utils.collections.DexMethodSignatureSet.size():167:167 -> a
     149:149:void lambda$resolveInstanceInitializerCollisions$10(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):344 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Sl;)V"}
     150:150:int com.android.tools.r8.utils.collections.DexMethodSignatureSet.size():167:167 -> a
     150:150:void lambda$resolveInstanceInitializerCollisions$10(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):344 -> a
     151:151:void lambda$resolveInstanceInitializerCollisions$10(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):345:345 -> a
     152:157:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):170:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/K00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/O00;"}
     158:158:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.createConcurrent():41:41 -> a
     158:158:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):178 -> a
     159:195:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):180:216 -> a
     196:263:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):180:247 -> a
     264:272:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):242:250 -> a
     273:293:void lambda$computeGlobalReservationState$3(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexProgramClass):183:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/D2;)V"}
     294:294:void lambda$computeGlobalReservationState$0(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.Map,com.android.tools.r8.graph.ProgramMethod):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     295:295:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():176:176 -> a
     295:295:void lambda$computeGlobalReservationState$0(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,java.util.Map,com.android.tools.r8.graph.ProgramMethod):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243178,7 +242658,7 @@
     320:335:void lambda$computeGlobalReservationState$4(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexTypeList,java.util.Set):224:239 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Set;Lcom/android/tools/r8/graph/K2;Ljava/util/Set;)V"}
     336:337:void addUnoptimizableMethod(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexTypeList,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):280:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/K2;Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/K2;Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;)V"}
     338:338:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37:37 -> a
     338:338:void addUnoptimizableMethod(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexTypeList,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):282 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243192,7 +242672,7 @@
     342:342:void addUnoptimizableMethod(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexTypeList,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):285 -> a
     343:344:void computeExtraReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):292:293 -> a
     343:344:void lambda$computeGlobalReservationState$5(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)V"}
     345:345:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethodSignature):54:54 -> a
     345:345:void computeExtraReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):293 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243203,11 +242683,11 @@
     347:347:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$8(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):317:317 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/graph/B2;)Lcom/android/tools/r8/graph/B2;"}
     348:349:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):325:326 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/L00;Lcom/android/tools/r8/internal/K00;)Ljava/util/HashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/P00;Lcom/android/tools/r8/internal/O00;)Ljava/util/HashMap;"}
     350:350:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):328:328 -> a
     350:350:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):326 -> a
     351:352:void lambda$computeInstanceInitializerCollisions$9(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):328:329 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L00;Lcom/android/tools/r8/internal/K00;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P00;Lcom/android/tools/r8/internal/O00;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;)V"}
     353:353:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState.getNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):456:456 -> a
     353:353:void lambda$computeInstanceInitializerCollisions$9(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):330 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243219,16 +242699,16 @@
     357:357:void lambda$computeInstanceInitializerCollisions$9(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):334 -> a
     358:359:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):382:383 -> a
     358:359:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexTypeList,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/K2;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Ql;)V"}
-    360:360:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):171:171 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/K2;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/Sl;)V"}
+    360:360:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):173:173 -> a
     360:360:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):383 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     360:360:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexTypeList,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):259 -> a
-    361:362:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):172:173 -> a
+    361:362:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):174:175 -> a
     361:362:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):383 -> a
     361:362:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexTypeList,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):259 -> a
-    363:363:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():178:178 -> a
-    363:363:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):174 -> a
+    363:363:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():180:180 -> a
+    363:363:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):176 -> a
     363:363:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):383 -> a
     363:363:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexTypeList,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):259 -> a
     364:368:boolean isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):384:388 -> a
@@ -243252,31 +242732,31 @@
     379:379:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexTypeList,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):260:260 -> a
     380:380:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):827:827 -> a
     380:380:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/graph/B2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Sl;)Lcom/android/tools/r8/graph/B2;"}
     381:381:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):895:895 -> a
     381:381:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):827 -> a
     381:381:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):314 -> a
     382:382:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):314:314 -> a
     1:8:java.util.Map computeNewInstanceInitializerSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):304:311 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/L00;Lcom/android/tools/r8/internal/K00;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/P00;Lcom/android/tools/r8/internal/O00;)Ljava/util/Map;"}
     9:9:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$7(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):315:315 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Ql;)Lcom/android/tools/r8/graph/B2;"}
-com.android.tools.r8.optimize.proto.ProtoNormalizer$1 -> com.android.tools.r8.internal.J00:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B2;Lcom/android/tools/r8/internal/Sl;)Lcom/android/tools/r8/graph/B2;"}
+com.android.tools.r8.optimize.proto.ProtoNormalizer$1 -> com.android.tools.r8.internal.N00:
 # {"id":"sourceFile","fileName":"ProtoNormalizer.java"}
     com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState val$globalReservationState -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O00;"}
     com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder val$lensBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R00;"}
     com.android.tools.r8.optimize.proto.ProtoNormalizer this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M00;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q00;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():70:70 -> <clinit>
     1:1:void <init>(com.android.tools.r8.optimize.proto.ProtoNormalizer,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder):70:70 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M00;Lcom/android/tools/r8/internal/K00;Lcom/android/tools/r8/internal/N00;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q00;Lcom/android/tools/r8/internal/O00;Lcom/android/tools/r8/internal/R00;)V"}
     1:1:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):92 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/List;)Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/List;)Lcom/android/tools/r8/internal/Nh0;"}
     2:5:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):92:95 -> a
     6:10:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):766:770 -> a
     6:10:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):95 -> a
@@ -243307,7 +242787,7 @@
     36:36:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     36:36:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     37:38:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):77:78 -> a
     39:39:void com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl.setState(java.lang.Object):97:97 -> a
     39:39:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):78 -> a
@@ -243319,7 +242799,7 @@
     44:44:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):81 -> a
     45:47:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):82:84 -> a
     48:52:com.android.tools.r8.graph.DexEncodedMethod lambda$joiner$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):111:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/L00;Ljava/util/Map;Lcom/android/tools/r8/internal/K00;Lcom/android/tools/r8/internal/N00;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/P00;Ljava/util/Map;Lcom/android/tools/r8/internal/O00;Lcom/android/tools/r8/internal/R00;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/graph/j1;"}
     53:53:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexMethodSignature$MethodBased.getName():126:126 -> a
     53:53:void com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState.recordNoSignatureChange(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory):533 -> a
     53:53:com.android.tools.r8.graph.DexEncodedMethod lambda$joiner$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):115 -> a
@@ -243444,7 +242924,7 @@
     105:108:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):155:158 -> a
     105:108:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):121 -> a
     105:108:com.android.tools.r8.graph.DexEncodedMethod lambda$joiner$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):134 -> a
-    109:109:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):272:272 -> a
+    109:109:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):270:270 -> a
     109:109:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):159 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     109:109:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):121 -> a
@@ -243465,24 +242945,18 @@
     115:115:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):125 -> a
     115:115:com.android.tools.r8.graph.DexEncodedMethod lambda$joiner$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):134 -> a
     116:116:com.android.tools.r8.graph.DexEncodedMethod lambda$joiner$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):140:140 -> a
-    117:117:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):144:144 -> a
+    117:120:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):144:147 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/j1$a;)V"}
-    118:118:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
-    118:118:java.util.function.Consumer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):87 -> a
-    118:118:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):146 -> a
-    119:119:java.util.function.Consumer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    119:119:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):146 -> a
-    120:121:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):146:147 -> a
-    122:122:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
-    122:122:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):147 -> a
-com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.K00:
+    121:121:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
+    121:121:void lambda$joiner$0(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):147 -> a
+com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.O00:
 # {"id":"sourceFile","fileName":"ProtoNormalizer.java"}
     java.util.Map reservedParameters -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet unoptimizableSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     1:3:void <init>(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):412:414 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/internal/Sl;)V"}
     1:1:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexMethodSignature$MethodBased.getProto():131:131 -> a
     1:1:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37 -> a
     1:1:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):436 -> a
@@ -243504,12 +242978,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> b
     3:3:boolean isUnoptimizable(com.android.tools.r8.graph.DexMethodSignature):441 -> b
-com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.L00:
+com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.P00:
 # {"id":"sourceFile","fileName":"ProtoNormalizer.java"}
     java.util.List parents -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():445:445 -> <clinit>
     1:5:void <init>():445:449 -> <init>
@@ -243524,7 +242998,7 @@
     7:7:com.android.tools.r8.graph.DexMethodSignature getReserved(com.android.tools.r8.graph.DexMethodSignature):510 -> a
     8:12:com.android.tools.r8.graph.DexMethodSignature getReserved(com.android.tools.r8.graph.DexMethodSignature):510:514 -> a
     13:15:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):473:475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/z2;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/K00;Z)Lcom/android/tools/r8/graph/B2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/z2;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/O00;Z)Lcom/android/tools/r8/graph/B2;"}
     16:27:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):474:485 -> a
     28:29:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> a
     28:29:boolean isDestinationTaken(com.android.tools.r8.graph.DexMethodSignature):520 -> a
@@ -243556,18 +243030,18 @@
     47:47:boolean isDestinationTaken(com.android.tools.r8.graph.DexMethodSignature):526:526 -> a
     47:47:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):486 -> a
     48:48:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):496:496 -> a
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.O00:
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.S00:
 # {"id":"sourceFile","fileName":"ProtoNormalizerGraphLens.java"}
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap newMethodSignatures -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TP;"}
     java.util.Map prototypeChanges -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/PP;Ljava/util/IdentityHashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TP;Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReboundReference():57:57 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):69 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243600,7 +243074,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.none():82:82 -> e
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):53 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):94:94 -> e
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):55 -> e
     3:3:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> e
@@ -243615,12 +243089,12 @@
     8:8:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):61:61 -> e
     9:9:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):94:94 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.N00:
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.R00:
 # {"id":"sourceFile","fileName":"ProtoNormalizerGraphLens.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Map prototypeChanges -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> d
@@ -243628,7 +243102,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):110:110 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView):105:111 -> <init>
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens -> com.android.tools.r8.internal.g20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens -> com.android.tools.r8.internal.k20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemovalLens.java"}
     java.util.Set interfaces -> f
     java.util.Map methodMap -> g
@@ -243636,7 +243110,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map):28:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     2:2:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     2:2:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -243676,7 +243150,7 @@
     27:27:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):67:67 -> a
     1:1:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):37:37 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens$Builder -> com.android.tools.r8.internal.f20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens$Builder -> com.android.tools.r8.internal.j20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemovalLens.java"}
     java.util.Set interfaces -> a
     java.util.Map methodMap -> b
@@ -243686,19 +243160,19 @@
     1:4:void <init>():70:73 -> <init>
     1:4:com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens$Builder map(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):76:79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions -> com.android.tools.r8.internal.h20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions -> com.android.tools.r8.internal.l20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemovalOptions.java"}
     boolean enableRetargetingOfConstructorBridgeCalls -> a
     1:3:void <init>():7:9 -> <init>
     1:1:void setEnableRetargetingOfConstructorBridgeCalls(boolean):17:17 -> a
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover -> com.android.tools.r8.internal.k20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover -> com.android.tools.r8.internal.o20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemover.java"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
     com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions redundantBridgeRemovalOptions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l20;"}
     com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalLens$Builder lensBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j20;"}
     boolean mustRetargetInvokesToTargetMethod -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():44:44 -> <clinit>
@@ -243710,17 +243184,17 @@
     7:8:void <init>(com.android.tools.r8.graph.AppView):56:57 -> <init>
     1:1:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():51:51 -> a
     1:1:void pruneApp(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:void pruneApp(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):269:269 -> a
     3:3:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.setPrunedApp(com.android.tools.r8.graph.DexApplication):180:180 -> a
     3:3:void pruneApp(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):269 -> a
     4:5:void pruneApp(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):270:271 -> a
     6:6:com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover setMustRetargetInvokesToTargetMethod():61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/k20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/o20;"}
     7:7:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     7:7:void lambda$removeRedundantBridgesConcurrently$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/CY;)V"}
     8:8:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     8:8:void lambda$removeRedundantBridgesConcurrently$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):191 -> a
     9:9:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
@@ -243728,15 +243202,15 @@
     10:10:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     10:10:boolean lambda$removeRedundantBridgesConcurrently$0(com.android.tools.r8.utils.collections.ProgramMethodSet):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;)Z"}
     11:11:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     11:11:boolean lambda$removeRedundantBridgesConcurrently$0(com.android.tools.r8.utils.collections.ProgramMethodSet):185 -> a
     12:31:boolean isTargetingSuperMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind,com.android.tools.r8.graph.DexMethod):111:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PB;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RB;Lcom/android/tools/r8/graph/w2;)Z"}
     32:32:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     33:34:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.MemberRebindingIdentityLens):143:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/jN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/nN;)V"}
     35:41:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.MemberRebindingIdentityLens):143:149 -> a
     42:42:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     42:42:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.MemberRebindingIdentityLens):150 -> a
@@ -243779,10 +243253,10 @@
     70:70:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.MemberRebindingIdentityLens):164 -> a
     71:72:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.MemberRebindingIdentityLens):169:170 -> a
     73:83:com.android.tools.r8.utils.collections.ProgramMethodSet removeRedundantBridgesConcurrently(java.util.concurrent.ExecutorService):176:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/CY;"}
     84:91:com.android.tools.r8.utils.collections.ProgramMethodSet removeRedundantBridgesConcurrently(java.util.concurrent.ExecutorService):182:189 -> a
     92:94:com.android.tools.r8.utils.collections.ProgramMethodSet removeRedundantBridgesInComponent(java.util.Set):202:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/CY;"}
     95:95:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal.getRemovedBridges():286:286 -> a
     95:95:com.android.tools.r8.utils.collections.ProgramMethodSet removeRedundantBridgesInComponent(java.util.Set):205 -> a
     96:96:void lambda$pruneApp$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.ProgramMethod):270:270 -> a
@@ -243792,25 +243266,25 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:98:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.addRemovedMethod(com.android.tools.r8.graph.DexMethod):237:237 -> a
     98:98:void lambda$pruneApp$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.ProgramMethod):270 -> a
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal -> com.android.tools.r8.internal.j20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal -> com.android.tools.r8.internal.n20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemover.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet removedBridges -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet superTargets -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover this$0 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o20;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():274:274 -> <clinit>
     1:1:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):280:280 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k20;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/o20;)V"}
     2:2:com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover.access$000(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):44:44 -> <init>
     2:2:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):282 -> <init>
     3:3:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):282:282 -> <init>
     4:4:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):281:281 -> <init>
     5:6:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover):277:278 -> <init>
     1:6:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):294:299 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/C5;)V"}
     7:24:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover.getTargetForRedundantAbstractBridge(com.android.tools.r8.graph.ProgramMethod):210:227 -> a
     7:24:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):299 -> a
     25:25:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getResolutionPair():477:477 -> a
@@ -243839,11 +243313,11 @@
     60:60:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):301 -> a
     61:69:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover.getTargetForRedundantNonAbstractBridge(com.android.tools.r8.graph.ProgramMethod):67:75 -> a
     61:69:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):301 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     70:70:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover.getTargetForRedundantNonAbstractBridge(com.android.tools.r8.graph.ProgramMethod):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     70:70:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):301 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     71:71:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover.getTargetForRedundantNonAbstractBridge(com.android.tools.r8.graph.ProgramMethod):75 -> a
     71:71:void lambda$visit$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):301 -> a
     72:72:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a
@@ -243946,18 +243420,18 @@
     13:13:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> l
     13:13:void visit(com.android.tools.r8.graph.DexProgramClass):336 -> l
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet getOrCreateSuperTargets(com.android.tools.r8.graph.DexProgramClass):387:391 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/CY;"}
     6:7:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> m
     6:7:com.android.tools.r8.utils.collections.ProgramMethodSet getOrCreateSuperTargets(com.android.tools.r8.graph.DexProgramClass):392 -> m
     8:30:com.android.tools.r8.utils.collections.ProgramMethodSet getOrCreateSuperTargets(com.android.tools.r8.graph.DexProgramClass):393:415 -> m
-com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal$1 -> com.android.tools.r8.internal.i20:
+com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal$1 -> com.android.tools.r8.internal.m20:
 # {"id":"sourceFile","fileName":"RedundantBridgeRemover.java"}
     com.android.tools.r8.graph.AppView val$appViewWithLiveness -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal this$1 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n20;"}
     1:1:void <init>(com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemover$RedundantBridgeRemoverClassHierarchyTraversal,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):399:399 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j20;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n20;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;)V"}
     1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):403:406 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     5:5:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> g
@@ -243969,25 +243443,25 @@
     8:8:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):694 -> g
     8:8:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):407 -> g
     9:14:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):404:409 -> g
-com.android.tools.r8.optimize.singlecaller.MonomorphicVirtualMethodsAnalysis -> com.android.tools.r8.internal.VO:
+com.android.tools.r8.optimize.singlecaller.MonomorphicVirtualMethodsAnalysis -> com.android.tools.r8.internal.ZO:
 # {"id":"sourceFile","fileName":"MonomorphicVirtualMethodsAnalysis.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):22:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;)V"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet computeMonomorphicVirtualRootMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):31:31 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Ljava/util/ArrayList;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Ljava/util/ArrayList;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/zY;"}
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.createConcurrent():67:67 -> a
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet computeMonomorphicVirtualRootMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):31 -> a
     3:11:com.android.tools.r8.utils.collections.ProgramMethodSet computeMonomorphicVirtualRootMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):32:40 -> a
     12:12:com.android.tools.r8.utils.collections.ProgramMethodSet computeMonomorphicVirtualRootMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.concurrent.ExecutorService):32:32 -> a
     13:16:com.android.tools.r8.utils.collections.ProgramMethodSet computeMonomorphicVirtualRootMethodsInComponent(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Set):49:52 -> a
     13:16:void lambda$computeMonomorphicVirtualRootMethods$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Set):36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/yY;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/CY;Ljava/util/Set;)V"}
     17:17:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     17:17:void lambda$computeMonomorphicVirtualRootMethods$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Set):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:void com.android.tools.r8.utils.collections.ProgramMethodSet.addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):83:83 -> a
     18:18:void lambda$computeMonomorphicVirtualRootMethods$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Set):38 -> a
-com.android.tools.r8.optimize.singlecaller.SingleCallerInliner -> com.android.tools.r8.internal.Gb0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerInliner -> com.android.tools.r8.internal.Kb0:
 # {"id":"sourceFile","fileName":"SingleCallerInliner.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -243997,14 +243471,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():51:51 -> a
     1:1:void pruneItems(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):232 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:void pruneItems(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):232:232 -> a
     3:3:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.setPrunedApp(com.android.tools.r8.graph.DexApplication):180:180 -> a
     3:3:void pruneItems(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):232 -> a
     4:12:void pruneItems(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):233:241 -> a
     13:13:boolean shouldRun():67:67 -> a
     13:13:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     14:14:boolean com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions.isEnabled():19:19 -> a
     14:14:boolean shouldRun():67 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244070,7 +243544,7 @@
     75:75:void lambda$processCallees$0(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod):118:118 -> a
     76:76:void lambda$processCallees$0(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod):117:117 -> a
     77:77:void lambda$performInlining$1(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/W;Lcom/android/tools/r8/internal/HU;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ge;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ir/optimize/W;Lcom/android/tools/r8/internal/LU;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ie;)V"}
     78:78:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     78:78:void lambda$performInlining$1(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244096,7 +243570,7 @@
     101:101:void lambda$performInlining$1(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):157 -> a
     102:102:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation createCallSiteInformation(com.android.tools.r8.utils.collections.ProgramMethodMap):167:167 -> a
     102:102:void performInlining(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fb0;Lcom/android/tools/r8/internal/tY;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb0;Lcom/android/tools/r8/internal/xY;Ljava/util/concurrent/ExecutorService;)V"}
     103:103:void performInlining(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):131:131 -> a
     104:104:com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Builder com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph.builder(com.android.tools.r8.graph.AppView):33:33 -> a
     104:104:java.util.Deque com.android.tools.r8.optimize.singlecaller.SingleCallerWaves.buildWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap):19 -> a
@@ -244149,14 +243623,14 @@
     154:155:void lambda$pruneItems$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):236 -> a
     156:156:void lambda$pruneItems$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
     1:14:void processCallees(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):108:121 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fb0;Lcom/android/tools/r8/internal/tY;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb0;Lcom/android/tools/r8/internal/xY;Ljava/util/concurrent/ExecutorService;)V"}
     15:15:void processCallees(com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):107:107 -> b
-com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$1 -> com.android.tools.r8.internal.Db0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$1 -> com.android.tools.r8.internal.Hb0:
 # {"id":"sourceFile","fileName":"SingleCallerInliner.java"}
     com.android.tools.r8.utils.collections.ProgramMethodMap val$singleCallerMethods -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     1:1:void <init>(com.android.tools.r8.optimize.singlecaller.SingleCallerInliner,com.android.tools.r8.utils.collections.ProgramMethodMap):167:167 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;)V"}
     1:1:boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):170:170 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.containsKey(com.android.tools.r8.graph.DexClassAndMember):64:64 -> a
@@ -244177,51 +243651,51 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:1:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):188:188 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl -> com.android.tools.r8.internal.Fb0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl -> com.android.tools.r8.internal.Jb0:
 # {"id":"sourceFile","fileName":"SingleCallerInliner.java"}
     com.android.tools.r8.utils.collections.ProgramMethodMap singleCallerMethods -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     1:1:void com.android.tools.r8.ir.optimize.Inliner.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):116:116 -> <init>
     1:1:void com.android.tools.r8.ir.optimize.Inliner.<init>(com.android.tools.r8.graph.AppView):112 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap):250 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xY;)V"}
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap):251:251 -> <init>
     1:1:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):260:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Wv;)Lcom/android/tools/r8/ir/optimize/H;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Yv;)Lcom/android/tools/r8/ir/optimize/H;"}
     2:2:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createWhyAreYouNotInliningReporter(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/bm0;"}
-com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl$1 -> com.android.tools.r8.internal.Eb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/fm0;"}
+com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl$1 -> com.android.tools.r8.internal.Ib0:
 # {"id":"sourceFile","fileName":"SingleCallerInliner.java"}
     com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl this$0 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jb0;"}
     1:1:void <init>(com.android.tools.r8.optimize.singlecaller.SingleCallerInliner$SingleCallerInlinerImpl,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.ir.code.IRCode):261:261 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fb0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/lO;Lcom/android/tools/r8/internal/Wv;Lcom/android/tools/r8/internal/Bt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb0;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pO;Lcom/android/tools/r8/internal/Yv;Lcom/android/tools/r8/internal/Dt;)V"}
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):273:273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/ec;Lcom/android/tools/r8/internal/Vv;Lcom/android/tools/r8/internal/bm0;)Lcom/android/tools/r8/ir/optimize/S;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gc;Lcom/android/tools/r8/internal/Xv;Lcom/android/tools/r8/internal/fm0;)Lcom/android/tools/r8/ir/optimize/S;"}
     2:2:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.containsKey(com.android.tools.r8.graph.DexClassAndMember):64:64 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):273 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.containsKey(com.android.tools.r8.graph.DexClassAndMember):64:64 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):273 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):276:276 -> a
-com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph -> com.android.tools.r8.internal.Jb0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph -> com.android.tools.r8.internal.Nb0:
 # {"id":"sourceFile","fileName":"SingleCallerInlinerCallGraph.java"}
     1:1:void <init>(java.util.Map):29:29 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;)V"}
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():37:41 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
     6:6:boolean com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node.isLeaf():109:109 -> c
     6:6:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():42 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node.isLeaf():109:109 -> c
     7:7:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():42 -> c
     8:13:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():43:48 -> c
-com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Builder -> com.android.tools.r8.internal.Hb0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Builder -> com.android.tools.r8.internal.Lb0:
 # {"id":"sourceFile","fileName":"SingleCallerInlinerCallGraph.java"}
     1:1:void <init>(com.android.tools.r8.graph.AppView):55:55 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Builder populateGraph(com.android.tools.r8.utils.collections.ProgramMethodMap):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;)Lcom/android/tools/r8/internal/Hb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;)Lcom/android/tools/r8/internal/Lb0;"}
     2:2:void lambda$populateGraph$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):60:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node.addCaller(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):92:92 -> a
@@ -244239,11 +243713,11 @@
     8:8:void lambda$populateGraph$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):60 -> a
     9:9:com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node createNode(com.android.tools.r8.graph.ProgramMethod):77:77 -> a
     9:9:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/mR;"}
-com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node -> com.android.tools.r8.internal.Ib0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/qR;"}
+com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node -> com.android.tools.r8.internal.Mb0:
 # {"id":"sourceFile","fileName":"SingleCallerInlinerCallGraph.java"}
     com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node caller -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ib0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mb0;"}
     java.util.Set callees -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/TreeSet;"}
     boolean $assertionsDisabled -> e
@@ -244252,81 +243726,81 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     2:3:void <init>(com.android.tools.r8.graph.ProgramMethod):84:85 -> <init>
     1:1:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;Z)V"}
     2:2:void addCallerConcurrently(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node,boolean):114:114 -> a
     2:2:void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean):81 -> a
     3:3:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qR;)V"}
     4:4:void addReaderConcurrently(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):119:119 -> a
     4:4:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):81 -> a
     5:5:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     6:6:boolean hasCaller(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):144:144 -> a
     6:6:boolean hasCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81 -> a
     1:1:boolean hasCallee(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     2:2:boolean hasCallee(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):139:139 -> b
     2:2:boolean hasCallee(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81 -> b
     3:3:java.util.Set getCalleesWithDeterministicOrder():129:129 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/TreeSet;"}
     1:1:boolean hasWriter(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
     2:2:java.util.Set getWritersWithDeterministicOrder():134:134 -> c
     1:1:int compareTo(java.lang.Object):81:81 -> compareTo
     2:2:int compareTo(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):124:124 -> compareTo
     2:2:int compareTo(java.lang.Object):81 -> compareTo
     1:1:void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     2:2:void removeReader(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):163:163 -> d
     2:2:void removeReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81 -> d
     1:1:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)V"}
     2:6:void removeCaller(com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerCallGraph$Node):149:153 -> e
     2:6:void removeCaller(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81 -> e
     7:10:void cleanForRemoval():101:104 -> e
     1:1:boolean hasReader(com.android.tools.r8.ir.conversion.callgraph.CycleEliminatorNode):81:81 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/th;)Z"}
-com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions -> com.android.tools.r8.internal.Kb0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vh;)Z"}
+com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions -> com.android.tools.r8.internal.Ob0:
 # {"id":"sourceFile","fileName":"SingleCallerInlinerOptions.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean enable -> b
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):14:14 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:5:void <init>(com.android.tools.r8.utils.InternalOptions):12:15 -> <init>
     1:1:void setEnable(boolean):27:27 -> a
-com.android.tools.r8.optimize.singlecaller.SingleCallerScanner -> com.android.tools.r8.internal.Lb0:
+com.android.tools.r8.optimize.singlecaller.SingleCallerScanner -> com.android.tools.r8.internal.Pb0:
 # {"id":"sourceFile","fileName":"SingleCallerScanner.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet monomorphicVirtualMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zY;"}
     com.android.tools.r8.graph.ProgramMethod MULTIPLE_CALLERS -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     1:1:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.ProgramMethod.createSentinel():34:34 -> <clinit>
     1:1:void <clinit>():32 -> <clinit>
     2:2:void <clinit>():32:32 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet):38:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/vY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/zY;)V"}
     1:9:com.android.tools.r8.utils.collections.ProgramMethodMap getSingleCallerMethods(java.util.concurrent.ExecutorService):45:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/xY;"}
     10:11:boolean lambda$getSingleCallerMethods$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):50:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
-    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):214:214 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
+    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):216:216 -> a
     12:12:boolean lambda$getSingleCallerMethods$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):215:215 -> a
+    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):217:217 -> a
     13:13:boolean lambda$getSingleCallerMethods$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):51 -> a
-    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():220:220 -> a
-    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):216 -> a
+    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():222:222 -> a
+    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.isSingleCallerInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):218 -> a
     14:14:boolean lambda$getSingleCallerMethods$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):51 -> a
     15:16:boolean lambda$getSingleCallerMethods$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):51:52 -> a
     17:17:void lambda$traceConstantPools$1(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/D2;)V"}
     18:18:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.containsKey(com.android.tools.r8.graph.DexClassAndMember):64:64 -> a
     18:18:void lambda$traceInstructions$8(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
     19:19:boolean com.android.tools.r8.utils.collections.DexClassAndMemberMap.containsKey(com.android.tools.r8.graph.DexClassAndMember):64:64 -> a
     19:19:void lambda$traceInstructions$8(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):201 -> a
     20:20:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
@@ -244338,13 +243812,13 @@
     23:23:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
     23:23:void lambda$traceInstructions$8(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):202 -> a
     24:24:void recordCallEdges(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodMap):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/tY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xY;)V"}
     25:25:boolean lambda$recordCallEdges$3(com.android.tools.r8.graph.DexEncodedMethod):80:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     26:26:void lambda$recordCallEdges$4(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
     27:27:void lambda$recordCallEdges$5(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     28:28:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
     28:28:void lambda$recordCallEdges$5(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244354,13 +243828,13 @@
     31:31:com.android.tools.r8.graph.ProgramMethod lambda$recordCallEdge$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):159:159 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/C5;"}
     32:73:com.android.tools.r8.utils.collections.ProgramMethodMap traceInstructions(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):165:206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/xY;"}
     74:74:com.android.tools.r8.utils.collections.ProgramMethodMap traceInstructions(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.concurrent.ExecutorService):171:171 -> a
     1:5:com.android.tools.r8.utils.collections.ProgramMethodMap traceConstantPools(java.util.concurrent.ExecutorService):58:62 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/xY;"}
     6:13:com.android.tools.r8.utils.collections.ProgramMethodMap traceConstantPools(java.util.concurrent.ExecutorService):59:66 -> b
     14:14:void lambda$traceConstantPools$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):68:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     15:15:boolean com.android.tools.r8.utils.ObjectUtils.notIdentical(java.lang.Object,java.lang.Object):25:25 -> b
     15:15:void lambda$traceConstantPools$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):69 -> b
     16:16:void lambda$traceConstantPools$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):70:70 -> b
@@ -244370,7 +243844,7 @@
     18:18:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> b
     18:18:void lambda$traceConstantPools$2(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):71 -> b
     19:20:void recordCallEdges(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):86:87 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
     21:21:com.android.tools.r8.lightir.LirConstant[] com.android.tools.r8.lightir.LirCode.getConstantPool():500:500 -> b
     21:21:void recordCallEdges(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):88 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244457,7 +243931,7 @@
     102:102:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> b
     102:102:void lambda$traceInstructions$9(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):174 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;)V"}
     103:103:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> b
     103:103:void lambda$traceInstructions$9(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):174 -> b
     104:113:void lambda$traceInstructions$9(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):174:183 -> b
@@ -244485,7 +243959,7 @@
     132:133:void lambda$traceInstructions$9(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):197 -> b
     134:134:void lambda$traceInstructions$9(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):199:199 -> b
     1:1:void lambda$traceInstructions$7(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169:169 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> c
     2:2:void lambda$traceInstructions$7(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244493,12 +243967,12 @@
     3:3:void lambda$traceInstructions$7(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169 -> c
     4:5:void lambda$traceInstructions$7(com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169:170 -> c
     1:1:void recordCallEdge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):158:158 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.optimize.singlecaller.SingleCallerWaves -> R8$$REMOVED$$CLASS$$213:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xY;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
+com.android.tools.r8.optimize.singlecaller.SingleCallerWaves -> R8$$REMOVED$$CLASS$$201:
 # {"id":"sourceFile","fileName":"SingleCallerWaves.java"}
-com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection -> R8$$REMOVED$$CLASS$$214:
+com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection -> R8$$REMOVED$$CLASS$$202:
 # {"id":"sourceFile","fileName":"ConcurrentNonProgramMethodsCollection.java"}
-com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection$1 -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.optimize.utils.ConcurrentNonProgramMethodsCollection$1 -> com.android.tools.r8.internal.Cf:
 # {"id":"sourceFile","fileName":"ConcurrentNonProgramMethodsCollection.java"}
     com.android.tools.r8.graph.AppView com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -244512,7 +243986,7 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):20 -> <init>
     1:1:boolean test(com.android.tools.r8.graph.DexClassAndMethod):23:23 -> a
     1:1:void com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.lambda$computeNonProgramMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/H0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/H0;)V"}
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.belongsToVirtualPool():73:73 -> a
     2:2:boolean test(com.android.tools.r8.graph.DexClassAndMethod):23 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -244525,11 +243999,11 @@
     5:5:void com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.lambda$computeNonProgramMethods$2(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):51 -> a
     6:6:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> a
     6:6:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.computeNonProgramMethods(com.android.tools.r8.graph.DexClass):41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Lcom/android/tools/r8/internal/Sl;"}
     7:20:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.computeNonProgramMethods(com.android.tools.r8.graph.DexClass):42:55 -> a
     21:24:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.getOrComputeNonProgramMethods(com.android.tools.r8.graph.DexClass):34:37 -> a
     21:24:void com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.lambda$computeNonProgramMethods$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;)V"}
     25:25:void com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.lambda$computeNonProgramMethods$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):46:46 -> a
     26:26:void com.android.tools.r8.utils.collections.DexMethodSignatureSet.addAll(com.android.tools.r8.utils.collections.DexMethodSignatureSet):79:79 -> a
     26:26:void com.android.tools.r8.optimize.utils.NonProgramMethodsCollection.lambda$computeNonProgramMethods$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):46 -> a
@@ -244555,10 +244029,10 @@
 com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.internal.L2:
 # {"id":"sourceFile","fileName":"AnnotationWriter.java"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     boolean useNamedValues -> c
     com.android.tools.r8.org.objectweb.asm.ByteVector annotation -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int numElementValuePairsOffset -> e
     int numElementValuePairs -> f
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> g
@@ -244567,12 +244041,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):59:59 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,boolean,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):115 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;ZLcom/android/tools/r8/internal/W7;Lcom/android/tools/r8/internal/L2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;ZLcom/android/tools/r8/internal/Y7;Lcom/android/tools/r8/internal/L2;)V"}
     2:9:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,boolean,com.android.tools.r8.org.objectweb.asm.ByteVector,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):116:123 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):143:146 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Ljava/lang/String;Lcom/android/tools/r8/internal/L2;)Lcom/android/tools/r8/internal/L2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Ljava/lang/String;Lcom/android/tools/r8/internal/L2;)Lcom/android/tools/r8/internal/L2;"}
     5:5:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Lcom/android/tools/r8/internal/L2;)Lcom/android/tools/r8/internal/L2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Lcom/android/tools/r8/internal/L2;)Lcom/android/tools/r8/internal/L2;"}
     6:6:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):433:433 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationWriter create(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):177 -> a
     7:7:void com.android.tools.r8.org.objectweb.asm.TypeReference.putTarget(int,com.android.tools.r8.org.objectweb.asm.ByteVector):419:419 -> a
@@ -244641,15 +244115,15 @@
     157:172:int computeAnnotationsSize(com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter):375:390 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;)I"}
     173:185:void putAnnotations(int,com.android.tools.r8.org.objectweb.asm.ByteVector):412:424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/W7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Y7;)V"}
     186:186:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):457:457 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/W7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/L2;Lcom/android/tools/r8/internal/Y7;)V"}
     187:192:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):456:461 -> a
     193:198:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):460:465 -> a
     199:204:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):464:469 -> a
     205:205:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):468:468 -> a
     206:229:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/L2;ILcom/android/tools/r8/internal/W7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/L2;ILcom/android/tools/r8/internal/Y7;)V"}
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
 com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.G4:
 # {"id":"sourceFile","fileName":"Attribute.java"}
@@ -244659,18 +244133,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G4;"}
     1:2:void <init>(java.lang.String):64:65 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):128:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hd;II)Lcom/android/tools/r8/internal/G4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jd;II)Lcom/android/tools/r8/internal/G4;"}
     4:4:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y7;"}
     5:5:int com.android.tools.r8.org.objectweb.asm.SymbolTable.getMajorVersion():321:321 -> a
     5:5:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;II)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;II)I"}
     6:17:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):249:260 -> a
     18:18:int com.android.tools.r8.org.objectweb.asm.SymbolTable.getMajorVersion():321:321 -> a
     18:18:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;IILcom/android/tools/r8/internal/W7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;IILcom/android/tools/r8/internal/Y7;)V"}
     19:28:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):337:346 -> a
 com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.F4:
 # {"id":"sourceFile","fileName":"Attribute.java"}
@@ -244684,7 +244158,7 @@
     3:8:void add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     3:8:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     9:9:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):364:364 -> a
-com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.Y7:
 # {"id":"sourceFile","fileName":"ByteVector.java"}
     byte[] data -> a
     int length -> b
@@ -244696,30 +244170,30 @@
     9:19:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):204:214 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(III)V"}
     20:58:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):294:332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)Lcom/android/tools/r8/internal/Y7;"}
     59:59:com.android.tools.r8.org.objectweb.asm.ByteVector encodeUtf8(java.lang.String,int,int):307:307 -> a
     60:66:com.android.tools.r8.org.objectweb.asm.ByteVector putByteArray(byte[],int,int):348:354 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([BII)Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([BII)Lcom/android/tools/r8/internal/Y7;"}
     67:74:void enlarge(int):364:371 -> a
     75:75:void enlarge(int):365:365 -> a
     1:6:com.android.tools.r8.org.objectweb.asm.ByteVector putByte(int):84:89 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Y7;"}
     7:16:com.android.tools.r8.org.objectweb.asm.ByteVector put112(int,int,int):161:170 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):139:147 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Y7;"}
     10:19:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):181:190 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Y7;"}
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):119:126 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/W7;"}
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.hd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Y7;"}
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.jd:
 # {"id":"sourceFile","fileName":"ClassReader.java"}
     int header -> a
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
     java.lang.String[] constantUtf8Values -> d
     com.android.tools.r8.org.objectweb.asm.ConstantDynamic[] constantDynamicValues -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/og;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/qg;"}
     int[] bootstrapMethodOffsets -> f
     int maxStringLength -> g
     1:1:void <init>(byte[]):166:166 -> <init>
@@ -244739,9 +244213,9 @@
     129:129:void <init>(byte[],int,boolean):276:276 -> <init>
     129:129:void com.android.tools.r8.internal.ClassReader.<init>(byte[],boolean):0 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ud;I)V"}
     2:93:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):446:537 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd;[Lcom/android/tools/r8/internal/G4;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ud;[Lcom/android/tools/r8/internal/G4;I)V"}
     94:131:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):534:571 -> a
     132:138:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):570:576 -> a
     139:139:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):774:774 -> a
@@ -244851,7 +244325,7 @@
     973:1013:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):745 -> a
     1014:1014:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):749:749 -> a
     1015:1319:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1537:1841 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;Lcom/android/tools/r8/internal/Ug;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;Lcom/android/tools/r8/internal/Wg;I)V"}
     1320:1320:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1743:1743 -> a
     1321:1324:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2692:2695 -> a
     1321:1324:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2708 -> a
@@ -244984,7 +244458,7 @@
     3445:3471:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2638:2664 -> a
     3472:3472:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1544:1544 -> a
     3473:3473:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2722:2722 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/II;)V"}
     3474:3476:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2693:2695 -> a
     3474:3476:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2723 -> a
     3477:3477:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2723:2723 -> a
@@ -244993,13 +244467,13 @@
     3479:3479:int getTypeAnnotationBytecodeOffset(int[],int):2852 -> a
     3480:3480:int getTypeAnnotationBytecodeOffset(int[],int):2855:2855 -> a
     3481:3539:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2871:2929 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wg;I)I"}
     3540:3583:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2888:2931 -> a
     3584:3584:int readByte(int):3597:3597 -> a
     3584:3584:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2933 -> a
     3585:3585:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2935:2935 -> a
     3586:3599:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2957:2970 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;Lcom/android/tools/r8/internal/Ug;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;Lcom/android/tools/r8/internal/Wg;IZ)V"}
     3600:3600:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2969:2969 -> a
     3601:3618:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2999:3016 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J2;IZ[C)I"}
@@ -245031,7 +244505,7 @@
     3996:4045:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):3051:3100 -> a
     4046:4046:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):3099:3099 -> a
     4047:4079:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3392:3424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;I[C[Lcom/android/tools/r8/internal/EI;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Ljava/lang/Object;I[C[Lcom/android/tools/r8/internal/II;)I"}
     4080:4080:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3420:3420 -> a
     4081:4081:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3416:3416 -> a
     4082:4082:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3413:3413 -> a
@@ -245043,7 +244517,7 @@
     4088:4088:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3395:3395 -> a
     4089:4118:int getFirstAttributeOffset():3443:3472 -> a
     4119:4121:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3542:3544 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/G4;Ljava/lang/String;II[CI[Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/G4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/G4;Ljava/lang/String;II[CI[Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/G4;"}
     4122:4124:com.android.tools.r8.org.objectweb.asm.Attribute com.android.tools.r8.org.objectweb.asm.Attribute.read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):128:130 -> a
     4122:4124:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3548 -> a
     4125:4126:int readInt(int):3632:3633 -> a
@@ -245053,10 +244527,10 @@
     4144:4144:java.lang.String readClass(int,char[]):3754 -> a
     1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2692:2695 -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2708 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I[Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/II;"}
     5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2709:2709 -> b
     6:59:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2750:2803 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;Lcom/android/tools/r8/internal/Ug;IZ)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;Lcom/android/tools/r8/internal/Wg;IZ)[I"}
     60:68:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2766:2774 -> b
     69:69:int readByte(int):3597:3597 -> b
     69:69:int[] readTypeAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2807 -> b
@@ -245081,14 +244555,14 @@
     4:10:java.lang.String readUtf(int,char[]):3682:3688 -> c
     4:10:java.lang.String readUTF8(int,char[]):3669 -> c
     1:2:int readUnsignedShort(int):3608:3609 -> d
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.md:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.od:
 # {"id":"sourceFile","fileName":"ClassTooLargeException.java"}
     java.lang.String className -> b
     int constantPoolCount -> c
     1:1:void <init>(java.lang.String,int):0:0 -> <init>
     1:1:void com.android.tools.r8.internal.ClassTooLargeException.<init>(int,java.lang.String):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":54,"2":55,"3":56,"4":57},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":54,"2":55,"3":56,"4":57},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     51:53:void <init>(java.lang.String,int):50:52 -> <init>
     51:53:void com.android.tools.r8.internal.ClassTooLargeException.<init>(int,java.lang.String):0 -> <init>
     54:54:java.lang.String stringConcat$0(java.lang.String):0:0 -> <init>
@@ -245099,19 +244573,19 @@
     56:56:void <init>(java.lang.String,int):50 -> <init>
     57:57:java.lang.String stringConcat$0(java.lang.String):0:0 -> <init>
     57:57:void <init>(java.lang.String,int):50 -> <init>
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.ud:
 # {"id":"sourceFile","fileName":"ClassVisitor.java"}
     int api -> a
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rc;"}
     1:15:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor):69:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc;)V"}
     1:4:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):119:122 -> a
     5:5:void com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):203:203 -> a
     5:5:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):123 -> a
     6:6:void visitSource(java.lang.String,java.lang.String):136:136 -> a
     7:10:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):152:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/QO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/UO;"}
     11:11:com.android.tools.r8.org.objectweb.asm.ModuleVisitor com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visitModule(java.lang.String,int,java.lang.String):214:214 -> a
     11:11:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):156 -> a
     12:12:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):153:153 -> a
@@ -245120,7 +244594,7 @@
     16:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):211:212 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     18:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):234:238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):235:235 -> a
     24:24:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):249:249 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
@@ -245131,63 +244605,63 @@
     27:28:void com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):271:272 -> a
     27:28:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):306 -> a
     29:29:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):355:355 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
     30:31:com.android.tools.r8.org.objectweb.asm.FieldVisitor com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):290:291 -> a
     30:31:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):356 -> a
     32:33:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):383:384 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     34:34:void visitEnd():394:394 -> a
     1:4:void visitNestMember(java.lang.String):264:267 -> b
     5:5:void com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visitNestMember(java.lang.String):260:260 -> b
     5:5:void visitNestMember(java.lang.String):268 -> b
     6:6:void visitNestMember(java.lang.String):265:265 -> b
     7:11:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):322:326 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/U10;"}
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):323:323 -> b
     1:4:void visitPermittedSubclass(java.lang.String):280:283 -> c
     5:5:void com.android.tools.r8.org.objectweb.asm.tree.ClassNode.visitPermittedSubclass(java.lang.String):265:265 -> c
     5:5:void visitPermittedSubclass(java.lang.String):284 -> c
     6:6:void visitPermittedSubclass(java.lang.String):281:281 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.td:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.vd:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfNestMemberClasses -> A
     com.android.tools.r8.org.objectweb.asm.ByteVector nestMemberClasses -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int numberOfPermittedSubclasses -> C
     com.android.tools.r8.org.objectweb.asm.ByteVector permittedSubclasses -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     com.android.tools.r8.org.objectweb.asm.RecordComponentWriter firstRecordComponent -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V10;"}
     com.android.tools.r8.org.objectweb.asm.RecordComponentWriter lastRecordComponent -> F
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V10;"}
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> G
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G4;"}
     int compute -> H
     int version -> c
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     int accessFlags -> e
     int thisClass -> f
     int superClass -> g
     int interfaceCount -> h
     int[] interfaces -> i
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mp;"}
     com.android.tools.r8.org.objectweb.asm.FieldWriter lastField -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mp;"}
     com.android.tools.r8.org.objectweb.asm.MethodWriter firstMethod -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FO;"}
     com.android.tools.r8.org.objectweb.asm.MethodWriter lastMethod -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FO;"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector innerClasses -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int enclosingClassIndex -> p
     int enclosingMethodIndex -> q
     int signatureIndex -> r
     int sourceFileIndex -> s
     com.android.tools.r8.org.objectweb.asm.ByteVector debugExtension -> t
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> v
@@ -245197,7 +244671,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
     com.android.tools.r8.org.objectweb.asm.ModuleWriter moduleWriter -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VO;"}
     int nestHostClassIndex -> z
     1:1:void com.android.tools.r8.org.objectweb.asm.ClassVisitor.<init>(int):58:58 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.ClassReader,int):264 -> <init>
@@ -245227,7 +244701,7 @@
     21:25:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):314:318 -> a
     26:29:void visitSource(java.lang.String,java.lang.String):325:328 -> a
     30:30:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):335:335 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/QO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/UO;"}
     31:31:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantModule(java.lang.String):996:996 -> a
     31:31:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):338 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -245245,7 +244719,7 @@
     43:47:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):360:364 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     48:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):372:377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     54:55:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):385:386 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     56:65:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):410:419 -> a
@@ -245259,9 +244733,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:75:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):423:426 -> a
     76:83:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):452:459 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
     84:91:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):469:476 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     92:92:void visitEnd():482:482 -> a
     93:95:com.android.tools.r8.org.objectweb.asm.Attribute[] getAttributePrototypes():791:793 -> a
     93:95:byte[] replaceAsmInstructions(byte[],boolean):758 -> a
@@ -245290,7 +244764,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void visitNestMember(java.lang.String):395:395 -> b
     8:15:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):435:442 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/U10;"}
     16:18:byte[] toByteArray():500:502 -> b
     19:32:int com.android.tools.r8.org.objectweb.asm.FieldWriter.computeFieldInfoSize():195:208 -> b
     19:32:byte[] toByteArray():505 -> b
@@ -245493,21 +244967,21 @@
     6:6:void visitPermittedSubclass(java.lang.String):404 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void visitPermittedSubclass(java.lang.String):404:404 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.og:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.qg:
 # {"id":"sourceFile","fileName":"ConstantDynamic.java"}
     java.lang.String name -> a
     java.lang.String descriptor -> b
     com.android.tools.r8.org.objectweb.asm.Handle bootstrapMethod -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/us;"}
     java.lang.Object[] bootstrapMethodArguments -> d
     1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):67:71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     1:8:boolean equals(java.lang.Object):150:157 -> equals
     1:4:int hashCode():162:165 -> hashCode
     1:7:java.lang.String toString():170:176 -> toString
     8:8:java.lang.String stringConcat$0(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.String):0:0 -> toString
     8:8:java.lang.String toString():176 -> toString
-com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.xg:
 # {"id":"sourceFile","fileName":"Constants.java"}
     1:2:void checkAsmExperimental(java.lang.Object):186:187 -> a
     3:7:boolean isWhitelisted(java.lang.String):194:198 -> a
@@ -245532,7 +245006,7 @@
     23:27:void checkAsmExperimental(java.lang.Object):189 -> a
     28:28:void checkIsPreview(java.io.InputStream):207:207 -> a
     28:28:void checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.Wg:
 # {"id":"sourceFile","fileName":"Context.java"}
     com.android.tools.r8.org.objectweb.asm.Attribute[] attributePrototypes -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/G4;"}
@@ -245542,14 +245016,14 @@
     java.lang.String currentMethodName -> e
     java.lang.String currentMethodDescriptor -> f
     com.android.tools.r8.org.objectweb.asm.Label[] currentMethodLabels -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/II;"}
     int currentTypeAnnotationTarget -> h
     com.android.tools.r8.org.objectweb.asm.TypePath currentTypeAnnotationTargetPath -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ej0;"}
     com.android.tools.r8.org.objectweb.asm.Label[] currentLocalVariableAnnotationRangeStarts -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label[] currentLocalVariableAnnotationRangeEnds -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/II;"}
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameOffset -> m
     int currentFrameType -> n
@@ -245559,35 +245033,35 @@
     int currentFrameStackCount -> r
     java.lang.Object[] currentFrameStackTypes -> s
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.kh:
 # {"id":"sourceFile","fileName":"CurrentFrame.java"}
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.Label):40:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     1:3:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):51:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/hg0;Lcom/android/tools/r8/internal/jg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/lg0;Lcom/android/tools/r8/internal/ng0;)V"}
     4:11:void com.android.tools.r8.org.objectweb.asm.Frame.copyFrom(com.android.tools.r8.org.objectweb.asm.Frame):259:266 -> a
     4:11:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):54 -> a
-com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.Im:
 # {"id":"sourceFile","fileName":"Edge.java"}
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Im;"}
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/Gm;)V"}
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Ip:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/Im;)V"}
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Lp:
 # {"id":"sourceFile","fileName":"FieldVisitor.java"}
     int api -> a
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lp;"}
     1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:74 -> <init>
     1:9:void com.android.tools.r8.internal.FieldVisitor.<init>(int,com.android.tools.r8.internal.FieldVisitor):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Ip;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Lp;)V"}
     10:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.FieldVisitor.<init>(int,com.android.tools.r8.internal.FieldVisitor):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":91,"2":92,"3":93,"4":94},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":91,"2":92,"3":93,"4":94},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     84:90:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):74:80 -> <init>
     84:90:void com.android.tools.r8.internal.FieldVisitor.<init>(int,com.android.tools.r8.internal.FieldVisitor):0 -> <init>
     91:91:java.lang.String stringConcat$0(int):0:0 -> <init>
@@ -245601,15 +245075,15 @@
     1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):101:102 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     3:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):122:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):123:123 -> a
     9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):137:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     11:12:void visitEnd():147:148 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Mp:
 # {"id":"sourceFile","fileName":"FieldWriter.java"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     int accessFlags -> d
     int nameIndex -> e
     int descriptorIndex -> f
@@ -245627,19 +245101,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G4;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.FieldVisitor.<init>(int):55:55 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):127 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"}
     2:10:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):128:136 -> <init>
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):147:151 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):159:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     12:13:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):172:173 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     14:14:void visitEnd():179:179 -> a
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Pq:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Rq:
 # {"id":"sourceFile","fileName":"Frame.java"}
     com.android.tools.r8.org.objectweb.asm.Label owner -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     int[] inputLocals -> b
     int[] inputStack -> c
     int[] outputLocals -> d
@@ -245649,9 +245123,9 @@
     int initializationCount -> h
     int[] initializations -> i
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Label):246:247 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     1:11:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):285:295 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Ljava/lang/Object;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Ljava/lang/Object;)I"}
     12:12:com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry com.android.tools.r8.org.objectweb.asm.SymbolTable.getOrAddLabelEntry(com.android.tools.r8.org.objectweb.asm.Label):1300:1300 -> a
     12:12:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addForwardUninitializedType(java.lang.String,com.android.tools.r8.org.objectweb.asm.Label):1222 -> a
     12:12:int getAbstractTypeFromApiFormat(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.Object):295 -> a
@@ -245669,17 +245143,17 @@
     63:122:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):324:383 -> a
     63:122:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Ljava/lang/String;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Ljava/lang/String;I)I"}
     123:123:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):0:0 -> a
     123:123:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":927,"2":928,"3":929,"4":930},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":927,"2":928,"3":929,"4":930},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     506:506:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):383:383 -> a
     506:506:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
     507:542:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):344:379 -> a
     507:542:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
     543:543:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):0:0 -> a
     543:543:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":931,"2":932,"3":933,"4":934},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":931,"2":932,"3":933,"4":934},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     922:922:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):379:379 -> a
     922:922:int com.android.tools.r8.internal.Frame.getAbstractTypeFromDescriptor(com.android.tools.r8.internal.SymbolTable,java.lang.String,int):0 -> a
     923:924:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):374:375 -> a
@@ -245703,19 +245177,19 @@
     934:934:java.lang.String stringConcat$0(java.lang.String):0:0 -> a
     934:934:int getAbstractTypeFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,int):379 -> a
     935:936:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):406:407 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;ILjava/lang/String;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;ILjava/lang/String;I)V"}
     937:937:java.lang.String com.android.tools.r8.org.objectweb.asm.SymbolTable.getClassName():330:330 -> a
     937:937:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):412 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     938:952:void setInputFrameFromDescriptor(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,int):412:426 -> a
     953:962:int getLocal(int):490:499 -> a
     963:968:void push(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):560:565 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Ljava/lang/String;)V"}
     969:973:int pop():576:580 -> a
     974:980:void pop(java.lang.String):606:612 -> a
     981:981:void pop(java.lang.String):610:610 -> a
     982:990:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):656:664 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;I)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;I)I"}
     991:991:java.lang.String com.android.tools.r8.org.objectweb.asm.SymbolTable.getClassName():330:330 -> a
     991:991:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):668 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -245727,7 +245201,7 @@
     994:994:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):671 -> a
     995:995:int getInitializedType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int):671:671 -> a
     996:996:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1117:1117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/hg0;Lcom/android/tools/r8/internal/jg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/lg0;Lcom/android/tools/r8/internal/ng0;)V"}
     997:998:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1113:1114 -> a
     999:1004:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1104:1109 -> a
     1005:1007:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):1095:1097 -> a
@@ -245796,9 +245270,9 @@
     1599:1599:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):711:711 -> a
     1600:1610:int getConcreteOutputType(int,int):1140:1150 -> a
     1611:1686:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.Frame,int):1180:1255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Lcom/android/tools/r8/internal/Pq;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Lcom/android/tools/r8/internal/Rq;I)Z"}
     1687:1718:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1280:1311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;I[II)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;I[II)Z"}
     1719:1719:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry com.android.tools.r8.org.objectweb.asm.SymbolTable.get(int):418:418 -> a
     1719:1719:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addMergedType(int,int):1255 -> a
     1719:1719:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1311 -> a
@@ -245824,7 +245298,7 @@
     1756:1756:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1311 -> a
     1757:1788:boolean merge(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int[],int):1316:1347 -> a
     1789:1816:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1368:1395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FO;)V"}
     1817:1817:void com.android.tools.r8.org.objectweb.asm.MethodWriter.visitAbstractType(int,int):1839:1839 -> a
     1817:1817:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1397 -> a
     1818:1818:void accept(com.android.tools.r8.org.objectweb.asm.MethodWriter):1401:1401 -> a
@@ -245834,7 +245308,7 @@
     1:11:void setLocal(int,int):513:523 -> b
     12:18:void pop(int):590:596 -> b
     1:16:void push(int):533:548 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.us:
 # {"id":"sourceFile","fileName":"Handle.java"}
     int tag -> a
     java.lang.String owner -> b
@@ -245850,22 +245324,22 @@
     1:1:java.lang.String toString():188:188 -> toString
     2:2:java.lang.String stringConcat$0(java.lang.String,java.lang.String,java.lang.String,int,java.lang.String):0:0 -> toString
     2:2:java.lang.String toString():188 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.vs:
 # {"id":"sourceFile","fileName":"Handler.java"}
     com.android.tools.r8.org.objectweb.asm.Label startPc -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label endPc -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     int catchType -> d
     java.lang.String catchTypeDescriptor -> e
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vs;"}
     1:6:void <init>(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int,java.lang.String):90:95 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;ILjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;ILjava/lang/String;)V"}
     1:17:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):123:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ts;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/ts;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vs;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/vs;"}
     18:19:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     18:19:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):139 -> a
     20:20:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):143:143 -> a
@@ -245877,10 +245351,10 @@
     26:27:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
     28:29:void <init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     28:29:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.EI:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.II:
 # {"id":"sourceFile","fileName":"Label.java"}
     java.lang.Object info -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     short flags -> b
     short lineNumber -> c
     int[] otherLineNumbers -> d
@@ -245891,30 +245365,30 @@
     short outputStackMax -> i
     short subroutineId -> j
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rq;"}
     com.android.tools.r8.org.objectweb.asm.Label nextBasicBlock -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Im;"}
     com.android.tools.r8.org.objectweb.asm.Label nextListElement -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label EMPTY_LIST -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     1:1:void <clinit>():140:140 -> <clinit>
     1:1:void <init>():299:299 -> <init>
     1:1:com.android.tools.r8.org.objectweb.asm.Label getCanonicalInstance():332:332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/II;"}
     2:14:void put(com.android.tools.r8.org.objectweb.asm.ByteVector,int,boolean):397:409 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W7;IZ)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y7;IZ)V"}
     15:26:void addForwardReference(int,int,int):442:453 -> a
     27:63:boolean resolve(byte[],com.android.tools.r8.org.objectweb.asm.ByteVector,int):475:511 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLcom/android/tools/r8/internal/W7;I)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLcom/android/tools/r8/internal/Y7;I)Z"}
     1:1:java.lang.String toString():652:652 -> toString
     1:1:java.lang.String com.android.tools.r8.internal.Label.toString():0 -> toString
       # {"id":"com.android.tools.r8.synthesized"}
     2:2:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String com.android.tools.r8.internal.Label.toString():0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     3:3:java.lang.String stringConcat$0(int):0:0 -> toString
     3:3:java.lang.String toString():652 -> toString
     4:4:java.lang.String stringConcat$0(int):0:0 -> toString
@@ -245923,7 +245397,7 @@
     5:5:java.lang.String toString():652 -> toString
     6:6:java.lang.String stringConcat$0(int):0:0 -> toString
     6:6:java.lang.String toString():652 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.yO:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.CO:
 # {"id":"sourceFile","fileName":"MethodTooLargeException.java"}
     java.lang.String className -> b
     java.lang.String methodName -> c
@@ -245933,18 +245407,18 @@
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     2:6:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:61 -> <init>
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.AO:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.EO:
 # {"id":"sourceFile","fileName":"MethodVisitor.java"}
     int api -> a
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EO;"}
     1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):82:90 -> <init>
     1:9:void com.android.tools.r8.internal.MethodVisitor.<init>(int,com.android.tools.r8.internal.MethodVisitor):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EO;)V"}
     10:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.MethodVisitor.<init>(int,com.android.tools.r8.internal.MethodVisitor):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":107,"2":108,"3":109,"4":110},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":107,"2":108,"3":109,"4":110},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     100:106:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor):90:96 -> <init>
     100:106:void com.android.tools.r8.internal.MethodVisitor.<init>(int,com.android.tools.r8.internal.MethodVisitor):0 -> <init>
     107:107:java.lang.String stringConcat$0(int):0:0 -> <init>
@@ -245972,29 +245446,29 @@
     18:18:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):446 -> a
     19:25:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):444:450 -> a
     26:30:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):470:474 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     31:31:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):471:471 -> a
     32:33:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):489:490 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     34:35:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):500:501 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     36:45:void visitLdcInsn(java.lang.Object):553:562 -> a
     46:47:void visitIincInsn(int,int):573:574 -> a
     48:49:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):589:590 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     50:51:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):603:604 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
     52:53:void visitMultiANewArrayInsn(java.lang.String,int):615:616 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     54:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):641:645 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     59:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):642:642 -> a
     60:61:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):668:669 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
     62:63:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):720:721 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
     64:68:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):753:757 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     69:69:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):754:754 -> a
     1:5:void visitParameter(java.lang.String,int):121:125 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
@@ -246002,18 +245476,18 @@
     7:8:void visitCode():241:242 -> b
     9:10:void visitIntInsn(int,int):355:356 -> b
     11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):690:694 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):691:691 -> b
     17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):773:774 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):177:181 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):178:178 -> c
     7:8:void visitTypeInsn(int,java.lang.String):385:386 -> c
     9:10:void visitMaxs(int,int):785:786 -> c
     11:12:void visitEnd():795:796 -> c
     1:2:void visitVarInsn(int,int):370:371 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.BO:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.FO:
 # {"id":"sourceFile","fileName":"MethodWriter.java"}
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
@@ -246030,19 +245504,19 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> H
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
     com.android.tools.r8.org.objectweb.asm.ByteVector defaultValue -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int parametersCount -> J
     com.android.tools.r8.org.objectweb.asm.ByteVector parameters -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> L
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G4;"}
     int compute -> M
     com.android.tools.r8.org.objectweb.asm.Label firstBasicBlock -> N
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label lastBasicBlock -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.Label currentBasicBlock -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     int relativeStackSize -> Q
     int maxRelativeStackSize -> R
     int currentLocals -> S
@@ -246054,7 +245528,7 @@
     int lastBytecodeOffset -> Y
     int[] STACK_SIZE_DELTA -> Z
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     int accessFlags -> d
     int nameIndex -> e
     java.lang.String name -> f
@@ -246063,23 +245537,23 @@
     int maxStack -> i
     int maxLocals -> j
     com.android.tools.r8.org.objectweb.asm.ByteVector code -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     com.android.tools.r8.org.objectweb.asm.Handler firstHandler -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vs;"}
     com.android.tools.r8.org.objectweb.asm.Handler lastHandler -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ts;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vs;"}
     int lineNumberTableLength -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector lineNumberTable -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int localVariableTableLength -> p
     com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTable -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int localVariableTypeTableLength -> r
     com.android.tools.r8.org.objectweb.asm.ByteVector localVariableTypeTable -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int stackMapTableNumberOfEntries -> t
     com.android.tools.r8.org.objectweb.asm.ByteVector stackMapTableEntries -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeVisibleTypeAnnotation -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L2;"}
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastCodeRuntimeInvisibleTypeAnnotation -> w
@@ -246090,7 +245564,7 @@
     1:1:void <clinit>():81:81 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):71:71 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):597 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V"}
     2:291:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):320:609 -> <init>
     292:292:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> <init>
     292:292:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],int):609 -> <init>
@@ -246149,7 +245623,7 @@
     316:323:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1053:1060 -> a
     324:324:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1047:1047 -> a
     325:327:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1071:1073 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     328:328:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantInvokeDynamic(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):929:929 -> a
     328:328:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1074 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -246161,19 +245635,19 @@
     339:343:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1085:1089 -> a
     344:344:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1081:1081 -> a
     345:444:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1096:1195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     445:515:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1203:1273 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     516:543:void visitLdcInsn(java.lang.Object):1279:1306 -> a
     544:544:void visitLdcInsn(java.lang.Object):1300:1300 -> a
     545:550:void visitIincInsn(int,int):1313:1318 -> a
     551:563:void visitIincInsn(int,int):1316:1328 -> a
     564:573:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1336:1345 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     574:584:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1350:1360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
     585:605:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1364:1384 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     606:608:void visitMultiANewArrayInsn(java.lang.String,int):1390:1392 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     609:609:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> a
@@ -246182,17 +245656,17 @@
     610:618:void visitMultiANewArrayInsn(java.lang.String,int):1393:1401 -> a
     619:619:void visitMultiANewArrayInsn(java.lang.String,int):1397:1397 -> a
     620:629:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1410:1419 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     630:632:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1431:1433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
     633:633:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> a
     633:633:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1433 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     634:640:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1433:1439 -> a
     641:666:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1465:1490 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
     667:674:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):1506:1513 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     675:678:void com.android.tools.r8.org.objectweb.asm.TypePath.put(com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.ByteVector):195:198 -> a
     675:678:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):1515 -> a
     679:688:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):1517:1526 -> a
@@ -246204,9 +245678,9 @@
     7:24:void visitIntInsn(int,int):886:903 -> b
     25:25:void visitIntInsn(int,int):896:896 -> b
     26:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1446:1451 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     32:37:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1537:1542 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     38:42:void putFrameType(java.lang.Object):1976:1980 -> b
     43:43:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> b
     43:43:void putFrameType(java.lang.Object):1981 -> b
@@ -246218,7 +245692,7 @@
     49:51:void com.android.tools.r8.org.objectweb.asm.Label.put(com.android.tools.r8.org.objectweb.asm.ByteVector):423:425 -> b
     49:51:void putFrameType(java.lang.Object):1984 -> b
     1:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):672:677 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     7:9:void visitTypeInsn(int,java.lang.String):972:974 -> c
     10:10:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> c
     10:10:void visitTypeInsn(int,java.lang.String):974 -> c
@@ -246296,7 +245770,7 @@
     300:303:void visitMaxs(int,int):1552:1555 -> c
     304:304:void visitEnd():1771:1771 -> c
     305:305:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1784:1784 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     1:31:void visitVarInsn(int,int):910:940 -> d
     32:70:void visitVarInsn(int,int):928:966 -> d
     71:80:void endCurrentBasicBlockWithNoSuccessor():1796:1805 -> d
@@ -246395,17 +245869,17 @@
     233:233:void putAbstractTypes(int,int):1961 -> e
     234:234:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1487:1487 -> e
     234:234:void putAbstractTypes(int,int):1961 -> e
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.QO:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.UO:
 # {"id":"sourceFile","fileName":"ModuleVisitor.java"}
     com.android.tools.r8.org.objectweb.asm.ModuleVisitor mv -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UO;"}
     1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:76 -> <init>
     1:9:void com.android.tools.r8.internal.ModuleVisitor.<init>(int,com.android.tools.r8.internal.ModuleVisitor):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/QO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/UO;)V"}
     10:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.ModuleVisitor.<init>(int,com.android.tools.r8.internal.ModuleVisitor):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95,"4":96},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95,"4":96},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     86:92:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):76:82 -> <init>
     86:92:void com.android.tools.r8.internal.ModuleVisitor.<init>(int,com.android.tools.r8.internal.ModuleVisitor):0 -> <init>
     93:93:java.lang.String stringConcat$0(int):0:0 -> <init>
@@ -246425,35 +245899,35 @@
     void visitOpen(java.lang.String,int,java.lang.String[]) -> b
     void visitPackage(java.lang.String) -> b
     void visitUse(java.lang.String) -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.RO:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.VO:
 # {"id":"sourceFile","fileName":"ModuleWriter.java"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     int moduleNameIndex -> c
     int moduleFlags -> d
     int moduleVersionIndex -> e
     int requiresCount -> f
     com.android.tools.r8.org.objectweb.asm.ByteVector requires -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int exportsCount -> h
     com.android.tools.r8.org.objectweb.asm.ByteVector exports -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int opensCount -> j
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int usesCount -> l
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int packageCount -> p
     com.android.tools.r8.org.objectweb.asm.ByteVector packageIndex -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int mainClassIndex -> r
     1:1:void com.android.tools.r8.org.objectweb.asm.ModuleVisitor.<init>(int):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,int):97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;III)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;III)V"}
     2:11:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,int):98:107 -> <init>
     1:1:void visitMainClass(java.lang.String):112:112 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):537:537 -> a
@@ -246486,7 +245960,7 @@
     31:33:void visitProvide(java.lang.String,java.lang.String[]):169:171 -> a
     34:34:void visitEnd():177:177 -> a
     35:64:void putAttributes(com.android.tools.r8.org.objectweb.asm.ByteVector):221:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y7;)V"}
     1:1:void visitPackage(java.lang.String):117:117 -> b
     2:2:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantPackage(java.lang.String):1007:1007 -> b
     2:2:void visitPackage(java.lang.String):117 -> b
@@ -246506,17 +245980,17 @@
     2:2:void visitUse(java.lang.String):160 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void visitUse(java.lang.String):160:161 -> c
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Q10:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.U10:
 # {"id":"sourceFile","fileName":"RecordComponentVisitor.java"}
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U10;"}
     1:9:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:76 -> <init>
     1:9:void com.android.tools.r8.internal.RecordComponentVisitor.<init>(int,com.android.tools.r8.internal.RecordComponentVisitor):0 -> <init>
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Q10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/U10;)V"}
     10:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):0:0 -> <init>
     10:10:void com.android.tools.r8.internal.RecordComponentVisitor.<init>(int,com.android.tools.r8.internal.RecordComponentVisitor):0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95,"4":96},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95,"4":96},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     86:92:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):76:82 -> <init>
     86:92:void com.android.tools.r8.internal.RecordComponentVisitor.<init>(int,com.android.tools.r8.internal.RecordComponentVisitor):0 -> <init>
     93:93:java.lang.String stringConcat$0(int):0:0 -> <init>
@@ -246531,13 +246005,13 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     void visitEnd() -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     1:2:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):139:140 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.R10:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.V10:
 # {"id":"sourceFile","fileName":"RecordComponentWriter.java"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ng0;"}
     int nameIndex -> c
     int descriptorIndex -> d
     int signatureIndex -> e
@@ -246553,55 +246027,55 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G4;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor.<init>(int):57:57 -> <init>
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,java.lang.String,java.lang.String):97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jg0;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ng0;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     2:6:void <init>(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String,java.lang.String,java.lang.String):98:102 -> <init>
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):113:117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):125:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     12:13:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):138:139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     14:14:void visitEnd():145:145 -> a
-com.android.tools.r8.org.objectweb.asm.Symbol -> R8$$REMOVED$$CLASS$$215:
+com.android.tools.r8.org.objectweb.asm.Symbol -> R8$$REMOVED$$CLASS$$203:
 # {"id":"sourceFile","fileName":"Symbol.java"}
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.jg0:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.ng0:
 # {"id":"sourceFile","fileName":"SymbolTable.java"}
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/td;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vd;"}
     int majorVersion -> b
     java.lang.String className -> c
     int entryCount -> d
     com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry[] entries -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lg0;"}
     int constantPoolCount -> f
     com.android.tools.r8.org.objectweb.asm.ByteVector constantPool -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int bootstrapMethodCount -> h
     com.android.tools.r8.org.objectweb.asm.ByteVector bootstrapMethods -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y7;"}
     int typeCount -> j
     com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry[] typeTable -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/lg0;"}
     int labelCount -> l
     com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry[] labelTable -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ig0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mg0;"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry[] labelEntries -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/ig0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/mg0;"}
     1:6:void <init>(com.android.tools.r8.org.objectweb.asm.ClassWriter):145:150 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/td;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vd;)V"}
     1:1:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.Symbol addConstantIntegerOrFloat(int,int):663 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/lg0;"}
     2:8:com.android.tools.r8.org.objectweb.asm.Symbol addConstantIntegerOrFloat(int,int):665:671 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):718 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IJ)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IJ)Lcom/android/tools/r8/internal/lg0;"}
     10:16:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):720:726 -> a
     17:32:com.android.tools.r8.org.objectweb.asm.ByteVector com.android.tools.r8.org.objectweb.asm.ByteVector.putLong(long):225:240 -> a
     17:32:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):726 -> a
     33:34:com.android.tools.r8.org.objectweb.asm.Symbol addConstantLongOrDouble(int,long):727:728 -> a
     35:36:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):481:482 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/lg0;"}
     37:37:com.android.tools.r8.org.objectweb.asm.Symbol addConstantInteger(int):639:639 -> a
     37:37:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):482 -> a
     38:39:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):483:484 -> a
@@ -246666,7 +246140,7 @@
     93:93:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):525 -> a
     94:94:com.android.tools.r8.org.objectweb.asm.Symbol addConstant(java.lang.Object):525:525 -> a
     95:113:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1064:1082 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)Lcom/android/tools/r8/internal/lg0;"}
     114:114:int com.android.tools.r8.org.objectweb.asm.Handle.getTag():115:115 -> a
     114:114:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1085 -> a
     115:115:java.lang.String com.android.tools.r8.org.objectweb.asm.Handle.getOwner():125:125 -> a
@@ -246687,7 +246161,7 @@
     141:157:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(int,int,int):1123:1139 -> a
     141:157:com.android.tools.r8.org.objectweb.asm.Symbol addBootstrapMethod(com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1106 -> a
     158:167:int addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1278:1287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hg0;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lg0;)I"}
     168:168:int hash(int,java.lang.String):1356:1356 -> a
     168:168:int addConstantUtf8(java.lang.String):788 -> a
     169:169:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
@@ -246700,7 +246174,7 @@
     204:204:int addConstantUtf8(java.lang.String):798 -> a
     205:205:int hash(int,java.lang.String):1356:1356 -> a
     205:205:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1023 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/lg0;"}
     206:206:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     206:206:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1024 -> a
     207:213:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1026:1032 -> a
@@ -246711,13 +246185,13 @@
     216:225:int addConstantNameAndType(java.lang.String,java.lang.String):756:765 -> a
     226:226:int hash(int,java.lang.String,java.lang.String,int):1369:1369 -> a
     226:226:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):948 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/lg0;"}
     227:227:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     227:227:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):949 -> a
     228:238:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):951:961 -> a
     239:239:int hash(int,java.lang.String,java.lang.String,java.lang.String):1374:1374 -> a
     239:239:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):583 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/lg0;"}
     240:240:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     240:240:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):584 -> a
     241:250:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):586:595 -> a
@@ -246727,7 +246201,7 @@
     253:255:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):595:597 -> a
     256:256:int hash(int,java.lang.String,java.lang.String,java.lang.String,int):1383:1383 -> a
     256:256:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):835 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/lg0;"}
     257:257:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> a
     257:257:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):836 -> a
     258:269:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):838:849 -> a
@@ -246739,7 +246213,7 @@
     275:275:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):852:852 -> a
     276:279:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):851:854 -> a
     1:20:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry put(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):431:450 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hg0;)Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lg0;)Lcom/android/tools/r8/internal/lg0;"}
     21:21:int hash(int,java.lang.String):1356:1356 -> b
     21:21:int addType(java.lang.String):1176 -> b
     22:22:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> b
@@ -246751,7 +246225,7 @@
     30:30:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):418:418 -> b
     30:30:int addUninitializedType(java.lang.String,int):1198 -> b
     31:39:int addUninitializedType(java.lang.String,int):1200:1208 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.hg0:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.lg0:
 # {"id":"sourceFile","fileName":"SymbolTable.java"}
     int com.android.tools.r8.org.objectweb.asm.Symbol.index -> a
     int com.android.tools.r8.org.objectweb.asm.Symbol.tag -> b
@@ -246762,7 +246236,7 @@
     int com.android.tools.r8.org.objectweb.asm.Symbol.info -> g
     int hashCode -> h
     com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry next -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lg0;"}
     1:7:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):236:242 -> <init>
     8:9:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1412:1413 -> <init>
     10:11:void <init>(int,int,java.lang.String,int):1417:1418 -> <init>
@@ -246771,44 +246245,44 @@
     14:15:void <init>(int,int,java.lang.String,java.lang.String,int):1428:1429 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;)V"}
     16:17:void <init>(int,int,long,int):1433:1434 -> <init>
-com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry -> com.android.tools.r8.internal.ig0:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry -> com.android.tools.r8.internal.mg0:
 # {"id":"sourceFile","fileName":"SymbolTable.java"}
     int index -> a
     com.android.tools.r8.org.objectweb.asm.Label label -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     com.android.tools.r8.org.objectweb.asm.SymbolTable$LabelEntry next -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ig0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mg0;"}
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label):1458:1460 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.bi0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.fi0:
 # {"id":"sourceFile","fileName":"Type.java"}
     int sort -> a
     java.lang.String valueBuffer -> b
     int valueBegin -> c
     int valueEnd -> d
     com.android.tools.r8.org.objectweb.asm.Type VOID_TYPE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type BOOLEAN_TYPE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type CHAR_TYPE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type BYTE_TYPE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type SHORT_TYPE -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type LONG_TYPE -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     1:26:void <clinit>():85:110 -> <clinit>
     1:5:void <init>(int,java.lang.String,int,int):159:163 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IIILjava/lang/String;)V"}
     1:27:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):403:429 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     28:28:java.lang.String stringConcat$0(java.lang.String):0:0 -> a
     28:28:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):429 -> a
     29:29:com.android.tools.r8.org.objectweb.asm.Type getTypeInternal(java.lang.String,int,int):429:429 -> a
@@ -246841,13 +246315,13 @@
     127:127:java.lang.String getClassName():446:446 -> a
     128:135:int getArgumentCount(java.lang.String):714:721 -> a
     1:20:com.android.tools.r8.org.objectweb.asm.Type[] getArgumentTypes(java.lang.String):298:317 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)[Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)[Lcom/android/tools/r8/internal/fi0;"}
     21:24:java.lang.String getDescriptor():505:508 -> b
     21:24:java.lang.String com.android.tools.r8.internal.Type.getDescriptor():0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
     25:25:java.lang.String getDescriptor():0:0 -> b
     25:25:java.lang.String com.android.tools.r8.internal.Type.getDescriptor():0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":536,"2":537,"3":538,"4":539,"5":540},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":536,"2":537,"3":538,"4":539,"5":540},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     535:535:java.lang.String getDescriptor():510:510 -> b
     535:535:java.lang.String com.android.tools.r8.internal.Type.getDescriptor():0 -> b
     536:536:java.lang.String stringConcat$1(java.lang.String):0:0 -> b
@@ -246863,16 +246337,16 @@
     1:1:int getSort():646:646 -> c
     2:21:int getArgumentsAndReturnSizes(java.lang.String):756:775 -> c
     1:1:com.android.tools.r8.org.objectweb.asm.Type getMethodType(java.lang.String):264:264 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     1:2:com.android.tools.r8.org.objectweb.asm.Type getObjectType(java.lang.String):252:253 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     1:17:boolean equals(java.lang.Object):872:888 -> equals
     1:8:int getReturnTypeOffset(java.lang.String):378:385 -> f
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fi0;"}
     1:4:int hashCode():902:905 -> hashCode
     1:1:java.lang.String toString():918:918 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.aj0:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.ej0:
 # {"id":"sourceFile","fileName":"TypePath.java"}
     byte[] typePathContainer -> a
     int typePathOffset -> b
@@ -246890,9 +246364,9 @@
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.TypeReference -> R8$$REMOVED$$CLASS$$216:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> R8$$REMOVED$$CLASS$$204:
 # {"id":"sourceFile","fileName":"TypeReference.java"}
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.DC:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.FC:
 # {"id":"sourceFile","fileName":"JSRInlinerAdapter.java"}
     java.util.BitSet sharedSubroutineInsns -> A
     java.util.BitSet mainSubroutineInsns -> y
@@ -246904,7 +246378,7 @@
     2:76:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):65:139 -> <init>
     2:76:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):102 -> <init>
     1:2:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):144:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.InsnList.getLast():79:79 -> a
     3:3:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -246980,7 +246454,7 @@
     46:46:void com.android.tools.r8.internal.JSRInlinerAdapter.visitEnd():0 -> c
     47:47:void visitEnd():0:0 -> c
     47:47:void com.android.tools.r8.internal.JSRInlinerAdapter.visitEnd():0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99,"4":100,"5":101},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99,"4":100,"5":101},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     48:55:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):372:379 -> c
     48:55:void emitCode():313 -> c
     48:55:void visitEnd():156 -> c
@@ -247080,19 +246554,19 @@
     101:101:void emitInstantiation(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.List,com.android.tools.r8.org.objectweb.asm.tree.InsnList,java.util.List,java.util.List):372 -> c
     101:101:void emitCode():313 -> c
     101:101:void visitEnd():156 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.EC:
 # {"id":"sourceFile","fileName":"JSRInlinerAdapter.java"}
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EC;"}
     java.util.BitSet subroutineInsns -> c
     java.util.Map clonedLabels -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter this$0 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FC;"}
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):455:459 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DC;Lcom/android/tools/r8/internal/CC;Ljava/util/BitSet;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FC;Lcom/android/tools/r8/internal/EC;Ljava/util/BitSet;)V"}
     6:8:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):458:460 -> <init>
     9:9:java.lang.String stringConcat$0(java.util.BitSet):0:0 -> <init>
     9:9:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):460 -> <init>
@@ -247102,10 +246576,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:32:void <init>(com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter,com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation,java.util.BitSet):473:481 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):508:518 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/CC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/EC;"}
     12:12:com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation findOwner(int):517:517 -> a
     13:13:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getClonedLabelForJumpInsn(com.android.tools.r8.org.objectweb.asm.tree.LabelNode):535:535 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FI;)Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JI;)Lcom/android/tools/r8/internal/JI;"}
     1:1:java.util.Set entrySet():554:554 -> entrySet
     1:1:boolean equals(java.lang.Object):564:564 -> equals
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):559:559 -> get
@@ -247114,10 +246588,10 @@
     2:2:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):559 -> get
     2:2:java.lang.Object get(java.lang.Object):428 -> get
     1:1:int hashCode():569:569 -> hashCode
-com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.hb0:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.lb0:
 # {"id":"sourceFile","fileName":"SignatureReader.java"}
     1:96:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):154:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/th0;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/xh0;)I"}
     97:97:void com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor.startType():331:331 -> a
     97:97:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor.visitArrayType():220 -> a
     97:97:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):173 -> a
@@ -247148,7 +246622,7 @@
     181:186:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):168 -> a
     187:187:void com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor.visitBaseType(char):205:205 -> a
     187:187:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):168 -> a
-com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.ib0:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.mb0:
 # {"id":"sourceFile","fileName":"SignatureVisitor.java"}
     1:1:void <init>(int):74:74 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -247164,14 +246638,14 @@
     int index -> f
     1:3:void <init>(int):129:131 -> <init>
     void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     int getType() -> a
     1:20:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode cloneAnnotations(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):245:264 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;)Lcom/android/tools/r8/internal/G;"}
     1:5:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):184:188 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     6:15:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):187:196 -> b
     16:16:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):195:195 -> b
 com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.internal.D2:
@@ -247220,7 +246694,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J2;)V"}
     100:116:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J2;Ljava/lang/String;Ljava/lang/Object;)V"}
-com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.Rc:
 # {"id":"sourceFile","fileName":"ClassNode.java"}
     java.util.List visibleAnnotations -> c
     java.util.List invisibleAnnotations -> d
@@ -247244,30 +246718,30 @@
     1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):203:203 -> a
     2:2:void visitSource(java.lang.String,java.lang.String):210:210 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/QO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/UO;"}
     4:4:void visitNestHost(java.lang.String):221:221 -> a
     5:5:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):228:228 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):232:236 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):244:248 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     16:16:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):255:255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     17:18:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):271:272 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     19:20:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):290:291 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
     21:21:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):302:302 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     22:22:void com.android.tools.r8.org.objectweb.asm.tree.MethodNode.<init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):194:194 -> a
     22:22:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):302 -> a
     23:23:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):303:303 -> a
     24:24:void visitEnd():310:310 -> a
     1:1:void visitNestMember(java.lang.String):260:260 -> b
     2:3:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):278:279 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/U10;"}
     1:1:void visitPermittedSubclass(java.lang.String):265:265 -> c
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.lp:
 # {"id":"sourceFile","fileName":"FieldInsnNode.java"}
     java.lang.String owner -> g
     java.lang.String name -> h
@@ -247275,10 +246749,10 @@
     1:4:void <init>(int,java.lang.String,java.lang.String,java.lang.String):65:68 -> <init>
     1:1:int getType():83:83 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.op:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.rp:
 # {"id":"sourceFile","fileName":"FieldNode.java"}
     java.lang.Object value -> c
     java.util.List visibleAnnotations -> d
@@ -247295,11 +246769,11 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):143:147 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):155:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):166:166 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     12:12:void visitEnd():172:172 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Sq:
 # {"id":"sourceFile","fileName":"FrameNode.java"}
     int type -> g
     java.util.List local -> h
@@ -247325,14 +246799,14 @@
     42:42:void <init>(int,int,java.lang.Object[],int,java.lang.Object[]):107:107 -> <init>
     1:1:int getType():127:127 -> a
     2:20:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):132:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     21:21:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):147:147 -> a
     22:22:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):144:144 -> a
     23:23:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):141:141 -> a
     24:24:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):138:138 -> a
     25:25:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):135:135 -> a
     26:32:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):156:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     33:33:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):559:559 -> a
     33:33:java.lang.Object com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):428 -> a
     33:33:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):163 -> a
@@ -247343,21 +246817,21 @@
     43:43:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):175:175 -> a
     44:50:java.lang.Object[] asArray(java.util.List):182:188 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)[Ljava/lang/Object;"}
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.du:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.fu:
 # {"id":"sourceFile","fileName":"IincInsnNode.java"}
     int var -> g
     int incr -> h
     1:3:void <init>(int,int):54:56 -> <init>
     1:1:int getType():61:61 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.Xv:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.Zv:
 # {"id":"sourceFile","fileName":"InnerClassNode.java"}
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):76:76 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Zv:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.bw:
 # {"id":"sourceFile","fileName":"InsnList.java"}
     int size -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> c
@@ -247379,7 +246853,7 @@
     1:7:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):93:99 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/G;"}
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode get(int):94:94 -> j
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.aw:
 # {"id":"sourceFile","fileName":"InsnList.java"}
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G;"}
@@ -247388,9 +246862,9 @@
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G;"}
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bw;"}
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):489:489 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zv;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bw;)V"}
     2:2:int com.android.tools.r8.org.objectweb.asm.tree.InsnList.size():61:61 -> <init>
     2:2:void <init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):490 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -247438,92 +246912,92 @@
     3:26:void com.android.tools.r8.org.objectweb.asm.tree.InsnList.set(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):194:217 -> set
     3:26:void set(java.lang.Object):593 -> set
     27:33:void set(java.lang.Object):594:600 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.aw:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.cw:
 # {"id":"sourceFile","fileName":"InsnNode.java"}
     1:1:void <init>(int):55:55 -> <init>
     1:1:int getType():60:60 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Vz:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Xz:
 # {"id":"sourceFile","fileName":"IntInsnNode.java"}
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:1:int getType():66:66 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.HB:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.JB:
 # {"id":"sourceFile","fileName":"InvokeDynamicInsnNode.java"}
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ss;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/us;"}
     java.lang.Object[] bsmArgs -> j
     1:5:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):70:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     1:1:int getType():79:79 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.eD:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.gD:
 # {"id":"sourceFile","fileName":"JumpInsnNode.java"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/FI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/JI;)V"}
     1:1:int getType():74:74 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     5:5:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.Map):219:219 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.FI:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.JI:
 # {"id":"sourceFile","fileName":"LabelNode.java"}
     com.android.tools.r8.org.objectweb.asm.Label value -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/II;"}
     1:1:void <init>():40:40 -> <init>
     1:1:int getType():50:50 -> a
     2:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     3:3:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):559:559 -> a
     3:3:java.lang.Object com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):428 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EI;"}
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.hJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/II;"}
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.lJ:
 # {"id":"sourceFile","fileName":"LdcInsnNode.java"}
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):64:65 -> <init>
     1:1:int getType():70:70 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.LJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.PJ:
 # {"id":"sourceFile","fileName":"LineNumberNode.java"}
     int line -> g
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/FI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/JI;)V"}
     1:1:int getType():62:62 -> a
     2:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):559:559 -> a
     4:4:java.lang.Object com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):428 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.Map):219 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.rL:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.vL:
 # {"id":"sourceFile","fileName":"LocalVariableAnnotationNode.java"}
     java.util.List start -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -247533,37 +247007,37 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):115:118 -> <init>
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/FI;[Lcom/android/tools/r8/internal/FI;[ILjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/JI;[Lcom/android/tools/r8/internal/JI;[ILjava/lang/String;)V"}
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;Z)V"}
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):136:136 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.sL:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.wL:
 # {"id":"sourceFile","fileName":"LocalVariableNode.java"}
     java.lang.String name -> a
     java.lang.String desc -> b
     java.lang.String signature -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     int index -> f
     1:7:void <init>(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int):74:80 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/FI;Lcom/android/tools/r8/internal/FI;I)V"}
-com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.UL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/JI;Lcom/android/tools/r8/internal/JI;I)V"}
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.YL:
 # {"id":"sourceFile","fileName":"LookupSwitchInsnNode.java"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     java.util.List keys -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List labels -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:4:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[]):61:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FI;[I[Lcom/android/tools/r8/internal/FI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JI;[I[Lcom/android/tools/r8/internal/JI;)V"}
     1:1:int getType():69:69 -> a
     2:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     13:13:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.Map):219:219 -> a
     13:13:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     14:14:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:89 -> a
@@ -247576,7 +247050,7 @@
     19:19:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(java.util.List,java.util.Map):233:233 -> a
     19:19:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     20:22:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.VN:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.ZN:
 # {"id":"sourceFile","fileName":"MethodInsnNode.java"}
     java.lang.String owner -> g
     java.lang.String name -> h
@@ -247585,10 +247059,10 @@
     1:5:void <init>(int,java.lang.String,java.lang.String,java.lang.String,boolean):91:95 -> <init>
     1:1:int getType():110:110 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.bO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.fO:
 # {"id":"sourceFile","fileName":"MethodNode.java"}
     int access -> c
     java.lang.String name -> d
@@ -247606,7 +247080,7 @@
     int invisibleAnnotableParameterCount -> o
     java.util.List[] invisibleParameterAnnotations -> p
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bw;"}
     java.util.List tryCatchBlocks -> r
     int maxStack -> s
     int maxLocals -> t
@@ -247638,21 +247112,21 @@
     44:44:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):362:362 -> a
     45:52:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):372:379 -> a
     53:53:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):388:388 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     54:54:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):395:395 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     55:55:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):400:400 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     56:56:void visitLdcInsn(java.lang.Object):405:405 -> a
     57:57:void visitIincInsn(int,int):410:410 -> a
     58:58:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):416:416 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     59:59:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):421:421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
     60:60:void visitMultiANewArrayInsn(java.lang.String,int):426:426 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     61:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):433:433 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     62:62:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.InsnList.getLast():79:79 -> a
     62:62:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):433 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -247663,15 +247137,15 @@
     64:64:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):435 -> a
     65:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):438:444 -> a
     72:74:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):452:454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
     75:78:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):480:483 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
     79:87:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):495:503 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     88:90:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):540:542 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/EI;)[Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Lcom/android/tools/r8/internal/II;)[Lcom/android/tools/r8/internal/JI;"}
     91:93:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):658:660 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     94:94:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
     94:94:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):660 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -247720,29 +247194,29 @@
     5:5:void visitCode():321:321 -> b
     6:6:void visitIntInsn(int,int):346:346 -> b
     7:14:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):460:467 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     15:15:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):510:510 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     16:19:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):533:536 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)Lcom/android/tools/r8/internal/JI;"}
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):272:276 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:6:void visitTypeInsn(int,java.lang.String):356:356 -> c
     7:8:void visitMaxs(int,int):515:516 -> c
     9:9:void visitEnd():522:522 -> c
     1:1:void visitVarInsn(int,int):351:351 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.aO:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.eO:
 # {"id":"sourceFile","fileName":"MethodNode.java"}
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fO;"}
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):249:249 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fO;)V"}
     1:2:boolean add(java.lang.Object):252:253 -> add
-com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.JO:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.NO:
 # {"id":"sourceFile","fileName":"ModuleExportNode.java"}
     1:1:void <init>(java.lang.String,int,java.util.List):68:68 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.MO:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.QO:
 # {"id":"sourceFile","fileName":"ModuleNode.java"}
     java.util.List packages -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -247768,19 +247242,19 @@
     1:4:void visitPackage(java.lang.String):150:153 -> b
     5:8:void visitOpen(java.lang.String,int,java.lang.String[]):174:177 -> b
     1:4:void visitUse(java.lang.String):182:185 -> c
-com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.NO:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.RO:
 # {"id":"sourceFile","fileName":"ModuleOpenNode.java"}
     1:1:void <init>(java.lang.String,int,java.util.List):67:67 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.OO:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.SO:
 # {"id":"sourceFile","fileName":"ModuleProvideNode.java"}
     1:1:void <init>(java.lang.String,java.util.List):56:56 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.PO:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.TO:
 # {"id":"sourceFile","fileName":"ModuleRequireNode.java"}
     1:1:void <init>(java.lang.String,int,java.lang.String):59:59 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.cP:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.gP:
 # {"id":"sourceFile","fileName":"MultiANewArrayInsnNode.java"}
     java.lang.String desc -> g
     int dims -> h
@@ -247788,16 +247262,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:int getType():61:61 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.KV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.OV:
 # {"id":"sourceFile","fileName":"ParameterNode.java"}
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.P10:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.T10:
 # {"id":"sourceFile","fileName":"RecordComponentNode.java"}
     java.util.List visibleAnnotations -> b
     java.util.List invisibleAnnotations -> c
@@ -247811,25 +247285,25 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):108:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):120:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:131 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G4;)V"}
     12:12:void visitEnd():137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.vg0:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.zg0:
 # {"id":"sourceFile","fileName":"TableSwitchInsnNode.java"}
     int min -> g
     int max -> h
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     java.util.List labels -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:5:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[]):66:70 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/FI;[Lcom/android/tools/r8/internal/FI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/JI;[Lcom/android/tools/r8/internal/JI;)V"}
     1:1:int getType():75:75 -> a
     2:7:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):80:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
     9:9:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.util.Map):219:219 -> a
     9:9:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     10:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
@@ -247842,81 +247316,81 @@
     15:15:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.clone(java.util.List,java.util.Map):233:233 -> a
     15:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     16:17:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.Xh0:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.bi0:
 # {"id":"sourceFile","fileName":"TryCatchBlockNode.java"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode handler -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     java.lang.String type -> d
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleTypeAnnotations -> f
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):74:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FI;Lcom/android/tools/r8/internal/FI;Lcom/android/tools/r8/internal/FI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JI;Lcom/android/tools/r8/internal/JI;Lcom/android/tools/r8/internal/JI;Ljava/lang/String;)V"}
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):108:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     3:9:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):108:114 -> a
     10:19:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):113:122 -> a
     20:20:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):121:121 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.Ti0:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.Xi0:
 # {"id":"sourceFile","fileName":"TypeAnnotationNode.java"}
     int typeRef -> d
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aj0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ej0;"}
     1:3:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):81:83 -> <init>
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;)V"}
     4:5:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):63:64 -> <init>
     6:8:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):81:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;I)V"}
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.Xi0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;I)V"}
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.bj0:
 # {"id":"sourceFile","fileName":"TypeInsnNode.java"}
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
     1:1:int getType():72:72 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
-com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.Uk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.Yk0:
 # {"id":"sourceFile","fileName":"Util.java"}
     1:2:java.util.List add(java.util.List,java.lang.Object):44:45 -> a
     3:7:java.util.List asArrayList(java.lang.Object[]):59:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Ljava/util/ArrayList;"}
     8:12:java.util.List asArrayList(int[]):114:118 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([I)Ljava/util/ArrayList;"}
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.rl0:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.vl0:
 # {"id":"sourceFile","fileName":"VarInsnNode.java"}
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:1:int getType():69:69 -> a
     2:3:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EO;)V"}
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CC;)Lcom/android/tools/r8/internal/G;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EC;)Lcom/android/tools/r8/internal/G;"}
 com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer -> com.android.tools.r8.internal.n2:
 # {"id":"sourceFile","fileName":"Analyzer.java"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter interpreter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q5;"}
     com.android.tools.r8.org.objectweb.asm.tree.InsnList insnList -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bw;"}
     int insnListSize -> c
     java.util.List[] handlers -> d
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] frames -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Qq;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine[] subroutines -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Rf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Vf0;"}
     boolean[] inInstructionsToProcess -> g
     int[] instructionsToProcess -> h
     int numInstructionsToProcess -> i
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):88:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;)V"}
     1:5:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):107:111 -> a
     1:5:void com.android.tools.r8.internal.Analyzer.analyze(com.android.tools.r8.internal.CheckMethodAdapter$1):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb;)V"}
     6:6:int com.android.tools.r8.org.objectweb.asm.tree.InsnList.size():61:61 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -247975,7 +247449,7 @@
     298:298:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyze(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):147:147 -> a
     298:298:void com.android.tools.r8.internal.Analyzer.analyze(com.android.tools.r8.internal.CheckMethodAdapter$1):0 -> a
     299:314:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):417:432 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Rf0;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Vf0;Ljava/util/ArrayList;)V"}
     315:315:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     315:315:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):433 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -247986,21 +247460,21 @@
     343:343:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):479:479 -> a
     344:344:void findSubroutine(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,java.util.List):423:423 -> a
     345:345:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):575:575 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oq;)Lcom/android/tools/r8/internal/Oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qq;)Lcom/android/tools/r8/internal/Qq;"}
     346:347:void com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.<init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):108:109 -> a
     346:347:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame newFrame(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):575 -> a
     348:368:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):639:659 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Oq;Lcom/android/tools/r8/internal/Rf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Qq;Lcom/android/tools/r8/internal/Vf0;)V"}
     369:369:boolean com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean[]):726:726 -> a
     369:369:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):687 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Oq;Lcom/android/tools/r8/internal/Oq;Lcom/android/tools/r8/internal/Rf0;[Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Qq;Lcom/android/tools/r8/internal/Qq;Lcom/android/tools/r8/internal/Vf0;[Z)V"}
     370:371:boolean com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean[]):727:728 -> a
     370:371:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):687 -> a
     372:385:void merge(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine,boolean[]):690:703 -> a
     1:5:int computeMaxLocals(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):324:328 -> b
     1:5:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyzeAndComputeMaxs(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):310 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb;)V"}
     6:6:int com.android.tools.r8.org.objectweb.asm.tree.InsnList.size():61:61 -> b
     6:6:void com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator.<init>(com.android.tools.r8.org.objectweb.asm.tree.InsnList,int):490 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -248051,7 +247525,7 @@
     29:29:int computeMaxLocals(com.android.tools.r8.org.objectweb.asm.tree.MethodNode):328 -> b
     29:29:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] analyzeAndComputeMaxs(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):310 -> b
     1:1:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):494:494 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hb;)Lcom/android/tools/r8/internal/Oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb;)Lcom/android/tools/r8/internal/Qq;"}
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame newFrame(int,int):565:565 -> c
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):494 -> c
     3:5:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):496:498 -> c
@@ -248083,7 +247557,7 @@
     46:46:void com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.setReturn(com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):160:160 -> c
     46:46:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame computeInitialFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):518 -> c
     1:1:void init(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):555:555 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb;)V"}
 com.android.tools.r8.org.objectweb.asm.tree.analysis.AnalyzerException -> com.android.tools.r8.internal.o2:
 # {"id":"sourceFile","fileName":"AnalyzerException.java"}
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode node -> b
@@ -248093,49 +247567,49 @@
     3:4:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Throwable):65:66 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/lang/String;Ljava/lang/Exception;)V"}
     5:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/lang/String;Ljava/lang/Object;Lcom/android/tools/r8/internal/Wk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/lang/String;Ljava/lang/Object;Lcom/android/tools/r8/internal/al0;)V"}
     6:6:java.lang.String stringConcat$0(java.lang.String):0:0 -> <init>
     6:6:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83 -> <init>
     7:7:java.lang.String stringConcat$1(java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):0:0 -> <init>
     7:7:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83 -> <init>
     8:13:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):82:87 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter -> R8$$REMOVED$$CLASS$$217:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter -> R8$$REMOVED$$CLASS$$205:
 # {"id":"sourceFile","fileName":"BasicInterpreter.java"}
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.P5:
 # {"id":"sourceFile","fileName":"BasicValue.java"}
     com.android.tools.r8.org.objectweb.asm.Type type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue UNINITIALIZED_VALUE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue INT_VALUE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue FLOAT_VALUE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue LONG_VALUE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue DOUBLE_VALUE -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue REFERENCE_VALUE -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue RETURNADDRESS_VALUE -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     1:20:void <clinit>():41:60 -> <clinit>
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.Type):70:71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bi0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fi0;)V"}
     1:1:int getSize():85:85 -> a
     1:1:boolean isReference():94:94 -> b
     1:5:boolean equals(java.lang.Object):101:105 -> equals
     1:1:int hashCode():114:114 -> hashCode
     1:8:java.lang.String toString():119:126 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.O5:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.Q5:
 # {"id":"sourceFile","fileName":"BasicVerifier.java"}
     com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.NULL_TYPE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fi0;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<clinit>():56:56 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<init>(int):77:77 -> <init>
     1:1:void <init>():51 -> <init>
     1:1:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/Wk0;Lcom/android/tools/r8/internal/Wk0;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/al0;Lcom/android/tools/r8/internal/al0;)Lcom/android/tools/r8/internal/P5;"}
     2:2:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):192 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -248259,7 +247733,7 @@
     219:219:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):301:301 -> a
     219:219:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44 -> a
     220:220:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/Wk0;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/al0;)Lcom/android/tools/r8/internal/P5;"}
     221:221:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     221:221:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -248275,7 +247749,7 @@
     232:260:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):74:102 -> a
     232:260:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44 -> a
     261:282:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):83:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bi0;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fi0;)Lcom/android/tools/r8/internal/P5;"}
     283:283:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):102:102 -> a
     284:284:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):99:99 -> a
     285:285:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):97:97 -> a
@@ -248287,7 +247761,7 @@
     288:288:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List):44 -> a
     288:288:com.android.tools.r8.internal.BasicValue com.android.tools.r8.internal.BasicVerifier.naryOperation(com.android.tools.r8.internal.AbstractInsnNode,java.util.ArrayList):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/P5;"}
     289:299:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List):378:388 -> a
     289:299:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List):44 -> a
     289:299:com.android.tools.r8.internal.BasicValue com.android.tools.r8.internal.BasicVerifier.naryOperation(com.android.tools.r8.internal.AbstractInsnNode,java.util.ArrayList):0 -> a
@@ -248358,7 +247832,7 @@
     330:330:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     330:330:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):110 -> a
     330:330:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;)Lcom/android/tools/r8/internal/P5;"}
     331:331:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):169:169 -> a
     331:331:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):50 -> a
     332:350:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):135:153 -> a
@@ -248405,7 +247879,7 @@
     434:434:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):163:163 -> a
     434:434:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode):50 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44:44 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/Wk0;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/al0;)Lcom/android/tools/r8/internal/P5;"}
     2:2:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> b
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):111 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -248443,7 +247917,7 @@
     85:85:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):44 -> b
     86:86:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> b
     86:86:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):182 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;)Lcom/android/tools/r8/internal/P5;"}
     87:87:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):262:262 -> b
     88:88:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):255:255 -> b
     89:89:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):253:253 -> b
@@ -248492,24 +247966,24 @@
     187:187:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getType(java.lang.String):177:177 -> b
     187:187:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):223 -> b
     188:188:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):223:223 -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Qq:
 # {"id":"sourceFile","fileName":"Frame.java"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value returnValue -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P5;"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value[] values -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Wk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/al0;"}
     int numLocals -> c
     int numStack -> d
     int maxStack -> e
     1:5:void <init>(int,int):95:99 -> <init>
     1:9:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame init(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):119:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oq;)Lcom/android/tools/r8/internal/Oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qq;)Lcom/android/tools/r8/internal/Qq;"}
     10:10:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     10:10:void execute(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):298 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void com.android.tools.r8.internal.Frame1.execute(com.android.tools.r8.internal.AbstractInsnNode,com.android.tools.r8.internal.BasicVerifier):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/O5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Lcom/android/tools/r8/internal/Q5;)V"}
     11:11:void execute(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):645:645 -> a
     11:11:void com.android.tools.r8.internal.Frame1.execute(com.android.tools.r8.internal.AbstractInsnNode,com.android.tools.r8.internal.BasicVerifier):0 -> a
     12:12:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
@@ -248800,12 +248274,12 @@
     438:441:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value getLocal(int):192:195 -> a
     438:441:com.android.tools.r8.internal.Value1 com.android.tools.r8.internal.Frame1.getLocal(int):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Wk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/al0;"}
     442:442:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value getLocal(int):193:193 -> a
     442:442:com.android.tools.r8.internal.Value1 com.android.tools.r8.internal.Frame1.getLocal(int):0 -> a
     443:443:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value getLocal(int):0:0 -> a
     443:443:com.android.tools.r8.internal.Value1 com.android.tools.r8.internal.Frame1.getLocal(int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"2":638,"3":639,"4":640},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"2":638,"3":639,"4":640},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     636:636:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value getLocal(int):193:193 -> a
     636:636:com.android.tools.r8.internal.Value1 com.android.tools.r8.internal.Frame1.getLocal(int):0 -> a
     637:637:java.lang.String stringConcat$0(int):0:0 -> a
@@ -248819,20 +248293,20 @@
     641:644:void setLocal(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):207:210 -> a
     641:644:void com.android.tools.r8.internal.Frame1.setLocal(int,com.android.tools.r8.internal.BasicValue):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/N5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/P5;)V"}
     645:645:void setLocal(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):208:208 -> a
     645:645:void com.android.tools.r8.internal.Frame1.setLocal(int,com.android.tools.r8.internal.BasicValue):0 -> a
     646:646:void com.android.tools.r8.internal.Frame1.setLocal(int,com.android.tools.r8.internal.BasicValue):0:0 -> a
     647:647:void setLocal(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):208:208 -> a
     647:647:void com.android.tools.r8.internal.Frame1.setLocal(int,com.android.tools.r8.internal.BasicValue):0 -> a
     648:651:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value pop():257:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/al0;"}
     652:652:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value pop():258:258 -> a
     653:659:void push(com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):271:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P5;)V"}
     660:666:void push(com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):273:279 -> a
     667:669:void executeInvokeInsn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):674:676 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/lang/String;Lcom/android/tools/r8/internal/O5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G;Ljava/lang/String;Lcom/android/tools/r8/internal/Q5;)V"}
     670:670:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():141:141 -> a
     670:670:void executeInvokeInsn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):678 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -248843,7 +248317,7 @@
     673:673:void executeInvokeInsn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):681 -> a
     674:677:void executeInvokeInsn(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):681:684 -> a
     678:683:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):699:704 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oq;Lcom/android/tools/r8/internal/O5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qq;Lcom/android/tools/r8/internal/Q5;)Z"}
     684:684:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):50:50 -> a
     684:684:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):704 -> a
     685:686:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):370:371 -> a
@@ -248860,26 +248334,26 @@
     7:7:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value getStack(int):231:231 -> toString
     7:7:java.lang.String toString():748 -> toString
     8:10:java.lang.String toString():748:750 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.rB:
 # {"id":"sourceFile","fileName":"Interpreter.java"}
     1:1:void <init>(int):60:60 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.Rf0:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.Vf0:
 # {"id":"sourceFile","fileName":"Subroutine.java"}
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JI;"}
     boolean[] localsUsed -> b
     java.util.List callers -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int,com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):61:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FI;ILcom/android/tools/r8/internal/eD;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JI;ILcom/android/tools/r8/internal/gD;)V"}
     6:9:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):73:76 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rf0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vf0;)V"}
     1:11:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):89:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rf0;)Z"}
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.Wk0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vf0;)Z"}
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.al0:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.Cb:
 # {"id":"sourceFile","fileName":"CheckAnnotationAdapter.java"}
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
@@ -248925,7 +248399,7 @@
     52:52:void visitEnum(java.lang.String,java.lang.String,java.lang.String):96:96 -> a
     53:53:void checkVisitEndNotCalled():132:132 -> a
     53:53:void visitEnum(java.lang.String,java.lang.String,java.lang.String):91 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.Gb:
 # {"id":"sourceFile","fileName":"CheckClassAdapter.java"}
     boolean checkDataFlow -> c
     int version -> d
@@ -248939,7 +248413,7 @@
     java.util.Map labelInsnIndices -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.ClassVisitor,boolean):194:196 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc;)V"}
     1:36:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):211:246 -> a
     37:37:char getChar(java.lang.String,int):917:917 -> a
     37:37:void checkClassSignature(java.lang.String):607 -> a
@@ -248975,7 +248449,7 @@
     66:70:void visitSource(java.lang.String,java.lang.String):267:271 -> a
     71:71:void visitSource(java.lang.String,java.lang.String):269:269 -> a
     72:82:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):277:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/QO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/UO;"}
     83:83:com.android.tools.r8.org.objectweb.asm.ModuleVisitor visitModule(java.lang.String,int,java.lang.String):279:279 -> a
     84:93:void visitNestHost(java.lang.String):293:302 -> a
     94:94:void visitNestHost(java.lang.String):299:299 -> a
@@ -248986,7 +248460,7 @@
     108:134:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):349:375 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
     135:149:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):398:412 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
     150:150:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1226:1226 -> a
     150:150:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):412 -> a
     151:153:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):413:415 -> a
@@ -249001,13 +248475,13 @@
     163:164:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):430:431 -> a
     163:164:com.android.tools.r8.internal.MethodVisitor com.android.tools.r8.internal.CheckClassAdapter.visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     165:168:void checkMethodAccess(int,int,int):564:567 -> a
     165:168:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):431 -> a
     165:168:com.android.tools.r8.internal.MethodVisitor com.android.tools.r8.internal.CheckClassAdapter.visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0 -> a
     169:169:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
     169:169:com.android.tools.r8.internal.MethodVisitor com.android.tools.r8.internal.CheckClassAdapter.visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":270,"2":271,"3":272,"4":273},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":270,"2":271,"3":272,"4":273},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     170:170:void checkMethodAccess(int,int,int):567:567 -> a
     170:170:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):431 -> a
     170:170:com.android.tools.r8.internal.MethodVisitor com.android.tools.r8.internal.CheckClassAdapter.visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0 -> a
@@ -249119,10 +248593,10 @@
     277:283:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):489:495 -> a
     277:283:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckClassAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     284:284:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
     284:284:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckClassAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":785,"2":786,"3":787,"4":788},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":785,"2":786,"3":787,"4":788},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     779:784:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):495:500 -> a
     779:784:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckClassAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     785:785:java.lang.String stringConcat$3(java.lang.String):0:0 -> a
@@ -249141,21 +248615,21 @@
       # {"id":"com.android.tools.r8.synthesized"}
     802:802:void checkAccess(int,int):0:0 -> a
     802:802:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2445,"2":2446,"3":2447,"4":2448},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2445,"2":2446,"3":2447,"4":2448},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1352:1352:void checkAccess(int,int):550:550 -> a
     1352:1352:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
     1353:1353:void checkAccess(int,int):546:546 -> a
     1353:1353:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
     1354:1354:void checkAccess(int,int):0:0 -> a
     1354:1354:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2449,"2":2450,"3":2451,"4":2452},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2449,"2":2450,"3":2451,"4":2452},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1900:1900:void checkAccess(int,int):546:546 -> a
     1900:1900:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
     1901:1901:void checkAccess(int,int):542:542 -> a
     1901:1901:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
     1902:1902:void checkAccess(int,int):0:0 -> a
     1902:1902:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2453,"2":2454,"3":2455,"4":2456},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2453,"2":2454,"3":2455,"4":2456},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     2444:2444:void checkAccess(int,int):542:542 -> a
     2444:2444:void com.android.tools.r8.internal.CheckClassAdapter.checkAccess(int,int):0 -> a
     2445:2445:java.lang.String stringConcat$6(int):0:0 -> a
@@ -249227,7 +248701,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     2506:2506:void checkTypeRef(int):0:0 -> a
     2506:2506:void com.android.tools.r8.internal.CheckClassAdapter.checkTypeRef(int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3470,"2":3471,"3":3472,"4":3473},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3470,"2":3471,"3":3472,"4":3473},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     3469:3469:void checkTypeRef(int):963:963 -> a
     3469:3469:void com.android.tools.r8.internal.CheckClassAdapter.checkTypeRef(int):0 -> a
     3470:3470:java.lang.String stringConcat$14(java.lang.String):0:0 -> a
@@ -249248,7 +248722,7 @@
     18:18:void visitNestMember(java.lang.String):317:317 -> b
     19:19:void visitNestMember(java.lang.String):310:310 -> b
     20:21:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):381:382 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/Q10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/U10;"}
     22:22:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1226:1226 -> b
     22:22:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):382 -> b
     23:28:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):383:388 -> b
@@ -249288,11 +248762,11 @@
     2:14:java.lang.String getUnqualifiedName(java.lang.String):1122:1134 -> e
     15:15:java.lang.String stringConcat$18(java.lang.String,java.lang.String):0:0 -> e
     15:15:java.lang.String getUnqualifiedName(java.lang.String):1134 -> e
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.Hb:
 # {"id":"sourceFile","fileName":"CheckFieldAdapter.java"}
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):69:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Ip;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Lp;)V"}
     1:1:void checkVisitEndNotCalled():112:112 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
@@ -249314,14 +248788,14 @@
     12:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):83 -> a
     12:12:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckFieldAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     13:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):89:92 -> a
     13:16:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckFieldAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     17:18:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):86:87 -> a
     17:18:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckFieldAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     19:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
     19:19:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckFieldAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110,"4":111},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110,"4":111},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     106:106:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):87:87 -> a
     106:106:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckFieldAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     107:107:void checkVisitEndNotCalled():113:113 -> a
@@ -249335,19 +248809,19 @@
     110:110:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):87 -> a
     111:111:java.lang.String stringConcat$0(java.lang.String):0:0 -> a
     111:111:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):87 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckFrameAnalyzer -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.org.objectweb.asm.util.CheckFrameAnalyzer -> com.android.tools.r8.internal.Ib:
 # {"id":"sourceFile","fileName":"CheckFrameAnalyzer.java"}
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter interpreter -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q5;"}
     com.android.tools.r8.org.objectweb.asm.tree.InsnList insnList -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bw;"}
     int currentLocals -> l
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter):113:114 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q5;)V"}
     1:37:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame expandFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.FrameNode):268:304 -> a
     1:37:com.android.tools.r8.internal.Frame1 com.android.tools.r8.internal.CheckFrameAnalyzer.expandFrame(com.android.tools.r8.internal.Frame1,com.android.tools.r8.internal.FrameNode):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oq;Lcom/android/tools/r8/internal/Qq;)Lcom/android/tools/r8/internal/Oq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qq;Lcom/android/tools/r8/internal/Sq;)Lcom/android/tools/r8/internal/Qq;"}
     38:38:com.android.tools.r8.internal.Frame1 com.android.tools.r8.internal.CheckFrameAnalyzer.expandFrame(com.android.tools.r8.internal.Frame1,com.android.tools.r8.internal.FrameNode):0:0 -> a
     39:39:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame expandFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.FrameNode):304:304 -> a
     39:39:com.android.tools.r8.internal.Frame1 com.android.tools.r8.internal.CheckFrameAnalyzer.expandFrame(com.android.tools.r8.internal.Frame1,com.android.tools.r8.internal.FrameNode):0 -> a
@@ -249391,7 +248865,7 @@
     90:91:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame expandFrame(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,com.android.tools.r8.org.objectweb.asm.tree.FrameNode):313:314 -> a
     90:91:com.android.tools.r8.internal.Frame1 com.android.tools.r8.internal.CheckFrameAnalyzer.expandFrame(com.android.tools.r8.internal.Frame1,com.android.tools.r8.internal.FrameNode):0 -> a
     92:92:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newFrameValue(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.FrameNode,java.lang.Object):331:331 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qq;Ljava/lang/Object;)Lcom/android/tools/r8/internal/N5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sq;Ljava/lang/Object;)Lcom/android/tools/r8/internal/P5;"}
     93:93:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):50:50 -> a
     93:93:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newFrameValue(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.FrameNode,java.lang.Object):332 -> a
     94:94:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.newValue(com.android.tools.r8.org.objectweb.asm.Type):83:83 -> a
@@ -249464,7 +248938,7 @@
     130:131:void com.android.tools.r8.internal.CheckFrameAnalyzer.endControlFlow(int):0 -> a
     132:132:void endControlFlow(int):0:0 -> a
     132:132:void com.android.tools.r8.internal.CheckFrameAnalyzer.endControlFlow(int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":583,"2":584,"3":585,"4":586},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":583,"2":584,"3":585,"4":586},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     581:581:void endControlFlow(int):449:449 -> a
     581:581:void com.android.tools.r8.internal.CheckFrameAnalyzer.endControlFlow(int):0 -> a
     582:582:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getNext():168:168 -> a
@@ -249483,14 +248957,14 @@
     587:587:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):375 -> a
     587:587:void com.android.tools.r8.internal.CheckFrameAnalyzer.checkFrame(int,com.android.tools.r8.internal.Frame1,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Oq;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Qq;Z)V"}
     588:593:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):375:380 -> a
     588:593:void com.android.tools.r8.internal.CheckFrameAnalyzer.checkFrame(int,com.android.tools.r8.internal.Frame1,boolean):0 -> a
     594:594:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):378:378 -> a
     594:594:void com.android.tools.r8.internal.CheckFrameAnalyzer.checkFrame(int,com.android.tools.r8.internal.Frame1,boolean):0 -> a
     595:595:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):0:0 -> a
     595:595:void com.android.tools.r8.internal.CheckFrameAnalyzer.checkFrame(int,com.android.tools.r8.internal.Frame1,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1004,"2":1005,"3":1006,"4":1007},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1004,"2":1005,"3":1006,"4":1007},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     973:973:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):378:378 -> a
     973:973:void com.android.tools.r8.internal.CheckFrameAnalyzer.checkFrame(int,com.android.tools.r8.internal.Frame1,boolean):0 -> a
     974:974:int com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.getLocals():170:170 -> a
@@ -249584,7 +249058,7 @@
     1007:1007:java.lang.String stringConcat$5(int):0:0 -> a
     1007:1007:void checkFrame(int,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame,boolean):378 -> a
     1:4:void init(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):119:122 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hb;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jb;)V"}
     5:5:com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame[] com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer.getFrames():531:531 -> d
     5:5:void init(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):125 -> d
     6:6:void init(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):126:126 -> d
@@ -249683,7 +249157,7 @@
     120:120:java.util.ListIterator com.android.tools.r8.org.objectweb.asm.tree.InsnList.iterator():156 -> d
     120:120:void expandFrames(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame):237 -> d
     120:120:void init(java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.MethodNode):127 -> d
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.Mb:
 # {"id":"sourceFile","fileName":"CheckMethodAdapter.java"}
     int version -> c
     int access -> d
@@ -249706,7 +249180,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"[I"}
     1:1:void <clinit>():83:83 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,java.util.Map):390:390 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/AO;Ljava/util/HashMap;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EO;Ljava/util/HashMap;)V"}
     2:64:void <init>(int,com.android.tools.r8.org.objectweb.asm.MethodVisitor,java.util.Map):331:393 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):508:510 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
@@ -249723,7 +249197,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     62:62:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):0:0 -> a
     62:62:void com.android.tools.r8.internal.CheckMethodAdapter.visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":725,"2":726,"3":727,"4":728},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":725,"2":726,"3":727,"4":728},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     683:717:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):621:655 -> a
     683:717:void com.android.tools.r8.internal.CheckMethodAdapter.visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):0 -> a
     718:718:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):629:629 -> a
@@ -249759,7 +249233,7 @@
     770:773:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]) -> a
     770:773:void com.android.tools.r8.internal.CheckMethodAdapter.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.internal.Handle,java.lang.Object[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     774:774:int com.android.tools.r8.org.objectweb.asm.Handle.getTag():115:115 -> a
     774:774:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):774 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -249771,7 +249245,7 @@
     776:776:void com.android.tools.r8.internal.CheckMethodAdapter.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.internal.Handle,java.lang.Object[]):0 -> a
     777:777:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
     777:777:void com.android.tools.r8.internal.CheckMethodAdapter.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.internal.Handle,java.lang.Object[]):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1560,"2":1561,"3":1562,"4":1563},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1560,"2":1561,"3":1562,"4":1563},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1553:1559:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):776:782 -> a
     1553:1559:void com.android.tools.r8.internal.CheckMethodAdapter.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.internal.Handle,java.lang.Object[]):0 -> a
     1560:1560:java.lang.String stringConcat$6(int):0:0 -> a
@@ -249783,9 +249257,9 @@
     1563:1563:java.lang.String stringConcat$6(int):0:0 -> a
     1563:1563:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):776 -> a
     1564:1569:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):787:792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     1570:1577:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):797:804 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     1578:1578:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):801:801 -> a
     1579:1583:void visitLdcInsn(java.lang.Object):809:813 -> a
     1584:1589:void visitIincInsn(int,int):818:823 -> a
@@ -249796,7 +249270,7 @@
     1590:1590:void com.android.tools.r8.internal.CheckMethodAdapter.visitIincInsn(int,int):0 -> a
     1591:1591:void visitIincInsn(int,int):0:0 -> a
     1591:1591:void com.android.tools.r8.internal.CheckMethodAdapter.visitIincInsn(int,int):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1593,"2":1594,"3":1595,"4":1596},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1593,"2":1594,"3":1595,"4":1596},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1592:1592:void checkSignedShort(int,java.lang.String):1133:1133 -> a
     1592:1592:void visitIincInsn(int,int):821 -> a
     1592:1592:void com.android.tools.r8.internal.CheckMethodAdapter.visitIincInsn(int,int):0 -> a
@@ -249813,7 +249287,7 @@
     1596:1596:void checkSignedShort(int,java.lang.String):1133 -> a
     1596:1596:void visitIincInsn(int,int):821 -> a
     1597:1608:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):829:840 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     1609:1609:java.lang.String stringConcat$8(int):0:0 -> a
     1609:1609:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):840 -> a
     1610:1613:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):840:843 -> a
@@ -249823,7 +249297,7 @@
     1616:1616:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):832 -> a
     1617:1617:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):832:832 -> a
     1618:1625:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):848:855 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
     1626:1626:java.lang.String stringConcat$9(int):0:0 -> a
     1626:1626:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):855 -> a
     1627:1630:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):855:858 -> a
@@ -249835,14 +249309,14 @@
     1650:1650:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
     1651:1651:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
     1651:1651:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3403,"2":3404,"3":3405,"4":3406},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3403,"2":3404,"3":3405,"4":3406},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     2526:2526:void visitMultiANewArrayInsn(java.lang.String,int):875:875 -> a
     2526:2526:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
     2527:2527:void visitMultiANewArrayInsn(java.lang.String,int):871:871 -> a
     2527:2527:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
     2528:2528:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
     2528:2528:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3407,"2":3408,"3":3409,"4":3410},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3407,"2":3408,"3":3409,"4":3410},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     3399:3399:void visitMultiANewArrayInsn(java.lang.String,int):871:871 -> a
     3399:3399:void com.android.tools.r8.internal.CheckMethodAdapter.visitMultiANewArrayInsn(int,java.lang.String):0 -> a
     3400:3400:void visitMultiANewArrayInsn(java.lang.String,int):867:867 -> a
@@ -249871,10 +249345,10 @@
     3411:3423:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):886:898 -> a
     3411:3423:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitInsnAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     3424:3424:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
     3424:3424:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitInsnAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4328,"2":4329,"3":4330,"4":4331},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4328,"2":4329,"3":4330,"4":4331},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     4322:4327:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):898:903 -> a
     4322:4327:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitInsnAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     4328:4328:java.lang.String stringConcat$13(java.lang.String):0:0 -> a
@@ -249886,10 +249360,10 @@
     4331:4331:java.lang.String stringConcat$13(java.lang.String):0:0 -> a
     4331:4331:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):898 -> a
     4332:4347:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):909:924 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
     4348:4348:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):917:917 -> a
     4349:4351:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):950:952 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
     4352:4352:void checkUnqualifiedName(int,java.lang.String,java.lang.String):1226:1226 -> a
     4352:4352:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):952 -> a
     4353:4366:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):953:966 -> a
@@ -249897,10 +249371,10 @@
     4368:4372:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):978:982 -> a
     4368:4372:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitLocalVariableAnnotation(int,com.android.tools.r8.internal.TypePath,com.android.tools.r8.internal.Label[],com.android.tools.r8.internal.Label[],int[],java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     4373:4373:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):0:0 -> a
     4373:4373:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitLocalVariableAnnotation(int,com.android.tools.r8.internal.TypePath,com.android.tools.r8.internal.Label[],com.android.tools.r8.internal.Label[],int[],java.lang.String,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5380,"2":5381,"3":5382,"4":5383},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5380,"2":5381,"3":5382,"4":5383},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     5355:5378:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):982:1005 -> a
     5355:5378:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitLocalVariableAnnotation(int,com.android.tools.r8.internal.TypePath,com.android.tools.r8.internal.Label[],com.android.tools.r8.internal.Label[],int[],java.lang.String,boolean):0 -> a
     5379:5379:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):991:991 -> a
@@ -249934,7 +249408,7 @@
     5412:5412:void com.android.tools.r8.internal.CheckMethodAdapter.checkIdentifier(int,java.lang.String,int,int,java.lang.String):0 -> a
     5413:5413:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):0:0 -> a
     5413:5413:void com.android.tools.r8.internal.CheckMethodAdapter.checkIdentifier(int,java.lang.String,int,int,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6660,"2":6661,"3":6662,"4":6663,"5":6664},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6660,"2":6661,"3":6662,"4":6663,"5":6664},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     6659:6659:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1246:1246 -> a
     6659:6659:void com.android.tools.r8.internal.CheckMethodAdapter.checkIdentifier(int,java.lang.String,int,int,java.lang.String):0 -> a
     6660:6660:java.lang.String stringConcat$24(java.lang.String):0:0 -> a
@@ -249974,17 +249448,17 @@
     6765:6766:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1452:1453 -> a
     6765:6766:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;ZLjava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;ZLjava/lang/String;)V"}
     6767:6767:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
     6767:6767:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9675,"2":9676,"3":9677,"4":9678,"5":9679},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9675,"2":9676,"3":9677,"4":9678,"5":9679},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     8220:8222:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1453:1455 -> a
     8220:8222:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
     8223:8223:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1450:1450 -> a
     8223:8223:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
     8224:8224:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
     8224:8224:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9680,"2":9681,"3":9682,"4":9683,"5":9684},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9680,"2":9681,"3":9682,"4":9683,"5":9684},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     9674:9674:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1450:1450 -> a
     9674:9674:void com.android.tools.r8.internal.CheckMethodAdapter.checkLabel(com.android.tools.r8.internal.Label,boolean,java.lang.String):0 -> a
     9675:9675:java.lang.String stringConcat$42(java.lang.String):0:0 -> a
@@ -250019,7 +249493,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     25:25:void visitIntInsn(int,int):0:0 -> b
     25:25:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":720,"2":721,"3":722,"4":723},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":720,"2":721,"3":722,"4":723},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     706:711:void visitIntInsn(int,int):681:686 -> b
     706:711:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
     712:712:void checkSignedShort(int,java.lang.String):1133:1133 -> b
@@ -250027,7 +249501,7 @@
     712:712:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
     713:713:void visitIntInsn(int,int):0:0 -> b
     713:713:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":724,"2":725,"3":726,"4":727},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":724,"2":725,"3":726,"4":727},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     714:714:void checkSignedShort(int,java.lang.String):1133:1133 -> b
     714:714:void visitIntInsn(int,int):677 -> b
     714:714:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
@@ -250038,7 +249512,7 @@
     717:717:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
     718:718:void visitIntInsn(int,int):0:0 -> b
     718:718:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":728,"2":729,"3":730,"4":731},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":728,"2":729,"3":730,"4":731},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     719:719:void checkSignedByte(int,java.lang.String):1121:1121 -> b
     719:719:void visitIntInsn(int,int):674 -> b
     719:719:void com.android.tools.r8.internal.CheckMethodAdapter.visitIntInsn(int,int):0 -> b
@@ -250077,12 +249551,12 @@
     732:741:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):930:939 -> b
     732:741:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTryCatchAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     742:742:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):934:934 -> b
     742:742:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTryCatchAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> b
     743:743:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> b
     743:743:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTryCatchAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1678,"2":1679,"3":1680,"4":1681},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1678,"2":1679,"3":1680,"4":1681},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     1677:1677:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):934:934 -> b
     1677:1677:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTryCatchAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> b
     1678:1678:java.lang.String stringConcat$14(java.lang.String):0:0 -> b
@@ -250094,7 +249568,7 @@
     1681:1681:java.lang.String stringConcat$14(java.lang.String):0:0 -> b
     1681:1681:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):934 -> b
     1682:1686:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1011:1015 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     1687:1701:void checkFrameValue(java.lang.Object):1079:1093 -> b
     1702:1702:java.lang.String stringConcat$16(java.lang.Object):0:0 -> b
     1702:1702:void checkFrameValue(java.lang.Object):1093 -> b
@@ -250106,7 +249580,7 @@
     1711:1711:void com.android.tools.r8.internal.CheckMethodAdapter.checkInternalName(int,java.lang.String,java.lang.String):0 -> b
     1712:1712:void checkInternalName(int,java.lang.String,java.lang.String):0:0 -> b
     1712:1712:void com.android.tools.r8.internal.CheckMethodAdapter.checkInternalName(int,java.lang.String,java.lang.String):0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3023,"2":3024,"3":3025,"4":3026,"5":3027},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3023,"2":3024,"3":3025,"4":3026,"5":3027},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     3022:3022:void checkInternalName(int,java.lang.String,java.lang.String):1310:1310 -> b
     3022:3022:void com.android.tools.r8.internal.CheckMethodAdapter.checkInternalName(int,java.lang.String,java.lang.String):0 -> b
     3023:3023:java.lang.String stringConcat$30(java.lang.String):0:0 -> b
@@ -250122,10 +249596,10 @@
     1:9:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):516:524 -> c
     1:9:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> c
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     10:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> c
     10:10:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":540,"2":541,"3":542,"4":543},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":540,"2":541,"3":542,"4":543},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     534:539:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):524:529 -> c
     534:539:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckMethodAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> c
     540:540:java.lang.String stringConcat$0(java.lang.String):0:0 -> c
@@ -250173,7 +249647,7 @@
     606:606:void com.android.tools.r8.internal.CheckMethodAdapter.checkLdcConstant(java.lang.Object):0 -> c
     607:607:void checkLdcConstant(java.lang.Object):0:0 -> c
     607:607:void com.android.tools.r8.internal.CheckMethodAdapter.checkLdcConstant(java.lang.Object):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1838,"2":1839,"3":1840,"4":1841},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1838,"2":1839,"3":1840,"4":1841},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1796:1796:void checkLdcConstant(java.lang.Object):1189:1189 -> c
     1796:1796:void com.android.tools.r8.internal.CheckMethodAdapter.checkLdcConstant(java.lang.Object):0 -> c
     1797:1818:void checkLdcConstant(java.lang.Object):1184:1205 -> c
@@ -250243,7 +249717,7 @@
     1869:1869:void com.android.tools.r8.internal.CheckMethodAdapter.checkMethodIdentifier(int,java.lang.String,java.lang.String):0 -> c
     1870:1870:void checkMethodIdentifier(int,java.lang.String,java.lang.String):0:0 -> c
     1870:1870:void com.android.tools.r8.internal.CheckMethodAdapter.checkMethodIdentifier(int,java.lang.String,java.lang.String):0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3148,"2":3149,"3":3150,"4":3151,"5":3152},"outline":"Lcom/android/tools/r8/internal/h40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3148,"2":3149,"3":3150,"4":3151,"5":3152},"outline":"Lcom/android/tools/r8/internal/l40;a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     3147:3147:void checkMethodIdentifier(int,java.lang.String,java.lang.String):1277:1277 -> c
     3147:3147:void com.android.tools.r8.internal.CheckMethodAdapter.checkMethodIdentifier(int,java.lang.String,java.lang.String):0 -> c
     3148:3148:java.lang.String stringConcat$27(java.lang.String):0:0 -> c
@@ -250296,12 +249770,12 @@
     4:4:java.lang.String stringConcat$21(java.lang.String,int):0:0 -> f
     4:4:void checkUnsignedShort(int,java.lang.String):1145 -> f
     5:5:void checkUnsignedShort(int,java.lang.String):1145:1145 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.Jb:
 # {"id":"sourceFile","fileName":"CheckMethodAdapter.java"}
     com.android.tools.r8.org.objectweb.asm.MethodVisitor val$methodVisitor -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EO;"}
     1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.org.objectweb.asm.MethodVisitor):446:446 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/AO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EO;)V"}
     1:6:void visitEnd():449:454 -> c
     7:7:boolean com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$MethodWriterWrapper.computesMaxs():1476:1476 -> c
     7:7:void visitEnd():458 -> c
@@ -250387,33 +249861,33 @@
     72:72:void visitEnd():475 -> c
     73:73:void throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):489:489 -> c
     73:73:void visitEnd():475 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Kb:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$MethodWriterWrapper -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$MethodWriterWrapper -> com.android.tools.r8.internal.Lb:
 # {"id":"sourceFile","fileName":"CheckMethodAdapter.java"}
     int version -> c
     com.android.tools.r8.org.objectweb.asm.ClassWriter owner -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/td;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vd;"}
     1:3:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.org.objectweb.asm.MethodVisitor):1470:1472 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/td;Lcom/android/tools/r8/internal/AO;)V"}
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.Mb:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/vd;Lcom/android/tools/r8/internal/EO;)V"}
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.Ob:
 # {"id":"sourceFile","fileName":"CheckModuleAdapter.java"}
     boolean isOpen -> b
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nb;"}
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet exportedPackages -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nb;"}
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet openedPackages -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nb;"}
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet usedServices -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nb;"}
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet providedServices -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nb;"}
     int classVersion -> h
     boolean visitEndCalled -> i
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor,boolean):91:91 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/QO;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/UO;Z)V"}
     2:50:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor,boolean):44:92 -> <init>
     1:1:void visitMainClass(java.lang.String):98:98 -> a
     2:3:void com.android.tools.r8.org.objectweb.asm.ModuleVisitor.visitMainClass(java.lang.String):102:103 -> a
@@ -250423,7 +249897,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     17:17:void visitRequire(java.lang.String,int,java.lang.String):0:0 -> a
     17:17:void com.android.tools.r8.internal.CheckModuleAdapter.visitRequire(int,java.lang.String,java.lang.String):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142,"2":143,"3":144,"4":145,"5":146},"outline":"Lcom/android/tools/r8/internal/Vu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142,"2":143,"3":144,"4":145,"5":146},"outline":"Lcom/android/tools/r8/internal/Xu;a(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     139:139:void visitRequire(java.lang.String,int,java.lang.String):122:122 -> a
     139:139:void com.android.tools.r8.internal.CheckModuleAdapter.visitRequire(int,java.lang.String,java.lang.String):0 -> a
     140:141:void com.android.tools.r8.org.objectweb.asm.ModuleVisitor.visitRequire(java.lang.String,int,java.lang.String):127:128 -> a
@@ -250460,7 +249934,7 @@
     1:3:void visitUse(java.lang.String):163:165 -> c
     4:5:void com.android.tools.r8.org.objectweb.asm.ModuleVisitor.visitUse(java.lang.String):169:170 -> c
     4:5:void visitUse(java.lang.String):166 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.Nb:
 # {"id":"sourceFile","fileName":"CheckModuleAdapter.java"}
     java.lang.String type -> a
     java.util.HashSet names -> b
@@ -250469,11 +249943,11 @@
     3:3:java.lang.String stringConcat$0(java.lang.String,java.lang.String):0:0 -> a
     3:3:void checkNameNotAlreadyDeclared(java.lang.String):208 -> a
     4:4:void checkNameNotAlreadyDeclared(java.lang.String):208:208 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.Rb:
 # {"id":"sourceFile","fileName":"CheckRecordComponentAdapter.java"}
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/Q10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/U10;)V"}
     1:1:void checkVisitEndNotCalled():117:117 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
@@ -250500,7 +249974,7 @@
     16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88 -> a
     16:16:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckRecordComponentAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     17:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):94:96 -> a
     17:19:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckRecordComponentAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     20:21:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor.visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):127:128 -> a
@@ -250512,7 +249986,7 @@
     23:24:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckRecordComponentAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     25:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
     25:25:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckRecordComponentAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":119,"2":120,"3":121,"4":122},"outline":"Lcom/android/tools/r8/internal/k40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":119,"2":120,"3":121,"4":122},"outline":"Lcom/android/tools/r8/internal/o40;a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     117:117:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92:92 -> a
     117:117:com.android.tools.r8.internal.AnnotationVisitor com.android.tools.r8.internal.CheckRecordComponentAdapter.visitTypeAnnotation(int,com.android.tools.r8.internal.TypePath,java.lang.String,boolean):0 -> a
     118:118:void checkVisitEndNotCalled() -> a
@@ -250526,7 +250000,7 @@
     121:121:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92 -> a
     122:122:java.lang.String stringConcat$0(java.lang.String):0:0 -> a
     122:122:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92 -> a
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.QX:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.UX:
 # {"id":"sourceFile","fileName":"Printer.java"}
     java.lang.StringBuilder stringBuilder -> a
     java.util.List text -> b
@@ -250538,7 +250012,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:23:void appendString(java.lang.StringBuilder,java.lang.String):1233:1255 -> a
     24:37:void appendString(java.lang.StringBuilder,java.lang.String):1245:1258 -> a
-com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.Gg0:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.Kg0:
 # {"id":"sourceFile","fileName":"Textifier.java"}
     java.lang.String tab -> e
     java.lang.String tab2 -> f
@@ -250555,7 +250029,7 @@
     1:1:int com.android.tools.r8.org.objectweb.asm.Handle.getTag():115:115 -> a
     1:1:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1387 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ss;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/us;)V"}
     2:38:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1388:1424 -> a
     39:55:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1404:1420 -> a
     56:64:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1408:1416 -> a
@@ -250576,16 +250050,16 @@
     116:116:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1438 -> a
     117:117:void appendHandle(com.android.tools.r8.org.objectweb.asm.Handle):1439:1439 -> a
     118:129:com.android.tools.r8.org.objectweb.asm.util.Textifier visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1223:1234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/Gg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/Kg0;"}
     130:130:void appendDescriptor(int,java.lang.String):1337:1337 -> a
     131:131:void appendDescriptor(int,java.lang.String):1334:1334 -> a
     132:137:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1370:1375 -> a
     132:137:void com.android.tools.r8.internal.Textifier.appendLabel(com.android.tools.r8.internal.Label):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     138:138:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
     138:138:void com.android.tools.r8.internal.Textifier.appendLabel(com.android.tools.r8.internal.Label):0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1517,"2":1518,"3":1519,"4":1520},"outline":"Lcom/android/tools/r8/internal/gX;a(ILjava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1517,"2":1518,"3":1519,"4":1520},"outline":"Lcom/android/tools/r8/internal/kX;a(ILjava/lang/String;)Ljava/lang/String;"}
     1514:1516:void appendLabel(com.android.tools.r8.org.objectweb.asm.Label):1376:1378 -> a
     1514:1516:void com.android.tools.r8.internal.Textifier.appendLabel(com.android.tools.r8.internal.Label):0 -> a
     1517:1517:java.lang.String stringConcat$2(int):0:0 -> a
@@ -250622,19 +250096,19 @@
     1564:1576:void appendFrameTypes(int,java.lang.Object[]) -> a
     1577:1577:com.android.tools.r8.org.objectweb.asm.util.Textifier createTextifier():1602:1602 -> a
     1577:1577:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1588 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Gg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Kg0;"}
     1578:1578:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1589:1589 -> a
     1579:1579:java.util.List com.android.tools.r8.org.objectweb.asm.util.Printer.getText():1197:1197 -> a
     1579:1579:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1589 -> a
     1580:1582:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1589:1591 -> a
     1:4:void visitAnnotationValue(java.lang.String):707:710 -> b
     5:5:void maybeAppendComma(int):1451:1451 -> b
-com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.qh0:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.uh0:
 # {"id":"sourceFile","fileName":"TraceAnnotationVisitor.java"}
     com.android.tools.r8.org.objectweb.asm.util.Printer printer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kg0;"}
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):60:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J2;Lcom/android/tools/r8/internal/Gg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/J2;Lcom/android/tools/r8/internal/Kg0;)V"}
     1:1:void visit(java.lang.String,java.lang.Object):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     2:2:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visit(java.lang.String,java.lang.Object):558:558 -> a
@@ -250761,13 +250235,13 @@
     103:105:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):84 -> a
     106:106:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):85:85 -> a
     107:108:void visitEnd():90:91 -> a
-com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.rh0:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.vh0:
 # {"id":"sourceFile","fileName":"TraceMethodVisitor.java"}
     com.android.tools.r8.org.objectweb.asm.util.Printer p -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kg0;"}
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):65:66 -> <init>
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kg0;)V"}
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:77 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.org.objectweb.asm.util.Textifier com.android.tools.r8.org.objectweb.asm.util.Textifier.visitAnnotation(java.lang.String,boolean):1202:1202 -> a
@@ -250864,7 +250338,7 @@
     142:151:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):183 -> a
     152:153:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):185:186 -> a
     154:154:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ss;[Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/us;[Ljava/lang/Object;)V"}
     155:155:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):944:944 -> a
     155:155:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250877,7 +250351,7 @@
     179:190:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
     191:191:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):197:197 -> a
     192:192:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     193:193:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):985:985 -> a
     193:193:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250885,7 +250359,7 @@
     194:198:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
     199:199:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
     200:200:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;)V"}
     201:201:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):994:994 -> a
     201:201:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250907,7 +250381,7 @@
     224:232:void visitIincInsn(int,int):220 -> a
     233:233:void visitIincInsn(int,int):221:221 -> a
     234:234:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;)V"}
     235:235:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1032:1032 -> a
     235:235:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250915,7 +250389,7 @@
     236:246:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
     247:247:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
     248:248:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;[I[Lcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;[I[Lcom/android/tools/r8/internal/II;)V"}
     249:249:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1047:1047 -> a
     249:249:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250931,13 +250405,13 @@
     264:268:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
     269:269:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
     270:270:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     271:271:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1072:1072 -> a
     271:271:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     272:273:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):247:248 -> a
     274:274:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254:254 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;Ljava/lang/String;)V"}
     275:275:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1078:1078 -> a
     275:275:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -250945,7 +250419,7 @@
     276:286:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
     287:287:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):255:255 -> a
     288:288:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274:274 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/EI;Lcom/android/tools/r8/internal/EI;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/II;Lcom/android/tools/r8/internal/II;I)V"}
     289:289:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1116:1116 -> a
     289:289:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -251129,7 +250603,7 @@
     413:413:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
     414:414:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):275:275 -> a
     415:415:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):287:287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;[Lcom/android/tools/r8/internal/EI;[Lcom/android/tools/r8/internal/EI;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;[Lcom/android/tools/r8/internal/II;[Lcom/android/tools/r8/internal/II;[ILjava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     416:416:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):1143:1143 -> a
     416:416:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):288 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -251158,7 +250632,7 @@
     49:56:void visitIntInsn(int,int):141 -> b
     57:57:void visitIntInsn(int,int):142:142 -> b
     58:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261:261 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     59:59:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1094:1094 -> b
     59:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -251166,7 +250640,7 @@
     60:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):261 -> b
     72:73:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):262:263 -> b
     74:74:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297:297 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
     75:75:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):1166:1166 -> b
     75:75:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -251174,7 +250648,7 @@
     76:80:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):297 -> b
     81:81:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):298:298 -> b
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85:85 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aj0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/ej0;Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMethodTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):791:791 -> c
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -251201,7 +250675,7 @@
     3:5:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):893:895 -> d
     3:5:void visitVarInsn(int,int):147 -> d
     6:6:void visitVarInsn(int,int):148:148 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.th0:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.xh0:
 # {"id":"sourceFile","fileName":"TraceSignatureVisitor.java"}
     boolean isInterface -> a
     java.lang.StringBuilder declaration -> b
@@ -251223,7 +250697,7 @@
     14:30:void <init>(java.lang.StringBuilder):104:120 -> <init>
     1:12:void visitClassType(java.lang.String):227:238 -> a
     13:23:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):266:276 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/th0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/xh0;"}
     24:24:void startType():331:331 -> a
     24:24:com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitTypeArgument(char):279 -> a
     25:30:void endType():335:340 -> a
@@ -251335,7 +250809,7 @@
 com.android.tools.r8.position.Position -> com.android.tools.r8.position.Position:
 # {"id":"sourceFile","fileName":"Position.java"}
     1:1:void <clinit>():19:19 -> <clinit>
-com.android.tools.r8.position.Position$1 -> com.android.tools.r8.internal.KW:
+com.android.tools.r8.position.Position$1 -> com.android.tools.r8.internal.OW:
 # {"id":"sourceFile","fileName":"Position.java"}
     1:1:void <init>():19:19 -> <init>
     1:1:java.lang.String getDescription():22:22 -> getDescription
@@ -251373,7 +250847,7 @@
     boolean containsMethodRule(com.android.tools.r8.graph.DexMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     void forEachRule(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     com.android.tools.r8.profile.AbstractProfileMethodRule getMethodRule(com.android.tools.r8.graph.DexMethod) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/m1;"}
 com.android.tools.r8.profile.AbstractProfile$Builder -> com.android.tools.r8.internal.h1:
@@ -251415,7 +250889,7 @@
     1:1:com.android.tools.r8.profile.art.ArtProfileRule asArtProfileRule():14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/u4;"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileRule asStartupProfileRule():19:19 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kd0;"}
 com.android.tools.r8.profile.art.AlwaysTrueArtProfileRulePredicate -> com.android.tools.r8.internal.j2:
 # {"id":"sourceFile","fileName":"AlwaysTrueArtProfileRulePredicate.java"}
     1:1:void <init>():10:10 -> <init>
@@ -251438,7 +250912,7 @@
     3:3:void lambda$supplyRuleConsumer$20(com.android.tools.r8.profile.art.ArtProfileRuleConsumer,com.android.tools.r8.profile.art.ArtProfileClassRule):253:253 -> a
     4:4:void lambda$supplyRuleConsumer$20(com.android.tools.r8.profile.art.ArtProfileRuleConsumer,com.android.tools.r8.profile.art.ArtProfileClassRule):252:252 -> a
     5:5:com.android.tools.r8.profile.art.ArtProfile$Builder builderForInitialArtProfile(com.android.tools.r8.profile.art.ArtProfileProvider,com.android.tools.r8.utils.InternalOptions):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileProvider;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/W3$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileProvider;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/W3$a;"}
     6:6:boolean containsClassRule(com.android.tools.r8.graph.DexType):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     7:7:com.android.tools.r8.references.MethodReference com.android.tools.r8.profile.art.ArtProfileMethodRule.getMethodReference():58:58 -> a
@@ -251454,7 +250928,7 @@
     12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.art.ArtProfileClassRule.getType():63:63 -> a
     12:12:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/d4;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/d4;Ljava/util/function/Consumer;)V"}
     13:13:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):103:103 -> a
     14:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     14:15:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):103 -> a
@@ -251462,7 +250936,7 @@
     18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.art.ArtProfileClassRule.getType():63:63 -> a
     18:18:void lambda$rewrittenWithLens$3(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vn;Lcom/android/tools/r8/internal/d4;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yn;Lcom/android/tools/r8/internal/d4;Ljava/util/function/Consumer;)V"}
     19:19:void lambda$rewrittenWithLens$3(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):119:119 -> a
     20:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     20:21:void lambda$rewrittenWithLens$3(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):119 -> a
@@ -251481,24 +250955,24 @@
     30:30:void lambda$withoutMissingItems$10(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):164 -> a
     31:31:void lambda$withoutMissingItems$10(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.art.ArtProfileClassRule,java.util.function.Consumer):164:164 -> a
     32:33:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):77:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     34:34:int size():94:94 -> a
     35:35:com.android.tools.r8.profile.art.ArtProfile rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/W3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/W3;"}
     36:36:boolean com.android.tools.r8.graph.lens.GraphLens.isEnumUnboxerLens():0:0 -> a
     36:36:com.android.tools.r8.profile.art.ArtProfile rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):98 -> a
     37:39:com.android.tools.r8.profile.art.ArtProfile rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):99:101 -> a
     40:40:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/l4;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/l4;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
     41:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     41:42:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):109 -> a
     43:44:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):109:110 -> a
     45:45:void lambda$rewrittenWithLens$1(com.android.tools.r8.profile.art.ArtProfileMethodRule,com.android.tools.r8.profile.art.ArtProfileMethodRuleInfoImpl$Builder):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l4;Lcom/android/tools/r8/internal/m4$a;)V"}
     46:46:com.android.tools.r8.profile.art.ArtProfile rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens):117:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Vn;)Lcom/android/tools/r8/internal/W3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Yn;)Lcom/android/tools/r8/internal/W3;"}
     47:47:void lambda$rewrittenWithLens$6(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vn;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/l4;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yn;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/l4;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
     48:49:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     48:49:void lambda$rewrittenWithLens$6(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):127 -> a
     50:51:void lambda$rewrittenWithLens$6(com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.art.ArtProfileMethodRule,java.util.function.Consumer,java.util.function.Function):130:131 -> a
@@ -251530,7 +251004,7 @@
     80:80:com.android.tools.r8.profile.art.ArtProfile withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):181:181 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)V"}
     81:94:com.android.tools.r8.profile.art.ArtProfile transform(java.util.function.BiConsumer,com.android.tools.r8.utils.TriConsumer):192:205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/internal/W3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Rh0;)Lcom/android/tools/r8/internal/W3;"}
     95:95:com.android.tools.r8.profile.art.ArtProfile$Builder builder():47:47 -> a
     95:95:com.android.tools.r8.profile.art.ArtProfile transform(java.util.function.BiConsumer,com.android.tools.r8.utils.TriConsumer):216 -> a
     96:96:com.android.tools.r8.profile.art.ArtProfile transform(java.util.function.BiConsumer,com.android.tools.r8.utils.TriConsumer):216:216 -> a
@@ -251543,9 +251017,9 @@
     107:107:void lambda$transform$17(java.util.function.BiConsumer,java.util.function.Consumer,com.android.tools.r8.profile.art.ArtProfileClassRule):211:211 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/d4;)V"}
     108:108:void lambda$transform$18(com.android.tools.r8.utils.TriConsumer,java.util.function.Consumer,java.util.function.Function,com.android.tools.r8.profile.art.ArtProfileMethodRule):214:214 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Ljava/util/function/Consumer;Ljava/util/function/Function;Lcom/android/tools/r8/internal/l4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Ljava/util/function/Consumer;Ljava/util/function/Function;Lcom/android/tools/r8/internal/l4;)V"}
     109:117:void supplyConsumer(com.android.tools.r8.profile.art.ArtProfileConsumer,com.android.tools.r8.utils.Reporter):221:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileConsumer;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileConsumer;Lcom/android/tools/r8/internal/d50;)V"}
     118:121:void supplyHumanReadableArtProfileConsumer(com.android.tools.r8.TextOutputStream):235:238 -> a
     122:123:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer):67:68 -> a
     122:123:void supplyHumanReadableArtProfileConsumer(com.android.tools.r8.TextOutputStream):238 -> a
@@ -251579,13 +251053,13 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     java.util.Map rules -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     1:1:void <init>():268:268 -> <init>
     2:7:void <init>():266:271 -> <init>
     8:8:void <init>(com.android.tools.r8.profile.art.ArtProfileProvider,com.android.tools.r8.utils.InternalOptions):277:277 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileProvider;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileProvider;Lcom/android/tools/r8/internal/iB;)V"}
     9:23:void <init>(com.android.tools.r8.profile.art.ArtProfileProvider,com.android.tools.r8.utils.InternalOptions):266:280 -> <init>
     1:1:com.android.tools.r8.profile.AbstractProfile$Builder addClassRule(com.android.tools.r8.profile.AbstractProfileClassRule):259:259 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k1;)Lcom/android/tools/r8/internal/h1;"}
@@ -251724,9 +251198,9 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):21:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     2:2:java.lang.Object apply(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.utils.ThrowingFunction):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;Lcom/android/tools/r8/internal/Ug0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yg0;Lcom/android/tools/r8/internal/Yg0;)Ljava/lang/Object;"}
     3:3:void writeHumanReadableRuleString(java.io.OutputStreamWriter):68:68 -> a
     1:1:com.android.tools.r8.graph.DexType getType():63:63 -> c
     1:1:com.android.tools.r8.graph.DexType getReference():59 -> c
@@ -251776,15 +251250,15 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.profile.art.NonEmptyArtProfileCollection asNonEmpty() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sR;"}
     com.android.tools.r8.profile.art.ArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     void supplyConsumers(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     com.android.tools.r8.profile.art.ArtProfileCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     1:14:com.android.tools.r8.profile.art.ArtProfileCollection createInitialArtProfileCollection(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):24:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/internal/f4;"}
     15:15:boolean com.android.tools.r8.profile.art.ArtProfileOptions.isNopCheckForTestingEnabled():64:64 -> a
     15:15:com.android.tools.r8.profile.art.ArtProfileCollection createInitialArtProfileCollection(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):39 -> a
     16:16:com.android.tools.r8.profile.art.ArtProfileCollection createInitialArtProfileCollection(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):40:40 -> a
@@ -251923,9 +251397,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.art.ArtProfileMethodRuleInfoImpl):24:26 -> <init>
     1:1:void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     2:2:java.lang.Object apply(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.utils.ThrowingFunction):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;Lcom/android/tools/r8/internal/Ug0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yg0;Lcom/android/tools/r8/internal/Yg0;)Ljava/lang/Object;"}
     3:3:void writeHumanReadableRuleString(java.io.OutputStreamWriter):72:72 -> a
     4:4:void com.android.tools.r8.profile.art.ArtProfileMethodRuleInfoImpl.writeHumanReadableFlags(java.io.OutputStreamWriter):54:54 -> a
     4:4:void writeHumanReadableRuleString(java.io.OutputStreamWriter):72 -> a
@@ -252113,12 +251587,12 @@
     boolean hasReadArtProfileProviders -> d
     boolean allowReadingEmptyArtProfileProvidersMultipleTimesForTesting -> e
     com.android.tools.r8.utils.InternalOptions options -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.lang.String nopCheckForTestingHashCode -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):36:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:3:void <init>(com.android.tools.r8.utils.InternalOptions):25:26 -> <init>
     4:4:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyOrDefault(java.lang.String,boolean):62:62 -> <init>
     4:4:void <init>(com.android.tools.r8.utils.InternalOptions):27 -> <init>
@@ -252142,11 +251616,11 @@
     18:18:java.lang.String computeNopCheckForTestingHashCode(com.android.tools.r8.graph.AppInfo):142 -> a
     19:19:java.lang.String computeNopCheckForTestingHashCode(com.android.tools.r8.graph.AppInfo):145:145 -> a
     1:1:boolean isCompletenessCheckForTestingEnabled():57:57 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608:608 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607:607 -> b
     2:2:boolean isCompletenessCheckForTestingEnabled():58 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():608 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():607 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean isCompletenessCheckForTestingEnabled():58 -> b
     4:4:boolean isCompletenessCheckForTestingEnabled():59:59 -> b
@@ -252200,11 +251674,11 @@
 com.android.tools.r8.profile.art.ArtProfileProviderUtils$2$2 -> com.android.tools.r8.internal.q4:
 # {"id":"sourceFile","fileName":"ArtProfileProviderUtils.java"}
     com.android.tools.r8.utils.Box val$methodReferenceBox -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     com.android.tools.r8.profile.art.ArtProfileProviderUtils$2 this$0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r4;"}
     1:1:void <init>(com.android.tools.r8.profile.art.ArtProfileProviderUtils$2,com.android.tools.r8.utils.Box):79:79 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r4;Lcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r4;Lcom/android/tools/r8/internal/m7;)V"}
     1:1:com.android.tools.r8.profile.art.ArtProfileMethodRuleBuilder setMethodReference(com.android.tools.r8.references.MethodReference):84:84 -> setMethodReference
     1:6:com.android.tools.r8.profile.art.ArtProfileMethodRuleBuilder setMethodRuleInfo(java.util.function.Consumer):92:97 -> setMethodRuleInfo
     7:7:void com.android.tools.r8.profile.art.ArtProfileMethodRuleInfoImpl.writeHumanReadableFlags(java.io.OutputStreamWriter):54:54 -> setMethodRuleInfo
@@ -252217,9 +251691,9 @@
 # {"id":"sourceFile","fileName":"ArtProfileRule.java"}
     1:1:void <init>():14:14 -> <init>
     void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     java.lang.Object apply(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.utils.ThrowingFunction) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;Lcom/android/tools/r8/internal/Ug0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yg0;Lcom/android/tools/r8/internal/Yg0;)Ljava/lang/Object;"}
     void writeHumanReadableRuleString(java.io.OutputStreamWriter) -> a
     com.android.tools.r8.graph.DexReference getReference() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/F2;"}
@@ -252237,17 +251711,17 @@
 # {"id":"sourceFile","fileName":"ArtProfileRuleConsumer.java"}
 com.android.tools.r8.profile.art.ArtProfileRulePredicate -> com.android.tools.r8.profile.art.ArtProfileRulePredicate:
 # {"id":"sourceFile","fileName":"ArtProfileRulePredicate.java"}
-com.android.tools.r8.profile.art.EmptyArtProfileCollection -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.profile.art.EmptyArtProfileCollection -> com.android.tools.r8.internal.Om:
 # {"id":"sourceFile","fileName":"EmptyArtProfileCollection.java"}
     com.android.tools.r8.profile.art.EmptyArtProfileCollection INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Om;"}
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:1:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection asNonEmpty():42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sR;"}
     2:2:com.android.tools.r8.profile.art.ArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     3:3:void supplyConsumers(com.android.tools.r8.graph.AppView):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     4:4:java.util.Collection com.android.tools.r8.profile.art.ArtProfileOptions.getArtProfilesForRewriting():41:41 -> a
@@ -252255,7 +251729,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void supplyConsumers(com.android.tools.r8.graph.AppView):57:57 -> a
     6:6:com.android.tools.r8.profile.art.ArtProfileCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     1:1:boolean isNonEmpty():32:32 -> b
     2:2:com.android.tools.r8.profile.art.ArtProfileCollection withoutMissingItems(com.android.tools.r8.graph.AppView):62:62 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/f4;"}
@@ -252265,19 +251739,19 @@
     1:1:java.util.Iterator iterator():37 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.empty():48:48 -> iterator
     2:2:java.util.Iterator iterator():37 -> iterator
-com.android.tools.r8.profile.art.HumanReadableArtProfileParser -> com.android.tools.r8.internal.ct:
+com.android.tools.r8.profile.art.HumanReadableArtProfileParser -> com.android.tools.r8.internal.et:
 # {"id":"sourceFile","fileName":"HumanReadableArtProfileParser.java"}
     java.util.function.Consumer diagnosticConsumer -> a
     com.android.tools.r8.profile.art.ArtProfileBuilder profileBuilder -> b
     com.android.tools.r8.profile.art.ArtProfileRulePredicate rulePredicate -> c
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(java.util.function.Consumer,com.android.tools.r8.profile.art.ArtProfileBuilder,com.android.tools.r8.profile.art.ArtProfileRulePredicate,com.android.tools.r8.utils.Reporter):37:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/profile/art/ArtProfileBuilder;Lcom/android/tools/r8/profile/art/ArtProfileRulePredicate;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/profile/art/ArtProfileBuilder;Lcom/android/tools/r8/profile/art/ArtProfileRulePredicate;Lcom/android/tools/r8/internal/d50;)V"}
     1:1:com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder builder():45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ct$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/et$a;"}
     2:8:void parse(com.android.tools.r8.TextInputStream,com.android.tools.r8.origin.Origin):50:56 -> a
     9:11:java.lang.String removeCommentFromLine(java.lang.String):186:188 -> a
     9:11:void parse(com.android.tools.r8.TextInputStream,com.android.tools.r8.origin.Origin):57 -> a
@@ -252319,25 +251793,25 @@
     7:7:boolean parseRule(java.lang.String):95 -> b
     8:8:boolean parseClassOrMethodRule(java.lang.String,com.android.tools.r8.profile.art.ArtProfileMethodRuleInfoImpl):127:127 -> b
     8:8:boolean parseRule(java.lang.String):95 -> b
-com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder -> com.android.tools.r8.internal.ct$a:
+com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder -> com.android.tools.r8.internal.et$a:
 # {"id":"sourceFile","fileName":"HumanReadableArtProfileParser.java"}
     java.util.function.Consumer diagnosticConsumer -> a
     com.android.tools.r8.profile.art.ArtProfileBuilder profileBuilder -> b
     com.android.tools.r8.profile.art.ArtProfileRulePredicate rulePredicate -> c
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     1:5:void <init>():193:197 -> <init>
     1:1:com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder setReporter(com.android.tools.r8.utils.Reporter):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/internal/ct$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/internal/et$a;"}
     2:2:com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder setProfileBuilder(com.android.tools.r8.profile.art.ArtProfileBuilder):218:218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileBuilder;)Lcom/android/tools/r8/internal/ct$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/profile/art/ArtProfileBuilder;)Lcom/android/tools/r8/internal/et$a;"}
     3:6:com.android.tools.r8.profile.art.HumanReadableArtProfileParser build():223:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ct;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/et;"}
     1:1:com.android.tools.r8.profile.art.HumanReadableArtProfileParser$Builder setRulePredicate(com.android.tools.r8.profile.art.ArtProfileRulePredicate):213:213 -> setRulePredicate
     1:1:com.android.tools.r8.profile.art.HumanReadableArtProfileParserBuilder setRulePredicate(com.android.tools.r8.profile.art.ArtProfileRulePredicate):193 -> setRulePredicate
 com.android.tools.r8.profile.art.HumanReadableArtProfileParserBuilder -> com.android.tools.r8.profile.art.HumanReadableArtProfileParserBuilder:
 # {"id":"sourceFile","fileName":"HumanReadableArtProfileParserBuilder.java"}
-com.android.tools.r8.profile.art.NonEmptyArtProfileCollection -> com.android.tools.r8.internal.oR:
+com.android.tools.r8.profile.art.NonEmptyArtProfileCollection -> com.android.tools.r8.internal.sR:
 # {"id":"sourceFile","fileName":"NonEmptyArtProfileCollection.java"}
     java.util.List artProfiles -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -252346,17 +251820,17 @@
     1:2:void <init>(java.util.List):24:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)V"}
     1:1:com.android.tools.r8.profile.art.ArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     2:2:com.android.tools.r8.profile.art.ArtProfileCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/f4;"}
     3:3:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection asNonEmpty():40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sR;"}
     4:4:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/sR;"}
     5:5:com.android.tools.r8.profile.art.ArtProfile lambda$rewrittenWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.art.ArtProfile):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/W3;)Lcom/android/tools/r8/internal/W3;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/W3;)Lcom/android/tools/r8/internal/W3;"}
     6:6:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/naming/r0;)Lcom/android/tools/r8/internal/sR;"}
     7:7:boolean com.android.tools.r8.naming.NamingLens.isIdentityLens():143:143 -> a
     7:7:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65 -> a
     8:9:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65:66 -> a
@@ -252392,16 +251866,16 @@
     42:42:void lambda$withoutPrunedItems$4(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.art.ArtProfile):108:108 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/W3;)V"}
     43:47:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection map(java.util.function.Function):114:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/sR;"}
     1:1:boolean isNonEmpty():35:35 -> b
     2:2:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):55:55 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/sR;"}
     3:3:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/sR;"}
     4:4:com.android.tools.r8.profile.art.ArtProfileCollection withoutMissingItems(com.android.tools.r8.graph.AppView):102:102 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/f4;"}
     5:7:com.android.tools.r8.profile.art.NonEmptyArtProfileCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):107:109 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/oR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/sR;"}
     1:1:boolean isEmpty():30:30 -> isEmpty
     1:1:java.util.Iterator iterator():49:49 -> iterator
 com.android.tools.r8.profile.art.diagnostic.HumanReadableArtProfileParserErrorDiagnostic -> com.android.tools.r8.profile.art.diagnostic.HumanReadableArtProfileParserErrorDiagnostic:
@@ -252419,7 +251893,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W3;)V"}
     1:1:com.android.tools.r8.profile.art.rewriting.ArtProfileAdditions create():36:36 -> a
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions create():18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
     2:2:com.android.tools.r8.profile.art.ArtProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod):46:46 -> a
     2:2:com.android.tools.r8.profile.AbstractProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod):18 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/l1;"}
@@ -252442,21 +251916,21 @@
     2:2:com.android.tools.r8.profile.AbstractProfile$Builder createProfileBuilder():18 -> c
     1:1:java.util.Comparator getRuleComparator():56:56 -> d
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions self():18:18 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
-com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions -> com.android.tools.r8.internal.pf:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
+com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions -> com.android.tools.r8.internal.rf:
 # {"id":"sourceFile","fileName":"ConcreteProfileCollectionAdditions.java"}
     java.util.List additionsCollection -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.Box startupProfileAdditions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     boolean committed -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(java.util.List,com.android.tools.r8.utils.Box):38:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Ljava/util/ArrayList;)V"}
     2:8:void <init>(java.util.List,com.android.tools.r8.utils.Box):34:40 -> <init>
     9:9:void <init>(com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile):44:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;Lcom/android/tools/r8/internal/Cd0;)V"}
     10:23:void <init>(com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile):34:47 -> <init>
     24:24:java.util.Iterator com.android.tools.r8.profile.art.NonEmptyArtProfileCollection.iterator():49:49 -> <init>
     24:24:void <init>(com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile):47 -> <init>
@@ -252465,7 +251939,7 @@
     25:25:void <init>(com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile):47 -> <init>
     26:32:void <init>(com.android.tools.r8.profile.art.ArtProfileCollection,com.android.tools.r8.profile.startup.profile.StartupProfile):47:53 -> <init>
     1:1:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions rewriteMethodReferences(java.util.function.Function):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/cY;"}
     2:5:void accept(java.util.function.Consumer):57:60 -> a
     6:6:void addMethodIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
@@ -252477,11 +251951,11 @@
     9:9:void addMethodIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):69 -> a
     10:12:void addMethodIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):70:72 -> a
     13:13:void lambda$addMethodIfContextIsInProfile$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bY;)V"}
     14:14:com.android.tools.r8.profile.rewriting.ProfileAdditions com.android.tools.r8.profile.rewriting.ProfileAdditions.addMethodRule(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Consumer):187:187 -> a
     14:14:void lambda$addMethodIfContextIsInProfile$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):74 -> a
     15:15:void lambda$addMethodAndHolderIfContextIsInProfile$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     16:16:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     16:16:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     16:16:void lambda$addMethodAndHolderIfContextIsInProfile$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):80 -> a
@@ -252494,13 +251968,13 @@
     20:20:void applyIfContextIsInProfile(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):95:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)V"}
     21:21:void lambda$applyIfContextIsInProfile$3(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.profile.rewriting.ProfileAdditions):95:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/bY;)V"}
     22:22:void applyIfContextIsInProfile(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):106:106 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;)V"}
     23:23:void lambda$applyIfContextIsInProfile$4(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer,com.android.tools.r8.profile.rewriting.ProfileAdditions):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/bY;)V"}
     24:24:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions asConcrete():111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rf;"}
     25:26:void commit(com.android.tools.r8.graph.AppView):116:117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     27:32:com.android.tools.r8.profile.art.ArtProfileCollection createNewArtProfileCollection():127:132 -> a
@@ -252516,10 +251990,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:38:void commit(com.android.tools.r8.graph.AppView):123:123 -> a
     39:39:com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions lambda$rewriteMethodReferences$5(java.util.function.Function,com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions):157:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/zd0;)Lcom/android/tools/r8/internal/zd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/Dd0;)Lcom/android/tools/r8/internal/Dd0;"}
     40:41:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):165:166 -> a
     40:41:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/cY;"}
     42:42:java.util.Iterator com.android.tools.r8.profile.art.NonEmptyArtProfileCollection.iterator():49:49 -> a
     42:42:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -252536,13 +252010,13 @@
     47:48:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):171:172 -> a
     47:48:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):29 -> a
     49:49:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setStartupProfile(com.android.tools.r8.profile.startup.profile.StartupProfile):179:179 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/internal/cY;"}
     50:50:void com.android.tools.r8.profile.rewriting.ProfileAdditions.setProfile(com.android.tools.r8.profile.AbstractProfile):299:299 -> a
     50:50:void lambda$setStartupProfile$6(com.android.tools.r8.profile.startup.profile.StartupProfile,com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;Lcom/android/tools/r8/internal/zd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;Lcom/android/tools/r8/internal/Dd0;)V"}
     1:1:void lambda$addMethodIfContextIsInProfile$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):65:65 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> b
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> b
     2:2:void lambda$addMethodIfContextIsInProfile$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):65 -> b
@@ -252554,7 +252028,7 @@
     5:5:void applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> b
     5:5:void addMethodAndHolderIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):79 -> b
     6:11:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions rewriteMethodReferences(java.util.function.Function):151:156 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/rf;"}
     12:12:com.android.tools.r8.utils.Box com.android.tools.r8.utils.Box.rebuild(com.android.tools.r8.utils.ThrowingFunction):53:53 -> b
     12:12:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions rewriteMethodReferences(java.util.function.Function):157 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -252565,18 +252039,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:boolean hasArtProfileAdditions():141:141 -> e
     1:1:boolean hasStartupProfileAdditions():145:145 -> f
-com.android.tools.r8.profile.rewriting.NopProfileCollectionAdditions -> com.android.tools.r8.internal.ER:
+com.android.tools.r8.profile.rewriting.NopProfileCollectionAdditions -> com.android.tools.r8.internal.IR:
 # {"id":"sourceFile","fileName":"NopProfileCollectionAdditions.java"}
     com.android.tools.r8.profile.rewriting.NopProfileCollectionAdditions INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ER;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IR;"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     1:1:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions rewriteMethodReferences(java.util.function.Function):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/cY;"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/cY;"}
     3:3:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setStartupProfile(com.android.tools.r8.profile.startup.profile.StartupProfile):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/internal/cY;"}
     4:4:void addMethodIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):29:29 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     5:5:void applyIfContextIsInProfile(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):35:35 -> a
@@ -252585,7 +252059,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean verifyIsCommitted():70:70 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.profile.rewriting.ProfileAdditions -> com.android.tools.r8.internal.XX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions -> com.android.tools.r8.internal.bY:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     com.android.tools.r8.profile.AbstractProfile profile -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/i1;"}
@@ -252595,14 +252069,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Set methodRuleRemovals -> d
     com.android.tools.r8.profile.rewriting.ProfileAdditions$NestedMethodRuleAdditionsGraph nestedMethodRuleAdditionsGraph -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZX;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.profile.AbstractProfile):89:89 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/i1;)V"}
     2:10:void <init>(com.android.tools.r8.profile.AbstractProfile):82:90 -> <init>
     com.android.tools.r8.profile.rewriting.ProfileAdditions create() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
     com.android.tools.r8.profile.AbstractProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/l1;"}
     1:2:void applyIfContextIsInProfile(com.android.tools.r8.graph.DexType,java.util.function.Consumer):95:96 -> a
@@ -252610,7 +252084,7 @@
     3:8:void addClassRule(com.android.tools.r8.graph.DexType):177:182 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     9:17:com.android.tools.r8.profile.rewriting.ProfileAdditions addMethodRule(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):193:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/bY;"}
     18:18:com.android.tools.r8.profile.rewriting.ProfileAdditions addMethodRule(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):199:199 -> a
     19:21:void removeMovedMethodRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):205:207 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
@@ -252621,9 +252095,9 @@
     33:35:void lambda$createNewProfile$2(java.util.List,com.android.tools.r8.profile.AbstractProfileMethodRule$Builder):252:254 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/l1;)V"}
     36:39:com.android.tools.r8.profile.rewriting.ProfileAdditions rewriteMethodReferences(java.util.function.Function):272:275 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/bY;"}
     40:43:void lambda$rewriteMethodReferences$3(java.util.function.Function,com.android.tools.r8.profile.rewriting.ProfileAdditions,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.AbstractProfileMethodRule$Builder):277:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/XX;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/l1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/bY;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/l1;)V"}
     44:46:void lambda$rewriteMethodReferences$3(java.util.function.Function,com.android.tools.r8.profile.rewriting.ProfileAdditions,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.AbstractProfileMethodRule$Builder):279:281 -> a
     com.android.tools.r8.profile.AbstractProfileClassRule$Builder createClassRuleBuilder(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/j1;"}
@@ -252640,56 +252114,56 @@
     java.util.Comparator getRuleComparator() -> d
     1:1:boolean hasAdditions():264:264 -> e
     com.android.tools.r8.profile.rewriting.ProfileAdditions self() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
-com.android.tools.r8.profile.rewriting.ProfileAdditions$1 -> com.android.tools.r8.internal.RX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
+com.android.tools.r8.profile.rewriting.ProfileAdditions$1 -> com.android.tools.r8.internal.VX:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     com.android.tools.r8.profile.rewriting.ProfileAdditions this$0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bY;"}
     1:1:void <init>(com.android.tools.r8.profile.rewriting.ProfileAdditions):97:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bY;)V"}
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addClassRule(com.android.tools.r8.graph.DexType):100:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aY;"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addMethodRule(com.android.tools.r8.graph.DexMethod):106:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/aY;"}
     3:3:void removeMovedMethodRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):113:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.profile.rewriting.ProfileAdditions$2 -> com.android.tools.r8.internal.SX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions$2 -> com.android.tools.r8.internal.WX:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     com.android.tools.r8.profile.AbstractProfileMethodRule val$contextMethodRule -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m1;"}
     com.android.tools.r8.profile.rewriting.ProfileAdditions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bY;"}
     1:1:void <init>(com.android.tools.r8.profile.rewriting.ProfileAdditions,com.android.tools.r8.profile.AbstractProfileMethodRule):124:124 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XX;Lcom/android/tools/r8/internal/m1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bY;Lcom/android/tools/r8/internal/m1;)V"}
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addClassRule(com.android.tools.r8.graph.DexType):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aY;"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addMethodRule(com.android.tools.r8.graph.DexMethod):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/aY;"}
     3:3:void lambda$addMethodRule$0(com.android.tools.r8.profile.AbstractProfileMethodRule,com.android.tools.r8.profile.AbstractProfileMethodRule$Builder):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m1;Lcom/android/tools/r8/internal/l1;)V"}
     4:4:void removeMovedMethodRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):141:141 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.profile.rewriting.ProfileAdditions$3 -> com.android.tools.r8.internal.TX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions$3 -> com.android.tools.r8.internal.XX:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     com.android.tools.r8.graph.DexMethod val$context -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.profile.rewriting.ProfileAdditions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bY;"}
     1:1:void <init>(com.android.tools.r8.profile.rewriting.ProfileAdditions,com.android.tools.r8.graph.DexMethod):146:146 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XX;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bY;Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addClassRule(com.android.tools.r8.graph.DexType):150:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aY;"}
     2:5:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addMethodRule(com.android.tools.r8.graph.DexMethod):156:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/aY;"}
     6:6:void lambda$addMethodRule$0(com.android.tools.r8.profile.AbstractProfileMethodRule$Builder,com.android.tools.r8.profile.AbstractProfileMethodRule$Builder):158:158 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l1;Lcom/android/tools/r8/internal/l1;)V"}
     7:7:void removeMovedMethodRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):165:165 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.profile.rewriting.ProfileAdditions$4 -> com.android.tools.r8.internal.UX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions$4 -> com.android.tools.r8.internal.YX:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.profile.rewriting.ProfileAdditions$NestedMethodRuleAdditionsGraph -> com.android.tools.r8.internal.VX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions$NestedMethodRuleAdditionsGraph -> com.android.tools.r8.internal.ZX:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     java.util.Map successors -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -252705,9 +252179,9 @@
     8:9:void propagateMethodRuleInfoFlags(java.util.Map):320 -> a
     10:11:void propagateMethodRuleInfoFlags(java.util.Map):320:321 -> a
     12:16:void lambda$propagateMethodRuleInfoFlags$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.WorkList):323:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/Bm0;)V"}
     17:17:void lambda$propagateMethodRuleInfoFlags$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod):331:331 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/w2;)V"}
     18:21:boolean verifyNoCycles():337:340 -> a
     22:23:java.util.Set verifyNoCyclesStartingFrom(com.android.tools.r8.graph.DexMethod):347:348 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Ljava/util/Set;"}
@@ -252715,29 +252189,29 @@
     24:25:java.util.Set verifyNoCyclesStartingFrom(com.android.tools.r8.graph.DexMethod):349 -> a
     26:45:java.util.Set verifyNoCyclesStartingFrom(com.android.tools.r8.graph.DexMethod):350:369 -> a
     46:49:void lambda$verifyNoCyclesStartingFrom$2(java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod):352:355 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/w2;)V"}
     50:50:void com.android.tools.r8.utils.WorkList.addFirstIgnoringSeenSet(java.lang.Object):133:133 -> a
     50:50:void lambda$verifyNoCyclesStartingFrom$2(java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod):356 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     51:51:void com.android.tools.r8.utils.WorkList.addFirstIgnoringSeenSet(java.lang.Object):133:133 -> a
     51:51:void lambda$verifyNoCyclesStartingFrom$2(java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod):356 -> a
     52:60:void lambda$verifyNoCyclesStartingFrom$2(java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod):357:365 -> a
-com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder -> com.android.tools.r8.internal.WX:
+com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder -> com.android.tools.r8.internal.aY:
 # {"id":"sourceFile","fileName":"ProfileAdditions.java"}
     com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addClassRule(com.android.tools.r8.graph.DexType) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/aY;"}
     com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addMethodRule(com.android.tools.r8.graph.DexMethod) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/aY;"}
     void removeMovedMethodRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/internal/aY;"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addRule(com.android.tools.r8.graph.DexReference):61:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)Lcom/android/tools/r8/internal/WX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)Lcom/android/tools/r8/internal/aY;"}
     3:3:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     3:3:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addRule(com.android.tools.r8.graph.DexReference):61 -> a
     4:7:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder addRule(com.android.tools.r8.graph.DexReference):62:65 -> a
-com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions -> com.android.tools.r8.internal.YX:
+com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions -> com.android.tools.r8.internal.cY:
 # {"id":"sourceFile","fileName":"ProfileCollectionAdditions.java"}
     1:1:void <init>():26:26 -> <init>
     void addMethodIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
@@ -252747,69 +252221,69 @@
     void commit(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions rewriteMethodReferences(java.util.function.Function) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/cY;"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setArtProfileCollection(com.android.tools.r8.profile.art.ArtProfileCollection) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f4;)Lcom/android/tools/r8/internal/cY;"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions setStartupProfile(com.android.tools.r8.profile.startup.profile.StartupProfile) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/internal/cY;"}
     1:1:com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions asConcrete():53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rf;"}
     1:1:boolean isNop():0:0 -> b
     2:2:com.android.tools.r8.profile.art.ArtProfileCollection com.android.tools.r8.graph.AppView.getArtProfileCollection():463:463 -> b
     2:2:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions create(com.android.tools.r8.graph.AppView):29 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/cY;"}
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfile com.android.tools.r8.graph.AppView.getStartupProfile():471:471 -> b
     3:3:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions create(com.android.tools.r8.graph.AppView):30 -> b
     4:7:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions create(com.android.tools.r8.graph.AppView):31:34 -> b
     1:1:com.android.tools.r8.profile.rewriting.NopProfileCollectionAdditions nop():38:38 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ER;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IR;"}
     boolean verifyIsCommitted() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingApiReferenceStubberEventConsumer -> com.android.tools.r8.internal.ZX:
+com.android.tools.r8.profile.rewriting.ProfileRewritingApiReferenceStubberEventConsumer -> com.android.tools.r8.internal.dY:
 # {"id":"sourceFile","fileName":"ProfileRewritingApiReferenceStubberEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions collectionAdditions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.androidapi.ApiReferenceStubberEventConsumer):20:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void acceptMockedLibraryClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass):41:41 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;)V"}
     2:2:void acceptMockedLibraryClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexProgramClass):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/D2;)V"}
     3:3:void lambda$acceptMockedLibraryClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     4:4:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramClassInitializer():348:348 -> a
     4:4:void lambda$acceptMockedLibraryClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):51 -> a
     5:5:void lambda$acceptMockedLibraryClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):51:51 -> a
     6:6:void finished(com.android.tools.r8.graph.AppView):57:57 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean isEmpty():63:63 -> isEmpty
-com.android.tools.r8.profile.rewriting.ProfileRewritingArgumentPropagatorSyntheticEventConsumer -> com.android.tools.r8.internal.aY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingArgumentPropagatorSyntheticEventConsumer -> com.android.tools.r8.internal.eY:
 # {"id":"sourceFile","fileName":"ProfileRewritingArgumentPropagatorSyntheticEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorSyntheticEventConsumer):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void acceptInitializerArgumentClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> a
     2:2:void acceptInitializerArgumentClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):39 -> a
     3:3:void lambda$acceptInitializerArgumentClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     4:4:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     4:4:void lambda$acceptInitializerArgumentClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):40 -> a
     5:5:void finished(com.android.tools.r8.graph.AppView):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingCfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.bY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingCfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.fY:
 # {"id":"sourceFile","fileName":"ProfileRewritingCfClassSynthesizerDesugaringEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     com.android.tools.r8.profile.art.ArtProfileOptions options -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n4;"}
     com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P8;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R8;"}
     1:4:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):28:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/internal/n4;Lcom/android/tools/r8/internal/P8;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/internal/n4;Lcom/android/tools/r8/internal/R8;)V"}
     1:1:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):80:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     2:2:void com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer$D8R8CfClassSynthesizerDesugaringEventConsumer.acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):77:77 -> a
@@ -252819,9 +252293,9 @@
     8:8:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):328:328 -> a
     8:8:void acceptRecordClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):90 -> a
     9:9:void lambda$acceptRecordClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     10:10:void lambda$acceptRecordClassContext$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     11:11:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference() -> a
     11:11:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     11:11:void lambda$acceptRecordClassContext$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):94 -> a
@@ -252863,20 +252337,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer$D8R8CfClassSynthesizerDesugaringEventConsumer.acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):104:104 -> y
     3:3:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):55 -> y
-com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.cY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.gY:
 # {"id":"sourceFile","fileName":"ProfileRewritingCfInstructionDesugaringEventConsumer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G9;"}
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer nestBasedAccessDesugaringEventConsumer -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iQ;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():25:25 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):37:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/internal/E9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/internal/G9;)V"}
     8:8:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingNestBasedAccessDesugaringEventConsumer.attach(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):30:30 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):42 -> <init>
     9:9:boolean com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions.isNop():0:0 -> <init>
@@ -252886,7 +252360,7 @@
     10:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):42 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):42:42 -> <init>
     1:1:void lambda$acceptBackportedClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     2:2:void lambda$acceptBackportedClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):69 -> a
     3:3:void lambda$acceptBackportedClass$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):70:70 -> a
@@ -252896,7 +252370,7 @@
     5:5:void acceptTypeSwitchClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):78 -> a
     6:6:void acceptTypeSwitchClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):84:84 -> a
     7:7:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/graph/C5;)V"}
     8:8:boolean com.android.tools.r8.profile.art.ArtProfileOptions.isIncludingConstantDynamicClass():81:81 -> a
     8:8:void acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -252907,7 +252381,7 @@
     12:18:void acceptConstantDynamicRewrittenBootstrapMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):134:140 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)V"}
     19:19:void lambda$acceptConstantDynamicRewrittenBootstrapMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aY;)V"}
     20:20:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     20:20:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     20:20:void lambda$acceptConstantDynamicRewrittenBootstrapMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):138 -> a
@@ -252916,7 +252390,7 @@
     21:21:void lambda$acceptConstantDynamicRewrittenBootstrapMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):138 -> a
     22:22:void lambda$acceptConstantDynamicRewrittenBootstrapMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):139:139 -> a
     23:23:void lambda$acceptDefaultAsCompanionMethod$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     24:24:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     24:24:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     24:24:void lambda$acceptDefaultAsCompanionMethod$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):154 -> a
@@ -252930,7 +252404,7 @@
     29:29:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):162:162 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     30:30:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):177:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TB;)V"}
     31:31:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.getNewDirectMethod():24:24 -> a
     31:31:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -252938,9 +252412,9 @@
     32:32:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):178 -> a
     33:35:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):177:179 -> a
     36:40:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):197:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     41:42:void lambda$addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile$5(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):209:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/internal/aY;)V"}
     43:43:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     43:43:void lambda$addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile$5(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):210 -> a
     44:44:void lambda$addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile$5(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):211:211 -> a
@@ -252957,7 +252431,7 @@
     49:49:void lambda$addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile$5(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):214 -> a
     50:51:void lambda$addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile$5(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):215:216 -> a
     52:53:void lambda$addLambdaVirtualMethodsIfLambdaImplementationIsInProfile$7(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):240:241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/internal/OI;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/internal/SI;Lcom/android/tools/r8/internal/aY;)V"}
     54:54:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> a
     54:54:void lambda$addLambdaVirtualMethodsIfLambdaImplementationIsInProfile$7(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):241 -> a
     55:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass$Target.getCallTarget():498:498 -> a
@@ -252974,7 +252448,7 @@
     64:65:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):319:320 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     66:66:void lambda$acceptPrivateAsCompanionMethod$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):335:335 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     67:67:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     67:67:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     67:67:void lambda$acceptPrivateAsCompanionMethod$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):335 -> a
@@ -252991,7 +252465,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     74:74:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
     74:74:void lambda$acceptConstantDynamicClass$2(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/internal/aY;)V"}
     75:75:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
     75:75:void lambda$acceptConstantDynamicClass$2(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):123 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -253009,13 +252483,13 @@
     83:85:void acceptVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):448:450 -> a
     86:86:java.util.List finalizeDesugaring():460:460 -> a
     1:1:void lambda$acceptTypeSwitchClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):81:81 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> b
     2:2:void lambda$acceptTypeSwitchClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):81 -> b
     3:3:void lambda$acceptTypeSwitchClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):82:82 -> b
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getFactoryMethod():151:151 -> b
     4:4:void lambda$addLambdaFactoryMethodIfSynthesizingContextIsInProfile$6(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):227 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/internal/aY;)V"}
     5:5:boolean com.android.tools.r8.ir.desugar.LambdaClass.hasFactoryMethod():147:147 -> b
     5:5:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getFactoryMethod():151 -> b
     5:5:void lambda$addLambdaFactoryMethodIfSynthesizingContextIsInProfile$6(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):227 -> b
@@ -253029,11 +252503,11 @@
     9:9:void acceptGenericApiConversionStub(com.android.tools.r8.graph.DexClasspathClass):172:172 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     10:10:void addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):206:206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     11:11:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> b
     11:11:void addLambdaClassAndInstanceInitializersIfSynthesizingContextIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):206 -> b
     12:13:void lambda$addLambdaVirtualMethodsIfLambdaImplementationIsInProfile$8(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):251:252 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/internal/OI;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/internal/SI;Lcom/android/tools/r8/internal/aY;)V"}
     14:14:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> b
     14:14:void lambda$addLambdaVirtualMethodsIfLambdaImplementationIsInProfile$8(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):252 -> b
     15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass$Target.getCallTarget():498:498 -> b
@@ -253050,7 +252524,7 @@
     23:23:void acceptRecordClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):350:350 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
     24:24:void lambda$acceptStaticAsCompanionMethod$10(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):384:384 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     25:25:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> b
     25:25:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> b
     25:25:void lambda$acceptStaticAsCompanionMethod$10(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):384 -> b
@@ -253078,7 +252552,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     8:8:boolean com.android.tools.r8.ir.desugar.LambdaClass.hasFactoryMethod():147:147 -> c
     8:8:void addLambdaFactoryMethodIfSynthesizingContextIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):224 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     9:9:void addLambdaFactoryMethodIfSynthesizingContextIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):225:225 -> c
     10:10:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> c
     10:10:void addLambdaFactoryMethodIfSynthesizingContextIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):225 -> c
@@ -253091,7 +252565,7 @@
     2:2:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.getTarget():114:114 -> d
     2:2:void addLambdaVirtualMethodsIfLambdaImplementationIsInProfile(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):234 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.ir.desugar.LambdaClass$Target.getInvokeType():506:506 -> d
     3:3:boolean shouldConservativelyAddLambdaVirtualMethodsIfLambdaInstantiated(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):264 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -253194,28 +252668,28 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:2:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):106:107 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingCfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingCfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.hY:
 # {"id":"sourceFile","fileName":"ProfileRewritingCfPostProcessingDesugaringEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     com.android.tools.r8.profile.art.ArtProfileOptions options -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n4;"}
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pa;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ra;"}
     1:4:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer):37:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/internal/n4;Lcom/android/tools/r8/internal/pa;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/internal/n4;Lcom/android/tools/r8/internal/ra;)V"}
     1:2:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):59:60 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass):78:78 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     4:4:void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/in;)V"}
     5:5:boolean com.android.tools.r8.profile.art.ArtProfileOptions.isIncludingDesugaredLibraryRetargeterForwardingMethodsUnconditionally():88:88 -> a
     5:5:void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:10:void acceptDesugaredLibraryRetargeterForwardingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):85:89 -> a
     11:11:void lambda$acceptDesugaredLibraryRetargeterForwardingMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bY;)V"}
     12:12:com.android.tools.r8.profile.rewriting.ProfileAdditions com.android.tools.r8.profile.rewriting.ProfileAdditions.addMethodRule(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Consumer):187:187 -> a
     12:12:void lambda$acceptDesugaredLibraryRetargeterForwardingMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):87 -> a
     13:13:void acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass):95:95 -> a
@@ -253233,10 +252707,10 @@
     22:32:void acceptThrowingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):125:135 -> a
     33:38:void acceptThrowingMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):134:139 -> a
     39:40:void lambda$acceptThrowingMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):128:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/j1;)V"}
     41:44:void lambda$acceptThrowingMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):128:131 -> a
     45:45:void lambda$acceptThrowingMethod$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):130:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     46:46:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     46:46:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     46:46:void lambda$acceptThrowingMethod$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):130 -> a
@@ -253245,11 +252719,11 @@
     47:47:void lambda$acceptThrowingMethod$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):130 -> a
     48:48:void finalizeDesugaring():154:154 -> a
     49:49:void warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/BA;)V"}
     1:1:void acceptGenericApiConversionStub(com.android.tools.r8.graph.DexClasspathClass):105:105 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
     2:2:void lambda$acceptThrowingMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):136:136 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     3:3:java.util.Set getNewlyLiveMethods():149:149 -> b
     1:1:void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass):144:144 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
@@ -253259,32 +252733,32 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     1:2:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):65:66 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.eY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer -> com.android.tools.r8.internal.iY:
 # {"id":"sourceFile","fileName":"ProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformerEventConsumer):18:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void acceptCovariantReturnTypeBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingMemberRebindingEventConsumer -> com.android.tools.r8.internal.fY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingMemberRebindingEventConsumer -> com.android.tools.r8.internal.jY:
 # {"id":"sourceFile","fileName":"ProfileRewritingMemberRebindingEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.optimize.MemberRebindingEventConsumer):20:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void acceptMemberRebindingBridgeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):38:38 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     2:2:void finished(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.MemberRebindingLens):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/nN;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingMethodProcessorEventConsumer -> com.android.tools.r8.internal.gY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rN;)V"}
+com.android.tools.r8.profile.rewriting.ProfileRewritingMethodProcessorEventConsumer -> com.android.tools.r8.internal.kY:
 # {"id":"sourceFile","fileName":"ProfileRewritingMethodProcessorEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.conversion.MethodProcessorEventConsumer):18:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void lambda$acceptEnumUnboxerCheckNotZeroContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     2:2:void lambda$acceptEnumUnboxerCheckNotZeroContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):52 -> a
@@ -253305,7 +252779,7 @@
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> b
     2:2:void acceptEnumUnboxerCheckNotZeroContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):51 -> b
     3:3:void lambda$acceptEnumUnboxerLocalUtilityClassMethodContext$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> b
     4:4:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> b
     4:4:void lambda$acceptEnumUnboxerLocalUtilityClassMethodContext$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):60 -> b
@@ -253316,7 +252790,7 @@
     7:7:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> b
     7:7:void lambda$acceptEnumUnboxerLocalUtilityClassMethodContext$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):60 -> b
     1:1:void lambda$acceptEnumUnboxerSharedUtilityClassMethodContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):70:70 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> c
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> c
     2:2:void lambda$acceptEnumUnboxerSharedUtilityClassMethodContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):70 -> c
@@ -253334,7 +252808,7 @@
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> d
     2:2:void acceptEnumUnboxerSharedUtilityClassMethodContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):67 -> d
     3:3:void lambda$acceptInstanceInitializerOutline$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):79:79 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> d
     4:4:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> d
     4:4:void lambda$acceptInstanceInitializerOutline$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):79 -> d
@@ -253347,7 +252821,7 @@
     1:1:void acceptAssertionErrorCreateMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):45:45 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void lambda$acceptUtilityThrowClassCastExceptionIfNotNullMethod$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):100:100 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> e
     3:3:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> e
     3:3:void lambda$acceptUtilityThrowClassCastExceptionIfNotNullMethod$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):100 -> e
@@ -253362,7 +252836,7 @@
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> f
     2:2:void acceptEnumUnboxerLocalUtilityClassMethodContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):59 -> f
     3:3:void lambda$acceptUtilityThrowIllegalAccessErrorMethod$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):108:108 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     4:4:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> f
     4:4:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> f
     4:4:void lambda$acceptUtilityThrowIllegalAccessErrorMethod$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):108 -> f
@@ -253373,7 +252847,7 @@
     7:7:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> f
     7:7:void lambda$acceptUtilityThrowIllegalAccessErrorMethod$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):108 -> f
     1:1:void lambda$acceptUtilityThrowIncompatibleClassChangeErrorMethod$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):116:116 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> g
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> g
     2:2:void lambda$acceptUtilityThrowIncompatibleClassChangeErrorMethod$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):116 -> g
@@ -253384,7 +252858,7 @@
     5:5:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> g
     5:5:void lambda$acceptUtilityThrowIncompatibleClassChangeErrorMethod$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):116 -> g
     1:1:void lambda$acceptUtilityThrowNoSuchMethodErrorMethod$8(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):124:124 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> h
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> h
     2:2:void lambda$acceptUtilityThrowNoSuchMethodErrorMethod$8(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):124 -> h
@@ -253395,7 +252869,7 @@
     5:5:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> h
     5:5:void lambda$acceptUtilityThrowNoSuchMethodErrorMethod$8(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):124 -> h
     1:1:void lambda$acceptUtilityThrowRuntimeExceptionWithMessageMethod$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):132:132 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> i
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> i
     2:2:void lambda$acceptUtilityThrowRuntimeExceptionWithMessageMethod$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):132 -> i
@@ -253406,7 +252880,7 @@
     5:5:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> i
     5:5:void lambda$acceptUtilityThrowRuntimeExceptionWithMessageMethod$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):132 -> i
     1:1:void lambda$acceptUtilityToStringIfNotNullMethod$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):92:92 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> j
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> j
     2:2:void lambda$acceptUtilityToStringIfNotNullMethod$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):92 -> j
@@ -253440,14 +252914,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> r
     2:2:void acceptUtilityThrowIllegalAccessErrorMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):107 -> r
-com.android.tools.r8.profile.rewriting.ProfileRewritingNestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.hY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingNestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.lY:
 # {"id":"sourceFile","fileName":"ProfileRewritingNestBasedAccessDesugaringEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer parent -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iQ;"}
     1:3:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):22:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/internal/eQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/internal/iQ;)V"}
     1:1:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):43:43 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/H0;)V"}
     2:2:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
@@ -253458,7 +252932,7 @@
     6:6:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):44 -> a
     7:13:void acceptNestConstructorBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClassAndMethod):48:54 -> a
     14:14:void lambda$acceptNestConstructorBridge$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     15:15:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     15:15:void lambda$acceptNestConstructorBridge$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):46 -> a
     16:16:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
@@ -253468,7 +252942,7 @@
     17:17:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     17:17:void lambda$acceptNestConstructorBridge$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):46 -> a
     18:18:void lambda$acceptNestConstructorBridge$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):51:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/XX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/bY;)V"}
     19:20:com.android.tools.r8.profile.rewriting.ProfileAdditions com.android.tools.r8.profile.rewriting.ProfileAdditions.addClassRule(com.android.tools.r8.graph.DexClass):172:173 -> a
     19:20:void lambda$acceptNestConstructorBridge$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):51 -> a
     21:21:void lambda$acceptNestConstructorBridge$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions):51:51 -> a
@@ -253480,18 +252954,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
     1:2:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):60:61 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/H0;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingOutlineOptimizationEventConsumer -> com.android.tools.r8.internal.iY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingOutlineOptimizationEventConsumer -> com.android.tools.r8.internal.mY:
 # {"id":"sourceFile","fileName":"ProfileRewritingOutlineOptimizationEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.ir.optimize.outliner.OutlineOptimizationEventConsumer):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:2:void acceptOutlineMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection):38:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> a
     3:3:void acceptOutlineMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection):39 -> a
     4:4:void lambda$acceptOutlineMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     5:5:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     5:5:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     5:5:void lambda$acceptOutlineMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):41 -> a
@@ -253503,14 +252977,14 @@
     8:8:void lambda$acceptOutlineMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):41 -> a
     9:9:void finished(com.android.tools.r8.graph.AppView):48:48 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.profile.rewriting.ProfileRewritingRootSetBuilderEventConsumer -> com.android.tools.r8.internal.jY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingRootSetBuilderEventConsumer -> com.android.tools.r8.internal.nY:
 # {"id":"sourceFile","fileName":"ProfileRewritingRootSetBuilderEventConsumer.java"}
     com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions additionsCollection -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rf;"}
     1:2:void <init>(com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.shaking.RootSetBuilderEventConsumer):16:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rf;)V"}
     1:1:void lambda$acceptPrivateAsCompanionMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> a
     2:2:void lambda$acceptPrivateAsCompanionMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):48 -> a
@@ -253523,7 +252997,7 @@
     6:6:void com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.removeMovedMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):74:74 -> a
     6:6:void lambda$acceptPrivateAsCompanionMethod$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):50 -> a
     1:1:void lambda$acceptStaticAsCompanionMethod$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):60:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> b
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57 -> b
     2:2:void lambda$acceptStaticAsCompanionMethod$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):60 -> b
@@ -253547,29 +253021,29 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> t
     2:2:void acceptPrivateAsCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):44 -> t
-com.android.tools.r8.profile.rewriting.ProfileRewritingVarHandleDesugaringEventConsumerUtils -> com.android.tools.r8.internal.kY:
+com.android.tools.r8.profile.rewriting.ProfileRewritingVarHandleDesugaringEventConsumerUtils -> com.android.tools.r8.internal.oY:
 # {"id":"sourceFile","fileName":"ProfileRewritingVarHandleDesugaringEventConsumerUtils.java"}
     1:1:void lambda$handleVarHandleDesugaringClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/aY;)V"}
     2:2:com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder.addRule(com.android.tools.r8.graph.ProgramDefinition):57:57 -> a
     2:2:void lambda$handleVarHandleDesugaringClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):22 -> a
     3:3:void lambda$handleVarHandleDesugaringClassContext$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):23:23 -> a
     4:4:boolean com.android.tools.r8.profile.art.ArtProfileOptions.isIncludingVarHandleClasses():101:101 -> a
     4:4:void handleVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions):18 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/pf;Lcom/android/tools/r8/internal/n4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/rf;Lcom/android/tools/r8/internal/n4;)V"}
     5:5:void handleVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions):19:19 -> a
     6:10:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):85:89 -> a
     6:10:void handleVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions):19 -> a
     11:11:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):100:100 -> a
     11:11:void com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions.applyIfContextIsInProfile(com.android.tools.r8.graph.ProgramDefinition,java.util.function.Consumer):89 -> a
     11:11:void handleVarHandleDesugaringClassContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.profile.rewriting.ConcreteProfileCollectionAdditions,com.android.tools.r8.profile.art.ArtProfileOptions):19 -> a
-com.android.tools.r8.profile.startup.StartupCompleteness -> com.android.tools.r8.internal.ud0:
+com.android.tools.r8.profile.startup.StartupCompleteness -> com.android.tools.r8.internal.yd0:
 # {"id":"sourceFile","fileName":"StartupCompleteness.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     3:3:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():938:938 -> <init>
@@ -253600,8 +253074,8 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     20:21:java.util.Set computeStartupItems():76:77 -> a
     22:22:void lambda$computeStartupItems$2(java.util.Set,com.android.tools.r8.profile.startup.profile.StartupProfileRule):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Gd0;)V"}
-com.android.tools.r8.profile.startup.StartupOptions -> com.android.tools.r8.internal.xd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Kd0;)V"}
+com.android.tools.r8.profile.startup.StartupOptions -> com.android.tools.r8.internal.Bd0:
 # {"id":"sourceFile","fileName":"StartupOptions.java"}
     boolean enableMinimalStartupDex -> a
     boolean enableStartupBoundaryOptimizations -> b
@@ -253641,21 +253115,21 @@
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     6:6:java.util.List lambda$new$0(java.lang.String):65 -> a
     7:7:com.android.tools.r8.profile.startup.StartupOptions setEnableMinimalStartupDex(boolean):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Bd0;"}
     8:8:java.lang.String getMultiStartupDexDistributionStrategyName():119:119 -> a
     1:1:com.android.tools.r8.profile.startup.StartupOptions setEnableStartupBoundaryOptimizations(boolean):86:86 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Bd0;"}
     2:2:com.android.tools.r8.profile.startup.StartupOptions setEnableStartupCompletenessCheckForTesting():103:103 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bd0;"}
     1:1:com.android.tools.r8.profile.startup.StartupOptions setEnableStartupCompletenessCheckForTesting(boolean):108:108 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/xd0;"}
-com.android.tools.r8.profile.startup.StartupProfileProviderUtils -> com.android.tools.r8.internal.Fd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Bd0;"}
+com.android.tools.r8.profile.startup.StartupProfileProviderUtils -> com.android.tools.r8.internal.Jd0:
 # {"id":"sourceFile","fileName":"StartupProfileProviderUtils.java"}
     1:1:com.android.tools.r8.startup.StartupProfileProvider createFromHumanReadableArtProfile(java.nio.file.Path):27:27 -> a
     2:2:com.android.tools.r8.startup.StartupProfileProvider createFromHumanReadableArtProfile(java.nio.file.Path,java.util.function.Consumer):32:32 -> a
     2:2:com.android.tools.r8.startup.StartupProfileProvider createFromHumanReadableArtProfile(java.nio.file.Path):27 -> a
     3:5:java.lang.String serializeToString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.startup.StartupProfileProvider):56:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/startup/StartupProfileProvider;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/startup/StartupProfileProvider;)Ljava/lang/String;"}
     6:6:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.setReporter(com.android.tools.r8.utils.Reporter):257:257 -> a
     6:6:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.setIgnoreWarnings():253 -> a
     6:6:java.lang.String serializeToString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.startup.StartupProfileProvider):60 -> a
@@ -253663,22 +253137,22 @@
     7:12:java.lang.String serializeToString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.startup.StartupProfileProvider):62:67 -> a
     13:14:void writeRule(com.android.tools.r8.profile.startup.profile.StartupProfileRule,java.lang.Appendable):71:72 -> a
     13:14:void lambda$serializeToString$0(java.lang.StringBuilder,com.android.tools.r8.profile.startup.profile.StartupProfileRule):66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/Gd0;)V"}
-com.android.tools.r8.profile.startup.StartupProfileProviderUtils$1 -> com.android.tools.r8.internal.Ed0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/Kd0;)V"}
+com.android.tools.r8.profile.startup.StartupProfileProviderUtils$1 -> com.android.tools.r8.internal.Id0:
 # {"id":"sourceFile","fileName":"StartupProfileProviderUtils.java"}
     java.nio.file.Path val$path -> a
     java.util.function.Consumer val$parserBuilderConsumer -> b
     1:1:void <init>(java.nio.file.Path,java.util.function.Consumer):32:32 -> <init>
     1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
     1:4:void getStartupProfile(com.android.tools.r8.startup.StartupProfileBuilder):37:40 -> getStartupProfile
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor -> com.android.tools.r8.internal.zP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor -> com.android.tools.r8.internal.DP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     com.android.tools.r8.profile.startup.profile.StartupProfile startupProfile -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cd0;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
     1:2:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     void distribute(java.util.List,com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/dex/q0;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/dex/r0;)V"}
     1:2:void distributeInOrder(java.util.List,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):40:41 -> a
@@ -253712,7 +253186,7 @@
     17:17:void com.android.tools.r8.dex.VirtualFile.commitTransaction():294:294 -> a
     17:17:void distributeInOrder(java.util.List,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):49 -> a
     18:18:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/yd0;)Lcom/android/tools/r8/internal/zP;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Cd0;)Lcom/android/tools/r8/internal/DP;"}
     19:19:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor getDefault(com.android.tools.r8.profile.startup.profile.StartupProfile):69:69 -> a
     19:19:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):76 -> a
     20:49:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):78:107 -> a
@@ -253722,22 +253196,22 @@
     52:52:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):80 -> a
     53:53:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):105:105 -> a
     54:54:com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor get(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.profile.startup.profile.StartupProfile):82:82 -> a
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$1 -> com.android.tools.r8.internal.uP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$1 -> com.android.tools.r8.internal.yP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):82:82 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     1:1:int getMetric(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)I"}
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$2 -> com.android.tools.r8.internal.vP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$2 -> com.android.tools.r8.internal.zP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):90:90 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     1:1:int getMetric(com.android.tools.r8.graph.DexEncodedMethod):99:99 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)I"}
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$ClassByLowestMetricMultiStartupDexDistributor -> com.android.tools.r8.internal.wP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$ClassByLowestMetricMultiStartupDexDistributor -> com.android.tools.r8.internal.AP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):116:116 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     int getMetric(com.android.tools.r8.graph.DexEncodedMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)I"}
     1:1:void distribute(java.util.List,com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):125:125 -> a
@@ -253755,26 +253229,26 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)I"}
     17:17:boolean forceSpillClassesWithNoStartupMethods():0:0 -> a
     17:17:int getMetric(com.android.tools.r8.graph.DexProgramClass):141 -> a
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$ClassByNameMultiStartupDexDistributor -> com.android.tools.r8.internal.xP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$ClassByNameMultiStartupDexDistributor -> com.android.tools.r8.internal.BP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):157:157 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     1:1:void distribute(java.util.List,com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):167:167 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/dex/q0;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/dex/r0;)V"}
-com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$PackageByNameMultiStartupDexDistributor -> com.android.tools.r8.internal.yP:
+com.android.tools.r8.profile.startup.distribution.MultiStartupDexDistributor$PackageByNameMultiStartupDexDistributor -> com.android.tools.r8.internal.CP:
 # {"id":"sourceFile","fileName":"MultiStartupDexDistributor.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):174:174 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     1:2:void distribute(java.util.List,com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):183:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/dex/q0;Lcom/android/tools/r8/dex/t0;Lcom/android/tools/r8/dex/r0;)V"}
-com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions -> com.android.tools.r8.internal.Pw:
 # {"id":"sourceFile","fileName":"InstrumentationOptions.java"}
     java.util.Set callSitesToInstrument -> a
     boolean enableExecutedClassesAndMethodsInstrumentation -> b
     java.lang.String syntheticServerContext -> c
     java.lang.String tag -> d
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):59:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:11:void <init>(com.android.tools.r8.utils.InternalOptions):23:32 -> <init>
     12:12:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):68:68 -> <init>
     12:12:void <init>(com.android.tools.r8.utils.InternalOptions):33 -> <init>
@@ -253817,23 +253291,23 @@
     63:63:void setCallSitesToInstrument(java.util.Set):90:90 -> <init>
     63:63:void <init>(com.android.tools.r8.utils.InternalOptions):63 -> <init>
     1:1:com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions setEnableExecutedClassesAndMethodsInstrumentation():98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pw;"}
     2:2:com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions setTag(java.lang.String):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Nw;"}
-com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentation -> com.android.tools.r8.internal.vd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Pw;"}
+com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentation -> com.android.tools.r8.internal.zd0:
 # {"id":"sourceFile","fileName":"StartupInstrumentation.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/It;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentationReferences references -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ad0;"}
     com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions instrumentationOptions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pw;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():54:54 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView):63:69 -> <init>
@@ -253871,16 +253345,16 @@
     104:104:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
     105:105:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):173:173 -> a
     105:105:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
-    106:106:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    106:106:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     106:106:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     106:106:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
-    107:107:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    107:107:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     107:107:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):175 -> a
     107:107:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
     108:108:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):175:175 -> a
     108:108:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
-    109:109:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     109:109:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):176 -> a
     109:109:void instrumentClass(com.android.tools.r8.graph.DexProgramClass):154 -> a
     110:110:boolean ensureClassInitializer(com.android.tools.r8.graph.DexProgramClass):176:176 -> a
@@ -253990,7 +253464,7 @@
     1:1:void lambda$instrumentClass$0(boolean,com.android.tools.r8.graph.ProgramMethod):159:159 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/C5;)V"}
     2:2:void lambda$instrumentClass$0(boolean,com.android.tools.r8.graph.ProgramMethod):158:158 -> b
-com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentationReferences -> com.android.tools.r8.internal.wd0:
+com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentationReferences -> com.android.tools.r8.internal.Ad0:
 # {"id":"sourceFile","fileName":"StartupInstrumentationReferences.java"}
     com.android.tools.r8.graph.DexType instrumentationServerType -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
@@ -254004,33 +253478,33 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     10:18:void <init>(com.android.tools.r8.graph.DexItemFactory):24:32 -> <init>
     19:19:void <init>(com.android.tools.r8.graph.DexItemFactory):30:30 -> <init>
-com.android.tools.r8.profile.startup.optimization.StartupBoundaryOptimizationUtils -> R8$$REMOVED$$CLASS$$218:
+com.android.tools.r8.profile.startup.optimization.StartupBoundaryOptimizationUtils -> R8$$REMOVED$$CLASS$$206:
 # {"id":"sourceFile","fileName":"StartupBoundaryOptimizationUtils.java"}
-com.android.tools.r8.profile.startup.profile.EmptyStartupProfile -> com.android.tools.r8.internal.dn:
+com.android.tools.r8.profile.startup.profile.EmptyStartupProfile -> com.android.tools.r8.internal.fn:
 # {"id":"sourceFile","fileName":"EmptyStartupProfile.java"}
     1:1:void <init>():18:18 -> <init>
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     2:2:com.android.tools.r8.profile.startup.profile.StartupProfile withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.utils.Timing):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     3:3:boolean containsClassRule(com.android.tools.r8.graph.DexType):22:22 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     4:4:boolean containsMethodRule(com.android.tools.r8.graph.DexMethod):27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
     5:5:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     6:6:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     1:1:com.android.tools.r8.profile.AbstractProfileMethodRule getMethodRule(com.android.tools.r8.graph.DexMethod):16:16 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/m1;"}
     2:2:com.android.tools.r8.profile.startup.profile.StartupProfile toStartupProfileForWriting(com.android.tools.r8.graph.AppView):16:16 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
     3:3:boolean isEmpty():55:55 -> b
     4:4:boolean isStartupClass(com.android.tools.r8.graph.DexType):60:60 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile withoutMissingItems(com.android.tools.r8.graph.AppView):75:75 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
-com.android.tools.r8.profile.startup.profile.NonEmptyStartupProfile -> com.android.tools.r8.internal.xR:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
+com.android.tools.r8.profile.startup.profile.NonEmptyStartupProfile -> com.android.tools.r8.internal.BR:
 # {"id":"sourceFile","fileName":"NonEmptyStartupProfile.java"}
     java.util.Set startupClasses -> a
     java.util.Map startupRules -> b
@@ -254043,7 +253517,7 @@
     8:8:void <init>(java.util.LinkedHashMap):36:36 -> <init>
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.builder():27:27 -> a
     1:1:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Bd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Fd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.getReference():51:51 -> a
     2:2:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):95 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -254063,7 +253537,7 @@
     9:9:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):93 -> a
     10:10:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule.builder():27:27 -> a
     10:10:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/Dd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/Hd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     11:11:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):100:100 -> a
     12:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     12:13:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):100 -> a
@@ -254085,12 +253559,12 @@
     20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.getReference():51:51 -> a
     20:20:void lambda$addStartupItem$5(com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fd0;)V"}
     21:21:void lambda$addStartupItem$5(com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):129:129 -> a
     22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.getReference():51:51 -> a
     22:22:void lambda$withoutMissingItems$7(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/Bd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/Fd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     23:23:void lambda$withoutMissingItems$7(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):164:164 -> a
     24:24:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule):243:243 -> a
     24:24:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addClassRule(com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):194 -> a
@@ -254102,7 +253576,7 @@
     26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.getReference():51:51 -> a
     26:26:void lambda$withoutPrunedItems$9(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/Bd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/Fd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     27:27:boolean com.android.tools.r8.graph.PrunedItems.isRemoved(com.android.tools.r8.graph.DexType):93:93 -> a
     27:27:void lambda$withoutPrunedItems$9(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -254116,22 +253590,22 @@
     30:30:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addClassRule(com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):194 -> a
     30:30:void lambda$withoutPrunedItems$9(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):186 -> a
     31:31:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer):52:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     32:33:void forEachRule(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):60:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     34:34:com.android.tools.r8.profile.startup.profile.StartupProfile lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Cd0;"}
     35:35:com.android.tools.r8.profile.startup.profile.StartupProfile rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     36:36:void lambda$toStartupProfileForWriting$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):122:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Fd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     37:37:void lambda$toStartupProfileForWriting$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):123:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Hd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     38:40:void addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):128:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gd0;Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kd0;Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/graph/y;)V"}
     41:41:void addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):128:128 -> a
     42:42:void addClassAndParentClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)V"}
     43:43:int com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.size():262:262 -> a
     43:43:boolean addClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -254168,9 +253642,9 @@
     51:51:void addClassAndParentClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):150:150 -> a
     51:51:void addClassAndParentClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):143 -> a
     52:52:void addParentClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/graph/y;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/graph/y;)V"}
     53:53:void lambda$withoutMissingItems$8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):171:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/Dd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h;Lcom/android/tools/r8/internal/Hd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     54:56:void lambda$withoutMissingItems$8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):170:172 -> a
     57:57:boolean com.android.tools.r8.graph.DexMember.isDefinedOnClass(com.android.tools.r8.graph.DexClass):33:33 -> a
     57:57:void lambda$withoutMissingItems$8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):172 -> a
@@ -254187,9 +253661,9 @@
     60:60:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addMethodRule(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):199 -> a
     60:60:void lambda$withoutMissingItems$8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):173 -> a
     61:74:com.android.tools.r8.profile.startup.profile.StartupProfile withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.utils.Timing):181:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     75:75:void lambda$withoutPrunedItems$10(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/Dd0;Lcom/android/tools/r8/internal/yd0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/Hd0;Lcom/android/tools/r8/internal/Cd0$a;)V"}
     76:76:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule):243:243 -> a
     76:76:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addMethodRule(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):199 -> a
     76:76:void lambda$withoutPrunedItems$10(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):191 -> a
@@ -254198,14 +253672,14 @@
     77:77:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile$Builder.addMethodRule(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):199 -> a
     77:77:void lambda$withoutPrunedItems$10(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder):191 -> a
     78:78:com.android.tools.r8.profile.startup.profile.StartupProfile transform(java.util.function.BiConsumer,java.util.function.BiConsumer):201:201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/internal/Cd0;"}
     79:79:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder com.android.tools.r8.profile.startup.profile.StartupProfile.builderWithCapacity(int):48:48 -> a
     79:79:com.android.tools.r8.profile.startup.profile.StartupProfile transform(java.util.function.BiConsumer,java.util.function.BiConsumer):201 -> a
     80:83:com.android.tools.r8.profile.startup.profile.StartupProfile transform(java.util.function.BiConsumer,java.util.function.BiConsumer):202:205 -> a
     84:84:void lambda$transform$11(java.util.function.BiConsumer,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.profile.startup.profile.StartupProfileClassRule):203:203 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/internal/Bd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/internal/Fd0;)V"}
     85:85:void lambda$transform$12(java.util.function.BiConsumer,com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):204:204 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/internal/Dd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/internal/Hd0;)V"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule getMethodRule(com.android.tools.r8.graph.DexMethod):72:72 -> b
     1:1:com.android.tools.r8.profile.AbstractProfileMethodRule getMethodRule(com.android.tools.r8.graph.DexMethod):26 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/m1;"}
@@ -254213,44 +253687,44 @@
     3:3:boolean isStartupClass(com.android.tools.r8.graph.DexType):82:82 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     4:4:com.android.tools.r8.profile.startup.profile.StartupProfile rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):91:91 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Cd0;"}
     5:5:com.android.tools.r8.profile.startup.profile.StartupProfile toStartupProfileForWriting(com.android.tools.r8.graph.AppView):121:121 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
     6:6:void lambda$addParentClasses$6(com.android.tools.r8.profile.startup.profile.StartupProfile$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156:156 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0$a;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)V"}
     1:2:com.android.tools.r8.profile.startup.profile.StartupProfile withoutMissingItems(com.android.tools.r8.graph.AppView):161:162 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
-com.android.tools.r8.profile.startup.profile.StartupProfile -> com.android.tools.r8.internal.yd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
+com.android.tools.r8.profile.startup.profile.StartupProfile -> com.android.tools.r8.internal.Cd0:
 # {"id":"sourceFile","fileName":"StartupProfile.java"}
     1:1:void <init>():41:41 -> <init>
     void forEachRule(com.android.tools.r8.utils.ThrowingConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     com.android.tools.r8.profile.startup.profile.StartupProfile rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Cd0;"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder builder():44:44 -> a
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile merge(java.util.Collection):86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;)Lcom/android/tools/r8/internal/Cd0;"}
     2:5:com.android.tools.r8.profile.startup.profile.StartupProfile merge(java.util.Collection):87:90 -> a
     6:6:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder,com.android.tools.r8.startup.StartupProfileProvider):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;Lcom/android/tools/r8/startup/StartupProfileProvider;)Lcom/android/tools/r8/internal/yd0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;Lcom/android/tools/r8/startup/StartupProfileProvider;)Lcom/android/tools/r8/internal/Cd0$a;"}
     7:7:com.android.tools.r8.profile.startup.profile.StartupProfile createInitialStartupProfileForD8(com.android.tools.r8.graph.AppView):69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
     8:8:com.android.tools.r8.profile.startup.profile.StartupProfile createInitialStartupProfileForD8(com.android.tools.r8.graph.AppView):68:68 -> a
     9:9:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder lambda$createInitialStartupProfileForD8$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):70:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;"}
     10:10:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder.setOrigin(com.android.tools.r8.origin.Origin):112:112 -> a
     10:10:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder lambda$createInitialStartupProfileForD8$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):70 -> a
     11:11:com.android.tools.r8.profile.startup.profile.StartupProfile createInitialStartupProfileForR8(com.android.tools.r8.graph.DexApplication):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/internal/Cd0;"}
     12:12:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder lambda$createInitialStartupProfileForR8$1(com.android.tools.r8.origin.Origin):78:78 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;)Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;"}
     13:13:com.android.tools.r8.profile.startup.profile.StartupProfile empty():82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cd0;"}
     14:14:com.android.tools.r8.profile.startup.profile.StartupProfile parseStartupProfile(com.android.tools.r8.utils.InternalOptions,java.util.function.Function):112:112 -> a
     14:14:com.android.tools.r8.profile.startup.profile.StartupProfile createInitialStartupProfile(com.android.tools.r8.utils.InternalOptions,java.util.function.Function):63 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Cd0;"}
     15:15:boolean com.android.tools.r8.profile.startup.StartupOptions.hasStartupProfileProviders():123:123 -> a
     15:15:com.android.tools.r8.profile.startup.profile.StartupProfile parseStartupProfile(com.android.tools.r8.utils.InternalOptions,java.util.function.Function):112 -> a
     15:15:com.android.tools.r8.profile.startup.profile.StartupProfile createInitialStartupProfile(com.android.tools.r8.utils.InternalOptions,java.util.function.Function):63 -> a
@@ -254280,23 +253754,23 @@
     boolean isStartupClass(com.android.tools.r8.graph.DexType) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     com.android.tools.r8.profile.startup.profile.StartupProfile toStartupProfileForWriting(com.android.tools.r8.graph.AppView) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
     com.android.tools.r8.profile.startup.profile.StartupProfile withoutMissingItems(com.android.tools.r8.graph.AppView) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yd0;"}
-com.android.tools.r8.profile.startup.profile.StartupProfile$Builder -> com.android.tools.r8.internal.yd0$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Cd0;"}
+com.android.tools.r8.profile.startup.profile.StartupProfile$Builder -> com.android.tools.r8.internal.Cd0$a:
 # {"id":"sourceFile","fileName":"StartupProfile.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder missingItemsDiagnosticBuilder -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;"}
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.startup.StartupProfileProvider startupProfileProvider -> d
     java.util.LinkedHashMap startupItems -> e
     1:6:void <init>():160:165 -> <init>
     7:12:void <init>(int):168:173 -> <init>
     13:18:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder,com.android.tools.r8.startup.StartupProfileProvider):179:184 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;Lcom/android/tools/r8/startup/StartupProfileProvider;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;Lcom/android/tools/r8/startup/StartupProfileProvider;)V"}
     1:1:com.android.tools.r8.profile.AbstractProfile$Builder addClassRule(com.android.tools.r8.profile.AbstractProfileClassRule):148:148 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k1;)Lcom/android/tools/r8/internal/h1;"}
     2:2:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule):243:243 -> a
@@ -254315,11 +253789,11 @@
     6:6:com.android.tools.r8.profile.AbstractProfile$Builder addRule(com.android.tools.r8.profile.AbstractProfileRule):148 -> a
     7:7:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule):243:243 -> a
     7:7:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder addMethodRule(com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule):199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dd0;)Lcom/android/tools/r8/internal/yd0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hd0;)Lcom/android/tools/r8/internal/Cd0$a;"}
     8:8:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder addStartupItem(com.android.tools.r8.profile.startup.profile.StartupProfileRule):243:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gd0;)Lcom/android/tools/r8/internal/yd0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kd0;)Lcom/android/tools/r8/internal/Cd0$a;"}
     9:12:com.android.tools.r8.profile.startup.profile.StartupProfile build():267:270 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cd0;"}
     1:4:com.android.tools.r8.startup.StartupProfileBuilder addHumanReadableArtProfile(com.android.tools.r8.TextInputStream,java.util.function.Consumer):231:234 -> addHumanReadableArtProfile
     5:10:com.android.tools.r8.startup.StartupProfileBuilder addHumanReadableArtProfile(com.android.tools.r8.TextInputStream,java.util.function.Consumer):233:238 -> addHumanReadableArtProfile
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfile$Builder addStartupClass(java.util.function.Consumer):204:204 -> addStartupClass
@@ -254408,14 +253882,14 @@
     16:16:com.android.tools.r8.startup.StartupProfileBuilder addStartupMethod(java.util.function.Consumer):148 -> addStartupMethod
     1:1:com.android.tools.r8.profile.AbstractProfile build():148:148 -> build
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/i1;"}
-com.android.tools.r8.profile.startup.profile.StartupProfileClassRule -> com.android.tools.r8.internal.Bd0:
+com.android.tools.r8.profile.startup.profile.StartupProfileClassRule -> com.android.tools.r8.internal.Fd0:
 # {"id":"sourceFile","fileName":"StartupProfileClassRule.java"}
     com.android.tools.r8.graph.DexType type -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexType):22:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     2:2:com.android.tools.r8.graph.DexType getReference():51:51 -> a
     2:2:void write(java.lang.Appendable):74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;)V"}
@@ -254425,7 +253899,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/F2;"}
     1:5:boolean equals(java.lang.Object):60:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
-com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder -> com.android.tools.r8.internal.Ad0:
+com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder -> com.android.tools.r8.internal.Ed0:
 # {"id":"sourceFile","fileName":"StartupProfileClassRule.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -254445,14 +253919,14 @@
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder setClassReference(com.android.tools.r8.graph.DexType):99:99 -> setClassReference
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder setClassReference(com.android.tools.r8.references.ClassReference):95 -> setClassReference
     3:3:com.android.tools.r8.startup.StartupClassBuilder setClassReference(com.android.tools.r8.references.ClassReference):77 -> setClassReference
-com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule -> com.android.tools.r8.internal.Dd0:
+com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule -> com.android.tools.r8.internal.Hd0:
 # {"id":"sourceFile","fileName":"StartupProfileMethodRule.java"}
     com.android.tools.r8.graph.DexMethod method -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):22:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     2:2:void write(java.lang.Appendable):74:74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;)V"}
     1:1:com.android.tools.r8.graph.DexReference getReference():17:17 -> c
@@ -254461,7 +253935,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getReference():51:51 -> getReference
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/w2;"}
     1:1:int hashCode():69:69 -> hashCode
-com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder -> com.android.tools.r8.internal.Cd0:
+com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder -> com.android.tools.r8.internal.Gd0:
 # {"id":"sourceFile","fileName":"StartupProfileMethodRule.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -254492,11 +253966,11 @@
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder setMethod(com.android.tools.r8.graph.DexMethod):121:121 -> setMethodReference
     3:3:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder setMethodReference(com.android.tools.r8.references.MethodReference):128 -> setMethodReference
     3:3:com.android.tools.r8.startup.StartupMethodBuilder setMethodReference(com.android.tools.r8.references.MethodReference):77 -> setMethodReference
-com.android.tools.r8.profile.startup.profile.StartupProfileRule -> com.android.tools.r8.internal.Gd0:
+com.android.tools.r8.profile.startup.profile.StartupProfileRule -> com.android.tools.r8.internal.Kd0:
 # {"id":"sourceFile","fileName":"StartupProfileRule.java"}
     1:1:void <init>():13:13 -> <init>
     void accept(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.utils.ThrowingConsumer) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/internal/Xg0;)V"}
     void write(java.lang.Appendable) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;)V"}
     com.android.tools.r8.graph.DexReference getReference() -> c
@@ -254504,10 +253978,10 @@
     1:1:int compareTo(java.lang.Object):13:13 -> compareTo
     2:2:int compareTo(com.android.tools.r8.profile.startup.profile.StartupProfileRule):27:27 -> compareTo
     2:2:int compareTo(java.lang.Object):13 -> compareTo
-com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions -> com.android.tools.r8.internal.zd0:
+com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions -> com.android.tools.r8.internal.Dd0:
 # {"id":"sourceFile","fileName":"StartupProfileAdditions.java"}
     1:1:void <init>(com.android.tools.r8.profile.startup.profile.StartupProfile):29:29 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Cd0;)V"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule.builder():27:27 -> a
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod):44 -> a
     1:1:com.android.tools.r8.profile.AbstractProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod):17 -> a
@@ -254517,7 +253991,7 @@
     2:2:com.android.tools.r8.profile.AbstractProfileMethodRule$Builder createMethodRuleBuilder(com.android.tools.r8.graph.DexMethod):17 -> a
     3:3:com.android.tools.r8.profile.startup.rewriting.StartupProfileAdditions create():34:34 -> a
     3:3:com.android.tools.r8.profile.rewriting.ProfileAdditions create():17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder com.android.tools.r8.profile.startup.profile.StartupProfileClassRule.builder():27:27 -> b
     1:1:com.android.tools.r8.profile.startup.profile.StartupProfileClassRule$Builder createClassRuleBuilder(com.android.tools.r8.graph.DexType):39 -> b
     1:1:com.android.tools.r8.profile.AbstractProfileClassRule$Builder createClassRuleBuilder(com.android.tools.r8.graph.DexType):17 -> b
@@ -254531,7 +254005,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h1;"}
     1:1:java.util.Comparator getRuleComparator():54:54 -> d
     1:1:com.android.tools.r8.profile.rewriting.ProfileAdditions self():17:17 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bY;"}
 com.android.tools.r8.references.ArrayReference -> com.android.tools.r8.references.ArrayReference:
 # {"id":"sourceFile","fileName":"ArrayReference.java"}
     int dimensions -> a
@@ -254585,12 +254059,12 @@
     com.android.tools.r8.references.ClassReference holderClass -> a
     java.lang.String methodName -> b
     java.util.List formalTypes -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.references.TypeReference returnType -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:7:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):29:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/references/TypeReference;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/references/TypeReference;)V"}
     1:8:boolean equals(java.lang.Object):62:69 -> equals
     1:1:java.util.List getFormalTypes():47:47 -> getFormalTypes
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():39:39 -> getHolderClass
@@ -254717,11 +254191,11 @@
 com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser -> com.android.tools.r8.internal.I2:
 # {"id":"sourceFile","fileName":"AnnotationPatternParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):19:19 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser$AnnotationProperty,java.lang.String,java.lang.String,java.util.function.Consumer):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F2;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/UV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F2;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/YV;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser$AnnotationProperty,java.lang.String,java.lang.String,java.util.function.Consumer):39 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser$AnnotationProperty,java.lang.String,java.lang.String,java.util.function.Consumer):39:39 -> a
@@ -254736,26 +254210,26 @@
 com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser$AnnotationDeclarationParser -> com.android.tools.r8.internal.E2:
 # {"id":"sourceFile","fileName":"AnnotationPatternParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser nameParser -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.ArrayPropertyParser retentionParser -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M3;"}
     java.util.List parsers -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:8:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):90:97 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     9:9:void com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.setValueCheck(java.util.function.BiConsumer):154:154 -> <init>
     9:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):97 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):103:103 -> <init>
     1:2:void lambda$new$0(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):99:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/gW;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
     3:3:void lambda$new$0(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):100 -> a
     1:1:java.util.List parsers():108:108 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:boolean com.android.tools.r8.relocated.keepanno.asm.Parser.isDefault():15:15 -> c
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern getValue():112 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yE;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern getValue():115:115 -> c
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.builder():38:38 -> c
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern getValue():115 -> c
@@ -254775,7 +254249,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):64:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     1:1:boolean tryPropertyEnum(java.lang.Object,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):58:58 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Z"}
     2:4:boolean tryPropertyEnum(com.android.tools.r8.relocated.keepanno.asm.AnnotationPatternParser$RetentionProperty,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):74:76 -> b
@@ -254790,10 +254264,10 @@
 com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase -> com.android.tools.r8.internal.K2:
 # {"id":"sourceFile","fileName":"AnnotationVisitorBase.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.AnnotationVisitor.<init>(int):59:59 -> <init>
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):17:17 -> <init>
     1:1:void visit(java.lang.String,java.lang.Object):30:30 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
@@ -254822,7 +254296,7 @@
     java.util.List values -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Function):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Ljava/util/function/Function;)V"}
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(java.lang.Object,java.lang.String,java.util.function.Consumer):28:28 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> c
@@ -254831,13 +254305,13 @@
 com.android.tools.r8.relocated.keepanno.asm.ArrayPropertyParser$1 -> com.android.tools.r8.internal.L3:
 # {"id":"sourceFile","fileName":"ArrayPropertyParser.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext val$parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     java.util.function.Consumer val$setValue -> d
     java.lang.String val$name -> e
     com.android.tools.r8.relocated.keepanno.asm.ArrayPropertyParser this$0 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M3;"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.asm.ArrayPropertyParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Consumer,java.lang.String):31:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M3;Lcom/android/tools/r8/internal/cW;Lcom/android/tools/r8/internal/cW;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M3;Lcom/android/tools/r8/internal/gW;Lcom/android/tools/r8/internal/gW;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
     1:1:void visitEnd():41:41 -> a
     2:3:void visit(java.lang.String,java.lang.Object):46:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
@@ -254847,38 +254321,38 @@
     11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):69:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     1:2:com.android.tools.r8.relocated.keepanno.asm.PropertyParser getParser():34:35 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PY;"}
     3:3:java.util.Map com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getMapping():33:33 -> b
     3:3:com.android.tools.r8.relocated.keepanno.asm.PropertyParser getParser():35 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.relocated.keepanno.asm.PropertyParser getParser():35:35 -> b
-com.android.tools.r8.relocated.keepanno.asm.BooleanParser -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.relocated.keepanno.asm.BooleanParser -> com.android.tools.r8.internal.U6:
 # {"id":"sourceFile","fileName":"BooleanParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):14:14 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):11:11 -> a
     2:3:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.BooleanParser$BooleanProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):24:25 -> a
     2:3:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):11 -> a
-com.android.tools.r8.relocated.keepanno.asm.BooleanParser$BooleanProperty -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.relocated.keepanno.asm.BooleanParser$BooleanProperty -> com.android.tools.r8.internal.T6:
 # {"id":"sourceFile","fileName":"BooleanParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.BooleanParser$BooleanProperty BOOL -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T6;"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.relocated.keepanno.asm.ClassNameParser -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.relocated.keepanno.asm.ClassNameParser -> com.android.tools.r8.internal.Qc:
 # {"id":"sourceFile","fileName":"ClassNameParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):23:23 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):23:23 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     3:3:void lambda$tryProperty$0(java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/dH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/nH;)V"}
     4:4:void lambda$tryProperty$0(java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):49:49 -> a
     5:14:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):42:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc;Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pc;Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
     15:15:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     15:15:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):51 -> a
     16:17:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):51:52 -> a
@@ -254887,19 +254361,19 @@
     19:19:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):44 -> a
     20:21:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):44:45 -> a
     22:22:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern typeToClassType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/bW;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nH;Lcom/android/tools/r8/internal/fW;)Lcom/android/tools/r8/internal/bH;"}
     23:23:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern lambda$typeToClassType$2(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/PG;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/ZG;)Lcom/android/tools/r8/internal/bH;"}
     24:24:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
     24:24:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern lambda$typeToClassType$2(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):67 -> a
     25:25:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern lambda$typeToClassType$3(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/lE;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/zE;)Lcom/android/tools/r8/internal/bH;"}
     26:26:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
     26:26:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern lambda$typeToClassType$3(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):70 -> a
     27:27:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern lambda$typeToClassType$4(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):72:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)Lcom/android/tools/r8/internal/bH;"}
     28:28:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nc;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/UV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pc;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/YV;"}
     29:29:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext() -> a
     29:29:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):85 -> a
     30:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):85:85 -> a
@@ -254907,7 +254381,7 @@
     31:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):85 -> a
     32:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):86:100 -> a
     47:55:void lambda$tryPropertyAnnotation$5(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser,com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser,com.android.tools.r8.relocated.keepanno.asm.PackageNameParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):102:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Oc;Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/internal/EV;Lcom/android/tools/r8/internal/VV;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qc;Lcom/android/tools/r8/internal/td;Lcom/android/tools/r8/internal/IV;Lcom/android/tools/r8/internal/ZV;Ljava/util/function/Consumer;)V"}
     56:58:void lambda$tryPropertyAnnotation$5(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser,com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser,com.android.tools.r8.relocated.keepanno.asm.PackageNameParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):106:108 -> a
     59:71:void lambda$tryPropertyAnnotation$5(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser,com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser,com.android.tools.r8.relocated.keepanno.asm.PackageNameParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):104:116 -> a
     72:76:void lambda$tryPropertyAnnotation$5(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser,com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser,com.android.tools.r8.relocated.keepanno.asm.PackageNameParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):115:119 -> a
@@ -254916,32 +254390,32 @@
     82:82:void lambda$tryPropertyAnnotation$5(com.android.tools.r8.relocated.keepanno.asm.ClassNameParser,com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser,com.android.tools.r8.relocated.keepanno.asm.PackageNameParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):113:113 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> b
     1:1:void lambda$tryProperty$1(java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):56 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/dH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/nH;)V"}
     2:2:void lambda$tryProperty$1(java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):56:56 -> b
-com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty -> com.android.tools.r8.internal.Pc:
 # {"id":"sourceFile","fileName":"ClassNameParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty PATTERN -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty NAME -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser$ClassNameProperty CONSTANT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pc;"}
     1:3:void <clinit>():31:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):30:30 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser -> com.android.tools.r8.internal.td:
 # {"id":"sourceFile","fileName":"ClassUnqualifiedNameParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser parser -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tf0;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):20:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):14:14 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     3:5:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):35:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qd;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
     6:6:void lambda$tryProperty$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/WG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gH;)V"}
     7:10:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern$Builder.build():94:97 -> a
     7:10:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):20 -> a
     7:10:void lambda$tryProperty$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):42 -> a
@@ -254950,9 +254424,9 @@
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):20 -> a
     12:12:void lambda$tryProperty$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):42 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty,java.lang.String,java.lang.String,java.util.function.Consumer):54:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qd;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/UV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sd;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/YV;"}
     1:1:void lambda$tryPropertyAnnotation$1(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/WG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gH;)V"}
     2:5:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern$Builder.build():94:97 -> b
     2:5:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):20 -> b
     2:5:void lambda$tryPropertyAnnotation$1(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):61 -> b
@@ -254960,102 +254434,102 @@
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern$Builder.build():92:92 -> b
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):20 -> b
     7:7:void lambda$tryPropertyAnnotation$1(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):61 -> b
-com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty -> com.android.tools.r8.internal.sd:
 # {"id":"sourceFile","fileName":"ClassUnqualifiedNameParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty NAME -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sd;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassUnqualifiedNameParser$ClassUnqualifiedNameProperty PATTERN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sd;"}
     1:2:void <clinit>():25:26 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser -> com.android.tools.r8.internal.zg:
 # {"id":"sourceFile","fileName":"ConstraintPropertiesParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):23:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):23 -> <init>
     3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):23:23 -> <init>
     1:5:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultAdditions(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):28:32 -> a
     1:5:void lambda$tryPropertyArray$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/YE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/kF;)V"}
     6:6:void lambda$tryPropertyArray$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):34:34 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty,java.lang.String,java.util.function.Consumer):29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wg;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/ZE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yg;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/lF;"}
     8:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty,java.lang.String,java.util.function.Consumer):29:36 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(java.lang.Object,java.lang.String,java.util.function.Consumer):14:14 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/J2;"}
-com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty -> com.android.tools.r8.internal.wg:
+com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty -> com.android.tools.r8.internal.yg:
 # {"id":"sourceFile","fileName":"ConstraintPropertiesParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty CONSTRAINTS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yg;"}
     com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser$ConstraintsProperty ADDITIONS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yg;"}
     1:2:void <clinit>():18:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):17:17 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor -> com.android.tools.r8.internal.Vg:
+com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor -> com.android.tools.r8.internal.Xg:
 # {"id":"sourceFile","fileName":"ContextDescriptor.java"}
     java.lang.String classDescriptor -> a
     java.lang.String memberName -> b
     java.lang.String memberDescriptor -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:4:void <init>(java.lang.String,java.lang.String,java.lang.String):56:59 -> <init>
-    1:4:void <init>(java.lang.String):53 -> <init>
-    5:8:void <init>(java.lang.String,java.lang.String,java.lang.String):56:59 -> <init>
-    1:18:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):28:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bW;)Lcom/android/tools/r8/internal/Vg;"}
-    19:19:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):41:41 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):30:30 -> a
-    21:21:boolean isClassContext():63:63 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)Lcom/android/tools/r8/internal/eF;"}
-    22:22:java.lang.String getClassDescriptor():75:75 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):94 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):94:94 -> a
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:4:void <init>(java.lang.String,java.lang.String,java.lang.String):58:61 -> <init>
+    1:4:void <init>(java.lang.String):55 -> <init>
+    5:8:void <init>(java.lang.String,java.lang.String,java.lang.String):58:61 -> <init>
+    1:18:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):30:47 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fW;)Lcom/android/tools/r8/internal/Xg;"}
+    19:19:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):43:43 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor parse(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):32:32 -> a
+    21:21:boolean isClassContext():65:65 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):95 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qF;)Lcom/android/tools/r8/internal/qF;"}
+    22:22:java.lang.String getClassDescriptor():77:77 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):96 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):96:96 -> a
     24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromClassDescriptor(java.lang.String):93:93 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):94 -> a
-    25:25:boolean isMethodContext():67:67 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):95 -> a
-    26:26:java.lang.String getClassDescriptor():75:75 -> a
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
-    27:27:java.lang.String getMemberName():79:79 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
-    28:28:java.lang.String getMethodDescriptor():83:83 -> a
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
-    29:29:boolean isMethodContext():67:67 -> a
-    29:29:java.lang.String getMethodDescriptor():83 -> a
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
-    30:31:java.lang.String getMethodDescriptor():83:84 -> a
-    30:31:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):96:96 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):96 -> a
+    25:25:boolean isMethodContext():69:69 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):97 -> a
+    26:26:java.lang.String getClassDescriptor():77:77 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
+    27:27:java.lang.String getMemberName():81:81 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
+    28:28:java.lang.String getMethodDescriptor():85:85 -> a
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
+    29:29:boolean isMethodContext():69:69 -> a
+    29:29:java.lang.String getMethodDescriptor():85 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
+    30:31:java.lang.String getMethodDescriptor():85:86 -> a
+    30:31:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):98:98 -> a
     33:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromMethodDescriptor(java.lang.String,java.lang.String,java.lang.String):99:99 -> a
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):96 -> a
-    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99:99 -> a
-    35:35:boolean isFieldContext():71:71 -> a
-    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99 -> a
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):99:99 -> a
-    37:37:java.lang.String getClassDescriptor():75:75 -> a
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101 -> a
-    38:38:java.lang.String getMemberName():79:79 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101 -> a
-    39:39:boolean isFieldContext():71:71 -> a
-    39:39:java.lang.String getFieldType():88 -> a
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101 -> a
-    40:41:java.lang.String getFieldType():88:89 -> a
-    40:41:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101 -> a
-    42:42:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):100:100 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):98 -> a
+    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101:101 -> a
+    35:35:boolean isFieldContext():73:73 -> a
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101 -> a
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):101:101 -> a
+    37:37:java.lang.String getClassDescriptor():77:77 -> a
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):103 -> a
+    38:38:java.lang.String getMemberName():81:81 -> a
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):103 -> a
+    39:39:boolean isFieldContext():73:73 -> a
+    39:39:java.lang.String getFieldType():90 -> a
+    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):103 -> a
+    40:41:java.lang.String getFieldType():90:91 -> a
+    40:41:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):103 -> a
+    42:42:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):102:102 -> a
     43:43:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromFieldDescriptor(java.lang.String,java.lang.String,java.lang.String):105:105 -> a
-    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):100 -> a
-com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser -> com.android.tools.r8.internal.ah:
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder applyToMetadata(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):102 -> a
+com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser -> com.android.tools.r8.internal.ch:
 # {"id":"sourceFile","fileName":"ConvertingPropertyParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.PropertyParser parser -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QY;"}
     java.util.function.Function converter -> b
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.asm.PropertyParser,java.util.function.Function):23:25 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MY;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/QY;Ljava/util/function/Function;)V"}
     1:1:void lambda$wrap$0(java.util.function.Consumer,java.lang.Object):29:29 -> a
     2:2:java.util.function.Consumer wrap(java.util.function.Consumer):29:29 -> a
     3:3:void setProperty(java.lang.String,java.lang.Object):34:34 -> a
@@ -255068,7 +254542,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseAnnotation(java.lang.String,java.lang.String,java.util.function.Consumer):65:65 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     1:1:java.lang.Object getValue():44:44 -> getValue
-com.android.tools.r8.relocated.keepanno.asm.DeclarationParser -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.relocated.keepanno.asm.DeclarationParser -> com.android.tools.r8.internal.Yh:
 # {"id":"sourceFile","fileName":"DeclarationParser.java"}
     1:1:void <init>():12:12 -> <init>
     1:1:void ignore(java.lang.Object):16:16 -> a
@@ -255088,22 +254562,22 @@
     14:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseAnnotation(java.lang.String,java.lang.String):78:79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     java.util.List parsers() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
-com.android.tools.r8.relocated.keepanno.asm.FieldTypeParser -> com.android.tools.r8.internal.Cp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
+com.android.tools.r8.relocated.keepanno.asm.FieldTypeParser -> com.android.tools.r8.internal.Fp:
 # {"id":"sourceFile","fileName":"FieldTypeParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):16:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YV;)V"}
-com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser -> com.android.tools.r8.internal.zw:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser -> com.android.tools.r8.internal.Bw:
 # {"id":"sourceFile","fileName":"InstanceOfParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):33:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):33 -> <init>
     3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):33:33 -> <init>
     1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Builder.<init>():15:15 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.builder():101 -> a
     1:1:void lambda$tryPropertyAnnotation$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.asm.BooleanParser,com.android.tools.r8.relocated.keepanno.asm.ClassNameParser):93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/S6;Lcom/android/tools/r8/internal/Oc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/U6;Lcom/android/tools/r8/internal/Qc;)V"}
     2:4:void lambda$tryPropertyAnnotation$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.asm.BooleanParser,com.android.tools.r8.relocated.keepanno.asm.ClassNameParser):94:96 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Builder.build():31:31 -> a
     5:5:void lambda$tryPropertyAnnotation$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.asm.BooleanParser,com.android.tools.r8.relocated.keepanno.asm.ClassNameParser):97 -> a
@@ -255199,36 +254673,36 @@
     56:56:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):21:21 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     57:57:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties,java.lang.String,java.lang.String,java.util.function.Consumer):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yw;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/UV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aw;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/YV;"}
     58:58:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     58:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties,java.lang.String,java.lang.String,java.util.function.Consumer):83 -> a
     59:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties,java.lang.String,java.lang.String,java.util.function.Consumer):83:83 -> a
     60:60:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
     60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties,java.lang.String,java.lang.String,java.util.function.Consumer):83 -> a
     61:67:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties,java.lang.String,java.lang.String,java.util.function.Consumer):84:90 -> a
-com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties -> com.android.tools.r8.internal.Aw:
 # {"id":"sourceFile","fileName":"InstanceOfParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties NAME -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aw;"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties NAME_EXCL -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aw;"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties CONSTANT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aw;"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties CONSTANT_EXCL -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aw;"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser$InstanceOfProperties PATTERN -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Aw;"}
     1:5:void <clinit>():25:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.asm.KeepConstraintsVisitor -> com.android.tools.r8.internal.ZE:
+com.android.tools.r8.relocated.keepanno.asm.KeepConstraintsVisitor -> com.android.tools.r8.internal.lF:
 # {"id":"sourceFile","fileName":"KeepConstraintsVisitor.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder builder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hF;"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/OF;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/aG;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.builder():37:37 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):17 -> <init>
     3:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):17:21 -> <init>
@@ -255333,2156 +254807,2381 @@
     99:100:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder.build():77:78 -> a
     99:100:void visitEnd():80 -> a
     101:102:void visitEnd():80:81 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader -> com.android.tools.r8.internal.TF:
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader -> com.android.tools.r8.internal.fG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
-    1:4:java.util.List internalReadKeepEdges(byte[],boolean,boolean):133:136 -> a
+    1:4:java.util.List internalReadKeepEdges(byte[],boolean,boolean):135:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"([BZZ)Ljava/util/ArrayList;"}
     5:5:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a
-    5:5:java.util.List internalReadKeepEdges(byte[],boolean,boolean):135 -> a
-    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createClassKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):149:149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Lcom/android/tools/r8/internal/VV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-    7:7:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):159:159 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/eF;)V"}
-    8:8:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):158:158 -> a
+    5:5:java.util.List internalReadKeepEdges(byte[],boolean,boolean):137 -> a
+    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createClassKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):151:151 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Lcom/android/tools/r8/internal/ZV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    7:7:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):161:161 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/qF;)V"}
+    8:8:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):160:160 -> a
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromClassDescriptor(java.lang.String):93:93 -> a
-    9:9:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):158 -> a
-    10:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createFieldKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):178:178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/VV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-    11:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createFieldKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):173:173 -> a
-    12:12:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/eF;)V"}
-    13:13:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):184:184 -> a
+    9:9:void lambda$createClassKeepAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):160 -> a
+    10:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createFieldKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):180:180 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ZV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    11:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createFieldKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):175:175 -> a
+    12:12:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):187:187 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/qF;)V"}
+    13:13:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):186:186 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromFieldDescriptor(java.lang.String,java.lang.String,java.lang.String):105:105 -> a
-    14:14:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):184 -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createMethodKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):206:206 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/VV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createMethodKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):201:201 -> b
-    3:3:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):213:213 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/eF;)V"}
-    4:4:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):212:212 -> b
+    14:14:void lambda$createFieldKeepAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):186 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createMethodKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):208:208 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/ZV;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createMethodKeepAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.function.Consumer):203:203 -> b
+    3:3:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):215:215 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/qF;)V"}
+    4:4:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):214:214 -> b
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromMethodDescriptor(java.lang.String,java.lang.String,java.lang.String):99:99 -> b
-    5:5:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):212 -> b
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor -> com.android.tools.r8.internal.nF:
+    5:5:void lambda$createMethodKeepAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):214 -> b
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor -> com.android.tools.r8.internal.zF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     java.lang.String className -> f
     com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind kind -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1515:1515 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/sE;)V"}
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1505:1505 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1631:1631 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/lang/String;Lcom/android/tools/r8/internal/GE;)V"}
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1621:1621 -> <init>
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1505 -> <init>
-    4:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1505:1520 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1525:1526 -> a
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1621 -> <init>
+    4:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1621:1636 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1641:1642 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1526 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1529:1529 -> a
-    5:14:void visitEnd():1534:1543 -> a
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
-    15:15:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():43 -> a
-    15:15:void visitEnd():1544 -> a
-    16:19:void visitEnd():1544:1547 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():38:38 -> a
-    20:20:void visitEnd():1548 -> a
-    21:21:void visitEnd():1543:1543 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():36:36 -> a
-    22:22:void visitEnd():1548 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor$1 -> com.android.tools.r8.internal.mF:
+    3:3:void visit(java.lang.String,java.lang.Object):1642 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1645:1645 -> a
+    5:15:void visitEnd():1650:1660 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
+    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    16:16:void visitEnd():1661 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():31:31 -> a
+    17:17:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():17 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    17:17:void visitEnd():1661 -> a
+    18:19:void visitEnd():1661:1662 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    20:20:void visitEnd():1664 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    21:21:void visitEnd():1664 -> a
+    22:22:void visitEnd():1665:1665 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):36:36 -> a
+    23:23:void visitEnd():1665 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49:49 -> a
+    24:24:void visitEnd():1666 -> a
+    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepBindings.verify(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference[]):63:63 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49 -> a
+    25:25:void visitEnd():1666 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():50:50 -> a
+    26:26:void visitEnd():1666 -> a
+    27:27:void visitEnd():1660:1660 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor$1 -> com.android.tools.r8.internal.yF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor this$0 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1535:1535 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nF;Lcom/android/tools/r8/internal/VV;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1538:1538 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> b
-    2:2:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1538 -> b
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedMemberVisitor -> com.android.tools.r8.internal.oF:
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper val$bindingsHelper -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedClassVisitor,com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1652:1652 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/dG;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1655:1655 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$CheckRemovedMemberVisitor -> com.android.tools.r8.internal.AF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern context -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference context -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind kind -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1566:1566 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/mG;Lcom/android/tools/r8/internal/sE;)V"}
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1557:1557 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1685:1685 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/util/function/Function;Lcom/android/tools/r8/internal/GE;)V"}
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1675:1675 -> <init>
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1557 -> <init>
-    4:17:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1557:1570 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1575:1576 -> a
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1675 -> <init>
+    4:18:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind):1675:1689 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1694:1695 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1576 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1579:1579 -> a
-    5:6:void visitEnd():1584:1585 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
-    7:7:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():43 -> a
-    7:7:void visitEnd():1586 -> a
-    8:10:void visitEnd():1586:1588 -> a
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():38:38 -> a
-    11:11:void visitEnd():1590 -> a
-    12:12:void visitEnd():1585:1585 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():36:36 -> a
-    13:13:void visitEnd():1590 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ClassDeclarationParser -> com.android.tools.r8.internal.pF:
+    3:3:void visit(java.lang.String,java.lang.Object):1695 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1698:1698 -> a
+    5:8:void visitEnd():1703:1706 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
+    9:9:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):919 -> a
+    9:9:void visitEnd():1705 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():31:31 -> a
+    10:10:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():17 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):919 -> a
+    10:10:void visitEnd():1705 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):922 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    11:11:void visitEnd():1705 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):922 -> a
+    12:12:void visitEnd():1705 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):36:36 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):923 -> a
+    13:13:void visitEnd():1705 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49:49 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    14:14:void visitEnd():1705 -> a
+    15:15:void com.android.tools.r8.relocated.keepanno.ast.KeepBindings.verify(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference[]):63:63 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    15:15:void visitEnd():1705 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():50:50 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor.buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    16:16:void visitEnd():1705 -> a
+    17:17:void visitEnd():1704:1704 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ClassDeclarationParser -> com.android.tools.r8.internal.BF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
     java.util.function.Supplier getBindingsHelper -> b
-    com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference boundClassItemReference -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xE;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference boundClassReference -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IE;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser classNameParser -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser annotatedByParser -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.InstanceOfParser instanceOfParser -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bw;"}
     java.util.List parsers -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():1594:1594 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1606:1606 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Ljava/util/function/Supplier;)V"}
-    2:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1599:1607 -> <init>
+    1:1:void <clinit>():1710:1710 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1722:1722 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Ljava/util/function/Supplier;)V"}
+    2:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1715:1723 -> <init>
     11:11:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    11:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1607 -> <init>
-    12:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1607:1609 -> <init>
+    11:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1723 -> <init>
+    12:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1723:1725 -> <init>
     15:15:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1609 -> <init>
-    16:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1609:1614 -> <init>
+    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1725 -> <init>
+    16:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1725:1730 -> <init>
     22:22:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1614 -> <init>
-    23:38:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1614:1629 -> <init>
-    1:1:boolean isBindingReferenceDefined():1638:1638 -> a
-    1:1:boolean isDeclared():1656 -> a
-    2:2:boolean isDeclared():1656:1656 -> a
-    3:4:boolean tryParse(java.lang.String,java.lang.Object):1687:1688 -> a
+    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1730 -> <init>
+    23:38:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.util.function.Supplier):1730:1745 -> <init>
+    1:1:boolean isBindingReferenceDefined():1754:1754 -> a
+    1:1:boolean isDeclared():1772 -> a
+    2:2:boolean isDeclared():1772:1772 -> a
+    3:4:boolean tryParse(java.lang.String,java.lang.Object):1807:1808 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)Z"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
-    5:5:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
-    6:6:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    7:7:boolean isBindingReferenceDefined():1638:1638 -> a
-    7:7:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):1678 -> a
-    7:7:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    8:8:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):1682:1682 -> a
-    8:8:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    9:9:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):1679:1679 -> a
-    9:9:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    10:10:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):1679 -> a
-    10:10:boolean tryParse(java.lang.String,java.lang.Object):1689 -> a
-    11:11:boolean tryParse(java.lang.String,java.lang.Object):1692:1692 -> a
-    1:1:java.util.List parsers():1634:1634 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
-    1:1:boolean isBindingReferenceDefined():1638:1638 -> c
-    1:1:void checkAllowedDefinitions():1648 -> c
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1660 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zE;"}
-    2:4:boolean classPatternsAreDeclared():1642:1644 -> c
-    2:4:void checkAllowedDefinitions():1648 -> c
-    2:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1660 -> c
-    5:5:void checkAllowedDefinitions():1649:1649 -> c
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1660 -> c
+    5:5:boolean tryParse(java.lang.String,java.lang.Object):1809 -> a
+    6:6:boolean isBindingReferenceDefined():1754:1754 -> a
+    6:6:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):1798 -> a
+    6:6:boolean tryParse(java.lang.String,java.lang.Object):1809 -> a
+    7:7:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):1802:1802 -> a
+    7:7:boolean tryParse(java.lang.String,java.lang.Object):1809 -> a
+    8:8:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):1799:1799 -> a
+    8:8:boolean tryParse(java.lang.String,java.lang.Object):1809 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
+    9:9:void setBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):1799 -> a
+    9:9:boolean tryParse(java.lang.String,java.lang.Object):1809 -> a
+    10:10:boolean tryParse(java.lang.String,java.lang.Object):1812:1812 -> a
+    1:1:java.util.List parsers():1750:1750 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
+    1:1:boolean isBindingReferenceDefined():1754:1754 -> c
+    1:1:void checkAllowedDefinitions():1764 -> c
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1776 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IE;"}
+    2:4:boolean classPatternsAreDeclared():1758:1760 -> c
+    2:4:void checkAllowedDefinitions():1764 -> c
+    2:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1776 -> c
+    5:5:void checkAllowedDefinitions():1765:1765 -> c
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1776 -> c
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
-    6:6:void checkAllowedDefinitions():1649 -> c
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1660 -> c
-    7:7:boolean isBindingReferenceDefined():1638:1638 -> c
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1661 -> c
-    8:10:boolean classPatternsAreDeclared():1642:1644 -> c
-    8:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1664 -> c
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1673:1673 -> c
+    6:6:void checkAllowedDefinitions():1765 -> c
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1776 -> c
+    7:7:boolean isBindingReferenceDefined():1754:1754 -> c
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1777 -> c
+    8:10:boolean classPatternsAreDeclared():1758:1760 -> c
+    8:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1781 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1791:1791 -> c
     12:12:boolean com.android.tools.r8.relocated.keepanno.asm.Parser.isDefault():15:15 -> c
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1673 -> c
-    13:14:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1673:1674 -> c
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> c
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> c
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1674 -> c
-    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> c
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1791 -> c
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1791:1791 -> c
+    14:14:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> c
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.any():14 -> c
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1792 -> c
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> c
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> c
+    15:15:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> c
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.any():14 -> c
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1792 -> c
+    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> c
     16:16:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1665 -> c
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> c
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> c
-    17:17:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> c
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1665 -> c
-    18:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1665:1667 -> c
-    21:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1666:1668 -> c
-    24:24:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.of(java.lang.Object):19:19 -> c
-    24:24:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23 -> c
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1668 -> c
-    25:25:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23:23 -> c
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1668 -> c
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1668:1668 -> c
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> c
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> c
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1669 -> c
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1669:1669 -> c
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> c
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1670 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getValue():1671 -> c
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser -> com.android.tools.r8.internal.qF:
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.any():14 -> c
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1792 -> c
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> c
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.any():14 -> c
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1792 -> c
+    18:18:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> c
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1783 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> c
+    19:19:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1783 -> c
+    20:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1783:1785 -> c
+    23:25:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1784:1786 -> c
+    26:26:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.of(java.lang.Object):19:19 -> c
+    26:26:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23 -> c
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1786 -> c
+    27:27:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23:23 -> c
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1786 -> c
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1786:1786 -> c
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> c
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> c
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1788 -> c
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1788:1788 -> c
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> c
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1789 -> c
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference getValue():1794:1794 -> c
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser -> com.android.tools.r8.internal.CF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.ConstraintPropertiesParser constraintsParser -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zg;"}
     com.android.tools.r8.relocated.keepanno.asm.ArrayPropertyParser annotationsParser -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M3;"}
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1075:1075 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1081:1089 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+    1:1:void <clinit>():1179:1179 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1185:1193 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     10:10:void com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.setValueCheck(java.util.function.BiConsumer):154:154 -> <init>
-    10:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1089 -> <init>
+    10:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1193 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):458:458 -> a
-    1:1:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VE;Lcom/android/tools/r8/internal/kE;)V"}
+    1:1:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hF;Lcom/android/tools/r8/internal/yE;)V"}
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.isAny():99:99 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):458 -> a
-    2:2:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    2:2:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotationsAll():446:446 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):459 -> a
-    3:3:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    3:3:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     4:4:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.isAnyWithRuntimeRetention():103:103 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):461 -> a
-    4:4:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    4:4:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotationsAllWithRuntimeRetention():450:450 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):462 -> a
-    5:5:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    5:5:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     6:6:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.isAnyWithClassRetention():107:107 -> a
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):464 -> a
-    6:6:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    6:6:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotationsAllWithClassRetention():454:454 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):465 -> a
-    7:7:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    7:7:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation com.android.tools.r8.relocated.keepanno.ast.KeepConstraint.annotation(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):467:467 -> a
-    8:8:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    8:8:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint):72:72 -> a
-    9:9:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
+    9:9:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint):72:72 -> a
-    10:10:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1128 -> a
-    11:12:void verifyAnnotationList(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1094:1095 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/cW;)V"}
+    10:10:void lambda$getValue$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):1232 -> a
+    11:12:void verifyAnnotationList(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1198:1199 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/gW;)V"}
     13:13:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    13:13:void verifyAnnotationList(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1095 -> a
-    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1105:1105 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XE;)Lcom/android/tools/r8/internal/YE;"}
-    1:1:java.util.List parsers():1101:1101 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+    13:13:void verifyAnnotationList(java.util.List,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1199 -> a
+    1:1:java.util.List parsers():1205:1205 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:boolean com.android.tools.r8.relocated.keepanno.asm.Parser.isDefault():15:15 -> c
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1109 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YE;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1113:1113 -> c
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1213 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kF;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1217:1217 -> c
     3:3:boolean com.android.tools.r8.relocated.keepanno.asm.Parser.isDefault():15:15 -> c
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1113 -> c
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1217 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:8:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1114:1118 -> c
+    4:8:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1218:1222 -> c
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.builder():37:37 -> c
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1120 -> c
-    10:11:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1120:1121 -> c
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1224 -> c
+    10:11:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1224:1225 -> c
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.builder():37:37 -> c
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1124 -> c
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1228 -> c
     13:13:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> c
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1124 -> c
-    14:18:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1124:1128 -> c
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1228 -> c
+    14:18:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1228:1232 -> c
     19:20:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder.build():77:78 -> c
-    19:20:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1129 -> c
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor -> com.android.tools.r8.internal.rF:
+    19:20:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints getValue():1233 -> c
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationVisitor -> com.android.tools.r8.internal.DF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor context -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xg;"}
     java.lang.String version -> e
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeVisitor edgeVisitor -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SF;"}
     boolean isCheckRemoved -> g
     boolean isCheckOptimizedOut -> h
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):755:755 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;)V"}
-    2:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):747:756 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):767:768 -> a
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):829:829 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;)V"}
+    2:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):821:830 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):841:842 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):771 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):771:771 -> a
-    5:5:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):760:760 -> a
-    5:5:void visit(java.lang.String,java.lang.Object):772 -> a
-    6:18:void visit(java.lang.String,java.lang.Object):773:785 -> a
-    19:19:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):761:761 -> a
-    19:19:void visit(java.lang.String,java.lang.Object):772 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):845 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):845:845 -> a
+    5:5:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):834:834 -> a
+    5:5:void visit(java.lang.String,java.lang.Object):846 -> a
+    6:18:void visit(java.lang.String,java.lang.Object):847:859 -> a
+    19:19:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):835:835 -> a
+    19:19:void visit(java.lang.String,java.lang.Object):846 -> a
     20:20:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    20:20:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):761 -> a
-    20:20:void visit(java.lang.String,java.lang.Object):772 -> a
-    21:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):790:791 -> a
+    20:20:void ensureVersion(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):835 -> a
+    20:20:void visit(java.lang.String,java.lang.Object):846 -> a
+    21:22:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):864:865 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     23:23:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):793 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):793:793 -> a
+    23:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):867 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):867:867 -> a
     25:25:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    25:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):793 -> a
-    26:29:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):793:796 -> a
-    30:30:void lambda$visitAnnotation$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):793:793 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cF;)V"}
-    31:31:void lambda$visitAnnotation$1(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):793:793 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
-    32:48:void visitEnd():801:817 -> a
-    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-    49:49:void visitEnd():817 -> a
+    25:25:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):867 -> a
+    26:29:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):867:870 -> a
+    30:30:void lambda$visitAnnotation$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):867:867 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oF;)V"}
+    31:31:void lambda$visitAnnotation$1(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):867:867 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qF;)V"}
+    32:48:void visitEnd():875:891 -> a
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    49:49:void visitEnd():891 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    50:50:void visitEnd():818:818 -> a
-    51:51:void visitEnd():814:814 -> a
+    50:50:void visitEnd():892:892 -> a
+    51:51:void visitEnd():888:888 -> a
     52:52:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    52:52:void visitEnd():811 -> a
-    53:54:void visitEnd():811:812 -> a
+    52:52:void visitEnd():885 -> a
+    53:54:void visitEnd():885:886 -> a
     55:55:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    55:55:void visitEnd():812 -> a
-    56:56:void visitEnd():821:821 -> a
+    55:55:void visitEnd():886 -> a
+    56:56:void visitEnd():895:895 -> a
     57:57:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    57:57:void visitEnd():822 -> a
-    58:59:void visitEnd():822:823 -> a
+    57:57:void visitEnd():896 -> a
+    58:59:void visitEnd():896:897 -> a
     60:60:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    60:60:void visitEnd():823 -> a
-    61:61:void visitEnd():826:826 -> a
+    60:60:void visitEnd():897 -> a
+    61:61:void visitEnd():900:900 -> a
     62:62:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    62:62:void visitEnd():827 -> a
-    63:64:void visitEnd():827:828 -> a
+    62:62:void visitEnd():901 -> a
+    63:64:void visitEnd():901:902 -> a
     65:65:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    65:65:void visitEnd():828 -> a
-    66:67:void visitEnd():832:833 -> a
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
-    68:68:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():43 -> a
-    68:68:void visitEnd():834 -> a
-    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> a
-    69:69:void visitEnd():835 -> a
-    70:71:void visitEnd():835:836 -> a
-    72:72:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getClassDescriptor():75:75 -> a
-    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():108 -> a
-    72:72:void visitEnd():837 -> a
+    65:65:void visitEnd():902 -> a
+    66:66:void visitEnd():906:906 -> a
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> a
+    67:67:void visitEnd():906 -> a
+    68:69:void visitEnd():906:907 -> a
+    70:70:void com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.<init>():697:697 -> a
+    70:70:void visitEnd():908 -> a
+    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():18:18 -> a
+    71:71:void com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.<init>():697 -> a
+    71:71:void visitEnd():908 -> a
+    72:72:void com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.<init>():698:698 -> a
+    72:72:void visitEnd():908 -> a
+    73:73:void visitEnd():909:909 -> a
+    74:74:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getClassDescriptor():77:77 -> a
+    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):110 -> a
+    74:74:void visitEnd():909 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():108:108 -> a
-    73:73:void visitEnd():837 -> a
-    74:74:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():110 -> a
-    74:74:void visitEnd():837 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    75:75:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():110 -> a
-    75:75:void visitEnd():837 -> a
-    76:76:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
+    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):110:110 -> a
+    75:75:void visitEnd():909 -> a
+    76:76:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
     76:76:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():110 -> a
-    76:76:void visitEnd():837 -> a
-    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():110 -> a
-    77:77:void visitEnd():837 -> a
-    78:78:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isClassContext():63:63 -> a
-    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():111 -> a
-    78:78:void visitEnd():837 -> a
-    79:79:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isMethodContext():67:67 -> a
-    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():115 -> a
-    79:79:void visitEnd():837 -> a
-    80:80:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():83:83 -> a
-    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():135 -> a
-    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    80:80:void visitEnd():837 -> a
-    81:81:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isMethodContext():67:67 -> a
-    81:81:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():83 -> a
-    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():135 -> a
-    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    81:81:void visitEnd():837 -> a
-    82:83:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():83:84 -> a
-    82:83:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():135 -> a
-    82:83:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    82:83:void visitEnd():837 -> a
-    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():135:135 -> a
-    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    84:84:void visitEnd():837 -> a
-    85:85:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344:344 -> a
-    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():137 -> a
-    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    85:85:void visitEnd():837 -> a
-    86:86:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):355:355 -> a
-    86:86:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344 -> a
-    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():137 -> a
-    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    86:86:void visitEnd():837 -> a
-    87:87:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):354:354 -> a
-    87:87:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344 -> a
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():137 -> a
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    87:87:void visitEnd():837 -> a
-    88:92:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():137:141 -> a
-    88:92:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    88:92:void visitEnd():837 -> a
-    93:93:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():141 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    93:93:void visitEnd():837 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():141 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    94:94:void visitEnd():837 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18:18 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():141 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    95:95:void visitEnd():837 -> a
-    96:96:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.<init>():40:40 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.builder():14 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():143 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    96:96:void visitEnd():837 -> a
-    97:97:com.android.tools.r8.org.objectweb.asm.Type[] com.android.tools.r8.org.objectweb.asm.Type.getArgumentTypes():285:285 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():144 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    97:97:void visitEnd():837 -> a
-    98:99:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():144:145 -> a
-    98:99:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    98:99:void visitEnd():837 -> a
-    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.addParameterTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):45:45 -> a
-    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():145 -> a
-    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    100:100:void visitEnd():837 -> a
-    101:101:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():21:21 -> a
-    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():148 -> a
-    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    101:101:void visitEnd():837 -> a
-    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.anyMethodAccess():25:25 -> a
-    102:102:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():22 -> a
-    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):112 -> a
+    76:76:void visitEnd():909 -> a
+    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    77:77:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):112 -> a
+    77:77:void visitEnd():909 -> a
+    78:78:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):112 -> a
+    78:78:void visitEnd():909 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):112 -> a
+    79:79:void visitEnd():909 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729:729 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):113 -> a
+    80:80:void visitEnd():909 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):113 -> a
+    81:81:void visitEnd():909 -> a
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):745:745 -> a
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729 -> a
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):113 -> a
+    82:82:void visitEnd():909 -> a
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):730 -> a
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):113 -> a
+    83:83:void visitEnd():909 -> a
+    84:84:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isClassContext():65:65 -> a
+    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):114 -> a
+    84:84:void visitEnd():909 -> a
+    85:85:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isMethodContext():69:69 -> a
+    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):118 -> a
+    85:85:void visitEnd():909 -> a
+    86:86:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():85:85 -> a
+    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():140 -> a
+    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    86:86:void visitEnd():909 -> a
+    87:87:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isMethodContext():69:69 -> a
+    87:87:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():85 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():140 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    87:87:void visitEnd():909 -> a
+    88:89:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMethodDescriptor():85:86 -> a
+    88:89:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():140 -> a
+    88:89:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    88:89:void visitEnd():909 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():140:140 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    90:90:void visitEnd():909 -> a
+    91:91:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344:344 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():142 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    91:91:void visitEnd():909 -> a
+    92:92:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):355:355 -> a
+    92:92:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344 -> a
+    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():142 -> a
+    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    92:92:void visitEnd():909 -> a
+    93:93:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):354:354 -> a
+    93:93:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344 -> a
+    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():142 -> a
+    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    93:93:void visitEnd():909 -> a
+    94:98:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():142:146 -> a
+    94:98:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    94:98:void visitEnd():909 -> a
+    99:99:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
+    99:99:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
+    99:99:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():146 -> a
+    99:99:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    99:99:void visitEnd():909 -> a
+    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
+    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
+    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():146 -> a
+    100:100:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    100:100:void visitEnd():909 -> a
+    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18:18 -> a
+    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():146 -> a
+    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    101:101:void visitEnd():909 -> a
+    102:102:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.<init>():40:40 -> a
+    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.builder():14 -> a
     102:102:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():148 -> a
-    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    102:102:void visitEnd():837 -> a
-    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
-    103:103:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
-    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():148 -> a
-    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    103:103:void visitEnd():837 -> a
-    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
-    104:104:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
-    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():148 -> a
-    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    104:104:void visitEnd():837 -> a
-    105:105:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMemberName():79:79 -> a
-    105:105:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():149 -> a
-    105:105:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    105:105:void visitEnd():837 -> a
-    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.exact(java.lang.String):30:30 -> a
-    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():149 -> a
-    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    106:106:void visitEnd():837 -> a
-    107:111:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.build():50:54 -> a
-    107:111:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():151 -> a
-    107:111:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    107:111:void visitEnd():837 -> a
-    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
-    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    112:112:void visitEnd():837 -> a
-    113:113:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
-    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    113:113:void visitEnd():837 -> a
-    114:114:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
-    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    114:114:void visitEnd():837 -> a
-    115:115:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
-    115:115:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    115:115:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    115:115:void visitEnd():837 -> a
-    116:116:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
-    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
-    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    116:116:void visitEnd():837 -> a
-    117:121:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
-    117:121:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():152 -> a
-    117:121:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():116 -> a
-    117:121:void visitEnd():837 -> a
-    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():118:118 -> a
-    122:122:void visitEnd():837 -> a
-    123:123:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isFieldContext():71:71 -> a
-    123:123:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():118 -> a
-    123:123:void visitEnd():837 -> a
-    124:124:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():118:118 -> a
-    124:124:void visitEnd():837 -> a
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.anyFieldAccess():22:22 -> a
-    125:125:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():22 -> a
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():128 -> a
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    125:125:void visitEnd():837 -> a
-    126:126:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
-    126:126:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    126:126:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():128 -> a
-    126:126:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    126:126:void visitEnd():837 -> a
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
-    127:127:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():128 -> a
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    127:127:void visitEnd():837 -> a
-    128:128:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMemberName():79:79 -> a
-    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():129 -> a
-    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    128:128:void visitEnd():837 -> a
-    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15:15 -> a
-    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():129 -> a
-    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    129:129:void visitEnd():837 -> a
-    130:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):19:22 -> a
-    130:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15 -> a
-    130:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():129 -> a
-    130:133:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    130:133:void visitEnd():837 -> a
-    134:134:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isFieldContext():71:71 -> a
-    134:134:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getFieldType():88 -> a
-    134:134:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():130 -> a
-    134:134:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    134:134:void visitEnd():837 -> a
-    135:136:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getFieldType():88:89 -> a
-    135:136:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():130 -> a
-    135:136:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    135:136:void visitEnd():837 -> a
-    137:137:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():130:130 -> a
-    137:137:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    137:137:void visitEnd():837 -> a
-    138:138:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
-    138:138:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():131 -> a
-    138:138:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():119 -> a
-    138:138:void visitEnd():837 -> a
-    139:139:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    139:139:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    139:139:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():121 -> a
-    139:139:void visitEnd():837 -> a
-    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    140:140:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():121 -> a
-    140:140:void visitEnd():837 -> a
-    141:141:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> a
-    141:141:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> a
-    141:141:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():122 -> a
-    141:141:void visitEnd():837 -> a
-    142:142:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> a
-    142:142:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.toItemPattern():124 -> a
-    142:142:void visitEnd():837 -> a
-    143:143:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():38:38 -> a
-    143:143:void visitEnd():838 -> a
-    144:150:void visitEnd():833:839 -> a
-    151:151:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    151:151:void visitEnd():806 -> a
-    152:153:void visitEnd():806:807 -> a
-    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    154:154:void visitEnd():807 -> a
-    155:155:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    155:155:void visitEnd():802 -> a
-    156:157:void visitEnd():802:803 -> a
-    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    158:158:void visitEnd():803 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor -> com.android.tools.r8.internal.tF:
+    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    102:102:void visitEnd():909 -> a
+    103:103:com.android.tools.r8.org.objectweb.asm.Type[] com.android.tools.r8.org.objectweb.asm.Type.getArgumentTypes():285:285 -> a
+    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():149 -> a
+    103:103:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    103:103:void visitEnd():909 -> a
+    104:105:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():149:150 -> a
+    104:105:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    104:105:void visitEnd():909 -> a
+    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.addParameterTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):45:45 -> a
+    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():150 -> a
+    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    106:106:void visitEnd():909 -> a
+    107:107:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():21:21 -> a
+    107:107:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    107:107:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():153 -> a
+    107:107:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    107:107:void visitEnd():909 -> a
+    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.anyMethodAccess():25:25 -> a
+    108:108:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():22 -> a
+    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():153 -> a
+    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    108:108:void visitEnd():909 -> a
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
+    109:109:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():153 -> a
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    109:109:void visitEnd():909 -> a
+    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
+    110:110:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
+    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():153 -> a
+    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    110:110:void visitEnd():909 -> a
+    111:111:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMemberName():81:81 -> a
+    111:111:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():154 -> a
+    111:111:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    111:111:void visitEnd():909 -> a
+    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.exact(java.lang.String):30:30 -> a
+    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():154 -> a
+    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    112:112:void visitEnd():909 -> a
+    113:117:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.build():50:54 -> a
+    113:117:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():156 -> a
+    113:117:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    113:117:void visitEnd():909 -> a
+    118:118:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
+    118:118:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    118:118:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    118:118:void visitEnd():909 -> a
+    119:119:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
+    119:119:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
+    119:119:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    119:119:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    119:119:void visitEnd():909 -> a
+    120:120:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
+    120:120:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
+    120:120:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    120:120:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    120:120:void visitEnd():909 -> a
+    121:121:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
+    121:121:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    121:121:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    121:121:void visitEnd():909 -> a
+    122:122:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
+    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
+    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    122:122:void visitEnd():909 -> a
+    123:127:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
+    123:127:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createMethodPatternFromDescriptor():157 -> a
+    123:127:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):119 -> a
+    123:127:void visitEnd():909 -> a
+    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):121:121 -> a
+    128:128:void visitEnd():909 -> a
+    129:129:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isFieldContext():73:73 -> a
+    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):121 -> a
+    129:129:void visitEnd():909 -> a
+    130:130:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):121:121 -> a
+    130:130:void visitEnd():909 -> a
+    131:131:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.anyFieldAccess():22:22 -> a
+    131:131:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():22 -> a
+    131:131:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    131:131:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():133 -> a
+    131:131:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    131:131:void visitEnd():909 -> a
+    132:132:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
+    132:132:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    132:132:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():133 -> a
+    132:132:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    132:132:void visitEnd():909 -> a
+    133:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
+    133:133:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
+    133:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    133:133:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():133 -> a
+    133:133:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    133:133:void visitEnd():909 -> a
+    134:134:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getMemberName():81:81 -> a
+    134:134:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():134 -> a
+    134:134:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    134:134:void visitEnd():909 -> a
+    135:135:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15:15 -> a
+    135:135:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():134 -> a
+    135:135:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    135:135:void visitEnd():909 -> a
+    136:139:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):19:22 -> a
+    136:139:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15 -> a
+    136:139:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():134 -> a
+    136:139:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    136:139:void visitEnd():909 -> a
+    140:140:boolean com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.isFieldContext():73:73 -> a
+    140:140:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getFieldType():90 -> a
+    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():135 -> a
+    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    140:140:void visitEnd():909 -> a
+    141:142:java.lang.String com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.getFieldType():90:91 -> a
+    141:142:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():135 -> a
+    141:142:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    141:142:void visitEnd():909 -> a
+    143:143:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():135:135 -> a
+    143:143:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    143:143:void visitEnd():909 -> a
+    144:144:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
+    144:144:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.createFieldPatternFromDescriptor():136 -> a
+    144:144:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):122 -> a
+    144:144:void visitEnd():909 -> a
+    145:145:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
+    145:145:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():19 -> a
+    145:145:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():13 -> a
+    145:145:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):125 -> a
+    145:145:void visitEnd():909 -> a
+    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
+    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
+    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29 -> a
+    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):126 -> a
+    146:146:void visitEnd():909 -> a
+    147:147:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():48:48 -> a
+    147:147:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):128 -> a
+    147:147:void visitEnd():909 -> a
+    148:148:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734:734 -> a
+    148:148:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):129 -> a
+    148:148:void visitEnd():909 -> a
+    149:149:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    149:149:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744 -> a
+    149:149:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734 -> a
+    149:149:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):129 -> a
+    149:149:void visitEnd():909 -> a
+    150:150:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):745:745 -> a
+    150:150:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734 -> a
+    150:150:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):129 -> a
+    150:150:void visitEnd():909 -> a
+    151:151:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):16:16 -> a
+    151:151:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):735 -> a
+    151:151:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.ContextDescriptor.defineBindingReference(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):129 -> a
+    151:151:void visitEnd():909 -> a
+    152:152:void visitEnd():910:910 -> a
+    153:153:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
+    153:153:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():15 -> a
+    153:153:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    153:153:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):919 -> a
+    153:153:void visitEnd():910 -> a
+    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():31:31 -> a
+    154:154:void com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.<init>():17 -> a
+    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck.builder():55 -> a
+    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):919 -> a
+    154:154:void visitEnd():910 -> a
+    155:155:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    155:155:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):922 -> a
+    155:155:void visitEnd():910 -> a
+    156:156:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):36:36 -> a
+    156:156:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):923 -> a
+    156:156:void visitEnd():910 -> a
+    157:157:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49:49 -> a
+    157:157:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    157:157:void visitEnd():910 -> a
+    158:158:void com.android.tools.r8.relocated.keepanno.ast.KeepBindings.verify(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference[]):63:63 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():49 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    158:158:void visitEnd():910 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.ast.KeepCheck com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder.build():50:50 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.ast.KeepCheck buildKeepCheckFromItem(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):924 -> a
+    159:159:void visitEnd():910 -> a
+    160:161:void visitEnd():910:911 -> a
+    162:162:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
+    162:162:void visitEnd():880 -> a
+    163:164:void visitEnd():880:881 -> a
+    165:165:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
+    165:165:void visitEnd():881 -> a
+    166:166:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
+    166:166:void visitEnd():876 -> a
+    167:168:void visitEnd():876:877 -> a
+    169:169:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
+    169:169:void visitEnd():877 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor -> com.android.tools.r8.internal.FF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     java.util.List declarations -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):711:711 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;)V"}
-    2:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):707:712 -> <init>
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):717:717 -> a
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):785:785 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;)V"}
+    2:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):781:786 -> <init>
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):791:791 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase.getParsingContext():25:25 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):718 -> a
-    3:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):718:731 -> a
-    17:21:void visitEnd():736:740 -> a
-    22:22:void visitEnd():737:737 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor$1 -> com.android.tools.r8.internal.sF:
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):792 -> a
+    3:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):792:805 -> a
+    17:21:void visitEnd():810:814 -> a
+    22:22:void visitEnd():811:811 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor$1 -> com.android.tools.r8.internal.EF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext val$parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fW;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FF;"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():719:719 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor,com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext):719:719 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tF;Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/bW;)V"}
-    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):722:724 -> a
+    1:1:void <clinit>():793:793 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ExtractedAnnotationsVisitor,com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext):793:793 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FF;Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/fW;)V"}
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):796:798 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):725 -> a
-    5:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):725:727 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldAccessVisitor -> com.android.tools.r8.internal.uF:
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):799 -> a
+    5:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):799:801 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldAccessVisitor -> com.android.tools.r8.internal.GF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder fieldAccessBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VF;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder):2394:2395 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/VF;)V"}
-    1:21:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2400:2420 -> a
-    1:6:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2407:2412 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hG;"}
+    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder):2484:2485 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/hG;)V"}
+    1:21:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2490:2510 -> a
+    1:6:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2497:2502 -> b
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder.setTransient(boolean):98:98 -> b
-    7:7:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2412 -> b
+    7:7:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2502 -> b
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder.setTransient(boolean):98:98 -> b
-    8:8:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2412 -> b
+    8:8:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2502 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2409:2409 -> b
+    9:9:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2499:2499 -> b
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder.setVolatile(boolean):93:93 -> b
-    10:10:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2409 -> b
+    10:10:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2499 -> b
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder.setVolatile(boolean):93:93 -> b
-    11:11:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2409 -> b
+    11:11:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2499 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser -> com.android.tools.r8.internal.vF:
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser -> com.android.tools.r8.internal.HF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser annotatedByParser -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser nameParser -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tf0;"}
     com.android.tools.r8.relocated.keepanno.asm.FieldTypeParser typeParser -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fp;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder accessBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder builder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kG;"}
     java.util.List parsers -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1791:1791 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
-    2:8:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1787:1793 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1911:1911 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
+    2:8:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1907:1913 -> <init>
     9:9:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    9:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1793 -> <init>
-    10:16:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1793:1799 -> <init>
+    9:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1913 -> <init>
+    10:16:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1913:1919 -> <init>
     17:17:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    17:17:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1799 -> <init>
-    18:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1799:1803 -> <init>
+    17:17:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1919 -> <init>
+    18:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1919:1923 -> <init>
     23:23:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    23:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1803 -> <init>
-    24:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1803:1804 -> <init>
+    23:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1923 -> <init>
+    24:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1923:1924 -> <init>
     26:26:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    26:26:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1804 -> <init>
+    26:26:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1924 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    27:27:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1804 -> <init>
-    28:28:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1805:1805 -> <init>
+    27:27:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1924 -> <init>
+    28:28:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1925:1925 -> <init>
     29:29:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    29:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1805 -> <init>
+    29:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1925 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1805 -> <init>
-    31:31:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1806:1806 -> <init>
+    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1925 -> <init>
+    31:31:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1926:1926 -> <init>
     32:32:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    32:32:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1806 -> <init>
+    32:32:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1926 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    33:33:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1806 -> <init>
-    34:34:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1808:1808 -> <init>
-    1:1:boolean isDeclared():1825:1825 -> a
-    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1846:1847 -> a
+    33:33:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1926 -> <init>
+    34:34:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1928:1928 -> <init>
+    1:1:boolean isDeclared():1945:1945 -> a
+    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1966:1967 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.builder():26:26 -> a
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1847 -> a
-    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1847:1850 -> a
-    1:1:java.util.List parsers():1813:1813 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ForApiClassVisitor -> com.android.tools.r8.internal.wF:
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1967 -> a
+    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1967:1970 -> a
+    1:1:java.util.List parsers():1933:1933 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ForApiClassVisitor -> com.android.tools.r8.internal.IF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     java.lang.String className -> k
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequences -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     boolean $assertionsDisabled -> q
-    1:1:void <clinit>():901:901 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):916:916 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):906 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):906:906 -> <init>
+    1:1:void <clinit>():986:986 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1001:1001 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):991 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):991:991 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.builder():41:41 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):907 -> <init>
-    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):907:907 -> <init>
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):992 -> <init>
+    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):992:992 -> <init>
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):908 -> <init>
-    7:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):908:924 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):934:935 -> a
+    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):993 -> <init>
+    7:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):993:1009 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1019:1020 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):935 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):938:938 -> a
-    5:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):943:951 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):1020 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1023:1023 -> a
+    5:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1028:1036 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    14:14:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):947:947 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CE;)V"}
-    15:51:void visitEnd():956:992 -> a
-    52:52:void visitEnd():988:988 -> a
-    53:53:void visitEnd():986:986 -> a
-    54:54:void visitEnd():980:980 -> a
-    55:84:void visitEnd():970:999 -> a
-    85:85:void visitEnd():994:994 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():929:929 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ForApiMemberVisitor -> com.android.tools.r8.internal.xF:
+    14:14:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1032:1032 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OE;)V"}
+    15:50:void visitEnd():1047:1082 -> a
+    51:51:void visitEnd():1078:1078 -> a
+    52:52:void visitEnd():1076:1076 -> a
+    53:72:void visitEnd():1070:1089 -> a
+    73:73:void visitEnd():1084:1084 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1014:1014 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ForApiMemberVisitor -> com.android.tools.r8.internal.JF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequences -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1022:1022 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/mG;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1012 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1012:1012 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1112:1112 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1102 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1102:1102 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1013 -> <init>
-    5:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1013:1014 -> <init>
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1103 -> <init>
+    5:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1103:1104 -> <init>
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.builder():41:41 -> <init>
-    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1015 -> <init>
-    8:18:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1015:1025 -> <init>
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> <init>
-    19:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1027 -> <init>
+    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1105 -> <init>
+    8:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1105:1116 -> <init>
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> <init>
+    20:20:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1117 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1027:1028 -> <init>
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):690:690 -> <init>
-    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1028 -> <init>
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):167:167 -> <init>
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):690 -> <init>
-    23:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1028 -> <init>
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):691:691 -> <init>
-    24:24:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1028 -> <init>
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> <init>
-    25:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1030 -> <init>
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> <init>
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> <init>
-    26:26:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1030 -> <init>
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> <init>
-    27:27:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> <init>
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():50 -> <init>
-    27:27:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1032 -> <init>
-    28:28:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> <init>
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> <init>
-    28:28:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1034 -> <init>
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> <init>
-    29:29:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> <init>
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> <init>
-    29:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1034 -> <init>
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> <init>
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):30 -> <init>
-    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1035 -> <init>
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> <init>
-    31:31:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1037 -> <init>
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):15:15 -> <init>
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.toItemReference():66 -> <init>
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):23 -> <init>
-    32:32:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1033 -> <init>
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():35:35 -> <init>
-    33:33:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1038 -> <init>
-    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
-    34:34:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1031 -> <init>
+    21:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1118:1118 -> <init>
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> <init>
+    22:22:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> <init>
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> <init>
+    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1120 -> <init>
+    23:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1121:1121 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):11:11 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference.toItemReference():22 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18 -> <init>
+    24:24:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1121 -> <init>
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> <init>
+    25:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1122 -> <init>
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    26:26:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1119 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
-    35:35:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1031 -> <init>
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():35:35 -> <init>
-    36:36:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1039 -> <init>
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
-    37:37:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1039 -> <init>
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    27:27:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1119 -> <init>
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():48:48 -> <init>
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():38 -> <init>
+    28:28:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1125 -> <init>
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18:18 -> <init>
+    29:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1125 -> <init>
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> <init>
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> <init>
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toItemReference():26 -> <init>
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18 -> <init>
+    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1125 -> <init>
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> <init>
+    31:31:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1126 -> <init>
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    32:32:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1123 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
-    38:38:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):1039 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1044:1045 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    33:33:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1123 -> <init>
+    34:34:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1131:1131 -> <init>
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> <init>
+    35:35:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> <init>
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> <init>
+    35:35:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1133 -> <init>
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> <init>
+    36:36:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():19 -> <init>
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():13 -> <init>
+    36:36:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1136 -> <init>
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> <init>
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):25 -> <init>
+    37:37:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1137 -> <init>
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> <init>
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> <init>
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29 -> <init>
+    38:38:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1138 -> <init>
+    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():48:48 -> <init>
+    39:39:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1139 -> <init>
+    40:40:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1135:1135 -> <init>
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):11:11 -> <init>
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference.toItemReference():22 -> <init>
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18 -> <init>
+    41:41:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1134 -> <init>
+    42:42:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> <init>
+    42:42:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1140 -> <init>
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    43:43:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1132 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    44:44:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1132 -> <init>
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> <init>
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> <init>
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toItemReference():26 -> <init>
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18 -> <init>
+    45:45:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1142 -> <init>
+    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> <init>
+    46:46:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1142 -> <init>
+    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    47:47:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1141 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> <init>
+    48:48:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1141 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1148:1149 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1045 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1048:1048 -> a
-    5:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1053:1061 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):1149 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1152:1152 -> a
+    5:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1157:1165 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    14:14:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1057:1057 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CE;)V"}
-    15:17:void visitEnd():1066:1068 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-    18:18:void visitEnd():1068 -> a
+    14:14:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1161:1161 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OE;)V"}
+    15:17:void visitEnd():1170:1172 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    18:18:void visitEnd():1172 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void visitEnd():1068:1068 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    20:20:void visitEnd():1069 -> a
+    19:19:void visitEnd():1172:1172 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    20:20:void visitEnd():1173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    21:21:void visitEnd():1069 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):153:153 -> a
-    22:22:void visitEnd():1069 -> a
-    23:24:void visitEnd():1069:1070 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):163:163 -> a
-    25:25:void visitEnd():1070 -> a
-    26:26:void visitEnd():1071:1071 -> a
-    27:27:void visitEnd():1066:1066 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind -> com.android.tools.r8.internal.yF:
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    21:21:void visitEnd():1173 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+    22:22:void visitEnd():1173 -> a
+    23:24:void visitEnd():1173:1174 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):170:170 -> a
+    25:25:void visitEnd():1174 -> a
+    26:26:void visitEnd():1175:1175 -> a
+    27:27:void visitEnd():1170:1170 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind -> com.android.tools.r8.internal.KF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind ONLY_CLASS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind ONLY_MEMBERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind ONLY_METHODS -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind ONLY_FIELDS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind CLASS_AND_MEMBERS -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind CLASS_AND_METHODS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind CLASS_AND_FIELDS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
-    1:7:void <clinit>():230:236 -> <clinit>
-    1:1:void <init>(java.lang.String,int):229:229 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
+    1:7:void <clinit>():231:237 -> <clinit>
+    1:1:void <init>(java.lang.String,int):230:230 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:4:boolean includesField():299:302 -> a
-    1:4:boolean includesMethod():292:295 -> b
-    1:1:boolean isOnlyClass():260:260 -> c
-    1:1:boolean requiresFields():273:273 -> d
-    1:1:boolean includesMembers():288:288 -> e
-    1:1:boolean requiresMembers():265 -> e
-    1:1:boolean requiresMethods():269:269 -> g
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepBindingVisitor -> com.android.tools.r8.internal.zF:
+    1:4:boolean includesClass():282:285 -> a
+    1:4:boolean includesField():300:303 -> b
+    1:4:boolean includesMethod():293:296 -> c
+    1:1:boolean isOnlyClass():261:261 -> d
+    1:1:boolean requiresFields():274:274 -> e
+    1:1:boolean includesMembers():289:289 -> g
+    1:1:boolean requiresMembers():266 -> g
+    1:1:boolean requiresMethods():270:270 -> h
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepBindingVisitor -> com.android.tools.r8.internal.LF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper helper -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     java.lang.String bindingName -> l
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2166:2168 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/RF;)V"}
-    1:5:void visit(java.lang.String,java.lang.Object):2178:2182 -> a
+    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2266:2268 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/dG;)V"}
+    1:5:void visit(java.lang.String,java.lang.Object):2278:2282 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
-    6:18:void visitEnd():2187:2199 -> a
-    19:21:void visitEnd():2192:2194 -> a
-    22:22:void visitEnd():2192:2192 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2173:2173 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepBindingsVisitor -> com.android.tools.r8.internal.AF:
+    6:8:void visitEnd():2287:2289 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2273:2273 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepBindingsVisitor -> com.android.tools.r8.internal.MF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fW;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper helper -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1416:1416 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1421:1423 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/RF;)V"}
-    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1428:1430 -> a
+    1:1:void <clinit>():1532:1532 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1537:1539 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/dG;)V"}
+    1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1544:1546 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1430 -> a
-    5:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1430:1432 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepConditionVisitor -> com.android.tools.r8.internal.BF:
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1546 -> a
+    5:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1546:1548 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepConditionVisitor -> com.android.tools.r8.internal.NF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2261:2263 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Lcom/android/tools/r8/internal/RF;)V"}
-    1:2:void visitEnd():2273:2274 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():36:36 -> a
-    3:3:void visitEnd():2274 -> a
-    4:4:void visitEnd():2274:2274 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2268:2268 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepConsequencesVisitor -> com.android.tools.r8.internal.CF:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2351:2353 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Lcom/android/tools/r8/internal/dG;)V"}
+    1:2:void visitEnd():2363:2364 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):27:27 -> a
+    3:3:void visitEnd():2364 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():37:37 -> a
+    4:4:void visitEnd():2364 -> a
+    5:5:void visitEnd():2364:2364 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2358:2358 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepConsequencesVisitor -> com.android.tools.r8.internal.OF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fW;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder builder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():1468:1468 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1478:1478 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/OF;Lcom/android/tools/r8/internal/RF;)V"}
+    1:1:void <clinit>():1584:1584 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1594:1594 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/aG;Lcom/android/tools/r8/internal/dG;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.builder():41:41 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1471 -> <init>
-    3:13:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1471:1481 -> <init>
-    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1486:1489 -> a
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1587 -> <init>
+    3:13:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1587:1597 -> <init>
+    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1602:1605 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1489 -> a
-    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1489:1489 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor.create(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2214:2214 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1488 -> a
-    8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1491:1491 -> a
-    9:9:void visitEnd():1496:1496 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeClassVisitor -> com.android.tools.r8.internal.DF:
+    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1605 -> a
+    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1605:1605 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor.create(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2304:2304 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1604 -> a
+    8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1607:1607 -> a
+    9:9:void visitEnd():1612:1612 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeClassVisitor -> com.android.tools.r8.internal.PF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     boolean readEmbedded -> c
     boolean readExtracted -> d
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     java.lang.String className -> f
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext parsingContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aW;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.ClassVisitor.<init>(int):58:58 -> <init>
-    1:1:void <init>(boolean,boolean,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):315 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/OF;)V"}
-    2:4:void <init>(boolean,boolean,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):316:318 -> <init>
-    1:1:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isExtractedAnnotation(java.lang.String):105:105 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):369 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/VV;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-    2:2:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):370:370 -> a
-    3:3:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):109:109 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):372 -> a
-    4:7:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):375:378 -> a
-    8:8:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):380 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    9:9:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):380 -> a
-    10:10:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):380 -> a
-    11:11:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):381:381 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):382 -> a
-    13:29:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):383:399 -> a
-    30:31:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):390:391 -> a
-    32:32:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):333:333 -> a
-    33:33:java.lang.String binaryNameToTypeName(java.lang.String):322:322 -> a
-    33:33:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):334 -> a
-    34:34:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):334:334 -> a
-    35:35:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext.fromName(java.lang.String):71:71 -> a
-    35:35:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
-    36:36:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:335 -> a
-    37:42:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):344:349 -> a
+    1:1:void <init>(boolean,boolean,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):316 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/aG;)V"}
+    2:4:void <init>(boolean,boolean,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent):317:319 -> <init>
+    1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):385 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/rG;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    2:2:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):385 -> a
+    3:3:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):385 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):386:386 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):387 -> a
+    6:6:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isExtractedAnnotation(java.lang.String):107:107 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):370 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/ZV;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    7:7:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):371:371 -> a
+    8:8:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.isEmbeddedAnnotation(java.lang.String):111:111 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):373 -> a
+    9:36:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):376:403 -> a
+    37:38:com.android.tools.r8.relocated.keepanno.asm.AnnotationVisitorBase createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.util.function.Consumer):394:395 -> a
+    39:39:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):334:334 -> a
+    40:40:java.lang.String binaryNameToTypeName(java.lang.String):323:323 -> a
+    40:40:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
+    41:41:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:335 -> a
+    42:42:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext.fromName(java.lang.String):71:71 -> a
+    42:42:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):336 -> a
+    43:43:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):336:336 -> a
+    44:49:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):345:350 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-    43:43:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):339:339 -> a
-    43:43:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):350 -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):339 -> a
-    44:44:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):350 -> a
-    45:45:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):350:350 -> a
-    46:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):344:344 -> a
-    47:48:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):405:406 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
-    49:49:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):405:405 -> a
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromClassDescriptor(java.lang.String):93:93 -> a
-    50:50:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):405 -> a
-    51:53:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):412:414 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
-    54:56:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):422:424 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Ip;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeFieldVisitor -> com.android.tools.r8.internal.EF:
+    50:50:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):340:340 -> a
+    50:50:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):351 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):340 -> a
+    51:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):351 -> a
+    52:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):351:351 -> a
+    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):345:345 -> a
+    54:55:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):409:410 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qF;)V"}
+    56:56:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):409:409 -> a
+    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromClassDescriptor(java.lang.String):93:93 -> a
+    57:57:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):409 -> a
+    58:60:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):416:418 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
+    61:63:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):426:428 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lp;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeFieldVisitor -> com.android.tools.r8.internal.QF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     java.lang.String className -> d
     java.lang.String fieldName -> e
     java.lang.String fieldTypeDescriptor -> f
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext$FieldParsingContext parsingContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bW;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.FieldVisitor.<init>(int):55:55 -> <init>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):577 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WV;Lcom/android/tools/r8/internal/OF;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
-    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):578:582 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):593:593 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/mG;"}
-    2:2:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):594 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    3:3:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):594 -> a
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):221:221 -> a
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):24:24 -> a
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    6:6:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    7:7:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    8:8:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25:25 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):595 -> a
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.anyFieldAccess():22:22 -> a
-    11:11:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():22 -> a
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):590 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aW;Lcom/android/tools/r8/internal/aG;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
+    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):591:595 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):609:609 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
+    2:2:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():19 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():13 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):610 -> a
+    3:3:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    4:4:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    5:5:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):225:225 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):226 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):223:223 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):611 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.anyFieldAccess():22:22 -> a
+    10:10:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():22 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):613 -> a
+    11:11:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):597 -> a
-    12:12:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):613 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
+    12:12:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):597 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
-    13:13:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):597 -> a
-    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15:15 -> a
-    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):598 -> a
-    15:18:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):19:22 -> a
-    15:18:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15 -> a
-    15:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):598 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):600 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String):601 -> a
-    21:22:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):605:606 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
-    23:23:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):605:605 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromFieldDescriptor(java.lang.String,java.lang.String,java.lang.String):105:105 -> a
-    24:24:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):605 -> a
-    25:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):611:616 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):613 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15:15 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):614 -> a
+    14:17:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):19:22 -> a
+    14:17:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.exact(java.lang.String):15 -> a
+    14:17:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):614 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):616 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():48:48 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMemberItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):617 -> a
+    20:21:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):621:622 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qF;)V"}
+    22:22:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):621:621 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromFieldDescriptor(java.lang.String,java.lang.String,java.lang.String):105:105 -> a
+    23:23:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):621 -> a
+    24:29:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):627:632 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-    31:31:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):587:587 -> a
-    31:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):617 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):587 -> a
-    32:32:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):617 -> a
-    33:33:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):617:617 -> a
-    34:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):611:611 -> a
-    35:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):643:666 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/VV;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeMethodVisitor -> com.android.tools.r8.internal.FF:
+    30:30:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):600:600 -> a
+    30:30:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):633 -> a
+    31:31:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
+    31:31:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):600 -> a
+    31:31:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):633 -> a
+    32:32:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):633:633 -> a
+    33:33:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):627:627 -> a
+    34:57:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):659:682 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/ZV;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):668:668 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/rG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):676:676 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):685:685 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeMethodVisitor -> com.android.tools.r8.internal.RF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     java.lang.String className -> d
     java.lang.String methodName -> e
     java.lang.String methodDescriptor -> f
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext$MethodParsingContext parsingContext -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eW;"}
     1:1:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.<init>(int):71:71 -> <init>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):443 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WV;Lcom/android/tools/r8/internal/OF;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
-    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):444:448 -> <init>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):447 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aW;Lcom/android/tools/r8/internal/aG;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"}
+    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.lang.String,java.lang.String,java.lang.String):448:452 -> <init>
     1:1:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):355:355 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):454 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/mG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):461 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
     2:2:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType(java.lang.String):354:354 -> a
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):454 -> a
-    3:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):454:455 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):461 -> a
+    3:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):461:462 -> a
     5:5:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.<init>():40:40 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.builder():14 -> a
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):456 -> a
-    6:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):457:458 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):463 -> a
+    6:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):464:465 -> a
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.addParameterTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):45:45 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):458 -> a
-    9:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):461:464 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):465 -> a
+    9:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):468:471 -> a
     13:13:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
     13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):463 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):470 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
-    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):463 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):470 -> a
     15:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18:18 -> a
-    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):463 -> a
-    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):465 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    17:17:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):465 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):221:221 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):24:24 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    20:20:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    21:21:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    22:22:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):25:25 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String):220 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):466 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.anyMethodAccess() -> a
-    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():22 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):470 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
+    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():19 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():13 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):473 -> a
+    17:17:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    18:18:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    19:19:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):224 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):225:225 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):226 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader.classReferenceFromName(java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):223:223 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):474 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.anyMethodAccess():25:25 -> a
+    24:24:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():22 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):476 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
+    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
     25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):468 -> a
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
-    26:26:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):476 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
+    26:26:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
     26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):468 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
-    27:27:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):468 -> a
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.exact(java.lang.String):30:30 -> a
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):469 -> a
-    29:33:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.build():50:54 -> a
-    29:33:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):471 -> a
-    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
-    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    35:35:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):476 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.exact(java.lang.String):30:30 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):477 -> a
+    28:32:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.build():50:54 -> a
+    28:32:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):479 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    34:34:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
+    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
+    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    35:35:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
     35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    36:36:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    38:38:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    39:43:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
-    39:43:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):472 -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build() -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String):473 -> a
-    45:50:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):482:487 -> a
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    37:37:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    38:42:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
+    38:42:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):480 -> a
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():48:48 -> a
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern createMethodItemContext(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):481 -> a
+    44:49:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):490:495 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Z)Lcom/android/tools/r8/internal/J2;"}
-    51:51:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):477:477 -> a
-    51:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):488 -> a
-    52:52:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    52:52:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):477 -> a
-    52:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):488 -> a
-    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):488:488 -> a
-    54:54:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):482:482 -> a
-    55:93:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):514:552 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/VV;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
-    94:98:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):533:537 -> a
-    99:100:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):559:560 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
-    101:101:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):559:559 -> a
-    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromMethodDescriptor(java.lang.String,java.lang.String,java.lang.String):99:99 -> a
-    102:102:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):559 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeVisitor -> com.android.tools.r8.internal.GF:
+    50:50:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):485:485 -> a
+    50:50:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):496 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext annotationParsingContext(java.lang.String):485 -> a
+    51:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):496 -> a
+    52:52:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):496:496 -> a
+    53:53:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):490:490 -> a
+    54:94:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):522:562 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ZZLjava/util/function/Consumer;Lcom/android/tools/r8/internal/ZV;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/K2;"}
+    95:97:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,boolean,boolean,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):543:545 -> a
+    98:99:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):572:573 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qF;)V"}
+    100:100:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):572:572 -> a
+    101:101:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setContextFromMethodDescriptor(java.lang.String,java.lang.String,java.lang.String):99:99 -> a
+    101:101:void setContext(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder):572 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern lambda$createAnnotationVisitor$0(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):531:531 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/rG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$1(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):539:539 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$2(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):548:548 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$3(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):556:556 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern lambda$createAnnotationVisitor$4(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):565:565 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/dG;)Lcom/android/tools/r8/internal/yG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepEdgeVisitor -> com.android.tools.r8.internal.SF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):855:855 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):847 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):847:847 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):940:940 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):932 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):932:932 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):848 -> <init>
-    5:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):848:858 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):863:864 -> a
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):933 -> <init>
+    5:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer):933:943 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):948:949 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):864 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):867:867 -> a
-    5:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):872:884 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):949 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):952:952 -> a
+    5:17:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):957:969 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    18:19:void visitEnd():889:890 -> a
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-    20:20:void visitEnd():890 -> a
+    18:19:void visitEnd():974:975 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    20:20:void visitEnd():975 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:void visitEnd():890:890 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    22:22:void visitEnd():890 -> a
+    21:21:void visitEnd():975:975 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    22:22:void visitEnd():975 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    23:23:void visitEnd():890 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):153:153 -> a
-    24:24:void visitEnd():890 -> a
-    25:25:void visitEnd():890:890 -> a
-    26:26:void visitEnd():889:889 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase -> com.android.tools.r8.internal.HF:
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    23:23:void visitEnd():975 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+    24:24:void visitEnd():975 -> a
+    25:25:void visitEnd():975:975 -> a
+    26:26:void visitEnd():974:974 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase -> com.android.tools.r8.internal.TF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     java.lang.String memberBindingReference -> d
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind kind -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ClassDeclarationParser classDeclaration -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MemberDeclarationParser memberDeclaration -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LF;"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemReference itemReference -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XF;"}
+    java.util.List itemReferences -> h
     boolean $assertionsDisabled -> i
-    1:1:void <clinit>():1926:1926 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1939:1939 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
-    2:16:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1928:1942 -> <init>
-    1:1:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2039:2039 -> a
-    2:16:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):239:253 -> a
-    2:16:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2042 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):251:251 -> a
-    17:17:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2042 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):249:249 -> a
-    18:18:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2042 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):245:245 -> a
-    19:19:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2042 -> a
-    20:24:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):243:247 -> a
-    20:24:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2042 -> a
-    25:27:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2044:2046 -> a
-    28:28:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2040:2040 -> a
-    29:37:void visit(java.lang.String,java.lang.Object):2052:2060 -> a
+    1:1:void <clinit>():2046:2046 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):2063:2063 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
+    2:20:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):2048:2066 -> <init>
+    1:1:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2096:2096 -> a
+    2:16:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):240:254 -> a
+    2:16:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2099 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):252:252 -> a
+    17:17:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2099 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):250:250 -> a
+    18:18:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2099 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):246:246 -> a
+    19:19:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2099 -> a
+    20:24:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):244:248 -> a
+    20:24:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2099 -> a
+    25:27:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2101:2103 -> a
+    28:28:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2097:2097 -> a
+    29:37:void visit(java.lang.String,java.lang.Object):2109:2117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
-    38:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):2065:2073 -> a
+    38:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):2122:2130 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    47:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2078:2082 -> a
+    47:51:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2135:2139 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    52:58:void visitEnd():2088:2094 -> a
-    59:88:void visitEnd():2090:2119 -> a
-    89:127:void visitEnd():2117:2155 -> a
+    52:52:void visitEnd():2187:2187 -> a
+    53:57:void visitEndWithMemberBindingReference():2143:2147 -> a
+    53:57:void visitEnd():2188 -> a
+    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):16:16 -> a
+    58:58:void visitEndWithMemberBindingReference():2148 -> a
+    58:58:void visitEnd():2188 -> a
+    59:69:void visitEndWithMemberBindingReference():2151:2161 -> a
+    59:69:void visitEnd():2188 -> a
+    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    70:70:void visitEndWithMemberBindingReference():2161 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    70:70:void visitEnd():2188 -> a
+    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2168:2168 -> a
+    71:71:void visitEndWithMemberBindingReference():2163 -> a
+    71:71:void visitEnd():2188 -> a
+    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():48:48 -> a
+    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():38 -> a
+    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2170 -> a
+    72:72:void visitEndWithMemberBindingReference():2163 -> a
+    72:72:void visitEnd():2188 -> a
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2170:2170 -> a
+    73:73:void visitEndWithMemberBindingReference():2163 -> a
+    73:73:void visitEnd():2188 -> a
+    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2178:2181 -> a
+    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    74:77:void visitEndWithMemberBindingReference():2163 -> a
+    74:77:void visitEnd():2188 -> a
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756:756 -> a
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    78:78:void visitEndWithMemberBindingReference():2163 -> a
+    78:78:void visitEnd():2188 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    79:79:void visitEndWithMemberBindingReference():2163 -> a
+    79:79:void visitEnd():2188 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    80:80:void visitEndWithMemberBindingReference():2163 -> a
+    80:80:void visitEnd():2188 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    81:81:void visitEndWithMemberBindingReference():2163 -> a
+    81:81:void visitEnd():2188 -> a
+    82:83:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):757:758 -> a
+    82:83:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    82:83:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    82:83:void visitEndWithMemberBindingReference():2163 -> a
+    82:83:void visitEnd():2188 -> a
+    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181:2181 -> a
+    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2171 -> a
+    84:84:void visitEndWithMemberBindingReference():2163 -> a
+    84:84:void visitEnd():2188 -> a
+    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):2173:2173 -> a
+    85:85:void visitEndWithMemberBindingReference():2163 -> a
+    85:85:void visitEnd():2188 -> a
+    86:86:void visitEndWithMemberBindingReference():2163:2163 -> a
+    86:86:void visitEnd():2188 -> a
+    87:87:void visitEndWithMemberBindingReference():2144:2144 -> a
+    87:87:void visitEnd():2188 -> a
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
+    88:88:void visitEndWithMemberBindingReference():2144 -> a
+    88:88:void visitEnd():2188 -> a
+    89:109:void visitEnd():2193:2213 -> a
+    110:150:void visitEnd():2211:2251 -> a
+    151:151:void visitEnd():2247:2247 -> a
+    152:159:void visitEnd():2245:2252 -> a
+    160:163:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2178:2181 -> a
+    160:163:void visitEnd():2253 -> a
+    164:164:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756:756 -> a
+    164:164:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    164:164:void visitEnd():2253 -> a
+    165:165:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    165:165:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    165:165:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    165:165:void visitEnd():2253 -> a
+    166:166:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    166:166:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    166:166:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    166:166:void visitEnd():2253 -> a
+    167:167:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    167:167:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+    167:167:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    167:167:void visitEnd():2253 -> a
+    168:169:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):757:758 -> a
+    168:169:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181 -> a
+    168:169:void visitEnd():2253 -> a
+    170:170:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference ensureCorrectBindingForMemberHolder(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):2181:2181 -> a
+    170:170:void visitEnd():2253 -> a
+    171:173:void visitEnd():2253:2255 -> a
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-    1:2:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference getItemReference():2023:2024 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference getItemReference():2024 -> c
-    1:8:java.util.Collection getItemsWithoutBinding():1946:1953 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+    1:7:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference getItemReference():2077:2083 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BE;"}
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference getItemReference():2081:2081 -> c
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference getItemReference():2081 -> c
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference getItemReference():2078:2078 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference getItemReference():2078 -> c
+    1:2:java.util.Collection getItems():2070:2071 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
-    9:12:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClass():281:284 -> d
-    9:12:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClassAndMembers():277 -> d
-    9:12:java.util.Collection getItemsWithoutBinding():1956 -> d
-    13:13:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesMembers():288:288 -> d
-    13:13:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClassAndMembers():277 -> d
-    13:13:java.util.Collection getItemsWithoutBinding():1956 -> d
-    14:19:java.util.Collection getItemsWithoutBinding():1957:1962 -> d
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> d
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> d
-    20:20:java.util.Collection getItemsWithoutBinding():1962 -> d
-    21:21:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> d
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> d
-    21:21:java.util.Collection getItemsWithoutBinding():1964 -> d
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> d
-    22:22:java.util.Collection getItemsWithoutBinding():1966 -> d
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> d
-    23:23:java.util.Collection getItemsWithoutBinding():1967 -> d
-    24:24:java.util.Collection getItemsWithoutBinding():1969:1969 -> d
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> d
-    25:25:java.util.Collection getItemsWithoutBinding():1970 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):15:15 -> d
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.toItemReference():66 -> d
-    26:26:java.util.Collection getItemsWithoutBinding():1972 -> d
-    27:29:java.util.Collection getItemsWithoutBinding():1972:1974 -> d
-    30:30:java.util.Collection getItemsWithoutBinding():1954:1954 -> d
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> d
-    31:31:java.util.Collection getItemsWithoutBinding():1954 -> d
-    32:32:java.util.Collection getItemsWithoutBinding():1947:1947 -> d
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> d
-    33:33:java.util.Collection getItemsWithoutBinding():1947 -> d
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind getKind():2030:2030 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yF;"}
-    1:1:boolean isDefaultMemberDeclaration():2034:2034 -> f
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> d
+    3:3:java.util.Collection getItems():2071 -> d
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind getKind():2087:2087 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KF;"}
+    1:1:boolean isDefaultMemberDeclaration():2091:2091 -> f
     2:2:boolean com.android.tools.r8.relocated.keepanno.asm.Parser.isDefault():15:15 -> f
-    2:2:boolean isDefaultMemberDeclaration():2034 -> f
+    2:2:boolean isDefaultMemberDeclaration():2091 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepPreconditionsVisitor -> com.android.tools.r8.internal.IF:
+    1:1:boolean useBindingForClassAndMembers():0:0 -> g
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepPreconditionsVisitor -> com.android.tools.r8.internal.UF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fW;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder builder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():1436:1436 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1446:1446 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bW;Lcom/android/tools/r8/internal/OF;Lcom/android/tools/r8/internal/RF;)V"}
+    1:1:void <clinit>():1552:1552 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1562:1562 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fW;Lcom/android/tools/r8/internal/aG;Lcom/android/tools/r8/internal/dG;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions.builder():33:33 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1439 -> <init>
-    3:13:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1439:1449 -> <init>
-    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1454:1457 -> a
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1555 -> <init>
+    3:13:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):1555:1565 -> <init>
+    1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1570:1573 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.annotation(java.lang.String):55:55 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1457 -> a
-    6:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1457:1459 -> a
-    9:9:void visitEnd():1464:1464 -> a
+    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1573 -> a
+    6:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):1573:1575 -> a
+    9:9:void visitEnd():1580:1580 -> a
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.build():26:26 -> a
-    10:10:void visitEnd():1464 -> a
+    10:10:void visitEnd():1580 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:13:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.build():26:28 -> a
-    11:13:void visitEnd():1464 -> a
-    14:14:void visitEnd():1464:1464 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor -> com.android.tools.r8.internal.JF:
+    11:13:void visitEnd():1580 -> a
+    14:14:void visitEnd():1580:1580 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepTargetVisitor -> com.android.tools.r8.internal.VF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser constraintsParser -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder builder -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XG;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2221:2221 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Lcom/android/tools/r8/internal/RF;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():50:50 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2208 -> <init>
-    3:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2208:2224 -> <init>
-    1:1:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):2234:2234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YE;)V"}
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2234:2234 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hH;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2311:2311 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Lcom/android/tools/r8/internal/dG;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51:51 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2298 -> <init>
+    3:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper):2298:2314 -> <init>
+    1:1:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):2324:2324 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;)V"}
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2324:2324 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor com.android.tools.r8.relocated.keepanno.asm.DeclarationParser.tryParseArray(java.lang.String,java.util.function.Consumer):40:40 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2234 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2238:2238 -> a
-    5:6:void visitEnd():2243:2244 -> a
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):2328:2328 -> a
+    5:6:void visitEnd():2333:2334 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
-    7:7:void visitEnd():2245 -> a
-    8:8:void visitEnd():2245:2245 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setConstraints(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):27:27 -> a
-    9:9:void visitEnd():2244 -> a
+    7:7:void visitEnd():2335 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    8:8:void visitEnd():2335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:17:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1979:1986 -> a
-    10:17:void visitEnd():2246 -> a
-    18:21:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClass():281:284 -> a
-    18:21:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClassAndMembers():277 -> a
-    18:21:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1989 -> a
-    18:21:void visitEnd():2246 -> a
-    22:22:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesMembers():288:288 -> a
-    22:22:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClassAndMembers():277 -> a
-    22:22:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1989 -> a
-    22:22:void visitEnd():2246 -> a
-    23:26:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1990:1993 -> a
-    23:26:void visitEnd():2246 -> a
-    27:27:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    27:27:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1995 -> a
-    27:27:void visitEnd():2246 -> a
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    28:28:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    28:28:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1995 -> a
-    28:28:void visitEnd():2246 -> a
-    29:29:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1996:1996 -> a
-    29:29:void visitEnd():2246 -> a
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> a
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> a
-    30:30:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1996 -> a
-    30:30:void visitEnd():2246 -> a
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> a
-    31:31:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1997 -> a
-    31:31:void visitEnd():2246 -> a
-    32:32:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1999:1999 -> a
-    32:32:void visitEnd():2246 -> a
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    33:33:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2002 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    9:9:void visitEnd():2335 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setConstraints(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):28:28 -> a
+    10:10:void visitEnd():2334 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:void visitEnd():2246 -> a
-    34:34:boolean com.android.tools.r8.relocated.keepanno.ast.KeepItemReference.isClassItemPattern():45:45 -> a
-    34:34:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2003 -> a
-    34:34:void visitEnd():2246 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    35:35:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2004:2004 -> a
-    35:35:void visitEnd():2246 -> a
-    36:36:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2229:2229 -> a
-    36:36:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006 -> a
-    36:36:void visitEnd():2246 -> a
-    37:37:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006:2006 -> a
-    37:37:void visitEnd():2246 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):690:690 -> a
-    38:38:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006 -> a
-    38:38:void visitEnd():2246 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):690:690 -> a
-    39:39:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006 -> a
-    39:39:void visitEnd():2246 -> a
-    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):167:167 -> a
-    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):690 -> a
-    40:40:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006 -> a
-    40:40:void visitEnd():2246 -> a
-    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):691:691 -> a
-    41:41:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2006 -> a
-    41:41:void visitEnd():2246 -> a
-    42:42:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
-    42:42:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2007 -> a
-    42:42:void visitEnd():2246 -> a
-    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
-    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
-    43:43:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2007 -> a
-    43:43:void visitEnd():2246 -> a
-    44:44:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    44:44:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2009 -> a
-    44:44:void visitEnd():2246 -> a
-    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    45:45:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    45:45:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2009 -> a
-    45:45:void visitEnd():2246 -> a
-    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):30 -> a
-    46:46:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2010 -> a
-    46:46:void visitEnd():2246 -> a
-    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> a
-    47:47:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2012 -> a
-    47:47:void visitEnd():2246 -> a
-    48:48:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2014:2014 -> a
-    48:48:void visitEnd():2246 -> a
-    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    49:49:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2015 -> a
-    49:49:void visitEnd():2246 -> a
-    50:50:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2015:2015 -> a
-    50:50:void visitEnd():2246 -> a
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):15:15 -> a
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.toItemReference():66 -> a
-    51:51:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2016 -> a
-    51:51:void visitEnd():2246 -> a
-    52:54:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():2016:2018 -> a
-    52:54:void visitEnd():2246 -> a
-    55:56:void visitEnd():2246:2247 -> a
-    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):18:18 -> a
-    57:57:void visitEnd():2247 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:58:void visitEnd():2247:2247 -> a
-    59:59:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1987:1987 -> a
-    59:59:void visitEnd():2246 -> a
-    60:60:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    60:60:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1987 -> a
-    60:60:void visitEnd():2246 -> a
-    61:61:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1980:1980 -> a
-    61:61:void visitEnd():2246 -> a
-    62:62:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    62:62:java.util.Collection com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getItemsWithBinding():1980 -> a
-    62:62:void visitEnd():2246 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2229:2229 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MemberAccessVisitor -> com.android.tools.r8.internal.KF:
+    11:12:void visitEnd():2336:2337 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18:18 -> a
+    13:13:void visitEnd():2337 -> a
+    14:14:void visitEnd():2337:2337 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():2319:2319 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MemberAccessVisitor -> com.android.tools.r8.internal.WF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase builder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iG;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase):2282:2283 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Lcom/android/tools/r8/internal/iG;)V"}
-    1:4:boolean withNormalizedAccessFlag(java.lang.String,java.util.function.BiPredicate):2287:2290 -> a
-    5:32:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2295:2322 -> a
-    33:33:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2296:2296 -> a
-    34:42:com.android.tools.r8.relocated.keepanno.ast.AccessVisibility getAccessVisibilityFromString(java.lang.String):2327:2335 -> a
-    34:42:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2302 -> a
-    43:45:com.android.tools.r8.relocated.keepanno.ast.AccessVisibility getAccessVisibilityFromString(java.lang.String):2329:2331 -> a
-    43:45:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2302 -> a
-    46:46:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2304:2304 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase):2372:2373 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Lcom/android/tools/r8/internal/uG;)V"}
+    1:4:boolean withNormalizedAccessFlag(java.lang.String,java.util.function.BiPredicate):2377:2380 -> a
+    5:32:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2385:2412 -> a
+    33:33:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2386:2386 -> a
+    34:42:com.android.tools.r8.relocated.keepanno.ast.AccessVisibility getAccessVisibilityFromString(java.lang.String):2417:2425 -> a
+    34:42:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2392 -> a
+    43:45:com.android.tools.r8.relocated.keepanno.ast.AccessVisibility getAccessVisibilityFromString(java.lang.String):2419:2421 -> a
+    43:45:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2392 -> a
+    46:46:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2394:2394 -> a
     47:49:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.setAccessVisibility(com.android.tools.r8.relocated.keepanno.ast.AccessVisibility,boolean):169:171 -> a
-    47:49:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2304 -> a
-    50:55:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2307:2312 -> a
+    47:49:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2394 -> a
+    50:55:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2397:2402 -> a
     56:56:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.setFinal(boolean):180:180 -> a
-    56:56:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2312 -> a
-    57:57:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2315:2315 -> a
+    56:56:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2402 -> a
+    57:57:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2405:2405 -> a
     58:58:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.setSynthetic(boolean):185:185 -> a
-    58:58:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2315 -> a
-    59:59:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2309:2309 -> a
+    58:58:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2405 -> a
+    59:59:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2399:2399 -> a
     60:60:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.setStatic(boolean):175:175 -> a
-    60:60:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2309 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MemberDeclarationParser -> com.android.tools.r8.internal.LF:
+    60:60:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2399 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MemberDeclarationParser -> com.android.tools.r8.internal.XF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder accessBuilder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tG;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser annotatedByParser -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser methodDeclaration -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser fieldDeclaration -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HF;"}
     java.util.List parsers -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1864:1864 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
-    2:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1857:1865 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1984:1984 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
+    2:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1977:1985 -> <init>
     11:11:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    11:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1865 -> <init>
-    12:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1865:1867 -> <init>
+    11:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1985 -> <init>
+    12:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1985:1987 -> <init>
     15:15:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1867 -> <init>
-    16:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1867:1876 -> <init>
-    1:1:boolean isDeclared():1886:1886 -> a
-    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1918:1919 -> a
+    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1987 -> <init>
+    16:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1987:1996 -> <init>
+    1:1:boolean isDeclared():2006:2006 -> a
+    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):2038:2039 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.memberBuilder():24:24 -> a
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1919 -> a
-    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1919:1922 -> a
-    1:1:java.util.List parsers():1881:1881 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890:1890 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rG;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1752:1752 -> c
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):2039 -> a
+    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):2039:2042 -> a
+    1:1:java.util.List parsers():2001:2001 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010:2010 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BG;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1872:1872 -> c
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1740:1740 -> c
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1753 -> c
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1860:1860 -> c
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1873 -> c
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11:11 -> c
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741 -> c
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1753 -> c
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741:1743 -> c
-    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1753 -> c
-    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1753:1753 -> c
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861 -> c
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1873 -> c
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861:1863 -> c
+    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1873 -> c
+    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1873:1873 -> c
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.setAccessPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):48:48 -> c
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1753 -> c
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1873 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1755:1755 -> c
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1740:1740 -> c
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756 -> c
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1875:1875 -> c
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1860:1860 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876 -> c
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11:11 -> c
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741 -> c
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756 -> c
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741:1743 -> c
-    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756 -> c
-    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756:1756 -> c
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861 -> c
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876 -> c
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861:1863 -> c
+    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876 -> c
+    13:15:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876:1876 -> c
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     17:18:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.of(java.lang.Object):18:19 -> c
-    17:18:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756 -> c
-    17:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    17:18:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876 -> c
+    17:18:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):43:43 -> c
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1756 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1876 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    20:21:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1758:1759 -> c
-    20:21:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1740:1740 -> c
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1760 -> c
-    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    20:21:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1878:1879 -> c
+    20:21:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1860:1860 -> c
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1880 -> c
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11:11 -> c
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741 -> c
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1760 -> c
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741:1743 -> c
-    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1760 -> c
-    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1760:1760 -> c
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861 -> c
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1880 -> c
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861:1863 -> c
+    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1880 -> c
+    24:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1880:1880 -> c
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.setNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern):53:53 -> c
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1760 -> c
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1880 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1762:1762 -> c
-    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1740:1740 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1763 -> c
-    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1882:1882 -> c
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1860:1860 -> c
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1883 -> c
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11:11 -> c
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741 -> c
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1763 -> c
-    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741:1743 -> c
-    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1763 -> c
-    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1763:1763 -> c
-    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861 -> c
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1883 -> c
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861:1863 -> c
+    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1883 -> c
+    32:34:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1883:1883 -> c
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.setReturnTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):58:58 -> c
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1763 -> c
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1883 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1765:1765 -> c
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1885:1885 -> c
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     38:38:boolean com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.isDeclared():39:39 -> c
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1765 -> c
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1885 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     39:39:boolean com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.isDeclared() -> c
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1765 -> c
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1740:1740 -> c
-    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1766 -> c
-    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1885 -> c
+    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1860:1860 -> c
+    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1886 -> c
+    40:40:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11:11 -> c
-    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741 -> c
-    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1766 -> c
-    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1741:1743 -> c
-    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1766 -> c
-    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1766:1766 -> c
-    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861 -> c
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1886 -> c
+    41:41:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getBuilder():1861:1863 -> c
+    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1886 -> c
+    42:44:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1886:1886 -> c
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
     46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.setParametersPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):67:67 -> c
-    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1766 -> c
+    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1886 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1768:1768 -> c
-    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1890 -> c
-    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891:1891 -> c
-    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1829:1829 -> c
-    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser.getValue():1888:1888 -> c
+    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2010 -> c
+    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011:2011 -> c
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1949:1949 -> c
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1817:1817 -> c
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1830 -> c
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1937:1937 -> c
+    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1950 -> c
+    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     51:51:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11:11 -> c
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818 -> c
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1830 -> c
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818:1820 -> c
-    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1830 -> c
-    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1830:1830 -> c
-    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938 -> c
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1950 -> c
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938:1940 -> c
+    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1950 -> c
+    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1950:1950 -> c
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     56:56:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.setAccessPattern(com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):47:47 -> c
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1830 -> c
+    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1950 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1832:1832 -> c
-    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1817:1817 -> c
-    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833 -> c
-    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1952:1952 -> c
+    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1937:1937 -> c
+    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953 -> c
+    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     59:59:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11:11 -> c
-    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818 -> c
-    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833 -> c
-    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818:1820 -> c
-    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833 -> c
-    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833:1833 -> c
-    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938 -> c
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953 -> c
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938:1940 -> c
+    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953 -> c
+    60:62:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953:1953 -> c
+    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     64:65:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.of(java.lang.Object):18:19 -> c
-    64:65:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833 -> c
-    64:65:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    64:65:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953 -> c
+    64:65:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     66:66:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):42:42 -> c
-    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1833 -> c
+    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1953 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1835:1835 -> c
-    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1817:1817 -> c
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836 -> c
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1955:1955 -> c
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1937:1937 -> c
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956 -> c
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     69:69:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11:11 -> c
-    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818 -> c
-    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836 -> c
-    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818:1820 -> c
-    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836 -> c
-    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836:1836 -> c
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938 -> c
+    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956 -> c
+    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938:1940 -> c
+    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956 -> c
+    70:72:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956:1956 -> c
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     74:77:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):19:22 -> c
-    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836 -> c
-    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956 -> c
+    74:77:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     78:78:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.setNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern):52:52 -> c
-    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1836 -> c
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1956 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1838:1838 -> c
-    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1958:1958 -> c
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     80:80:boolean com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.isDeclared():39:39 -> c
-    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1838 -> c
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1958 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     81:81:boolean com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.isDeclared():39:39 -> c
-    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1838 -> c
-    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1817:1817 -> c
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1839 -> c
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1958 -> c
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1937:1937 -> c
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1959 -> c
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     83:83:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11:11 -> c
-    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818 -> c
-    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1839 -> c
-    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1818:1820 -> c
-    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1839 -> c
-    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1839:1839 -> c
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938 -> c
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1959 -> c
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getBuilder():1938:1940 -> c
+    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1959 -> c
+    84:86:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1959:1959 -> c
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
     88:88:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.setTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern):57:57 -> c
-    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1839 -> c
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1959 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1841:1841 -> c
-    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1891 -> c
-    90:103:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1892:1905 -> c
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$FieldDeclarationParser.getValue():1961:1961 -> c
+    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2011 -> c
+    90:103:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2012:2025 -> c
     104:104:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
-    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1905 -> c
+    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2025 -> c
     105:105:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.anyMemberAccess():20:20 -> c
     105:105:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder.<init>():22 -> c
     105:105:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.memberBuilder():17 -> c
-    105:105:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1897 -> c
-    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1898:1898 -> c
+    105:105:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2017 -> c
+    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2018:2018 -> c
     107:107:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():95:95 -> c
-    107:107:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    107:107:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     108:108:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getStaticPattern():137:137 -> c
     108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():96 -> c
-    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    108:108:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     109:109:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getFinalPattern():141:141 -> c
     109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():97 -> c
-    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     110:110:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getSyntheticPattern():145:145 -> c
     110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():98 -> c
-    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    110:110:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     111:112:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():99:100 -> c
-    111:112:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    111:112:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     113:113:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> c
     113:113:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():100 -> c
-    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     114:114:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():101:101 -> c
-    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     115:115:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> c
     115:115:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():101 -> c
-    115:115:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    115:115:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     116:116:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():102:102 -> c
-    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     117:117:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> c
     117:117:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():102 -> c
-    117:117:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
+    117:117:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
     118:121:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder.build():105:108 -> c
-    118:121:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1899 -> c
-    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1901:1901 -> c
+    118:121:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2019 -> c
+    122:122:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2021:2021 -> c
     123:123:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.of(java.lang.Object):19:19 -> c
     123:123:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23 -> c
-    123:123:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1901 -> c
+    123:123:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2021 -> c
     124:124:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.ofNullable(java.lang.Object):23:23 -> c
-    124:124:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1901 -> c
+    124:124:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2021 -> c
     125:125:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder.build():36:36 -> c
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1902 -> c
+    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2022 -> c
     126:126:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> c
     126:126:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder.build():37 -> c
-    126:126:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1902 -> c
+    126:126:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2022 -> c
     127:127:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder.build():39:39 -> c
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1902 -> c
-    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1894:1894 -> c
+    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2022 -> c
+    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2014:2014 -> c
     129:129:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> c
-    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():1894 -> c
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodAccessVisitor -> com.android.tools.r8.internal.MF:
+    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern getValue():2014 -> c
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodAccessVisitor -> com.android.tools.r8.internal.YF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder methodAccessBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder):2348:2349 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/sG;)V"}
-    1:30:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2354:2383 -> a
-    1:6:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2361:2366 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CG;"}
+    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder):2438:2439 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/CG;)V"}
+    1:30:void visitEnum(java.lang.String,java.lang.String,java.lang.String):2444:2473 -> a
+    1:6:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2451:2456 -> b
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder.setBridge(boolean):132:132 -> b
-    7:7:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2366 -> b
-    8:8:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2363:2363 -> b
+    7:7:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2456 -> b
+    8:8:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2453:2453 -> b
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder.setSynchronized(boolean):127:127 -> b
-    9:9:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2363 -> b
-    10:10:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2375:2375 -> b
+    9:9:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2453 -> b
+    10:10:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2465:2465 -> b
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder.setStrictFp(boolean):147:147 -> b
-    11:11:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2375 -> b
-    12:12:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2372:2372 -> b
+    11:11:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2465 -> b
+    12:12:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2462:2462 -> b
     13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder.setAbstract(boolean):142:142 -> b
-    13:13:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2372 -> b
-    14:14:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2369:2369 -> b
+    13:13:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2462 -> b
+    14:14:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2459:2459 -> b
     15:15:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder.setNative(boolean):137:137 -> b
-    15:15:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2369 -> b
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser -> com.android.tools.r8.internal.NF:
+    15:15:boolean lambda$visitEnum$0(java.lang.String,java.lang.Boolean):2459 -> b
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$MethodDeclarationParser -> com.android.tools.r8.internal.ZF:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder accessBuilder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder builder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IG;"}
     com.android.tools.r8.relocated.keepanno.asm.ClassNameParser annotatedByParser -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qc;"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser nameParser -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tf0;"}
     com.android.tools.r8.relocated.keepanno.asm.MethodReturnTypeParser returnTypeParser -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vO;"}
     com.android.tools.r8.relocated.keepanno.asm.MethodParametersParser parametersParser -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oO;"}
     java.util.List parsers -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1708:1708 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
-    2:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1699:1711 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1828:1828 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
+    2:14:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1819:1831 -> <init>
     15:15:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1711 -> <init>
-    16:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1711:1718 -> <init>
+    15:15:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1831 -> <init>
+    16:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1831:1838 -> <init>
     24:24:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    24:24:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1718 -> <init>
-    25:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1718:1722 -> <init>
+    24:24:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1838 -> <init>
+    25:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1838:1842 -> <init>
     30:30:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1722 -> <init>
-    31:36:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1722:1727 -> <init>
+    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1842 -> <init>
+    31:36:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1842:1847 -> <init>
     37:37:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.group(java.lang.String):51:51 -> <init>
-    37:37:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1727 -> <init>
-    38:39:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1727:1728 -> <init>
+    37:37:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1847 -> <init>
+    38:39:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1847:1848 -> <init>
     40:40:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    40:40:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1728 -> <init>
+    40:40:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1848 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:41:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    41:41:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1728 -> <init>
-    42:42:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1729:1729 -> <init>
+    41:41:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1848 -> <init>
+    42:42:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1849:1849 -> <init>
     43:43:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    43:43:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1729 -> <init>
+    43:43:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1849 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     44:44:void com.android.tools.r8.relocated.keepanno.asm.ConvertingPropertyParser.setProperty(java.lang.String,java.lang.Object):34:34 -> <init>
-    44:44:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1729 -> <init>
-    45:45:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1731:1731 -> <init>
-    1:1:boolean isDeclared():1748:1748 -> a
-    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1773:1774 -> a
+    44:44:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1849 -> <init>
+    45:45:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):1851:1851 -> <init>
+    1:1:boolean isDeclared():1868:1868 -> a
+    2:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1893:1894 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.builder():29:29 -> a
-    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1774 -> a
-    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1774:1777 -> a
-    1:1:java.util.List parsers():1736:1736 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent -> com.android.tools.r8.internal.OF:
+    4:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1894 -> a
+    5:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String):1894:1897 -> a
+    1:1:java.util.List parsers():1856:1856 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent -> com.android.tools.r8.internal.aG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     void accept(java.lang.Object) -> accept
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsedByReflectionClassVisitor -> com.android.tools.r8.internal.PF:
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsedByReflectionClassVisitor -> com.android.tools.r8.internal.bG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     java.lang.String className -> k
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequences -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser constraintsParser -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1156:1156 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1145 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1145:1145 -> <init>
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> p
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser constraintsParser -> q
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CF;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1260:1260 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/lang/String;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1249 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1249:1249 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.builder():41:41 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1146 -> <init>
-    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1146:1146 -> <init>
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1250 -> <init>
+    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1250:1250 -> <init>
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1147 -> <init>
-    7:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1147:1163 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1173:1174 -> a
+    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1251 -> <init>
+    7:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.lang.String):1251:1267 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1277:1278 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1174 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1177:1177 -> a
-    5:18:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1182:1195 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):1278 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1281:1281 -> a
+    5:18:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1286:1299 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     19:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor com.android.tools.r8.relocated.keepanno.asm.DeclarationParser.tryParseArray(java.lang.String,java.util.function.Consumer):40:40 -> a
-    19:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1195 -> a
+    19:19:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1299 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1199:1199 -> a
-    21:21:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1191:1191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CE;)V"}
-    22:22:void lambda$visitArray$1(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1195:1195 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YE;)V"}
-    23:51:void visitEnd():1204:1232 -> a
-    52:54:void visitEnd():1231:1233 -> a
-    55:55:void visitEnd():1228:1228 -> a
-    56:56:void visitEnd():1226:1226 -> a
-    57:57:void visitEnd():1223:1223 -> a
-    58:85:void visitEnd():1213:1240 -> a
-    86:86:void visitEnd():1235:1235 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1168:1168 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RF;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsedByReflectionMemberVisitor -> com.android.tools.r8.internal.QF:
+    20:20:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1303:1303 -> a
+    21:21:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1295:1295 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OE;)V"}
+    22:22:void lambda$visitArray$1(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1299:1299 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;)V"}
+    23:28:void verifyItemStructure(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):1338:1343 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BE;)V"}
+    29:37:void verifyItemStructure(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):1342:1350 -> a
+    38:38:void verifyItemStructure(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):1347:1347 -> a
+    39:39:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$KeepItemVisitorBase.getKind():2087:2087 -> a
+    39:39:void visitEnd():1315 -> a
+    40:47:void visitEnd():1315:1322 -> a
+    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    48:48:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
+    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> a
+    48:48:void visitEnd():1323 -> a
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18:18 -> a
+    49:49:void visitEnd():1324 -> a
+    50:50:void visitEnd():1324:1324 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    51:51:void visitEnd():1326 -> a
+    52:52:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    52:52:void visitEnd():1326 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    53:53:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    53:53:void visitEnd():1326 -> a
+    54:54:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> a
+    54:54:void visitEnd():1327 -> a
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    55:55:void visitEnd():1322 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    56:56:void visitEnd():1322 -> a
+    57:59:void visitEnd():1329:1331 -> a
+    60:60:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    60:60:void visitEnd():1331 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    61:61:void visitEnd():1331:1331 -> a
+    62:62:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    62:62:void visitEnd():1332 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    63:63:void visitEnd():1332 -> a
+    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+    64:64:void visitEnd():1332 -> a
+    65:66:void visitEnd():1332:1333 -> a
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):170:170 -> a
+    67:67:void visitEnd():1333 -> a
+    68:68:void visitEnd():1334:1334 -> a
+    69:69:void visitEnd():1329:1329 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper getBindingsHelper():1272:1272 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
+    1:1:boolean useBindingForClassAndMembers():1310:1310 -> g
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsedByReflectionMemberVisitor -> com.android.tools.r8.internal.cG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern context -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern context -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequences -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind kind -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yF;"}
-    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser constraintsParser -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
-    boolean $assertionsDisabled -> l
-    1:1:void <clinit>():1249:1249 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1266:1266 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/mG;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1254 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1254:1254 -> <init>
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequences -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind kind -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KF;"}
+    com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser constraintsParser -> k
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CF;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1377:1377 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1365 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1365:1365 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1255 -> <init>
-    5:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1255:1256 -> <init>
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1366 -> <init>
+    5:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1366:1367 -> <init>
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.builder():41:41 -> <init>
-    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1257 -> <init>
-    8:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1257:1271 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1276:1277 -> a
+    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1368 -> <init>
+    8:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1368:1382 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1387:1388 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1277 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1280:1280 -> a
-    5:5:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1285:1285 -> a
-    6:20:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):239:253 -> a
-    6:20:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1288 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):251:251 -> a
-    21:21:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1288 -> a
-    22:22:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):249:249 -> a
-    22:22:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1288 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):245:245 -> a
-    23:23:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1288 -> a
-    24:28:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):243:247 -> a
-    24:28:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1288 -> a
-    29:31:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1290:1292 -> a
-    32:32:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1286:1286 -> a
-    33:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1298:1311 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):1388 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1391:1391 -> a
+    5:5:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1396:1396 -> a
+    6:20:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):240:254 -> a
+    6:20:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1399 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):252:252 -> a
+    21:21:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1399 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):250:250 -> a
+    22:22:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1399 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):246:246 -> a
+    23:23:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1399 -> a
+    24:28:com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.fromString(java.lang.String):244:248 -> a
+    24:28:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1399 -> a
+    29:31:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1401:1403 -> a
+    32:32:void visitEnum(java.lang.String,java.lang.String,java.lang.String):1397:1397 -> a
+    33:46:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1409:1422 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     47:47:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor com.android.tools.r8.relocated.keepanno.asm.DeclarationParser.tryParseArray(java.lang.String,java.util.function.Consumer):40:40 -> a
-    47:47:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1311 -> a
+    47:47:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1422 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:48:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1315:1315 -> a
-    49:49:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1307:1307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CE;)V"}
-    50:50:void lambda$visitArray$1(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1311:1311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YE;)V"}
-    51:51:void visitEnd():1320:1320 -> a
-    52:52:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.isOnlyClass():260:260 -> a
-    52:52:void visitEnd():1320 -> a
-    53:53:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.isOnlyClass():260:260 -> a
-    53:53:void visitEnd():1320 -> a
+    48:48:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1426:1426 -> a
+    49:49:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):1418:1418 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OE;)V"}
+    50:50:void lambda$visitArray$1(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1422:1422 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;)V"}
+    51:51:void visitEnd():1431:1431 -> a
+    52:52:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.isOnlyClass():261:261 -> a
+    52:52:void visitEnd():1431 -> a
+    53:53:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.isOnlyClass():261:261 -> a
+    53:53:void visitEnd():1431 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:56:void visitEnd():1323:1325 -> a
-    57:57:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClass():281:281 -> a
-    57:57:void visitEnd():1325 -> a
+    54:58:void visitEnd():1434:1438 -> a
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    59:59:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> a
+    59:59:void visitEnd():1439 -> a
+    60:60:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    60:60:void visitEnd():1439 -> a
+    61:61:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> a
+    61:61:void visitEnd():1439 -> a
+    62:62:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    62:62:void visitEnd():1438 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    58:61:boolean com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ItemKind.includesClass():281:284 -> a
-    58:61:void visitEnd():1325 -> a
-    62:62:void visitEnd():1326:1326 -> a
-    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
-    63:63:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
-    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():50 -> a
-    63:63:void visitEnd():1327 -> a
-    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    64:64:void visitEnd():1327 -> a
+    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    63:63:void visitEnd():1438 -> a
+    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():34:34 -> a
+    64:64:void visitEnd():1439 -> a
+    65:65:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    65:65:void visitEnd():1441 -> a
+    66:67:void visitEnd():1441:1442 -> a
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    68:68:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> a
+    68:68:void visitEnd():1443 -> a
+    69:69:void visitEnd():1443:1443 -> a
+    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    70:70:void visitEnd():1445 -> a
+    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    71:71:void visitEnd():1445 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:65:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():35:35 -> a
-    65:65:void visitEnd():1327 -> a
-    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    66:66:void visitEnd():1326 -> a
+    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$ConstraintDeclarationParser.getValueOrDefault(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):1209:1209 -> a
+    72:72:void visitEnd():1445 -> a
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):11:11 -> a
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference.toItemReference():22 -> a
+    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18 -> a
+    73:73:void visitEnd():1446 -> a
+    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> a
+    74:74:void visitEnd():1447 -> a
+    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    75:75:void visitEnd():1442 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    67:67:void visitEnd():1326 -> a
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    68:68:void visitEnd():1329 -> a
+    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    76:76:void visitEnd():1442 -> a
+    77:79:void visitEnd():1448:1450 -> a
+    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    80:80:void visitEnd():1450 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:70:void visitEnd():1329:1330 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
-    71:71:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():50 -> a
-    71:71:void visitEnd():1331 -> a
-    72:72:void visitEnd():1331:1331 -> a
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
-    73:73:void visitEnd():1333 -> a
-    74:74:void visitEnd():1333:1333 -> a
-    75:75:void visitEnd():1332:1332 -> a
-    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):23:23 -> a
-    76:76:void visitEnd():1334 -> a
-    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):15:15 -> a
-    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.toItemReference():66 -> a
-    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):23 -> a
-    77:77:void visitEnd():1334 -> a
-    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():35:35 -> a
-    78:78:void visitEnd():1335 -> a
-    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    79:79:void visitEnd():1330 -> a
+    81:81:void visitEnd():1450:1450 -> a
+    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    82:82:void visitEnd():1451 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    80:80:void visitEnd():1330 -> a
-    81:83:void visitEnd():1336:1338 -> a
-    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-    84:84:void visitEnd():1338 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85:void visitEnd():1338:1338 -> a
-    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    86:86:void visitEnd():1339 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    87:87:void visitEnd():1339 -> a
-    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):153:153 -> a
-    88:88:void visitEnd():1339 -> a
-    89:90:void visitEnd():1339:1340 -> a
-    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):163:163 -> a
-    91:91:void visitEnd():1340 -> a
-    92:92:void visitEnd():1341:1341 -> a
-    93:93:void visitEnd():1336:1336 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():33:33 -> a
-    94:94:void visitEnd():1327 -> a
-    95:95:void visitEnd():1321:1321 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
-    96:96:void visitEnd():1321 -> a
-    97:104:void validateConsistentKind(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):1345:1352 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)V"}
-    105:105:void validateConsistentKind(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):1346:1346 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper -> com.android.tools.r8.internal.RF:
+    83:83:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    83:83:void visitEnd():1451 -> a
+    84:84:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+    84:84:void visitEnd():1451 -> a
+    85:86:void visitEnd():1451:1452 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):170:170 -> a
+    87:87:void visitEnd():1452 -> a
+    88:88:void visitEnd():1453:1453 -> a
+    89:89:void visitEnd():1448:1448 -> a
+    90:90:void visitEnd():1432:1432 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
+    91:91:void visitEnd():1432 -> a
+    92:99:void validateConsistentKind(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):1457:1464 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;)V"}
+    100:100:void validateConsistentKind(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):1458:1458 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper -> com.android.tools.r8.internal.dG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder builder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DE;"}
     java.util.Map userNames -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
-    1:2:void <init>():677:678 -> <init>
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():16:16 -> <init>
-    3:3:void <init>():678 -> <init>
-    4:5:void <init>():678:679 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol resolveUserBinding(java.lang.String):682:682 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/qE;"}
-    2:2:void defineUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):686:686 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fG;)V"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():700:700 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rE;"}
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsesReflectionVisitor -> com.android.tools.r8.internal.SF:
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():696:696 -> <clinit>
+    1:2:void <init>():696:697 -> <init>
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():18:18 -> <init>
+    3:3:void <init>():697 -> <init>
+    4:5:void <init>():697:698 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol resolveUserBinding(java.lang.String):705:705 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/EE;"}
+    2:2:void replaceWithUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):714:714 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/BE;Lcom/android/tools/r8/internal/ZV;)V"}
+    3:3:boolean isUserBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):701:701 -> a
+    3:3:void replaceWithUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):714 -> a
+    4:4:void replaceWithUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):724:724 -> a
+    5:5:void defineUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):709:709 -> a
+    5:5:void replaceWithUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):725 -> a
+    6:6:void replaceWithUserBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference,com.android.tools.r8.relocated.keepanno.ast.ParsingContext):717:717 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729:729 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KE;)Lcom/android/tools/r8/internal/IE;"}
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744:744 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):745:745 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):729 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference defineFreshClassBinding(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):730 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734:734 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yG;)Lcom/android/tools/r8/internal/wG;"}
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744:744 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):745:745 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):734 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol) -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference defineFreshMemberBinding(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):735 -> a
+    17:18:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):750:751 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BE;)Lcom/android/tools/r8/internal/rG;"}
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756:756 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):751 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):751 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):751 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):756 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):751 -> a
+    23:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItem(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):757:758 -> a
+    23:24:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):751 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752:752 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern getMemberItem(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):762:762 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern getMemberItem(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):762 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752 -> a
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern getMemberItem(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):762 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):223:223 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern getMemberItem(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):762 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752 -> a
+    30:31:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern getMemberItem(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):763:764 -> a
+    30:31:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):752 -> a
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItemForReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):768:768 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LE;)Lcom/android/tools/r8/internal/KE;"}
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():48:48 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():38 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItemForReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):769 -> a
+    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern getClassItemForReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):769:769 -> a
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():774:774 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FE;"}
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UsesReflectionVisitor -> com.android.tools.r8.internal.eG:
 # {"id":"sourceFile","fileName":"KeepEdgeReader.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZV;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent parent -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder builder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder preconditions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder metaInfoBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qF;"}
     com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper bindingsHelper -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RF;"}
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1371:1371 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/OF;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/fG;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176:176 -> <init>
-    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1361 -> <init>
-    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1361:1361 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1483:1483 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/aG;Ljava/util/function/Consumer;Ljava/util/function/Function;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183:183 -> <init>
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1473 -> <init>
+    3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1473:1473 -> <init>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions.builder():33:33 -> <init>
-    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1362 -> <init>
-    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1362:1362 -> <init>
+    4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1474 -> <init>
+    5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1474:1474 -> <init>
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.builder():30:30 -> <init>
-    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1363 -> <init>
-    7:17:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1363:1373 -> <init>
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):32:32 -> <init>
-    18:18:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1374 -> <init>
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():36:36 -> <init>
-    19:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1374 -> <init>
-    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> <init>
-    20:20:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1374 -> <init>
+    6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1475 -> <init>
+    7:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1475:1487 -> <init>
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744:744 -> <init>
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):739 -> <init>
+    20:20:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> <init>
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):744 -> <init>
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):739 -> <init>
+    21:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):745:745 -> <init>
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):739 -> <init>
+    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20:20 -> <init>
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):740 -> <init>
+    23:23:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20 -> <init>
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):740 -> <init>
+    24:24:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):16:16 -> <init>
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20 -> <init>
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.defineFreshItemBinding(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):740 -> <init>
+    25:25:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1488 -> <init>
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):27:27 -> <init>
+    26:26:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1490 -> <init>
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():37:37 -> <init>
+    27:27:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1490 -> <init>
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> <init>
+    28:28:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1489 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition) -> <init>
-    21:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1374 -> <init>
-    22:22:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):1375:1375 -> <init>
-    1:2:void visit(java.lang.String,java.lang.Object):1380:1381 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> <init>
+    29:29:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1489 -> <init>
+    30:30:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$Parent,java.util.function.Consumer,java.util.function.Function):1491:1491 -> <init>
+    1:2:void visit(java.lang.String,java.lang.Object):1496:1497 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder.setDescription(java.lang.String):88:88 -> a
-    3:3:void visit(java.lang.String,java.lang.Object):1381 -> a
-    4:4:void visit(java.lang.String,java.lang.Object):1384:1384 -> a
-    5:18:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1389:1402 -> a
+    3:3:void visit(java.lang.String,java.lang.Object):1497 -> a
+    4:4:void visit(java.lang.String,java.lang.Object):1500:1500 -> a
+    5:18:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):1505:1518 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
-    19:19:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):1398:1398 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OG;)V"}
-    20:22:void visitEnd():1407:1409 -> a
-    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-    23:23:void visitEnd():1409 -> a
+    19:19:void lambda$visitArray$0(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):1514:1514 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)V"}
+    20:22:void visitEnd():1523:1525 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+    23:23:void visitEnd():1525 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:void visitEnd():1409:1409 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    25:25:void visitEnd():1410 -> a
+    24:24:void visitEnd():1525:1525 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    25:25:void visitEnd():1526 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():700:700 -> a
-    26:26:void visitEnd():1410 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):153:153 -> a
-    27:27:void visitEnd():1410 -> a
-    28:28:void visitEnd():1410:1410 -> a
+    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReader$UserBindingsHelper.build():774:774 -> a
+    26:26:void visitEnd():1526 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+    27:27:void visitEnd():1526 -> a
+    28:28:void visitEnd():1526:1526 -> a
     29:29:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.build():26:26 -> a
-    29:29:void visitEnd():1411 -> a
+    29:29:void visitEnd():1527 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:32:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.build():26:28 -> a
-    30:32:void visitEnd():1411 -> a
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setPreconditions(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):158:158 -> a
-    33:33:void visitEnd():1411 -> a
-    34:34:void visitEnd():1412:1412 -> a
-    35:35:void visitEnd():1407:1407 -> a
-com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReaderUtils -> com.android.tools.r8.internal.UF:
+    30:32:void visitEnd():1527 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.setPreconditions(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):165:165 -> a
+    33:33:void visitEnd():1527 -> a
+    34:34:void visitEnd():1528:1528 -> a
+    35:35:void visitEnd():1523:1523 -> a
+com.android.tools.r8.relocated.keepanno.asm.KeepEdgeReaderUtils -> com.android.tools.r8.internal.gG:
 # {"id":"sourceFile","fileName":"KeepEdgeReaderUtils.java"}
     1:1:java.lang.String getDescriptorFromBinaryName(java.lang.String):27:27 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern typePatternFromString(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bW;)Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fW;)Lcom/android/tools/r8/internal/nH;"}
     3:33:java.lang.String internalDescriptorFromJavaType(java.lang.String,java.util.function.Function):75:105 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/String;)Ljava/lang/String;"}
     34:45:java.lang.String internalDescriptorFromJavaType(java.lang.String,java.util.function.Function):103:114 -> a
@@ -257502,28 +257201,28 @@
     45:51:java.lang.String getJavaTypeFromDescriptor(java.lang.String):42:48 -> d
     52:52:java.lang.String getJavaTypeFromDescriptor(java.lang.String):38:38 -> d
     53:78:java.lang.String getJavaTypeFromDescriptor(java.lang.String):36:61 -> d
-com.android.tools.r8.relocated.keepanno.asm.MethodParametersParser -> com.android.tools.r8.internal.kO:
+com.android.tools.r8.relocated.keepanno.asm.MethodParametersParser -> com.android.tools.r8.internal.oO:
 # {"id":"sourceFile","fileName":"MethodParametersParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):18:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
     1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.<init>():40:40 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.builder():14 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern convert(java.util.List):24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/xG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/HG;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern convert(java.util.List):25:25 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.addParameterTypePattern(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):45:45 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern convert(java.util.List):26 -> a
     4:8:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder.build():50:54 -> a
     4:8:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern convert(java.util.List):28 -> a
-com.android.tools.r8.relocated.keepanno.asm.MethodReturnTypeParser -> com.android.tools.r8.internal.rO:
+com.android.tools.r8.relocated.keepanno.asm.MethodReturnTypeParser -> com.android.tools.r8.internal.vO:
 # {"id":"sourceFile","fileName":"MethodReturnTypeParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.TypeParser typeParser -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dj0;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18:18 -> a
     1:1:void lambda$wrap$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/dH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/nH;)V"}
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):18 -> a
     2:2:void lambda$wrap$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):32 -> a
@@ -257551,28 +257250,28 @@
     2:2:boolean tryPropertyEnum(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):64:64 -> b
     2:2:boolean tryPropertyEnum(java.lang.Object,java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer):21 -> b
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern getValue():37:37 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MG;"}
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(java.lang.Object,java.lang.String,java.util.function.Consumer):21:21 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/J2;"}
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.util.function.Consumer):70:70 -> c
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(java.lang.Object,java.lang.String,java.util.function.Consumer):21 -> c
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern getValue():37:37 -> getValue
     1:1:java.lang.Object getValue():21 -> getValue
-com.android.tools.r8.relocated.keepanno.asm.PackageNameParser -> com.android.tools.r8.internal.EV:
+com.android.tools.r8.relocated.keepanno.asm.PackageNameParser -> com.android.tools.r8.internal.IV:
 # {"id":"sourceFile","fileName":"PackageNameParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):15:15 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):12:12 -> a
     2:4:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.PackageNameParser$PackageNameProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):28:30 -> a
     2:4:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):12 -> a
-com.android.tools.r8.relocated.keepanno.asm.PackageNameParser$PackageNameProperty -> com.android.tools.r8.internal.DV:
+com.android.tools.r8.relocated.keepanno.asm.PackageNameParser$PackageNameProperty -> com.android.tools.r8.internal.HV:
 # {"id":"sourceFile","fileName":"PackageNameParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.PackageNameParser$PackageNameProperty NAME -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HV;"}
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.relocated.keepanno.asm.Parser -> com.android.tools.r8.internal.SV:
+com.android.tools.r8.relocated.keepanno.asm.Parser -> com.android.tools.r8.internal.WV:
 # {"id":"sourceFile","fileName":"Parser.java"}
     boolean isDeclared() -> a
     boolean tryParse(java.lang.String,java.lang.Object,java.util.function.Consumer) -> a
@@ -257582,14 +257281,14 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryParseArray(java.lang.String,java.util.function.Consumer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     boolean tryParseEnum(java.lang.String,java.lang.String,java.lang.String,java.util.function.Consumer) -> a
-com.android.tools.r8.relocated.keepanno.asm.ParserVisitor -> com.android.tools.r8.internal.UV:
+com.android.tools.r8.relocated.keepanno.asm.ParserVisitor -> com.android.tools.r8.internal.YV:
 # {"id":"sourceFile","fileName":"ParserVisitor.java"}
     java.util.List parsers -> c
     java.lang.Runnable onVisitEnd -> d
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.List,java.lang.Runnable):20:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/vu;Ljava/lang/Runnable;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/xu;Ljava/lang/Runnable;)V"}
     4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.Parser,java.lang.Runnable):27:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/SV;Ljava/lang/Runnable;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/WV;Ljava/lang/Runnable;)V"}
     5:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,java.util.List,java.lang.Runnable):20:22 -> <init>
     5:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.Parser,java.lang.Runnable):27 -> <init>
     1:1:void ignore(java.lang.Object):30:30 -> a
@@ -257601,14 +257300,14 @@
     21:27:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):65:71 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/internal/J2;"}
     28:29:void visitEnd():76:77 -> a
-com.android.tools.r8.relocated.keepanno.asm.PropertyParser -> com.android.tools.r8.internal.LY:
+com.android.tools.r8.relocated.keepanno.asm.PropertyParser -> com.android.tools.r8.internal.PY:
 # {"id":"sourceFile","fileName":"PropertyParser.java"}
     void setProperty(java.lang.String,java.lang.Object) -> a
     java.lang.Object getValue() -> getValue
-com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase -> com.android.tools.r8.internal.MY:
+com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase -> com.android.tools.r8.internal.QY:
 # {"id":"sourceFile","fileName":"PropertyParserBase.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parsingContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     java.util.Map mapping -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.lang.String resultPropertyName -> c
@@ -257617,7 +257316,7 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):24:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     2:8:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):19:25 -> <init>
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):37:37 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):51:51 -> a
@@ -257649,19 +257348,19 @@
     1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyArray(java.lang.Object,java.lang.String,java.util.function.Consumer):46:46 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/function/Consumer;Ljava/lang/Object;)Lcom/android/tools/r8/internal/J2;"}
     1:2:java.lang.Object getValue():82:83 -> getValue
-com.android.tools.r8.relocated.keepanno.asm.StringPatternParser -> com.android.tools.r8.internal.pf0:
+com.android.tools.r8.relocated.keepanno.asm.StringPatternParser -> com.android.tools.r8.internal.tf0:
 # {"id":"sourceFile","fileName":"StringPatternParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):19:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):16:16 -> a
     2:5:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):30:33 -> a
     2:5:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):16 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):16:16 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     7:10:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):30:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/of0;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf0;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
     11:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.String,java.util.function.Consumer):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/of0;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/UV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sf0;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/YV;"}
     12:12:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     12:12:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.String,java.util.function.Consumer):51 -> a
     13:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.String,java.util.function.Consumer):51:51 -> a
@@ -257669,7 +257368,7 @@
     14:14:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.String,java.util.function.Consumer):51 -> a
     15:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty,java.lang.String,java.lang.String,java.util.function.Consumer):52:60 -> a
     24:31:void lambda$tryPropertyAnnotation$0(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,java.util.function.Consumer):62:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pf0;Lcom/android/tools/r8/internal/nf0;Lcom/android/tools/r8/internal/VV;Lcom/android/tools/r8/internal/nf0;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tf0;Lcom/android/tools/r8/internal/rf0;Lcom/android/tools/r8/internal/ZV;Lcom/android/tools/r8/internal/rf0;Ljava/util/function/Consumer;)V"}
     32:32:void lambda$tryPropertyAnnotation$0(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,java.util.function.Consumer):67:67 -> a
     33:33:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException com.android.tools.r8.relocated.keepanno.ast.ParsingContext.error(java.lang.String):15:15 -> a
     33:33:void lambda$tryPropertyAnnotation$0(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,java.util.function.Consumer):67 -> a
@@ -257680,44 +257379,44 @@
     38:40:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern$Builder.build():52:54 -> a
     38:40:void lambda$tryPropertyAnnotation$0(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,java.util.function.Consumer):75 -> a
     41:41:void lambda$tryPropertyAnnotation$0(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext,com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser,java.util.function.Consumer):71:71 -> a
-com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser -> com.android.tools.r8.internal.nf0:
+com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser -> com.android.tools.r8.internal.rf0:
 # {"id":"sourceFile","fileName":"StringPatternParser.java"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():84:84 -> <clinit>
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):91:91 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):84:84 -> a
     2:4:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser$Property,java.lang.String,java.lang.Object,java.util.function.Consumer):97:99 -> a
     2:4:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):84 -> a
-com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser$Property -> com.android.tools.r8.internal.mf0:
+com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser$Property -> com.android.tools.r8.internal.qf0:
 # {"id":"sourceFile","fileName":"StringPatternParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringParser$Property STRING -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mf0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qf0;"}
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(java.lang.String,int):86:86 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty -> com.android.tools.r8.internal.of0:
+com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty -> com.android.tools.r8.internal.sf0:
 # {"id":"sourceFile","fileName":"StringPatternParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty EXACT -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/of0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sf0;"}
     com.android.tools.r8.relocated.keepanno.asm.StringPatternParser$StringProperty PATTERN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/of0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sf0;"}
     1:2:void <clinit>():23:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.asm.TypeParser -> com.android.tools.r8.internal.Zi0:
+com.android.tools.r8.relocated.keepanno.asm.TypeParser -> com.android.tools.r8.internal.dj0:
 # {"id":"sourceFile","fileName":"TypeParser.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext):20:20 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)V"}
     1:1:boolean tryProperty(java.lang.Object,java.lang.String,java.lang.Object,java.util.function.Consumer):17:17 -> a
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(java.lang.Object,java.lang.String,java.lang.String,java.util.function.Consumer):17:17 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.fromClass(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):28:28 -> a
     3:3:void lambda$tryPropertyAnnotation$1(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/bH;)V"}
     4:4:void lambda$tryPropertyAnnotation$1(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):71:71 -> a
     5:12:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):33:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yi0;Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cj0;Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/Consumer;)Z"}
     13:13:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):35:35 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     14:14:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):37 -> a
@@ -257725,7 +257424,7 @@
     16:16:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):36:36 -> a
     17:17:boolean tryProperty(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.Object,java.util.function.Consumer):35:35 -> a
     18:34:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.util.function.Consumer):50:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yi0;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cj0;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/J2;"}
     35:35:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.asm.PropertyParserBase.getParsingContext():29:29 -> a
     35:35:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.util.function.Consumer):66 -> a
     36:37:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.util.function.Consumer):66:67 -> a
@@ -257736,17 +257435,17 @@
     40:40:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.util.function.Consumer):54 -> a
     41:45:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor tryPropertyAnnotation(com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty,java.lang.String,java.lang.String,java.util.function.Consumer):55:59 -> a
     46:46:void lambda$tryPropertyAnnotation$0(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.asm.TypeParser):62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/Zi0;)V"}
-com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty -> com.android.tools.r8.internal.Yi0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/dj0;)V"}
+com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty -> com.android.tools.r8.internal.cj0:
 # {"id":"sourceFile","fileName":"TypeParser.java"}
     com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty TYPE_PATTERN -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj0;"}
     com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty TYPE_NAME -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj0;"}
     com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty TYPE_CONSTANT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj0;"}
     com.android.tools.r8.relocated.keepanno.asm.TypeParser$TypeProperty CLASS_NAME_PATTERN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yi0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cj0;"}
     1:4:void <clinit>():24:27 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
@@ -257761,7 +257460,7 @@
     com.android.tools.r8.relocated.keepanno.ast.AccessVisibility PRIVATE -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X1;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet ALL -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G40;"}
     com.android.tools.r8.relocated.keepanno.ast.AccessVisibility[] $VALUES -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/X1;"}
     1:4:void <clinit>():12:15 -> <clinit>
@@ -257793,291 +257492,260 @@
 # {"id":"sourceFile","fileName":"AstUtils.java"}
     1:1:java.util.function.Function toVoidFunction(java.util.function.Consumer):15:15 -> a
     2:2:java.lang.Void lambda$toVoidFunction$0(java.util.function.Consumer,java.lang.Object):16:16 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException -> com.android.tools.r8.internal.hE:
+com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException -> com.android.tools.r8.internal.vE:
 # {"id":"sourceFile","fileName":"KeepAnnotationParserException.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext context -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):12:13 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Ljava/lang/String;)V"}
     3:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.RuntimeException):17:18 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Ljava/lang/RuntimeException;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Ljava/lang/RuntimeException;)V"}
     1:1:java.lang.String getMessage():23:23 -> getMessage
     2:12:java.lang.String getContextAsString():27:37 -> getMessage
     2:12:java.lang.String getMessage():23 -> getMessage
     13:13:java.lang.String getMessage():23:23 -> getMessage
-com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern -> com.android.tools.r8.internal.kE:
+com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern -> com.android.tools.r8.internal.yE:
 # {"id":"sourceFile","fileName":"KeepAnnotationPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern namePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     int retentionPolicies -> b
     com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern ANY_WITH_ANY_RETENTION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern ANY_WITH_RUNTIME_RETENTION -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern ANY_WITH_CLASS_RETENTION -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yE;"}
     boolean $assertionsDisabled -> f
     1:14:void <clinit>():10:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,int):92:95 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;I)V"}
     1:5:boolean equals(java.lang.Object):127:131 -> equals
     1:1:int hashCode():136:136 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$1 -> com.android.tools.r8.internal.iE:
+com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$1 -> com.android.tools.r8.internal.wE:
 # {"id":"sourceFile","fileName":"KeepAnnotationPattern.java"}
     int[] $SwitchMap$java$lang$annotation$RetentionPolicy -> a
     1:1:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder -> com.android.tools.r8.internal.jE:
+com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder -> com.android.tools.r8.internal.xE:
 # {"id":"sourceFile","fileName":"KeepAnnotationPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern namePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     int retentionPolicies -> b
     1:1:void <init>():46:46 -> <init>
     2:3:void <init>():43:44 -> <init>
     1:11:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder addRetentionPolicy(java.lang.annotation.RetentionPolicy):54:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/annotation/RetentionPolicy;)Lcom/android/tools/r8/internal/jE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/annotation/RetentionPolicy;)Lcom/android/tools/r8/internal/xE;"}
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder addRetentionPolicy(java.lang.annotation.RetentionPolicy):62:62 -> a
     13:13:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder addRetentionPolicy(java.lang.annotation.RetentionPolicy):59:59 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern$Builder addRetentionPolicy(java.lang.annotation.RetentionPolicy):56:56 -> a
     15:27:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern build():70:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yE;"}
     28:28:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern build():78:78 -> a
     29:38:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern build():76:85 -> a
     39:39:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern build():71:71 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern -> com.android.tools.r8.internal.lE:
+com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern -> com.android.tools.r8.internal.zE:
 # {"id":"sourceFile","fileName":"KeepArrayTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern baseType -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nH;"}
     int dimensions -> b
     com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern ANY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zE;"}
     boolean $assertionsDisabled -> d
     1:4:void <clinit>():10:13 -> <clinit>
     1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern,int):22:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nH;I)V"}
     1:5:boolean equals(java.lang.Object):62:66 -> equals
     1:1:int hashCode():71:71 -> hashCode
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepAttribute -> com.android.tools.r8.internal.mE:
+com.android.tools.r8.relocated.keepanno.ast.KeepAttribute -> com.android.tools.r8.internal.AE:
 # {"id":"sourceFile","fileName":"KeepAttribute.java"}
     java.lang.String printName -> b
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute GENERIC_SIGNATURES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_VISIBLE_ANNOTATIONS -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_VISIBLE_TYPE_ANNOTATIONS -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_INVISIBLE_ANNOTATIONS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAttribute RUNTIME_INVISIBLE_TYPE_ANNOTATIONS -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AE;"}
     1:8:void <clinit>():8:15 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.String):19:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference -> com.android.tools.r8.internal.nE:
+com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference -> com.android.tools.r8.internal.BE:
 # {"id":"sourceFile","fileName":"KeepBindingReference.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol name -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EE;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):25:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)Lcom/android/tools/r8/internal/kG;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference asClassBindingReference():44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uE;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getName():32:32 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qE;"}
-    1:1:boolean isClassType():36:36 -> c
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference asClassBindingReference():44:44 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IE;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference asMemberBindingReference():48:48 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getName():32:32 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/EE;"}
+    1:1:boolean isClassType():36:36 -> d
+    com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference() -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sG;"}
     1:1:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepBindings -> com.android.tools.r8.internal.rE:
+com.android.tools.r8.relocated.keepanno.ast.KeepBindings -> com.android.tools.r8.internal.FE:
 # {"id":"sourceFile","fileName":"KeepBindings.java"}
     java.util.Map bindings -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings NONE_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FE;"}
     boolean $assertionsDisabled -> c
-    1:7:void <clinit>():13:19 -> <clinit>
-    1:3:void <init>(java.util.Map):23:25 -> <init>
-    1:1:void forEach(java.util.function.BiConsumer):49:49 -> a
-    2:2:java.lang.String lambda$toString$1(java.util.Map$Entry):56:56 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    3:3:void lambda$forEach$0(java.util.function.BiConsumer,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding):49 -> a
+    1:7:void <clinit>():15:21 -> <clinit>
+    1:3:void <init>(java.util.Map):25:27 -> <init>
+    1:1:void forEach(java.util.function.BiConsumer):51:51 -> a
+    2:2:java.lang.String lambda$toString$1(java.util.Map$Entry):58:58 -> a
+    3:11:void verify(java.util.Collection):67:75 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    12:12:void lambda$forEach$0(java.util.function.BiConsumer,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/oE;)V"}
-    4:4:void lambda$forEach$0(java.util.function.BiConsumer,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding):49:49 -> a
-    1:4:java.lang.String toString():54:57 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding -> com.android.tools.r8.internal.oE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/EE;Lcom/android/tools/r8/internal/CE;)V"}
+    13:13:void lambda$forEach$0(java.util.function.BiConsumer,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding):51:51 -> a
+    1:4:java.lang.String toString():56:59 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding -> com.android.tools.r8.internal.CE:
 # {"id":"sourceFile","fileName":"KeepBindings.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern item -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fG;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):108:109 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fG;)V"}
-    1:1:boolean equals(java.lang.Object):118:118 -> equals
-    1:1:int hashCode():123:123 -> hashCode
-    1:1:java.lang.String toString():128:128 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder -> com.android.tools.r8.internal.pE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rG;"}
+    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):132:133 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)V"}
+    1:1:boolean equals(java.lang.Object):142:142 -> equals
+    1:1:int hashCode():147:147 -> hashCode
+    1:1:java.lang.String toString():152:152 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder -> com.android.tools.r8.internal.DE:
 # {"id":"sourceFile","fileName":"KeepBindings.java"}
     java.util.Map reserved -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Map bindings -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
-    1:4:void <init>():160:163 -> <init>
-    1:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol create(java.lang.String):171:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/qE;"}
-    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder addBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):183:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/fG;)V"}
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder addBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):181:181 -> a
-    9:24:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():196:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rE;"}
-    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol.setSuffix(java.lang.String):141:141 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():211 -> a
-    26:32:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():212:218 -> a
-    33:45:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding verifyAndCreateBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):222:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)Lcom/android/tools/r8/internal/oE;"}
-    46:59:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding verifyAndCreateBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):227:240 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol -> com.android.tools.r8.internal.qE:
+    1:4:void <init>():184:187 -> <init>
+    1:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol create(java.lang.String):195:198 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/EE;"}
+    5:7:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder addBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):207:209 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;Lcom/android/tools/r8/internal/rG;)V"}
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder addBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):205:205 -> a
+    9:11:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern deleteBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):215:217 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)Lcom/android/tools/r8/internal/rG;"}
+    12:27:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():228:243 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FE;"}
+    28:28:void com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol.setSuffix(java.lang.String):165:165 -> a
+    28:28:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():243 -> a
+    29:35:com.android.tools.r8.relocated.keepanno.ast.KeepBindings build():244:250 -> a
+    1:13:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding verifyAndCreateBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):254:266 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)Lcom/android/tools/r8/internal/CE;"}
+    14:27:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding verifyAndCreateBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):259:272 -> b
+com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol -> com.android.tools.r8.internal.EE:
 # {"id":"sourceFile","fileName":"KeepBindings.java"}
     java.lang.String hint -> a
     java.lang.String suffix -> b
-    1:1:void <init>(java.lang.String):136:136 -> <init>
-    2:5:void <init>(java.lang.String):134:137 -> <init>
-    1:1:boolean equals(java.lang.Object):151:151 -> equals
-    1:1:int hashCode():156:156 -> hashCode
-    1:1:java.lang.String toString():146:146 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepCheck -> com.android.tools.r8.internal.tE:
+    1:1:void <init>(java.lang.String):160:160 -> <init>
+    2:5:void <init>(java.lang.String):158:161 -> <init>
+    1:1:boolean equals(java.lang.Object):175:175 -> equals
+    1:1:int hashCode():180:180 -> hashCode
+    1:1:java.lang.String toString():170:170 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepCheck -> com.android.tools.r8.internal.HE:
 # {"id":"sourceFile","fileName":"KeepCheck.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo metaInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind kind -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern itemPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fG;"}
-    1:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):50:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/sE;Lcom/android/tools/r8/internal/fG;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepCheck asKeepCheck():58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tE;"}
-    1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder -> R8$$REMOVED$$CLASS$$219:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepBindings bindings -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FE;"}
+    com.android.tools.r8.relocated.keepanno.ast.KeepItemReference itemReference -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
+    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):67:71 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/GE;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/sG;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepCheck asKeepCheck():76:76 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HE;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings getBindings():88:88 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FE;"}
+    1:1:java.lang.String toString():104:104 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepCheck$Builder -> R8$$REMOVED$$CLASS$$207:
 # {"id":"sourceFile","fileName":"KeepCheck.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind -> com.android.tools.r8.internal.sE:
+com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind -> com.android.tools.r8.internal.GE:
 # {"id":"sourceFile","fileName":"KeepCheck.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind REMOVED -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind OPTIMIZED_OUT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
     1:2:void <clinit>():9:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference -> com.android.tools.r8.internal.uE:
+com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference -> com.android.tools.r8.internal.IE:
 # {"id":"sourceFile","fileName":"KeepClassBindingReference.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference asClassBindingReference():17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uE;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> d
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference toClassItemReference():21 -> d
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():26 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IE;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> e
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference toClassItemReference():21 -> e
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():26 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sG;"}
     1:1:java.lang.String toString():31:31 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern -> com.android.tools.r8.internal.wE:
+com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern -> com.android.tools.r8.internal.KE:
 # {"id":"sourceFile","fileName":"KeepClassItemPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern classNamePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern instanceOfPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pG;"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):65:71 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;Lcom/android/tools/r8/internal/dG;Lcom/android/tools/r8/internal/UU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;Lcom/android/tools/r8/internal/pG;Lcom/android/tools/r8/internal/YU;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern asClassItemPattern():76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wE;"}
-    1:1:java.util.Collection getBindingReferences():90:90 -> c
-    1:7:boolean equals(java.lang.Object):114:120 -> equals
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> f
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference toClassItemReference():85 -> f
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():81 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
-    1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> g
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder builder():18 -> g
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern any():14 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wE;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> g
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> g
-    2:2:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> g
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder builder():18 -> g
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern any():14 -> g
-    3:3:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():26:26 -> g
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder builder():18 -> g
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern any():14 -> g
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> g
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern any():14 -> g
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern getClassNamePattern():94:94 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RG;"}
-    1:1:int hashCode():125:125 -> hashCode
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern getInstanceOfPattern():98:98 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dG;"}
-    1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder -> com.android.tools.r8.internal.vE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KE;"}
+    1:1:java.util.Collection getBindingReferences():81:81 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
+    1:7:boolean equals(java.lang.Object):105:111 -> equals
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern getClassNamePattern():85:85 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bH;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern getInstanceOfPattern():89:89 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pG;"}
+    1:1:int hashCode():116:116 -> hashCode
+    1:1:java.lang.String toString():121:121 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder -> com.android.tools.r8.internal.JE:
 # {"id":"sourceFile","fileName":"KeepClassItemPattern.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
-com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference -> com.android.tools.r8.internal.zE:
-# {"id":"sourceFile","fileName":"KeepClassItemReference.java"}
-    1:1:void <init>():11:11 -> <init>
-    java.util.Collection getBindingReferences() -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding -> com.android.tools.r8.internal.xE:
+com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding -> com.android.tools.r8.internal.LE:
 # {"id":"sourceFile","fileName":"KeepClassItemReference.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference bindingReference -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IE;"}
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):51:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference asBindingReference():58:58 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference():48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nE;"}
-    1:5:boolean equals(java.lang.Object):71:75 -> equals
-    1:1:java.util.Collection getBindingReferences():63:63 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
-    1:1:int hashCode():80:80 -> hashCode
-    1:1:java.lang.String toString():85:85 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassItem -> com.android.tools.r8.internal.yE:
-# {"id":"sourceFile","fileName":"KeepClassItemReference.java"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern classItemPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():89:89 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):92:94 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern asClassItemPattern():104:104 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wE;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern asItemPattern():99:99 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fG;"}
-    1:5:boolean equals(java.lang.Object):117:121 -> equals
-    1:1:java.util.Collection getBindingReferences():109:109 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
-    1:1:int hashCode():126:126 -> hashCode
-    1:1:java.lang.String toString():131:131 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepCondition -> com.android.tools.r8.internal.AE:
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.<init>():11:11 -> <init>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):41 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IE;)V"}
+    2:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):42:43 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference asBindingReference():48:48 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference():38 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BE;"}
+    1:5:boolean equals(java.lang.Object):61:65 -> equals
+    1:1:int hashCode():70:70 -> hashCode
+    1:1:java.lang.String toString():75:75 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepCondition -> com.android.tools.r8.internal.ME:
 # {"id":"sourceFile","fileName":"KeepCondition.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepItemReference item -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):42:44 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;)V"}
-    1:5:boolean equals(java.lang.Object):56:60 -> equals
-    1:1:int hashCode():65:65 -> hashCode
-    1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder -> R8$$REMOVED$$CLASS$$220:
+    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):43:45 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sG;)V"}
+    1:5:boolean equals(java.lang.Object):57:61 -> equals
+    1:1:int hashCode():66:66 -> hashCode
+    1:1:java.lang.String toString():71:71 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder -> R8$$REMOVED$$CLASS$$208:
 # {"id":"sourceFile","fileName":"KeepCondition.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepConsequences -> com.android.tools.r8.internal.CE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConsequences -> com.android.tools.r8.internal.OE:
 # {"id":"sourceFile","fileName":"KeepConsequences.java"}
     java.util.List targets -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -258089,38 +257757,38 @@
     1:5:boolean equals(java.lang.Object):65:69 -> equals
     1:1:int hashCode():74:74 -> hashCode
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder -> com.android.tools.r8.internal.BE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder -> com.android.tools.r8.internal.NE:
 # {"id":"sourceFile","fileName":"KeepConsequences.java"}
     java.util.List targets -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>():23:23 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)Lcom/android/tools/r8/internal/BE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;)Lcom/android/tools/r8/internal/NE;"}
     2:5:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences build():33:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/OE;"}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences build():34:34 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint -> com.android.tools.r8.internal.RE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint -> com.android.tools.r8.internal.dF:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     1:1:void <init>():10:10 -> <init>
     void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
     void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     1:1:void addRequiredKeepAttributes(java.util.Set):40:40 -> a
     1:1:boolean equals(java.lang.Object):20:20 -> equals
     1:1:int hashCode():25:25 -> hashCode
     1:2:java.lang.String toString():14:15 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation -> com.android.tools.r8.internal.DE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation -> com.android.tools.r8.internal.PE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern annotationPattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation ALL_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation ALL_WITH_RUNTIME_RETENTION_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation ALL_WITH_CLASS_RETENTION_INSTANCE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PE;"}
     boolean $assertionsDisabled -> e
     1:3:void <clinit>():470:472 -> <clinit>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.any():26:26 -> <clinit>
@@ -258133,11 +257801,11 @@
     12:12:void <clinit>():478 -> <clinit>
     13:13:void <clinit>():478:478 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):482:484 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yE;)V"}
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):500:500 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
     2:2:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):508:508 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     3:3:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):508 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -258154,327 +257822,293 @@
     13:15:void addRequiredKeepAttributes(java.util.Set):519:521 -> a
     1:5:boolean equals(java.lang.Object):530:534 -> equals
     1:1:int hashCode():539:539 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate -> com.android.tools.r8.internal.EE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate -> com.android.tools.r8.internal.QE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QE;"}
     1:1:void <clinit>():203:203 -> <clinit>
     1:1:void <init>():205:205 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):219:219 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassInstantiate(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate):198:198 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassInstantiate(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate):200:200 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassInstantiate(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate):198:198 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassInstantiate(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassInstantiate):200:200 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):219 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):224 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):224 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy -> com.android.tools.r8.internal.RE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RE;"}
     1:1:void <clinit>():234:234 -> <clinit>
     1:1:void <init>():236:236 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassOpenHierarchy(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy):203:203 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassOpenHierarchy(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy):205:205 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassOpenHierarchy(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy):203:203 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onClassOpenHierarchy(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$ClassOpenHierarchy):205:205 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):250 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):255:255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):255 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):255 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet -> com.android.tools.r8.internal.GE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet -> com.android.tools.r8.internal.SE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SE;"}
     1:1:void <clinit>():327:327 -> <clinit>
     1:1:void <init>():329:329 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):343:343 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldGet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet):218:218 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldGet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet):220:220 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):343 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldGet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet):218:218 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldGet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldGet):220:220 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):343 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):348:348 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):348 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):348 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace -> com.android.tools.r8.internal.HE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace -> com.android.tools.r8.internal.TE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TE;"}
     1:1:void <clinit>():389:389 -> <clinit>
     1:1:void <init>():391:391 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):405:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace):228:228 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace):230:230 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):405 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace):228:228 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldReplace):230:230 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):405 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):410:410 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):410 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):410 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet -> com.android.tools.r8.internal.UE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UE;"}
     1:1:void <clinit>():358:358 -> <clinit>
     1:1:void <init>():360:360 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):374:374 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldSet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet):223:223 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldSet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet):225:225 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldSet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet):223:223 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onFieldSet(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$FieldSet):225:225 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):374 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):379:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):379 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):379 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature -> com.android.tools.r8.internal.JE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature -> com.android.tools.r8.internal.VE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VE;"}
     1:1:void <clinit>():420:420 -> <clinit>
     1:1:void <init>():422:422 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431:431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):233:233 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):235:235 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696:696 -> a
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):233 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):235:235 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):540:540 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696 -> a
-    4:4:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):233 -> a
-    4:4:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):541:541 -> a
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> a
-    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696 -> a
-    5:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):233 -> a
-    5:5:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431 -> a
-    6:6:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():697:697 -> a
-    6:6:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onGenericSignature(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$GenericSignature):233 -> a
-    6:6:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):431 -> a
-    7:7:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436:436 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
-    8:8:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436 -> a
+    4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436:436 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
+    5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
-    9:9:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436 -> a
-    10:10:void addRequiredKeepAttributes(java.util.Set):441:441 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup -> com.android.tools.r8.internal.KE:
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
+    6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):436 -> a
+    7:7:void addRequiredKeepAttributes(java.util.Set):441:441 -> a
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup -> com.android.tools.r8.internal.WE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WE;"}
     1:1:void <clinit>():72:72 -> <clinit>
     1:1:void <init>():74:74 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):169:169 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):171:171 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):169:170 -> a
+    3:4:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):171:172 -> a
     3:4:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):83 -> a
-    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:651 -> a
-    5:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):170 -> a
+    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:570 -> a
+    5:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):172 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):83 -> a
-    6:7:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:652 -> a
-    6:7:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):170 -> a
+    6:7:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:571 -> a
+    6:7:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onLookup(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Lookup):172 -> a
     6:7:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):83 -> a
     8:8:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     9:9:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):88 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     10:10:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):88 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke -> com.android.tools.r8.internal.XE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XE;"}
     1:1:void <clinit>():265:265 -> <clinit>
     1:1:void <init>():267:267 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):281:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodInvoke(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke):208:208 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodInvoke(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke):210:210 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodInvoke(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke):208:208 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodInvoke(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodInvoke):210:210 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):281 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):286 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):286 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace -> com.android.tools.r8.internal.YE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ME;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YE;"}
     1:1:void <clinit>():296:296 -> <clinit>
     1:1:void <init>():298:298 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):312:312 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace):213:213 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace):215:215 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):312 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace):213:213 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onMethodReplace(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$MethodReplace):215:215 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):312 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):317:317 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):317 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):317 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name -> com.android.tools.r8.internal.NE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name -> com.android.tools.r8.internal.ZE:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZE;"}
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>():100:100 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onName(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name):175:175 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onName(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name):177:177 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onName(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name):175:177 -> a
+    3:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onName(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Name):177:179 -> a
     3:5:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):109 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     7:7:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):114 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     8:8:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):114 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline -> com.android.tools.r8.internal.aF:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aF;"}
     1:1:void <clinit>():177:177 -> <clinit>
     1:1:void <init>():179:179 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):188:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onNeverInline(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline):193:193 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onNeverInline(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline):195:195 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):188 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onNeverInline(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline):193:193 -> a
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onNeverInline(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$NeverInline):195:195 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):188 -> a
     4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):193 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
     6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):193 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRelax -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRelax -> com.android.tools.r8.internal.bF:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRelax INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bF;"}
     1:1:void <clinit>():124:124 -> <clinit>
     1:1:void <init>():126:126 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
     2:2:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict -> com.android.tools.r8.internal.QE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict -> com.android.tools.r8.internal.cF:
 # {"id":"sourceFile","fileName":"KeepConstraint.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cF;"}
     1:1:void <clinit>():150:150 -> <clinit>
     1:1:void <init>():152:152 -> <init>
     1:1:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161:161 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;)V"}
-    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):188:188 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;)V"}
+    2:2:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):190:190 -> a
     2:2:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656:656 -> a
-    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):188 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):190:190 -> a
     3:3:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):471:471 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> a
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656 -> a
-    4:4:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):188 -> a
-    4:4:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):472:472 -> a
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> a
-    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656 -> a
-    5:5:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):188 -> a
-    5:5:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161 -> a
-    6:6:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():657:657 -> a
-    6:6:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1.onVisibilityRestrict(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$VisibilityRestrict):188 -> a
-    6:6:void accept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):161 -> a
-    7:7:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DG;)V"}
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
-    8:8:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167 -> a
+    4:4:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167:167 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NG;)V"}
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
+    5:5:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
-    9:9:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor -> com.android.tools.r8.internal.SE:
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> a
+    6:6:void convertToDisallowKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder):167 -> a
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor -> com.android.tools.r8.internal.eF:
 # {"id":"sourceFile","fileName":"KeepConstraintVisitor.java"}
     1:1:void <init>():22:22 -> <init>
     void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DE;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints -> com.android.tools.r8.internal.YE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PE;)V"}
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints -> com.android.tools.r8.internal.kF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints all():20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gF;"}
     2:2:void forEachAccept(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oE;)V"}
     3:3:void lambda$forEachAccept$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraintVisitor,com.android.tools.r8.relocated.keepanno.ast.KeepConstraint):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SE;Lcom/android/tools/r8/internal/RE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eF;Lcom/android/tools/r8/internal/dF;)V"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints defaultConstraints():24:24 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XE;"}
-    java.util.Set getConstraints() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
-    java.util.Set getRequiredKeepAttributes() -> e
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Additions -> com.android.tools.r8.internal.TE:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
+    java.util.Set getConstraints() -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
+    java.util.Set getRequiredKeepAttributes() -> d
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Additions -> com.android.tools.r8.internal.fF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints additions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iF;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints):193:194 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iF;)V"}
     1:2:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):207:208 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.disallowBuilder():39:39 -> b
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):208 -> b
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[] com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption.values():21:21 -> b
@@ -258493,46 +258127,46 @@
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.add(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption):59:59 -> b
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):211 -> b
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):214:214 -> b
-    1:1:java.util.Set getConstraints():199:199 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> d
-    2:2:java.util.Set getConstraints():199 -> d
-    3:3:java.util.Set getConstraints():199:199 -> d
-    4:4:java.util.Set com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Defaults.getConstraints():169:169 -> d
-    4:4:java.util.Set getConstraints():200 -> d
+    1:1:java.util.Set getConstraints():199:199 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> c
+    2:2:java.util.Set getConstraints():199 -> c
+    3:3:java.util.Set getConstraints():199:199 -> c
+    4:4:java.util.Set com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Defaults.getConstraints():169:169 -> c
+    4:4:java.util.Set getConstraints():200 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):549:549 -> d
-    5:5:java.util.Set getConstraints():200 -> d
-    6:6:java.util.Set getConstraints():200:200 -> d
-    7:7:java.util.Set com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints.getConstraints():233:233 -> d
-    7:7:java.util.Set getConstraints():201 -> d
+    5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):549:549 -> c
+    5:5:java.util.Set getConstraints():200 -> c
+    6:6:java.util.Set getConstraints():200:200 -> c
+    7:7:java.util.Set com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints.getConstraints():233:233 -> c
+    7:7:java.util.Set getConstraints():201 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):549:549 -> d
-    8:8:java.util.Set getConstraints():201 -> d
-    9:9:java.util.Set getConstraints():202:202 -> d
-    1:1:java.util.Set getRequiredKeepAttributes():219:219 -> e
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$All -> com.android.tools.r8.internal.UE:
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):549:549 -> c
+    8:8:java.util.Set getConstraints():201 -> c
+    9:9:java.util.Set getConstraints():202:202 -> c
+    1:1:java.util.Set getRequiredKeepAttributes():219:219 -> d
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$All -> com.android.tools.r8.internal.gF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     java.util.Set constraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$All INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gF;"}
     1:1:void <clinit>():112:112 -> <clinit>
     1:20:void <init>():110:129 -> <init>
     21:21:void <init>():115:115 -> <init>
     1:1:void lambda$getRequiredKeepAttributes$0(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepConstraint):144:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/RE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/dF;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.keepAll():31:31 -> b
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):150 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
-    1:1:java.util.Set getConstraints():133:133 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
-    1:1:java.util.Set getRequiredKeepAttributes():143:143 -> e
-    2:2:java.util.Set getConstraints():133:133 -> e
-    2:2:java.util.Set getRequiredKeepAttributes():144 -> e
-    3:3:java.util.Set getRequiredKeepAttributes():144:144 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
+    1:1:java.util.Set getConstraints():133:133 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
+    1:1:java.util.Set getRequiredKeepAttributes():143:143 -> d
+    2:2:java.util.Set getConstraints():133:133 -> d
+    2:2:java.util.Set getRequiredKeepAttributes():144 -> d
+    3:3:java.util.Set getRequiredKeepAttributes():144:144 -> d
     1:1:java.lang.String toString():138:138 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder -> com.android.tools.r8.internal.VE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder -> com.android.tools.r8.internal.hF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     boolean defaultAdditions -> a
     java.util.Set constraints -> b
@@ -258542,127 +258176,126 @@
     1:1:void <init>():49:49 -> <init>
     2:3:void <init>():46:47 -> <init>
     1:10:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Builder copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):52:61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YE;)Lcom/android/tools/r8/internal/VE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;)Lcom/android/tools/r8/internal/hF;"}
     11:11:boolean lambda$verifyNoAnnotations$0(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RE;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dF;)Z"}
     12:12:boolean verifyNoAnnotations():67:67 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints -> com.android.tools.r8.internal.WE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Constraints -> com.android.tools.r8.internal.iF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     java.util.Set constraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:2:void <init>(java.util.Set):227:228 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):238:238 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.disallowBuilder():39:39 -> b
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):238 -> b
     3:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions convertToKeepOptions(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):239:242 -> b
-    1:1:java.util.Set getConstraints():233:233 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
-    1:3:java.util.Set getRequiredKeepAttributes():254:256 -> e
+    1:1:java.util.Set getConstraints():233:233 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
+    1:3:java.util.Set getRequiredKeepAttributes():254:256 -> d
     1:2:java.lang.String toString():247:248 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Defaults -> com.android.tools.r8.internal.XE:
+com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Defaults -> com.android.tools.r8.internal.jF:
 # {"id":"sourceFile","fileName":"KeepConstraints.java"}
     java.util.Set constraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints$Defaults INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jF;"}
     1:1:void <clinit>():156:156 -> <clinit>
     1:12:void <init>():154:165 -> <init>
     13:13:void <init>():159:159 -> <init>
     com.android.tools.r8.internal.KeepOptions com.android.tools.r8.internal.KeepConstraints$Defaults.convertToKeepOptions() -> b
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
-    1:1:java.util.Set getConstraints():169:169 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
-    1:1:java.util.Set getRequiredKeepAttributes():185:185 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
+    1:1:java.util.Set getConstraints():169:169 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
+    1:1:java.util.Set getRequiredKeepAttributes():185:185 -> d
     1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration -> com.android.tools.r8.internal.aF:
+com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration -> com.android.tools.r8.internal.mF:
 # {"id":"sourceFile","fileName":"KeepDeclaration.java"}
     1:1:void <init>():10:10 -> <init>
-    1:1:void match(java.util.function.Consumer,java.util.function.Consumer):22:22 -> a
-    2:2:boolean isKeepEdge():26:26 -> a
-    2:2:java.lang.Object apply(java.util.function.Function,java.util.function.Function):15 -> a
-    2:2:void match(java.util.function.Consumer,java.util.function.Consumer):22 -> a
-    3:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function):16:18 -> a
-    3:5:void match(java.util.function.Consumer,java.util.function.Consumer):22 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepCheck asKeepCheck():38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tE;"}
+    1:1:boolean isKeepEdge():26:26 -> a
+    1:1:java.lang.Object apply(java.util.function.Function,java.util.function.Function):15 -> a
+    2:4:java.lang.Object apply(java.util.function.Function,java.util.function.Function):16:18 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepCheck asKeepCheck():38:38 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/HE;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge asKeepEdge():30:30 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oF;"}
     1:1:boolean equals(java.lang.Object):43:43 -> equals
     1:1:int hashCode():48:48 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepEdge -> com.android.tools.r8.internal.cF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdge -> com.android.tools.r8.internal.oF:
 # {"id":"sourceFile","fileName":"KeepEdge.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo metaInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings bindings -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions preconditions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences consequences -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OE;"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():137:137 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions,com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):188:196 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/OG;Lcom/android/tools/r8/internal/CE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge asKeepEdge():201:201 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cF;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo getMetaInfo():205:205 -> toString
-    1:1:java.lang.String toString():223 -> toString
-    2:2:java.lang.String toString():223:223 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder -> com.android.tools.r8.internal.bF:
+    1:1:void <clinit>():139:139 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions,com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):195:203 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/YG;Lcom/android/tools/r8/internal/OE;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge asKeepEdge():208:208 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oF;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindings getBindings():216:216 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FE;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo getMetaInfo():212:212 -> toString
+    1:1:java.lang.String toString():230 -> toString
+    2:2:java.lang.String toString():230:230 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder -> com.android.tools.r8.internal.nF:
 # {"id":"sourceFile","fileName":"KeepEdge.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo metaInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings bindings -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions preconditions -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences consequences -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CE;"}
-    1:1:void <init>():145:145 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OE;"}
+    1:1:void <init>():147:147 -> <init>
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> <init>
-    2:2:void <init>():140 -> <init>
-    3:3:void <init>():140:140 -> <init>
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():29:29 -> <init>
-    4:4:void <init>():141 -> <init>
-    5:6:void <init>():141:142 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):148:148 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;)Lcom/android/tools/r8/internal/bF;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;)Lcom/android/tools/r8/internal/bF;"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setPreconditions(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):158:158 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OG;)Lcom/android/tools/r8/internal/bF;"}
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CE;)Lcom/android/tools/r8/internal/bF;"}
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cF;"}
+    2:2:void <init>():142 -> <init>
+    3:3:void <init>():142:142 -> <init>
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():31:31 -> <init>
+    4:4:void <init>():143 -> <init>
+    5:6:void <init>():143:144 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setMetaInfo(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):155:155 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;)Lcom/android/tools/r8/internal/nF;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setBindings(com.android.tools.r8.relocated.keepanno.ast.KeepBindings):160:160 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FE;)Lcom/android/tools/r8/internal/nF;"}
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setPreconditions(com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions):165:165 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)Lcom/android/tools/r8/internal/nF;"}
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder setConsequences(com.android.tools.r8.relocated.keepanno.ast.KeepConsequences):170:170 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/OE;)Lcom/android/tools/r8/internal/nF;"}
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():175:175 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oF;"}
     6:6:boolean com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.isEmpty():53:53 -> a
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():168 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.isEmpty():53:53 -> a
-    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():168 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():171:171 -> a
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():169:169 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeException -> com.android.tools.r8.internal.dF:
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():175 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():178:178 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepEdge build():176:176 -> a
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeException -> com.android.tools.r8.internal.pF:
 # {"id":"sourceFile","fileName":"KeepEdgeException.java"}
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo -> com.android.tools.r8.internal.kF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo -> com.android.tools.r8.internal.wF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext context -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription description -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo NONE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wF;"}
     1:3:void <clinit>():21:23 -> <clinit>
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription.empty():253:253 -> <clinit>
     4:4:void <clinit>():23 -> <clinit>
     5:5:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeVersion,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription):38:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gF;Lcom/android/tools/r8/internal/hF;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sF;Lcom/android/tools/r8/internal/tF;)V"}
     1:1:java.lang.String toString():69:69 -> toString
     2:2:boolean hasContext():57:57 -> toString
     2:2:java.lang.String toString():73 -> toString
@@ -258674,25 +258307,25 @@
     5:5:java.lang.String toString():76 -> toString
     6:7:java.lang.String toString():77:78 -> toString
     8:11:java.lang.String toString():77:80 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder -> com.android.tools.r8.internal.eF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$Builder -> com.android.tools.r8.internal.qF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext context -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription description -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tF;"}
     1:2:void <init>():83:84 -> <init>
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription.empty():253:253 -> <init>
     3:3:void <init>():85 -> <init>
     4:4:void <init>():85:85 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo build():110:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wF;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription.empty():253:253 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo build():111 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo build():111:111 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo build():112 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo build():114:114 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeClassContext -> com.android.tools.r8.internal.fF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeClassContext -> com.android.tools.r8.internal.rF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     java.lang.String classDescriptor -> b
     boolean $assertionsDisabled -> c
@@ -258701,27 +258334,27 @@
     1:1:java.lang.String getDescriptorString():152:152 -> a
     1:5:boolean equals(java.lang.Object):160:164 -> equals
     1:1:int hashCode():169:169 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext -> com.android.tools.r8.internal.sF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeContext NONE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sF;"}
     1:1:void <clinit>():119:119 -> <clinit>
     1:1:void <init>():125:125 -> <init>
     1:1:java.lang.String getDescriptorString():128:128 -> a
     1:1:boolean equals(java.lang.Object):133:133 -> equals
     1:1:int hashCode():138:138 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription -> com.android.tools.r8.internal.hF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription -> com.android.tools.r8.internal.tF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     java.lang.String description -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeDescription EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tF;"}
     boolean $assertionsDisabled -> c
     1:2:void <clinit>():249:250 -> <clinit>
     1:3:void <init>(java.lang.String):258:260 -> <init>
     1:5:boolean equals(java.lang.Object):269:273 -> equals
     1:1:int hashCode():278:278 -> hashCode
     1:1:java.lang.String toString():283:283 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeFieldContext -> com.android.tools.r8.internal.iF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeFieldContext -> com.android.tools.r8.internal.uF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     java.lang.String classDescriptor -> b
     java.lang.String fieldName -> c
@@ -258730,7 +258363,7 @@
     1:1:java.lang.String getDescriptorString():226:226 -> a
     1:7:boolean equals(java.lang.Object):234:240 -> equals
     1:1:int hashCode():245:245 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeMethodContext -> com.android.tools.r8.internal.jF:
+com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo$KeepEdgeMethodContext -> com.android.tools.r8.internal.vF:
 # {"id":"sourceFile","fileName":"KeepEdgeMetaInfo.java"}
     java.lang.String classDescriptor -> b
     java.lang.String methodName -> c
@@ -258741,20 +258374,20 @@
     1:1:java.lang.String getDescriptorString():190:190 -> a
     1:7:boolean equals(java.lang.Object):198:204 -> equals
     1:1:int hashCode():209:209 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern -> com.android.tools.r8.internal.WF:
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern -> com.android.tools.r8.internal.iG:
 # {"id":"sourceFile","fileName":"KeepFieldAccessPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern volatilePattern -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern transientPattern -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern ANY -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iG;"}
     1:1:void <clinit>():12:12 -> <clinit>
     2:2:java.util.Set com.android.tools.r8.relocated.keepanno.ast.AccessVisibility.all():43:43 -> <clinit>
     2:2:void <clinit>():14 -> <clinit>
     3:7:void <clinit>():15:19 -> <clinit>
     1:3:void <init>(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):39:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;)V"}
     1:1:boolean isAny():56:56 -> a
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> a
     2:2:boolean isAny():56 -> a
@@ -258777,18 +258410,18 @@
     10:10:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrintingUtils.printFieldAccess(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):310:310 -> toString
     10:10:java.lang.String toString():50 -> toString
     11:11:java.lang.String toString():51:51 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder -> com.android.tools.r8.internal.VF:
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder -> com.android.tools.r8.internal.hG:
 # {"id":"sourceFile","fileName":"KeepFieldAccessPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern volatilePattern -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern transientPattern -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     1:1:void <init>():72:72 -> <init>
     2:3:void <init>():69:70 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase self():67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uG;"}
     1:3:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern build():81:83 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/WF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iG;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getStaticPattern():137:137 -> c
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern build():84 -> c
     5:5:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getFinalPattern():141:141 -> c
@@ -258802,53 +258435,53 @@
     9:10:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern build():88:89 -> c
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.anyFieldAccess():22:22 -> c
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern build():89 -> c
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern -> com.android.tools.r8.internal.XF:
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern -> com.android.tools.r8.internal.jG:
 # {"id":"sourceFile","fileName":"KeepFieldNamePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern pattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern ANY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jG;"}
     1:1:void <clinit>():8:8 -> <clinit>
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WG;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern -> com.android.tools.r8.internal.ZF:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gH;)V"}
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern -> com.android.tools.r8.internal.lG:
 # {"id":"sourceFile","fileName":"KeepFieldPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern accessPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern namePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern typePattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nG;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():8:8 -> <clinit>
     1:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern,com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern,com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern):75:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/internal/WF;Lcom/android/tools/r8/internal/XF;Lcom/android/tools/r8/internal/bG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YU;Lcom/android/tools/r8/internal/iG;Lcom/android/tools/r8/internal/jG;Lcom/android/tools/r8/internal/nG;)V"}
     1:1:java.lang.String lambda$toString$0(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):139:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)Ljava/lang/String;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern asField():88:88 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern getAccessPattern():105:105 -> d
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern getAccessPattern():8 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern getAnnotatedByPattern():100:100 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
     1:8:boolean equals(java.lang.Object):121:128 -> equals
     1:1:int hashCode():133:133 -> hashCode
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder builder():11:11 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kG;"}
     1:2:java.lang.String toString():138:139 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder -> com.android.tools.r8.internal.YF:
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder -> com.android.tools.r8.internal.kG:
 # {"id":"sourceFile","fileName":"KeepFieldPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern accessPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern namePattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern typePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nG;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -258860,109 +258493,97 @@
     6:6:void <init>():24 -> <init>
     7:7:void <init>():24:24 -> <init>
     1:3:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):33:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)Lcom/android/tools/r8/internal/YF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;)Lcom/android/tools/r8/internal/kG;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.builder():26:26 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):35 -> a
     5:6:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):36:37 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder setAccessPattern(com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):47:47 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):34 -> a
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern build():62:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZF;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern -> com.android.tools.r8.internal.bG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lG;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern -> com.android.tools.r8.internal.nG:
 # {"id":"sourceFile","fileName":"KeepFieldTypePattern.java"}
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;)Lcom/android/tools/r8/internal/bG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nH;)Lcom/android/tools/r8/internal/nG;"}
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):13 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern any():9:9 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):13 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern fromType(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):13:13 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType -> com.android.tools.r8.internal.mG:
 # {"id":"sourceFile","fileName":"KeepFieldTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern typePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType ANY_TYPE_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mG;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():28:30 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):34:36 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nH;)V"}
     1:5:boolean equals(java.lang.Object):50:54 -> equals
     1:1:int hashCode():59:59 -> hashCode
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern -> com.android.tools.r8.internal.dG:
+com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern -> com.android.tools.r8.internal.pG:
 # {"id":"sourceFile","fileName":"KeepInstanceOfPattern.java"}
     1:1:void <init>():104:104 -> <init>
     boolean isAny() -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Builder -> R8$$REMOVED$$CLASS$$221:
+com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Builder -> R8$$REMOVED$$CLASS$$209:
 # {"id":"sourceFile","fileName":"KeepInstanceOfPattern.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some -> com.android.tools.r8.internal.cG:
+com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some -> com.android.tools.r8.internal.oG:
 # {"id":"sourceFile","fileName":"KeepInstanceOfPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern namePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     boolean isInclusive -> b
     com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern ANY_INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oG;"}
     boolean $assertionsDisabled -> d
     1:4:void <clinit>():43:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,boolean):55:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;Z)V"}
     1:1:boolean isAny():63:63 -> a
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():90:90 -> hashCode
     1:2:java.lang.String toString():95:96 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern -> com.android.tools.r8.internal.rG:
 # {"id":"sourceFile","fileName":"KeepItemPattern.java"}
     1:1:void <init>():20:20 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern asClassItemPattern():39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wE;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():43:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern asClassItemPattern():35:35 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/KE;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():39:39 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yG;"}
     java.util.Collection getBindingReferences() -> c
-    1:1:boolean isClassItemPattern():31:31 -> d
-    1:1:boolean isMemberItemPattern():35:35 -> e
-    com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference() -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepItemReference -> com.android.tools.r8.internal.gG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
+    1:1:boolean isClassItemPattern():27:27 -> d
+    1:1:boolean isMemberItemPattern():31:31 -> e
+com.android.tools.r8.relocated.keepanno.ast.KeepItemReference -> com.android.tools.r8.internal.sG:
 # {"id":"sourceFile","fileName":"KeepItemReference.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference():53:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nE;"}
-    2:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function):70:73 -> a
-    6:6:boolean isItemPattern():41:41 -> a
-    6:6:java.lang.Object apply(java.util.function.Function,java.util.function.Function):73 -> a
-    7:8:java.lang.Object apply(java.util.function.Function,java.util.function.Function):73:74 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern asClassItemPattern():61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wE;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern asItemPattern():57:57 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():65:65 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference asMemberItemReference():29:29 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pG;"}
-    1:1:boolean isBindingReference():36:36 -> f
-    1:1:boolean isMemberItemReference():21:21 -> g
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern -> com.android.tools.r8.internal.jG:
+    com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference() -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BE;"}
+    1:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function):70:74 -> a
+    6:6:java.lang.Object apply(java.util.function.Function,java.util.function.Function):73:73 -> a
+    1:1:boolean isBindingReference():36:36 -> b
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern -> com.android.tools.r8.internal.vG:
 # {"id":"sourceFile","fileName":"KeepMemberAccessPattern.java"}
     java.util.Set allowedVisibilities -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern staticPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern finalPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern syntheticPattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern ANY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vG;"}
     1:1:void <clinit>():12:12 -> <clinit>
     2:2:java.util.Set com.android.tools.r8.relocated.keepanno.ast.AccessVisibility.all():43:43 -> <clinit>
     2:2:void <clinit>():14 -> <clinit>
     3:5:void <clinit>():15:17 -> <clinit>
     1:5:void <init>(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):36:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;)V"}
     1:1:boolean isAnyVisibility():63:63 -> a
     1:1:boolean isAny():56 -> a
     2:3:boolean isAny():56:57 -> a
@@ -258978,25 +258599,25 @@
     5:5:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> toString
     5:5:java.lang.String toString():49 -> toString
     6:7:java.lang.String toString():50:51 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$Builder -> com.android.tools.r8.internal.tG:
 # {"id":"sourceFile","fileName":"KeepMemberAccessPattern.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():86:86 -> <clinit>
     1:1:void <init>():86:86 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase self():86:86 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase -> com.android.tools.r8.internal.iG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uG;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase -> com.android.tools.r8.internal.uG:
 # {"id":"sourceFile","fileName":"KeepMemberAccessPattern.java"}
     java.util.Set allowed -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     java.util.Set disallowed -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern staticPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern finalPattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern syntheticPattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     1:1:void <init>():121:121 -> <init>
     2:2:void <init>():115:115 -> <init>
     3:3:java.util.Set com.android.tools.r8.relocated.keepanno.ast.AccessVisibility.createSet():39:39 -> <init>
@@ -259006,7 +258627,7 @@
     5:5:void <init>():116 -> <init>
     6:9:void <init>():116:119 -> <init>
     1:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase copyOfMemberAccess(com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):128:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jG;)Lcom/android/tools/r8/internal/iG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vG;)Lcom/android/tools/r8/internal/uG;"}
     4:4:java.util.Set com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.getAllowedAccessVisibilities():71:71 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase copyOfMemberAccess(com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -259028,150 +258649,144 @@
     16:16:java.util.Set getAllowedVisibilities():156 -> a
     17:24:java.util.Set getAllowedVisibilities():156:163 -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase self() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference -> com.android.tools.r8.internal.kG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uG;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference -> com.android.tools.r8.internal.wG:
 # {"id":"sourceFile","fileName":"KeepMemberBindingReference.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):11:11 -> d
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():22 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
-    1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern -> com.android.tools.r8.internal.mG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference asMemberBindingReference():17:17 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):11:11 -> e
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():22 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sG;"}
+    1:1:java.lang.String toString():31:31 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern -> com.android.tools.r8.internal.yG:
 # {"id":"sourceFile","fileName":"KeepMemberItemPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference classReference -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern memberPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BG;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):52:56 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zE;Lcom/android/tools/r8/internal/rG;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():61:61 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mG;"}
-    1:1:java.util.Collection getBindingReferences():78:78 -> c
-    1:5:boolean equals(java.lang.Object):86:90 -> equals
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.fromMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):15:15 -> f
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference toItemReference():66 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder builder():17:17 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getClassReference():70:70 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zE;"}
-    1:1:int hashCode():95:95 -> hashCode
-    1:1:java.lang.String toString():100:100 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder -> com.android.tools.r8.internal.lG:
+    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):56:60 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LE;Lcom/android/tools/r8/internal/BG;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():65:65 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yG;"}
+    1:1:java.util.Collection getBindingReferences():77:77 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/List;"}
+    2:2:java.util.Collection com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.getBindingReferences():53:53 -> c
+    2:2:java.util.Collection getBindingReferences():77 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:java.util.Collection com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.getBindingReferences():53:53 -> c
+    3:3:java.util.Collection getBindingReferences():77 -> c
+    1:5:boolean equals(java.lang.Object):85:89 -> equals
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder builder():13:13 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xG;"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference getClassReference():69:69 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/LE;"}
+    1:1:int hashCode():94:94 -> hashCode
+    1:1:java.lang.String toString():99:99 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder -> com.android.tools.r8.internal.xG:
 # {"id":"sourceFile","fileName":"KeepMemberItemPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference classReference -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern memberPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rG;"}
-    1:1:void <init>():26:26 -> <init>
-    2:2:void <init>():23:23 -> <init>
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromClassItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):19:19 -> <init>
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.toClassItemReference():85 -> <init>
-    3:3:void <init>():23 -> <init>
-    4:4:void <init>():23:23 -> <init>
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> <init>
-    5:5:void <init>():24 -> <init>
-    6:6:void <init>():24:24 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setClassReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zE;)Lcom/android/tools/r8/internal/lG;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)Lcom/android/tools/r8/internal/lG;"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern build():44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference -> com.android.tools.r8.internal.pG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BG;"}
+    1:1:void <init>():21:21 -> <init>
+    2:2:void <init>():18:18 -> <init>
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> <init>
+    3:3:void <init>():19 -> <init>
+    4:4:void <init>():19:19 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29:29 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IE;)Lcom/android/tools/r8/internal/xG;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setClassBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):29:29 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder setMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):39:39 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;)Lcom/android/tools/r8/internal/xG;"}
+    5:9:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern build():44:48 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yG;"}
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern build():45:45 -> a
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference -> R8$$REMOVED$$CLASS$$210:
 # {"id":"sourceFile","fileName":"KeepMemberItemReference.java"}
-    1:1:void <init>():7:7 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference asMemberItemReference():20:20 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/pG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference$MemberBinding -> com.android.tools.r8.internal.nG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference$MemberBinding -> com.android.tools.r8.internal.zG:
 # {"id":"sourceFile","fileName":"KeepMemberItemReference.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference bindingReference -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kG;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):27:28 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kG;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference():33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nE;"}
-    1:1:java.lang.String toString():38:38 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference$MemberItem -> com.android.tools.r8.internal.oG:
-# {"id":"sourceFile","fileName":"KeepMemberItemReference.java"}
-    com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern itemPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mG;"}
-    1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):46:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mG;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern asItemPattern():52:52 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fG;"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern asMemberItemPattern():57:57 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mG;"}
-    1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern -> com.android.tools.r8.internal.rG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wG;"}
+    1:1:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemReference.<init>():7:7 -> <init>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):23 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wG;)V"}
+    2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference):24:24 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference asBindingReference():29:29 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/BE;"}
+    1:1:java.lang.String toString():34:34 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern -> com.android.tools.r8.internal.BG:
 # {"id":"sourceFile","fileName":"KeepMemberPattern.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():95:95 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern allMembers():13:13 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/AG;"}
     2:4:void match(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):144:146 -> a
     5:12:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):129:136 -> a
     5:12:void match(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):143 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern asField():118:118 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ZF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern asMethod():110:110 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern getAccessPattern() -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vG;"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern getAnnotatedByPattern() -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
     1:1:boolean isField():114:114 -> f
     1:1:boolean isGeneralMember():102:102 -> g
     1:1:boolean isMethod():106:106 -> h
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder -> R8$$REMOVED$$CLASS$$222:
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Builder -> R8$$REMOVED$$CLASS$$211:
 # {"id":"sourceFile","fileName":"KeepMemberPattern.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Some -> com.android.tools.r8.internal.qG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern$Some -> com.android.tools.r8.internal.AG:
 # {"id":"sourceFile","fileName":"KeepMemberPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern accessPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern ANY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AG;"}
     1:2:void <clinit>():44:45 -> <clinit>
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.anyMemberAccess():20:20 -> <clinit>
     3:3:void <clinit>():45 -> <clinit>
     4:4:void <clinit>():45:45 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):52:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/internal/jG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YU;Lcom/android/tools/r8/internal/vG;)V"}
     1:1:java.lang.String lambda$toString$0(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)Ljava/lang/String;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern getAccessPattern():64:64 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern getAnnotatedByPattern():59:59 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
     1:6:boolean equals(java.lang.Object):72:77 -> equals
     1:1:int hashCode():82:82 -> hashCode
     1:2:java.lang.String toString():87:88 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern -> com.android.tools.r8.internal.tG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern -> com.android.tools.r8.internal.DG:
 # {"id":"sourceFile","fileName":"KeepMethodAccessPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern synchronizedPattern -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern bridgePattern -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern nativePattern -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern abstractPattern -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern strictFpPattern -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern ANY -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DG;"}
     1:1:void <clinit>():12:12 -> <clinit>
     2:2:java.util.Set com.android.tools.r8.relocated.keepanno.ast.AccessVisibility.all():43:43 -> <clinit>
     2:2:void <clinit>():14 -> <clinit>
     3:10:void <clinit>():15:22 -> <clinit>
     1:6:void <init>(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):48:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;Lcom/android/tools/r8/internal/IO;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;Lcom/android/tools/r8/internal/MO;)V"}
     1:2:boolean isAny():68:69 -> a
     3:3:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> a
     3:3:boolean isAny():69 -> a
@@ -259218,24 +258833,24 @@
     16:16:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrintingUtils.printMethodAccess(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):302:302 -> toString
     16:16:java.lang.String toString():62 -> toString
     17:17:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder -> com.android.tools.r8.internal.sG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder -> com.android.tools.r8.internal.CG:
 # {"id":"sourceFile","fileName":"KeepMethodAccessPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern synchronizedPattern -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern bridgePattern -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern nativePattern -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern abstractPattern -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern strictFpPattern -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MO;"}
     1:1:void <init>():103:103 -> <init>
     2:6:void <init>():97:101 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase self():96:96 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uG;"}
     1:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern build():112:114 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/DG;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getStaticPattern():137:137 -> c
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern build():115 -> c
     5:5:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern$BuilderBase.getFinalPattern():141:141 -> c
@@ -259255,48 +258870,48 @@
     12:13:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern build():122:123 -> c
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.anyMethodAccess():25:25 -> c
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern build():123 -> c
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern -> com.android.tools.r8.internal.uG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern -> com.android.tools.r8.internal.EG:
 # {"id":"sourceFile","fileName":"KeepMethodNamePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern pattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern ANY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern INSTANCE_INIT -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern CLASS_INIT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
     boolean $assertionsDisabled -> e
     1:10:void <clinit>():6:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):51:53 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gH;)V"}
     1:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):34:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WG;)Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gH;)Lcom/android/tools/r8/internal/EG;"}
     5:5:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern.asExactString():96:96 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):38 -> a
     6:13:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern fromStringPattern(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):39:46 -> a
     1:5:boolean equals(java.lang.Object):65:69 -> equals
     1:1:int hashCode():74:74 -> hashCode
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern -> com.android.tools.r8.internal.xG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern -> com.android.tools.r8.internal.HG:
 # {"id":"sourceFile","fileName":"KeepMethodParametersPattern.java"}
     1:1:void <init>():25:25 -> <init>
     1:1:java.util.List asList():36:36 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Any -> com.android.tools.r8.internal.vG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Any -> com.android.tools.r8.internal.FG:
 # {"id":"sourceFile","fileName":"KeepMethodParametersPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Any INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FG;"}
     1:1:void <clinit>():101:101 -> <clinit>
     1:1:void <init>():100:100 -> <init>
     1:1:boolean equals(java.lang.Object):114:114 -> equals
     1:1:int hashCode():119:119 -> hashCode
     1:1:java.lang.String toString():124:124 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder -> R8$$REMOVED$$CLASS$$223:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Builder -> R8$$REMOVED$$CLASS$$212:
 # {"id":"sourceFile","fileName":"KeepMethodParametersPattern.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Some -> com.android.tools.r8.internal.wG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Some -> com.android.tools.r8.internal.GG:
 # {"id":"sourceFile","fileName":"KeepMethodParametersPattern.java"}
     java.util.List parameterPatterns -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern$Some EMPTY_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GG;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():58:60 -> <clinit>
     1:3:void <init>(java.util.List):64:66 -> <init>
@@ -259304,48 +258919,48 @@
     1:6:boolean equals(java.lang.Object):79:84 -> equals
     1:1:int hashCode():89:89 -> hashCode
     1:2:java.lang.String toString():94:95 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern -> com.android.tools.r8.internal.zG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern -> com.android.tools.r8.internal.JG:
 # {"id":"sourceFile","fileName":"KeepMethodPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern accessPattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern namePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern returnTypePattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern parametersPattern -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HG;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():8:8 -> <clinit>
     1:11:void <init>(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern,com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):95:105 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UU;Lcom/android/tools/r8/internal/tG;Lcom/android/tools/r8/internal/uG;Lcom/android/tools/r8/internal/CG;Lcom/android/tools/r8/internal/xG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YU;Lcom/android/tools/r8/internal/DG;Lcom/android/tools/r8/internal/EG;Lcom/android/tools/r8/internal/MG;Lcom/android/tools/r8/internal/HG;)V"}
     1:1:java.lang.String lambda$toString$0(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)Ljava/lang/String;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern asMethod():110:110 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern getAccessPattern():128:128 -> d
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern getAccessPattern():8 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/jG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vG;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern getAnnotatedByPattern():123:123 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YU;"}
     1:9:boolean equals(java.lang.Object):148:156 -> equals
     1:1:int hashCode():161:161 -> hashCode
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder builder():11:11 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IG;"}
     1:2:java.lang.String toString():167:168 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder -> com.android.tools.r8.internal.yG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder -> com.android.tools.r8.internal.IG:
 # {"id":"sourceFile","fileName":"KeepMethodPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern annotatedByPattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YU;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern accessPattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern namePattern -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern returnTypePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern parametersPattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HG;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -259360,14 +258975,14 @@
     7:7:void <init>():24 -> <init>
     8:9:void <init>():24:25 -> <init>
     1:3:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):34:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)Lcom/android/tools/r8/internal/yG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;)Lcom/android/tools/r8/internal/IG;"}
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.builder():29:29 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):36 -> a
     5:6:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):37:38 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder setAccessPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):48:48 -> a
     7:7:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder copyFromMemberPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):35 -> a
     8:9:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern build():72:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JG;"}
     10:10:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern build():73 -> a
     11:11:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern build():73:73 -> a
@@ -259377,56 +258992,56 @@
     14:14:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
     14:14:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern build():74 -> a
     15:19:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern build():75:79 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern -> com.android.tools.r8.internal.CG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern -> com.android.tools.r8.internal.MG:
 # {"id":"sourceFile","fileName":"KeepMethodReturnTypePattern.java"}
     1:1:void <init>():7:7 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern asType():34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nH;"}
     1:1:boolean isType():30:30 -> b
     1:1:boolean isAny():22 -> b
     2:2:boolean isAny():22:22 -> b
     3:3:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> b
     3:3:boolean isAny():22 -> b
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$SomeType -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$SomeType -> com.android.tools.r8.internal.KG:
 # {"id":"sourceFile","fileName":"KeepMethodReturnTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern typePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$SomeType ANY_TYPE_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KG;"}
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():65:67 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):71:73 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nH;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern asType():78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nH;"}
     1:5:boolean equals(java.lang.Object):87:91 -> equals
     1:1:int hashCode():96:96 -> hashCode
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$VoidType -> com.android.tools.r8.internal.BG:
+com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$VoidType -> com.android.tools.r8.internal.LG:
 # {"id":"sourceFile","fileName":"KeepMethodReturnTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern$VoidType INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LG;"}
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():37:37 -> <init>
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():56:56 -> hashCode
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepOptions -> com.android.tools.r8.internal.FG:
+com.android.tools.r8.relocated.keepanno.ast.KeepOptions -> com.android.tools.r8.internal.PG:
 # {"id":"sourceFile","fileName":"KeepOptions.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet allowedOptions -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions ALLOW_NONE_INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PG;"}
     1:1:void <clinit>():15:15 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> <clinit>
     2:2:void <clinit>():15 -> <clinit>
     3:3:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet):102:103 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;)V"}
     1:5:boolean equals(java.lang.Object):115:119 -> equals
     1:1:int hashCode():124:124 -> hashCode
     1:2:java.lang.String toString():129:130 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder -> com.android.tools.r8.internal.NG:
 # {"id":"sourceFile","fileName":"KeepOptions.java"}
     boolean allowIfSet -> a
     java.util.Set options -> b
@@ -259434,7 +259049,7 @@
     1:1:void <init>(boolean):54:54 -> <init>
     2:5:void <init>(boolean):52:55 -> <init>
     1:2:com.android.tools.r8.relocated.keepanno.ast.KeepOptions build():74:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PG;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.keepAll():31:31 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepOptions build():76 -> a
     4:6:com.android.tools.r8.relocated.keepanno.ast.KeepOptions build():78:80 -> a
@@ -259449,32 +259064,32 @@
     19:19:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[] com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption.values():21:21 -> a
     19:19:com.android.tools.r8.relocated.keepanno.ast.KeepOptions build():91 -> a
     20:25:com.android.tools.r8.relocated.keepanno.ast.KeepOptions build():91:96 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption -> com.android.tools.r8.internal.EG:
+com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption -> com.android.tools.r8.internal.OG:
 # {"id":"sourceFile","fileName":"KeepOptions.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption SHRINKING -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption OPTIMIZING -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption OBFUSCATING -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption ACCESS_MODIFICATION -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption ANNOTATION_REMOVAL -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption SIGNATURE_REMOVAL -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[] $VALUES -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/EG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/OG;"}
     1:6:void <clinit>():22:27 -> <clinit>
     7:7:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern -> com.android.tools.r8.internal.UG:
 # {"id":"sourceFile","fileName":"KeepPackagePattern.java"}
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder builder():9:9 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern exact(java.lang.String):21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/IG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/SG;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern exact(java.lang.String):21:21 -> a
     3:4:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder.build():44:45 -> a
     3:4:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern exact(java.lang.String):21 -> a
@@ -259484,11 +259099,11 @@
     boolean isTop() -> d
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top.getInstance():97:97 -> e
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern top():17 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Any -> com.android.tools.r8.internal.GG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TG;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Any -> com.android.tools.r8.internal.QG:
 # {"id":"sourceFile","fileName":"KeepPackagePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Any INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QG;"}
     1:1:void <clinit>():53:53 -> <clinit>
     1:1:void <init>():59:59 -> <init>
     1:1:boolean isAny():63:63 -> b
@@ -259497,18 +259112,18 @@
     1:1:boolean equals(java.lang.Object):78:78 -> equals
     1:1:int hashCode():83:83 -> hashCode
     1:1:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder -> com.android.tools.r8.internal.HG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder -> com.android.tools.r8.internal.RG:
 # {"id":"sourceFile","fileName":"KeepPackagePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern pattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SG;"}
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder exact(java.lang.String):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/HG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/RG;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top.getInstance():97:97 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern.top():17 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder exact(java.lang.String):39 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Builder exact(java.lang.String):39:39 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Exact -> com.android.tools.r8.internal.IG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Exact -> com.android.tools.r8.internal.SG:
 # {"id":"sourceFile","fileName":"KeepPackagePattern.java"}
     java.lang.String fullPackage -> a
     boolean $assertionsDisabled -> b
@@ -259521,23 +259136,23 @@
     1:5:boolean equals(java.lang.Object):156:160 -> equals
     1:1:int hashCode():165:165 -> hashCode
     1:1:java.lang.String toString():170:170 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top -> com.android.tools.r8.internal.TG:
 # {"id":"sourceFile","fileName":"KeepPackagePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern$Top INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TG;"}
     1:1:void <clinit>():94:94 -> <clinit>
     1:1:void <init>():101:101 -> <init>
     1:1:boolean isTop():111:111 -> d
     1:1:java.lang.String toString():116:116 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions -> com.android.tools.r8.internal.YG:
 # {"id":"sourceFile","fileName":"KeepPreconditions.java"}
     1:1:void <init>():10:10 -> <init>
     void forEach(java.util.function.Consumer) -> a
     boolean isAlways() -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Always -> com.android.tools.r8.internal.LG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Always -> com.android.tools.r8.internal.VG:
 # {"id":"sourceFile","fileName":"KeepPreconditions.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Always INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VG;"}
     1:1:void <clinit>():44:44 -> <clinit>
     1:1:void <init>():42:42 -> <init>
     1:1:boolean isAlways():52:52 -> a
@@ -259545,15 +259160,15 @@
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:1:int hashCode():67:67 -> hashCode
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder -> com.android.tools.r8.internal.WG:
 # {"id":"sourceFile","fileName":"KeepPreconditions.java"}
     java.util.List preconditions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:1:void <init>():18:18 -> <init>
     2:2:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AE;)Lcom/android/tools/r8/internal/MG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$KeepPreconditionsSome -> com.android.tools.r8.internal.NG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ME;)Lcom/android/tools/r8/internal/WG;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$KeepPreconditionsSome -> com.android.tools.r8.internal.XG:
 # {"id":"sourceFile","fileName":"KeepPreconditions.java"}
     java.util.List preconditions -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -259566,13 +259181,13 @@
     1:5:boolean equals(java.lang.Object):102:106 -> equals
     1:1:int hashCode():111:111 -> hashCode
     1:1:java.lang.String toString():116:116 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern -> com.android.tools.r8.internal.PG:
+com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern -> com.android.tools.r8.internal.ZG:
 # {"id":"sourceFile","fileName":"KeepPrimitiveTypePattern.java"}
     char descriptor -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern ANY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZG;"}
     java.util.Map PRIMITIVES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:11:void <clinit>():13:23 -> <clinit>
     12:13:com.android.tools.r8.com.google.common.collect.ImmutableMap populate(com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern[]):28:29 -> <clinit>
     12:13:void <clinit>():24 -> <clinit>
@@ -259595,22 +259210,22 @@
     2:2:char getDescriptorChar():85:85 -> a
     3:3:char getDescriptorChar():83:83 -> a
     4:4:void forEachPrimitive(java.util.function.Consumer):93:93 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern -> com.android.tools.r8.internal.RG:
+com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern -> com.android.tools.r8.internal.bH:
 # {"id":"sourceFile","fileName":"KeepQualifiedClassNamePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern packagePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern namePattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oH;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():8:8 -> <clinit>
     1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern,com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern):73:77 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KG;Lcom/android/tools/r8/internal/eH;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UG;Lcom/android/tools/r8/internal/oH;)V"}
     1:2:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern any():16:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bH;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder.build():65:65 -> a
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern any():18 -> a
     4:4:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exact(java.lang.String):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bH;"}
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder builder():11:11 -> a
     5:5:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exact(java.lang.String):34 -> a
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exact(java.lang.String):36:36 -> a
@@ -259621,9 +259236,9 @@
     15:17:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exact(java.lang.String):42:44 -> a
     18:18:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exact(java.lang.String):31:31 -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder builder():11:11 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/aH;"}
     2:5:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern exactFromDescriptor(java.lang.String):22:25 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bH;"}
     1:7:java.lang.String getExactDescriptor():89:95 -> c
     8:8:java.lang.String getExactDescriptor():90:90 -> c
     1:1:boolean isAny():81:81 -> d
@@ -259647,31 +259262,31 @@
     3:3:int hashCode():121 -> hashCode
     4:4:int hashCode():121:121 -> hashCode
     1:1:java.lang.String toString():126:126 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder -> com.android.tools.r8.internal.QG:
+com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder -> com.android.tools.r8.internal.aH:
 # {"id":"sourceFile","fileName":"KeepQualifiedClassNamePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern packagePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern namePattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oH;"}
     1:1:void <init>():52:52 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder setPackagePattern(com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KG;)Lcom/android/tools/r8/internal/QG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UG;)Lcom/android/tools/r8/internal/aH;"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern$Builder setNamePattern(com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eH;)Lcom/android/tools/r8/internal/QG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oH;)Lcom/android/tools/r8/internal/aH;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern build():65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RG;"}
-com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern -> com.android.tools.r8.internal.WG:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bH;"}
+com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern -> com.android.tools.r8.internal.gH:
 # {"id":"sourceFile","fileName":"KeepStringPattern.java"}
     java.lang.String exact -> a
     java.lang.String prefix -> b
     java.lang.String suffix -> c
     com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern ANY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gH;"}
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(java.lang.String,java.lang.String,java.lang.String):62:65 -> <init>
     1:4:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern$Builder.build():49:52 -> a
     1:4:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern exact(java.lang.String):18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/WG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/gH;"}
     5:5:boolean isAny():88:88 -> a
     1:1:boolean isExact():92:92 -> b
     1:7:boolean equals(java.lang.Object):73:79 -> equals
@@ -259683,104 +259298,100 @@
     8:8:boolean hasSuffix():104:104 -> toString
     8:8:java.lang.String toString():123 -> toString
     9:9:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern$Builder -> R8$$REMOVED$$CLASS$$224:
+com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern$Builder -> R8$$REMOVED$$CLASS$$213:
 # {"id":"sourceFile","fileName":"KeepStringPattern.java"}
-com.android.tools.r8.relocated.keepanno.ast.KeepTarget -> com.android.tools.r8.internal.YG:
+com.android.tools.r8.relocated.keepanno.ast.KeepTarget -> com.android.tools.r8.internal.iH:
 # {"id":"sourceFile","fileName":"KeepTarget.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepItemReference item -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints constraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():8:8 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):42:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;Lcom/android/tools/r8/internal/YE;)V"}
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder builder():50:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XG;"}
-    1:5:boolean equals(java.lang.Object):66:70 -> equals
-    1:1:int hashCode():75:75 -> hashCode
-    1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder -> com.android.tools.r8.internal.XG:
+    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):43:47 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sG;Lcom/android/tools/r8/internal/kF;)V"}
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder builder():51:51 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hH;"}
+    1:5:boolean equals(java.lang.Object):67:71 -> equals
+    1:1:int hashCode():76:76 -> hashCode
+    1:1:java.lang.String toString():81:81 -> toString
+com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder -> com.android.tools.r8.internal.hH:
 # {"id":"sourceFile","fileName":"KeepTarget.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepItemReference item -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConstraints constraints -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
     1:1:void <init>():15:15 -> <init>
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> <init>
     2:2:void <init>():13 -> <init>
     3:3:void <init>():13:13 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;)Lcom/android/tools/r8/internal/XG;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fG;)Lcom/android/tools/r8/internal/XG;"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):18:18 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):23 -> a
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setConstraints(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):27:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YE;)Lcom/android/tools/r8/internal/XG;"}
-    5:8:com.android.tools.r8.relocated.keepanno.ast.KeepTarget build():32:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/YG;"}
-    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepTarget build():33:33 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern -> com.android.tools.r8.internal.dH:
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):18:18 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BE;)Lcom/android/tools/r8/internal/hH;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder setConstraints(com.android.tools.r8.relocated.keepanno.ast.KeepConstraints):28:28 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gF;)Lcom/android/tools/r8/internal/hH;"}
+    3:6:com.android.tools.r8.relocated.keepanno.ast.KeepTarget build():33:36 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iH;"}
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepTarget build():34:34 -> a
+com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern -> com.android.tools.r8.internal.nH:
 # {"id":"sourceFile","fileName":"KeepTypePattern.java"}
     1:1:void <init>():13:13 -> <init>
     java.lang.Object apply(java.util.function.Supplier,java.util.function.Function,java.util.function.Function,java.util.function.Function) -> a
     1:7:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromDescriptor(java.lang.String):32:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/dH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nH;"}
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromClass(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):28:28 -> a
     8:8:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromDescriptor(java.lang.String):38 -> a
     9:19:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromDescriptor(java.lang.String):36:46 -> a
     20:20:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromArray(com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):24:24 -> a
     20:20:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromDescriptor(java.lang.String):46 -> a
     21:25:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern fromDescriptor(java.lang.String):48:52 -> a
-com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$Any -> com.android.tools.r8.internal.ZG:
+com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$Any -> com.android.tools.r8.internal.jH:
 # {"id":"sourceFile","fileName":"KeepTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$Any INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jH;"}
     1:1:void <clinit>():79:79 -> <clinit>
     1:1:void <init>():77:77 -> <init>
     1:1:java.lang.Object apply(java.util.function.Supplier,java.util.function.Function,java.util.function.Function,java.util.function.Function):91:91 -> a
     1:1:boolean equals(java.lang.Object):101:101 -> equals
     1:1:int hashCode():106:106 -> hashCode
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$ArrayType -> com.android.tools.r8.internal.aH:
+com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$ArrayType -> com.android.tools.r8.internal.kH:
 # {"id":"sourceFile","fileName":"KeepTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zE;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):202:203 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zE;)V"}
     1:1:java.lang.Object apply(java.util.function.Supplier,java.util.function.Function,java.util.function.Function,java.util.function.Function):212:212 -> a
     1:5:boolean equals(java.lang.Object):220:224 -> equals
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():234:234 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$ClassType -> com.android.tools.r8.internal.bH:
+com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$ClassType -> com.android.tools.r8.internal.lH:
 # {"id":"sourceFile","fileName":"KeepTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):163:164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)V"}
     1:1:java.lang.Object apply(java.util.function.Supplier,java.util.function.Function,java.util.function.Function,java.util.function.Function):173:173 -> a
     1:5:boolean equals(java.lang.Object):181:185 -> equals
     1:1:int hashCode():190:190 -> hashCode
     1:1:java.lang.String toString():195:195 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$PrimitiveType -> com.android.tools.r8.internal.cH:
+com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern$PrimitiveType -> com.android.tools.r8.internal.mH:
 # {"id":"sourceFile","fileName":"KeepTypePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern type -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZG;"}
     java.util.Map PRIMITIVES -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     1:2:void <clinit>():117:118 -> <clinit>
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):131:132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZG;)V"}
     1:1:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern.getDescriptor():89:89 -> a
     1:1:void lambda$populate$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/internal/PG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/internal/ZG;)V"}
     2:2:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern.getDescriptor():89:89 -> a
     2:2:void lambda$populate$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):124 -> a
     3:3:void lambda$populate$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):124:124 -> a
     4:5:java.util.Map populate():121:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     6:6:java.util.Map populate():126 -> a
     7:7:java.lang.Object apply(java.util.function.Supplier,java.util.function.Function,java.util.function.Function,java.util.function.Function):156:156 -> a
@@ -259792,17 +259403,17 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern.getDescriptor():89:89 -> toString
     3:3:java.lang.String toString():147 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern -> com.android.tools.r8.internal.eH:
+com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern -> com.android.tools.r8.internal.oH:
 # {"id":"sourceFile","fileName":"KeepUnqualfiedClassNamePattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern unqualifiedNamePattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern ANY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oH;"}
     1:2:void <clinit>():8:9 -> <clinit>
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):29:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gH;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern exact(java.lang.String):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/eH;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/oH;"}
     2:2:java.lang.String asExactString():42:42 -> a
     3:3:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern.asExactString():96:96 -> a
     3:3:java.lang.String asExactString():42 -> a
@@ -259810,32 +259421,32 @@
     1:5:boolean equals(java.lang.Object):54:58 -> equals
     1:1:int hashCode():63:63 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern$Builder -> R8$$REMOVED$$CLASS$$225:
+com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern$Builder -> R8$$REMOVED$$CLASS$$214:
 # {"id":"sourceFile","fileName":"KeepUnqualfiedClassNamePattern.java"}
-com.android.tools.r8.relocated.keepanno.ast.ModifierPattern -> com.android.tools.r8.internal.IO:
+com.android.tools.r8.relocated.keepanno.ast.ModifierPattern -> com.android.tools.r8.internal.MO:
 # {"id":"sourceFile","fileName":"ModifierPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern ANY -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern POSITIVE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KO;"}
     com.android.tools.r8.relocated.keepanno.ast.ModifierPattern NEGATIVE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LO;"}
     1:17:void <clinit>():9:25 -> <clinit>
     1:1:void <init>():49:49 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern fromAllowValue(boolean):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/IO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/MO;"}
     1:1:boolean equals(java.lang.Object):65:65 -> equals
     1:1:int hashCode():70:70 -> hashCode
-com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$1 -> com.android.tools.r8.internal.FO:
+com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$1 -> com.android.tools.r8.internal.JO:
 # {"id":"sourceFile","fileName":"ModifierPattern.java"}
     1:1:void <init>():10:10 -> <init>
-com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$2 -> com.android.tools.r8.internal.GO:
+com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$2 -> com.android.tools.r8.internal.KO:
 # {"id":"sourceFile","fileName":"ModifierPattern.java"}
     1:1:void <init>():18:18 -> <init>
-com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$3 -> com.android.tools.r8.internal.HO:
+com.android.tools.r8.relocated.keepanno.ast.ModifierPattern$3 -> com.android.tools.r8.internal.LO:
 # {"id":"sourceFile","fileName":"ModifierPattern.java"}
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.relocated.keepanno.ast.OptionalPattern -> com.android.tools.r8.internal.UU:
+com.android.tools.r8.relocated.keepanno.ast.OptionalPattern -> com.android.tools.r8.internal.YU:
 # {"id":"sourceFile","fileName":"OptionalPattern.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
@@ -259844,22 +259455,22 @@
     2:2:java.lang.Object mapOrDefault(java.util.function.Function,java.lang.Object):41:41 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Ljava/lang/Object;"}
     boolean isAbsent() -> b
-com.android.tools.r8.relocated.keepanno.ast.OptionalPattern$Absent -> com.android.tools.r8.internal.SU:
+com.android.tools.r8.relocated.keepanno.ast.OptionalPattern$Absent -> com.android.tools.r8.internal.WU:
 # {"id":"sourceFile","fileName":"OptionalPattern.java"}
     com.android.tools.r8.relocated.keepanno.ast.OptionalPattern$Absent INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WU;"}
     1:1:void <clinit>():56:56 -> <clinit>
     1:1:void <init>():55:55 -> <init>
     1:1:boolean isAbsent():60:60 -> b
     1:1:boolean equals(java.lang.Object):65:65 -> equals
     1:1:int hashCode():70:70 -> hashCode
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.relocated.keepanno.ast.OptionalPattern$Some -> com.android.tools.r8.internal.TU:
+com.android.tools.r8.relocated.keepanno.ast.OptionalPattern$Some -> com.android.tools.r8.internal.XU:
 # {"id":"sourceFile","fileName":"OptionalPattern.java"}
     java.lang.Object value -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     1:2:void <init>(java.lang.Object):82:83 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)V"}
     1:1:java.lang.Object get():93:93 -> a
     2:2:java.lang.Object mapOrDefault(java.util.function.Function,java.lang.Object):98:98 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Ljava/lang/Object;"}
@@ -259867,27 +259478,27 @@
     1:5:boolean equals(java.lang.Object):106:110 -> equals
     1:1:int hashCode():115:115 -> hashCode
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext -> com.android.tools.r8.internal.cW:
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext -> com.android.tools.r8.internal.gW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     java.lang.String getContextFrameAsString() -> a
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationParserException error(java.lang.String):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/hE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/vE;"}
     java.lang.String getContextType() -> b
     1:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext property(java.lang.String):59:60 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/bW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fW;"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext getParentContext():28:28 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
     1:1:boolean isSynthetic():0:0 -> d
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext -> com.android.tools.r8.internal.VV:
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$AnnotationParsingContext -> com.android.tools.r8.internal.ZV:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parentContext -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     java.lang.String annotationDescriptor -> c
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):179:179 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.nonSyntheticParent():42:42 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):180 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -259899,28 +259510,28 @@
     3:3:java.lang.String getContextFrameAsString():210:210 -> a
     1:1:java.lang.String getContextType():205:205 -> b
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext getParentContext():200:200 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cW;"}
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext -> com.android.tools.r8.internal.WV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext -> com.android.tools.r8.internal.aW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     java.lang.String className -> b
     1:2:void <init>(java.lang.String):66:67 -> <init>
     1:1:java.lang.String getContextFrameAsString():91:91 -> a
     1:1:java.lang.String getContextType():86:86 -> b
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$FieldParsingContext -> com.android.tools.r8.internal.XV:
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$FieldParsingContext -> com.android.tools.r8.internal.bW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     java.lang.String fieldName -> c
     java.lang.String fieldDescriptor -> d
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,java.lang.String,java.lang.String):159:161 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WV;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aW;Ljava/lang/String;Ljava/lang/String;)V"}
     1:1:java.lang.String getContextFrameAsString():171:171 -> a
     1:1:java.lang.String getContextType():166:166 -> b
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext -> com.android.tools.r8.internal.YV:
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$GroupParsingContext -> com.android.tools.r8.internal.cW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parentContext -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     java.lang.String propertyGroupDescription -> c
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):218:218 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VV;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZV;Ljava/lang/String;)V"}
     2:4:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.nonSyntheticParent():42:44 -> <init>
     2:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):219 -> <init>
     5:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):219:220 -> <init>
@@ -259928,21 +259539,21 @@
     1:1:java.lang.String getContextFrameAsString():251 -> a
     1:1:java.lang.String getContextType():246:246 -> b
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext getParentContext():241:241 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cW;"}
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$MemberParsingContext -> com.android.tools.r8.internal.ZV:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$MemberParsingContext -> com.android.tools.r8.internal.dW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext classContext -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aW;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext):98:99 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aW;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext getParentContext():109:109 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cW;"}
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$MethodParsingContext -> com.android.tools.r8.internal.aW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$MethodParsingContext -> com.android.tools.r8.internal.eW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     java.lang.String methodName -> c
     java.lang.String methodDescriptor -> d
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext$ClassParsingContext,java.lang.String,java.lang.String):120:122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WV;Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aW;Ljava/lang/String;Ljava/lang/String;)V"}
     1:2:java.lang.String getContextFrameAsString():132:133 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.Type.getReturnType():344:344 -> a
     3:3:java.lang.String getContextFrameAsString():135 -> a
@@ -259957,13 +259568,13 @@
     10:10:java.lang.String getContextFrameAsString():140 -> a
     11:19:java.lang.String getContextFrameAsString():140:148 -> a
     1:1:java.lang.String getContextType():127:127 -> b
-com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext -> com.android.tools.r8.internal.bW:
+com.android.tools.r8.relocated.keepanno.ast.ParsingContext$PropertyParsingContext -> com.android.tools.r8.internal.fW:
 # {"id":"sourceFile","fileName":"ParsingContext.java"}
     com.android.tools.r8.relocated.keepanno.ast.ParsingContext parentContext -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
     java.lang.String propertyName -> c
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):259:259 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cW;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;Ljava/lang/String;)V"}
     2:2:com.android.tools.r8.relocated.keepanno.ast.ParsingContext com.android.tools.r8.relocated.keepanno.ast.ParsingContext.nonSyntheticParent():42:42 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.ParsingContext,java.lang.String):260 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -259974,24 +259585,24 @@
     1:1:java.lang.String getContextFrameAsString():285 -> a
     1:1:java.lang.String getContextType():280:280 -> b
     1:1:com.android.tools.r8.relocated.keepanno.ast.ParsingContext getParentContext():275:275 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
     1:1:boolean isSynthetic():291:291 -> d
-com.android.tools.r8.relocated.keepanno.keeprules.KeepEdgeNormalizer -> com.android.tools.r8.internal.lF:
+com.android.tools.r8.relocated.keepanno.keeprules.KeepEdgeNormalizer -> com.android.tools.r8.internal.xF:
 # {"id":"sourceFile","fileName":"KeepEdgeNormalizer.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdge edge -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oF;"}
     java.util.Map normalizedUserBindings -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder bindingsBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder preconditionsBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WG;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder consequencesBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NE;"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):43:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cF;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oF;)V"}
     2:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):38:39 -> <init>
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():16:16 -> <init>
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():18:18 -> <init>
     4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):39 -> <init>
     5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):39:39 -> <init>
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions.builder():33:33 -> <init>
@@ -260001,29 +259612,29 @@
     8:8:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):41 -> <init>
     9:12:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):41:44 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cF;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getBindings():209:209 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oF;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getBindings():216:216 -> a
     2:2:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():48:56 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():213:213 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():220:220 -> a
     12:12:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:20:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():56:63 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():217:217 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():224:224 -> a
     21:21:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():63 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:23:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():63:64 -> a
     24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.none():26:26 -> a
-    24:24:void com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.<init>():140 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176 -> a
+    24:24:void com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.<init>():142 -> a
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183 -> a
     24:24:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():72 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():29:29 -> a
-    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.<init>():141 -> a
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():176 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepBindings.none():31:31 -> a
+    25:25:void com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.<init>():143 -> a
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder com.android.tools.r8.relocated.keepanno.ast.KeepEdge.builder():183 -> a
     25:25:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():72 -> a
     26:26:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():72:72 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():205:205 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():212:212 -> a
     27:27:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():73 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     28:29:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():73:74 -> a
@@ -260034,837 +259645,881 @@
     31:33:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():75 -> a
     34:35:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():75:76 -> a
     36:36:boolean com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.isEmpty():53:53 -> a
-    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():168 -> a
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     36:36:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():77 -> a
     37:37:boolean com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.isEmpty():53:53 -> a
-    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():168 -> a
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():175 -> a
     37:37:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():77 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():171:171 -> a
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():178:178 -> a
     38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():77 -> a
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():169:169 -> a
+    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.ast.KeepEdge$Builder.build():176:176 -> a
     39:39:com.android.tools.r8.relocated.keepanno.ast.KeepEdge run():77 -> a
     40:42:void lambda$run$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):51:53 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/fG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;Lcom/android/tools/r8/internal/rG;)V"}
     43:43:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AE;)V"}
-    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():48:48 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ME;)V"}
+    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():49:49 -> a
     44:44:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61:61 -> a
-    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():36:36 -> a
-    46:46:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):62 -> a
-    47:47:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> a
-    47:47:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):59 -> a
+    45:50:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):92:97 -> a
+    45:50:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97 -> a
+    51:51:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
+    52:54:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97:99 -> a
+    52:54:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):99 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> a
-    48:48:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):59 -> a
-    49:49:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)V"}
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
-    50:50:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
-    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():50 -> a
-    50:50:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):67 -> a
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():58:58 -> a
-    51:51:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):68 -> a
+    55:55:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
+    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepCondition com.android.tools.r8.relocated.keepanno.ast.KeepCondition$Builder.build():37:37 -> a
+    56:56:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):62 -> a
+    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> a
+    57:57:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():54:54 -> a
-    52:52:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
-    53:53:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69:69 -> a
-    54:54:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():35:35 -> a
-    54:54:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):70 -> a
-    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    55:55:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66 -> a
+    58:58:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions$Builder.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):21:21 -> a
+    58:58:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):59 -> a
+    59:59:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):104:104 -> a
+    59:59:void lambda$run$1(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):61 -> a
+    60:60:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66:66 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;)V"}
+    61:61:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepConstraints.defaultConstraints():24:24 -> a
+    61:61:void com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.<init>():13 -> a
+    61:61:com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder com.android.tools.r8.relocated.keepanno.ast.KeepTarget.builder():51 -> a
+    61:61:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):67 -> a
+    62:62:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():59:59 -> a
+    62:62:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
-    56:56:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66 -> a
-    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():33:33 -> a
-    57:57:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):70 -> a
-    58:63:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):92:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;)Lcom/android/tools/r8/internal/gG;"}
-    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97 -> a
-    65:67:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97:99 -> a
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):99 -> a
+    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():55:55 -> a
+    63:63:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    64:69:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):92:97 -> a
+    64:69:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97 -> a
+    70:70:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    71:73:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):97:99 -> a
+    71:73:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):99 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):104:104 -> a
-    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81:81 -> a
-    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):87 -> a
-    70:70:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):167:167 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):87 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):82:82 -> a
-    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):87 -> a
-    72:72:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20:20 -> a
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):88 -> a
-    73:73:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):88 -> a
-    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepMemberBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forMember(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):16:16 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forItem(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):20 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference synthesizeFreshBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):88 -> a
-    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105 -> a
-    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):105:105 -> a
-    77:81:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):109:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fG;)Lcom/android/tools/r8/internal/fG;"}
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):118 -> a
+    74:74:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():36:36 -> a
+    75:75:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):70 -> a
+    76:76:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    76:76:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    82:82:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    83:89:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):119:125 -> a
-    83:89:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81:81 -> a
-    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    77:77:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder com.android.tools.r8.relocated.keepanno.ast.KeepConsequences$Builder.addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):28:28 -> a
+    77:77:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):66 -> a
+    78:78:com.android.tools.r8.relocated.keepanno.ast.KeepTarget com.android.tools.r8.relocated.keepanno.ast.KeepTarget$Builder.build():34:34 -> a
+    78:78:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):70 -> a
+    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference normalizeItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):104:104 -> a
+    79:79:void lambda$run$2(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):69 -> a
+    80:84:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):109:113 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)Lcom/android/tools/r8/internal/rG;"}
+    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):118 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    85:85:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
+    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):119:119 -> a
+    86:86:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81:81 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81 -> a
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    88:88:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
+    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):82:82 -> a
+    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    89:89:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
+    90:90:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():19 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():13 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):126 -> a
     90:90:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):167:167 -> a
-    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):81 -> a
-    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):25 -> a
+    91:91:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):127 -> a
     91:91:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol synthesizeFreshBindingSymbol(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):82:82 -> a
-    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):125 -> a
+    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
+    92:92:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):128 -> a
     92:92:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    93:93:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():23:23 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):126 -> a
+    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
+    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
+    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):128 -> a
     93:93:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    94:94:void com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.<init>():24 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.builder():17 -> a
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):126 -> a
+    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():48:48 -> a
+    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):129 -> a
     94:94:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):30 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):127 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.forClass(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):12:12 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):128 -> a
-    96:96:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference.fromBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference):15:15 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference.toClassItemReference():21 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):128 -> a
-    97:97:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-    98:98:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern$Builder.build():44:44 -> a
-    98:98:com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern normalizeMemberItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern):129 -> a
-    98:98:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern normalizeItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):113 -> a
-com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor -> com.android.tools.r8.internal.VG:
+com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor -> com.android.tools.r8.internal.fH:
 # {"id":"sourceFile","fileName":"KeepRuleExtractor.java"}
     java.util.function.Consumer ruleConsumer -> a
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions defaultOptions -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PG;"}
     boolean $assertionsDisabled -> c
-    1:179:void <clinit>():50:228 -> <clinit>
-    180:180:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.disallowBuilder():39:39 -> <clinit>
-    180:180:void <clinit>():228 -> <clinit>
-    181:181:void <clinit>():228:228 -> <clinit>
-    182:182:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64:64 -> <clinit>
-    182:182:void <clinit>():229 -> <clinit>
-    183:183:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(java.util.Collection):68:68 -> <clinit>
-    183:183:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64 -> <clinit>
-    183:183:void <clinit>():229 -> <clinit>
-    184:184:void <clinit>():230:230 -> <clinit>
-    1:2:void <init>(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):60:61 -> <init>
-    1:2:void <init>(java.util.function.Consumer):56 -> <init>
+    1:188:void <clinit>():52:239 -> <clinit>
+    189:189:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.disallowBuilder():39:39 -> <clinit>
+    189:189:void <clinit>():239 -> <clinit>
+    190:190:void <clinit>():239:239 -> <clinit>
+    191:191:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64:64 -> <clinit>
+    191:191:void <clinit>():240 -> <clinit>
+    192:192:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(java.util.Collection):68:68 -> <clinit>
+    192:192:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64 -> <clinit>
+    192:192:void <clinit>():240 -> <clinit>
+    193:193:void <clinit>():241:241 -> <clinit>
+    1:2:void <init>(java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):62:63 -> <init>
+    1:2:void <init>(java.util.function.Consumer):58 -> <init>
     1:1:boolean com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration.isKeepCheck():34:34 -> a
-    1:1:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):77 -> a
+    1:1:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aF;)V"}
-    2:2:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78:78 -> a
-    2:2:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():70:70 -> a
-    3:3:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    3:3:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getKind():66:66 -> a
-    4:4:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):88 -> a
-    4:4:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    4:4:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    5:10:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):88:93 -> a
-    5:10:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    5:10:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder():16:16 -> a
-    11:11:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):93 -> a
-    11:11:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    11:11:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    12:12:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):94:94 -> a
-    12:12:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    12:12:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):167:167 -> a
-    13:13:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):94 -> a
-    13:13:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    13:13:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    14:20:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):95:101 -> a
-    14:20:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    14:20:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    21:21:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):101 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    21:21:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    22:22:boolean com.android.tools.r8.relocated.keepanno.ast.KeepItemReference.isClassItemPattern():45:45 -> a
-    22:22:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):101 -> a
-    22:22:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    22:22:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
+    1:1:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mF;)V"}
+    2:2:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80:80 -> a
+    2:2:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():96:96 -> a
+    3:3:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    3:3:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    3:3:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    23:23:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):101:101 -> a
-    23:23:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    23:23:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    24:24:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):102 -> a
+    4:5:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():96:97 -> a
+    4:5:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    4:5:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    4:5:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    24:24:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    25:25:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):102:102 -> a
-    25:25:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    25:25:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    26:26:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    26:26:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):103 -> a
-    26:26:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    26:26:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    27:31:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):105:109 -> a
-    27:31:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    27:31:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
+    6:6:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    6:6:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    6:6:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):109 -> a
-    32:32:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    32:32:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    33:33:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
-    33:33:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):109 -> a
-    33:33:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    33:33:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    34:34:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
+    7:7:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
+    7:7:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    7:7:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    7:7:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
+    8:8:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    8:8:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    8:8:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    9:9:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):109 -> a
-    34:34:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    34:34:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    35:36:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159:160 -> a
-    35:36:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):109 -> a
-    35:36:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    35:36:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    37:37:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):111:111 -> a
-    37:37:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    37:37:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():62:62 -> a
-    38:38:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):113 -> a
-    38:38:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    38:38:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    39:39:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.keepAll():31:31 -> a
-    39:39:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):115 -> a
-    39:39:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    39:39:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    40:40:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):115:115 -> a
-    40:40:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    40:40:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    41:53:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):111:123 -> a
-    41:53:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    41:53:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    54:54:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allowBuilder():35:35 -> a
-    54:54:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
-    54:54:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):123 -> a
-    54:54:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    54:54:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64:64 -> a
-    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
-    55:55:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):123 -> a
-    55:55:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    55:55:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(java.util.Collection):68:68 -> a
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64 -> a
-    56:56:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
-    56:56:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):123 -> a
-    56:56:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    56:56:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    57:57:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43:43 -> a
-    57:57:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):123 -> a
-    57:57:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    57:57:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    58:62:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):124:128 -> a
-    58:62:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    58:62:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    63:63:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():62:62 -> a
-    63:63:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):130 -> a
-    63:63:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    63:63:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    64:64:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
-    64:64:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):133 -> a
-    64:64:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    64:64:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    65:66:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):133:134 -> a
-    65:66:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    65:66:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    67:78:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):128:139 -> a
-    67:78:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    67:78:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    79:79:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():62:62 -> a
-    79:79:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):141 -> a
-    79:79:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    79:79:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    80:80:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):145:145 -> a
-    80:80:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    80:80:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    81:81:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):139:139 -> a
-    81:81:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):78 -> a
-    81:81:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    82:82:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80:80 -> a
-    82:82:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    83:84:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.keeprules.KeepEdgeNormalizer.normalize(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):32:33 -> a
-    83:84:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
-    83:84:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    85:85:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80:80 -> a
-    85:85:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):66 -> a
-    86:92:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):67:73 -> a
-    93:93:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    93:93:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):360 -> a
+    9:9:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    9:9:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    9:9:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():99:99 -> a
+    10:10:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):89 -> a
+    10:10:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    10:10:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getKind():84:84 -> a
+    11:11:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):90 -> a
+    11:11:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    11:11:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    12:17:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):90:95 -> a
+    12:17:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    12:17:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder com.android.tools.r8.relocated.keepanno.ast.KeepBindings.builder() -> a
+    18:18:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):95 -> a
+    18:18:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    18:18:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    19:20:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):97:98 -> a
+    19:20:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    19:20:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Builder.generateFreshSymbol(java.lang.String):191:191 -> a
+    21:21:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):98 -> a
+    21:21:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    21:21:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    22:26:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):99:103 -> a
+    22:26:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    22:26:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    27:27:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/qE;)V"}
-    94:94:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    94:94:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):360 -> a
-    95:95:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    95:95:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):360 -> a
+    27:27:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    27:27:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    28:28:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):105:105 -> a
+    28:28:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    28:28:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepClassBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():48:48 -> a
+    29:29:com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference$ClassBinding.asBindingReference():38 -> a
+    29:29:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):109 -> a
+    29:29:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    29:29:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    30:30:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getBindings():88:88 -> a
+    30:30:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):110 -> a
+    30:30:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    30:30:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    31:31:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    31:31:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):110 -> a
+    31:31:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    31:31:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName() -> a
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    96:97:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):361:362 -> a
-    98:98:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    98:98:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):364 -> a
+    32:32:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):110 -> a
+    32:32:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    32:32:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    33:33:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    33:33:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):110 -> a
+    33:33:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    33:33:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    34:34:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    34:34:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):111 -> a
+    34:34:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    34:34:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    35:35:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    35:35:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    99:101:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):364:366 -> a
-    102:102:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():48:48 -> a
-    102:102:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):274 -> a
+    35:35:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    35:35:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    36:36:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):112:112 -> a
+    36:36:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    36:36:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    37:37:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    37:37:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):114 -> a
+    37:37:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    37:37:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    38:42:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):116:120 -> a
+    38:42:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    38:42:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    43:43:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Ljava/util/Map;Lcom/android/tools/r8/internal/AE;)V"}
-    103:106:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):274:277 -> a
-    107:107:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):247:247 -> a
-    107:107:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    108:108:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278:278 -> a
-    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():48:48 -> a
-    109:109:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):247 -> a
+    43:43:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):120 -> a
+    43:43:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    43:43:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    44:44:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
+    44:44:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):120 -> a
+    44:44:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    44:44:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    45:45:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    109:109:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    110:110:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):247:247 -> a
-    110:110:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    111:111:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):248:248 -> a
-    111:111:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
+    45:45:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):120 -> a
+    45:45:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    45:45:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    46:47:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170:171 -> a
+    46:47:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):120 -> a
+    46:47:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    46:47:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    48:48:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):122:122 -> a
+    48:48:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    48:48:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():80:80 -> a
+    49:49:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):124 -> a
+    49:49:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    49:49:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.keepAll():31:31 -> a
+    50:50:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):126 -> a
+    50:50:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    50:50:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    51:51:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):126:126 -> a
+    51:51:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    51:51:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    52:64:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):122:134 -> a
+    52:64:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    52:64:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    65:65:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allowBuilder():35:35 -> a
+    65:65:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
+    65:65:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):134 -> a
+    65:65:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    65:65:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64:64 -> a
+    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
+    66:66:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):134 -> a
+    66:66:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    66:66:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(java.util.Collection):68:68 -> a
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder com.android.tools.r8.relocated.keepanno.ast.KeepOptions$Builder.addAll(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):64 -> a
+    67:67:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43 -> a
+    67:67:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):134 -> a
+    67:67:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    67:67:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    68:68:com.android.tools.r8.relocated.keepanno.ast.KeepOptions com.android.tools.r8.relocated.keepanno.ast.KeepOptions.allow(com.android.tools.r8.relocated.keepanno.ast.KeepOptions$KeepOption[]):43:43 -> a
+    68:68:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):134 -> a
+    68:68:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    68:68:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    69:73:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):135:139 -> a
+    69:73:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    69:73:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    74:74:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():80:80 -> a
+    74:74:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):141 -> a
+    74:74:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    74:74:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    75:75:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.allMembers():13:13 -> a
+    75:75:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):144 -> a
+    75:75:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    75:75:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    76:77:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):144:145 -> a
+    76:77:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    76:77:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    78:89:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):139:150 -> a
+    78:89:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    78:89:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    90:90:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getMetaInfo():80:80 -> a
+    90:90:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):152 -> a
+    90:90:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    90:90:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    91:91:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):156:156 -> a
+    91:91:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    91:91:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    92:92:java.util.List generateCheckRules(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):150:150 -> a
+    92:92:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):80 -> a
+    92:92:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    93:93:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):82:82 -> a
+    93:93:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    94:95:com.android.tools.r8.relocated.keepanno.ast.KeepEdge com.android.tools.r8.relocated.keepanno.keeprules.KeepEdgeNormalizer.normalize(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):32:33 -> a
+    94:95:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):82 -> a
+    94:95:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    96:96:java.util.List split(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):82:82 -> a
+    96:96:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):68 -> a
+    97:103:void extract(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):69:75 -> a
+    104:104:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    104:104:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):371 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    112:112:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():48:48 -> a
-    112:112:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):248 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FE;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/EE;)V"}
+    105:105:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    105:105:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):371 -> a
+    106:106:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    106:106:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):371 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    112:112:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    113:113:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):248:248 -> a
-    113:113:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    114:114:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    114:114:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):248 -> a
+    107:108:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):372:373 -> a
+    109:109:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    109:109:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):375 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    114:114:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    115:115:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):248:248 -> a
-    115:115:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):278 -> a
-    116:116:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():58:58 -> a
-    116:116:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):283 -> a
+    110:112:void lambda$computeConditions$9(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):375:377 -> a
+    113:113:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():49:49 -> a
+    113:113:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):285 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/rE;Ljava/util/Map;Lcom/android/tools/r8/internal/YG;)V"}
-    117:117:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):283:283 -> a
-    118:118:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():54:54 -> a
-    118:118:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):285 -> a
-    119:123:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):285:289 -> a
-    124:124:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> a
-    124:124:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
-    124:124:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):466 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/HashSet;Ljava/util/Set;)V"}
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FE;Ljava/util/Map;Lcom/android/tools/r8/internal/ME;)V"}
+    114:117:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):285:288 -> a
+    118:118:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):258:258 -> a
+    118:118:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    119:119:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289:289 -> a
+    120:120:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():49:49 -> a
+    120:120:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    125:125:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):466 -> a
-    126:126:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):466:466 -> a
-    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> a
-    127:127:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):467 -> a
-    128:128:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> a
-    128:128:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):467 -> a
+    120:120:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    121:121:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):258:258 -> a
+    121:121:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    122:122:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):259:259 -> a
+    122:122:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:139:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):467:477 -> a
-    140:140:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():205:205 -> a
-    140:140:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):308 -> a
+    123:123:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():49:49 -> a
+    123:123:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/cF;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/SG;Lcom/android/tools/r8/internal/FG;Ljava/util/Set;)V"}
-    141:141:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):308:308 -> a
-    142:142:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):305:305 -> a
-    143:143:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():205:205 -> a
-    143:143:void lambda$doSplit$5(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):321 -> a
+    123:123:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    124:124:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):259:259 -> a
+    124:124:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    125:125:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    125:125:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):259 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/cF;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/Set;)V"}
-    144:144:void lambda$doSplit$5(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):320:320 -> a
-    145:145:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239:239 -> a
-    145:145:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/qE;)Lcom/android/tools/r8/internal/SG;"}
-    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    146:146:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
+    125:125:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    126:126:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.addCondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):259:259 -> a
+    126:126:void lambda$doSplit$1(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepCondition):289 -> a
+    127:127:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():59:59 -> a
+    127:127:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):294 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    146:146:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> a
-    146:146:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-    147:147:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    147:147:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
-    147:147:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> a
-    147:147:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-    148:148:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    148:148:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/FE;Ljava/util/Map;Lcom/android/tools/r8/internal/iH;)V"}
+    128:128:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):294:294 -> a
+    129:129:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():55:55 -> a
+    129:129:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):296 -> a
+    130:134:void lambda$doSplit$3(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepTarget):296:300 -> a
+    135:135:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> a
+    135:135:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
+    135:135:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):477 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/HashSet;Ljava/util/Set;)V"}
+    136:136:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    136:136:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    148:148:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> a
-    148:148:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-    149:150:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159:160 -> a
-    149:150:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> a
-    149:150:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-    151:151:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239:239 -> a
-    151:151:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):277 -> a
-    152:154:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):263:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cF;)Ljava/util/ArrayList;"}
-    155:155:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getBindings():209:209 -> a
-    155:155:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):268 -> a
+    136:136:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):477 -> a
+    137:137:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):477:477 -> a
+    138:138:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> a
+    138:138:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):478 -> a
+    139:139:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> a
+    139:139:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):478 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    156:156:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):269:269 -> a
-    157:157:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():213:213 -> a
-    157:157:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):270 -> a
-    158:159:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):270:271 -> a
-    160:160:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():217:217 -> a
-    160:160:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):280 -> a
-    161:161:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):280:280 -> a
-    162:162:void com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.forEachTarget(java.util.function.Consumer):57:57 -> a
-    162:162:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):281 -> a
+    140:150:void createConditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):478:488 -> a
+    151:151:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():212:212 -> a
+    151:151:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):319 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    163:163:void com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.forEachTarget(java.util.function.Consumer):57:57 -> a
-    163:163:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):281 -> a
-    164:165:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):293:294 -> a
-    166:166:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():205:205 -> a
-    166:166:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):295 -> a
-    167:167:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):295:295 -> a
-    168:223:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):294:349 -> a
-    224:238:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):300:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/cF;Lcom/android/tools/r8/internal/rE;Ljava/util/Map;Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/SG;)V"}
-    239:239:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():213:213 -> a
-    239:239:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):317 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/oF;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/cH;Lcom/android/tools/r8/internal/PG;Ljava/util/Set;)V"}
+    152:152:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):319:319 -> a
+    153:153:void lambda$doSplit$4(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):316:316 -> a
+    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():212:212 -> a
+    154:154:void lambda$doSplit$5(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):332 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    240:247:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):317:324 -> a
-    248:248:void lambda$doSplit$7(java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):330:330 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/cF;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/Set;)V"}
-    249:249:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):332:332 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/cF;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/Set;Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/SG;)V"}
-    250:250:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():205:205 -> a
-    250:250:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):335 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/oF;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/Set;)V"}
+    155:155:void lambda$doSplit$5(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):331:331 -> a
+    156:156:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250:250 -> a
+    156:156:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/EE;)Lcom/android/tools/r8/internal/cH;"}
+    157:157:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    157:157:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    251:251:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):335:335 -> a
-    252:252:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):333:333 -> a
-    253:254:java.util.List computeConditions(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map):357:358 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/internal/rE;Ljava/util/HashMap;)Ljava/util/ArrayList;"}
-    255:258:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):387:390 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TG;Ljava/util/Set;Lcom/android/tools/r8/internal/rE;Ljava/util/HashMap;Lcom/android/tools/r8/internal/UG;)V"}
-    259:259:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    259:259:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):391 -> a
+    157:157:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> a
+    157:157:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    260:260:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    260:260:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):391 -> a
-    261:261:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    261:261:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):391 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> a
+    159:159:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+    160:161:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170:171 -> a
+    160:161:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> a
+    160:161:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+    162:162:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250:250 -> a
+    162:162:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$0(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> a
+    163:165:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):274:276 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oF;)Ljava/util/ArrayList;"}
+    166:166:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getBindings():216:216 -> a
+    166:166:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):279 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    262:265:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):392:395 -> a
-    266:266:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    266:266:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):396 -> a
+    167:167:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):280:280 -> a
+    168:168:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():220:220 -> a
+    168:168:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):281 -> a
+    169:170:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):281:282 -> a
+    171:171:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():224:224 -> a
+    171:171:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):291 -> a
+    172:172:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):291:291 -> a
+    173:173:void com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.forEachTarget(java.util.function.Consumer):57:57 -> a
+    173:173:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):292 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    267:267:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):396:396 -> a
-    268:268:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
-    268:268:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):396 -> a
-    269:269:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):397:397 -> a
-    270:270:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    270:270:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):400 -> a
-    271:284:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):400:413 -> a
-    285:285:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):177:177 -> a
-    285:285:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
+    174:174:void com.android.tools.r8.relocated.keepanno.ast.KeepConsequences.forEachTarget(java.util.function.Consumer):57:57 -> a
+    174:174:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):292 -> a
+    175:176:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):304:305 -> a
+    177:177:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():212:212 -> a
+    177:177:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):306 -> a
+    178:178:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):306:306 -> a
+    179:234:java.util.List doSplit(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):305:360 -> a
+    235:249:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):311:325 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/oF;Lcom/android/tools/r8/internal/FE;Ljava/util/Map;Lcom/android/tools/r8/internal/EE;Lcom/android/tools/r8/internal/cH;)V"}
+    250:250:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():220:220 -> a
+    250:250:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):328 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    286:286:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():98:98 -> a
-    286:286:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):177 -> a
+    251:258:void lambda$doSplit$8(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):328:335 -> a
+    259:259:void lambda$doSplit$7(java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):341:341 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/oF;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/Set;)V"}
+    260:260:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):343:343 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/oF;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/Set;Lcom/android/tools/r8/internal/EE;Lcom/android/tools/r8/internal/cH;)V"}
+    261:261:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getMetaInfo():212:212 -> a
+    261:261:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):346 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    286:286:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    287:287:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):178:178 -> a
-    287:287:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    288:288:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
-    288:288:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):178 -> a
+    262:262:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):346:346 -> a
+    263:263:void lambda$doSplit$6(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdge,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers):344:344 -> a
+    264:265:java.util.List computeConditions(java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map):368:369 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/internal/FE;Ljava/util/HashMap;)Ljava/util/ArrayList;"}
+    266:269:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):398:401 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;Ljava/util/Set;Lcom/android/tools/r8/internal/FE;Ljava/util/HashMap;Lcom/android/tools/r8/internal/eH;)V"}
+    270:270:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    270:270:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):402 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    288:288:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    289:289:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
-    289:289:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):178 -> a
-    289:289:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    290:290:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):180:180 -> a
-    290:290:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    291:291:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isInclusive():68:68 -> a
-    291:291:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.isExclusive():113 -> a
-    291:291:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):183 -> a
-    291:291:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    292:292:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):185:185 -> a
-    292:292:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    293:293:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> a
-    293:293:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
-    293:293:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):188 -> a
-    293:293:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    294:294:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    294:294:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
+    271:271:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    271:271:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):402 -> a
+    272:272:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    272:272:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):402 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    294:294:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):188 -> a
-    294:294:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    295:298:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):188:191 -> a
-    295:298:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    299:299:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    299:299:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    299:299:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):193 -> a
-    299:299:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    300:300:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    300:300:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    300:300:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    300:300:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    300:300:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):193 -> a
-    300:300:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    301:301:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):193:193 -> a
-    301:301:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    302:302:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    302:302:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
+    273:276:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):403:406 -> a
+    277:277:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    277:277:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):407 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    278:278:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):407:407 -> a
+    279:279:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
+    279:279:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):407 -> a
+    280:280:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):408:408 -> a
+    281:281:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    281:281:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):411 -> a
+    282:295:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):411:424 -> a
+    296:296:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):188:188 -> a
+    296:296:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    297:297:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():89:89 -> a
+    297:297:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):188 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    297:297:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    298:298:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):189:189 -> a
+    298:298:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    299:299:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
+    299:299:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):189 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    299:299:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    300:300:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
+    300:300:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):189 -> a
+    300:300:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    301:301:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):191:191 -> a
+    301:301:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    302:302:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isInclusive():68:68 -> a
+    302:302:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.isExclusive():113 -> a
     302:302:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):194 -> a
-    302:302:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    303:303:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
-    303:303:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    303:303:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):194 -> a
-    303:303:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    304:304:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
-    304:304:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    304:304:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):194 -> a
-    304:304:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    305:305:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    305:305:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    305:305:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):195 -> a
-    305:305:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    306:306:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    306:306:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):196 -> a
-    306:306:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    307:308:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):196:197 -> a
-    307:308:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    309:309:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> a
-    309:309:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
-    309:309:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):200 -> a
-    309:309:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    310:310:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    310:310:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> a
+    302:302:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    303:303:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):196:196 -> a
+    303:303:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    304:304:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> a
+    304:304:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
+    304:304:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):199 -> a
+    304:304:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    305:305:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    305:305:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    310:310:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):200 -> a
-    310:310:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    311:314:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):200:203 -> a
-    311:314:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    315:315:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    315:315:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    305:305:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):199 -> a
+    305:305:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    306:309:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):199:202 -> a
+    306:309:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    310:310:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    310:310:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    310:310:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):204 -> a
+    310:310:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    311:311:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    311:311:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    311:311:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    311:311:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    311:311:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):204 -> a
+    311:311:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    312:312:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):204:204 -> a
+    312:312:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    313:313:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    313:313:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    313:313:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):205 -> a
+    313:313:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    314:314:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
+    314:314:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
+    314:314:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):205 -> a
+    314:314:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    315:315:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
+    315:315:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
     315:315:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):205 -> a
-    315:315:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
+    315:315:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
     316:316:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
     316:316:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    316:316:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    316:316:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    316:316:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):205 -> a
-    316:316:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    317:317:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):205:205 -> a
-    317:317:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    318:318:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    318:318:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
+    316:316:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):206 -> a
+    316:316:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    317:317:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    317:317:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):207 -> a
+    317:317:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    318:319:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):207:208 -> a
+    318:319:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    320:320:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> a
+    320:320:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
+    320:320:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):211 -> a
+    320:320:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    321:321:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    321:321:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    318:318:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):206 -> a
-    318:318:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    319:319:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
-    319:319:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    319:319:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):206 -> a
-    319:319:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    320:320:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
-    320:320:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    320:320:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):206 -> a
-    320:320:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    321:321:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getClassNamePattern():73:73 -> a
-    321:321:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):207 -> a
-    321:321:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    322:322:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    322:322:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    322:322:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):208 -> a
-    322:322:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    323:323:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    323:323:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):209 -> a
-    323:323:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    324:331:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):209:216 -> a
-    324:331:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    332:332:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
-    332:332:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    321:321:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):211 -> a
+    321:321:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    322:325:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):211:214 -> a
+    322:325:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    326:326:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    326:326:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    326:326:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):216 -> a
+    326:326:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    327:327:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    327:327:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    327:327:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    327:327:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    327:327:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):216 -> a
+    327:327:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    328:328:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):216:216 -> a
+    328:328:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    329:329:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    329:329:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    329:329:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):217 -> a
+    329:329:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    330:330:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
+    330:330:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
+    330:330:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):217 -> a
+    330:330:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    331:331:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
+    331:331:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
+    331:331:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):217 -> a
+    331:331:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    332:332:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getClassNamePattern():73:73 -> a
     332:332:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):218 -> a
-    332:332:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
+    332:332:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
     333:333:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
     333:333:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    333:333:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
-    333:333:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
-    333:333:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):218 -> a
-    333:333:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    334:334:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):218:218 -> a
-    334:334:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    335:335:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    335:335:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
+    333:333:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):219 -> a
+    333:333:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    334:334:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    334:334:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):220 -> a
+    334:334:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    335:342:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):220:227 -> a
+    335:342:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    343:343:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():23:23 -> a
+    343:343:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    343:343:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):229 -> a
+    343:343:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    344:344:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    344:344:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    344:344:void com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.<init>():24 -> a
+    344:344:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.builder():18 -> a
+    344:344:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):229 -> a
+    344:344:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    345:345:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):229:229 -> a
+    345:345:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    346:346:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    346:346:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    335:335:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):219 -> a
-    335:335:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    336:336:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
-    336:336:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    336:336:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):219 -> a
-    336:336:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    337:337:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
-    337:337:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
-    337:337:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):219 -> a
-    337:337:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    338:338:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
-    338:338:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
-    338:338:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):220 -> a
-    338:338:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    339:339:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
-    339:339:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):221 -> a
-    339:339:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    340:342:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):221:223 -> a
-    340:342:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):413 -> a
-    343:343:void lambda$computeTargets$10(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):415:415 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;Lcom/android/tools/r8/internal/TG;)V"}
-    344:344:void createUnconditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):425:425 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/Set;)V"}
-    345:353:void lambda$createUnconditionalRules$11(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):431:439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-    354:365:void lambda$createUnconditionalRules$11(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):433:444 -> a
-    366:366:void lambda$createConditionalRules$12(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):483:483 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-    367:370:void createDependentRules(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):504:507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/FG;Ljava/util/HashSet;Ljava/util/Set;)V"}
-    371:378:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):513:520 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-    379:379:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):568:568 -> a
-    379:379:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    380:380:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.builder():29:29 -> a
-    380:380:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):568 -> a
-    380:380:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    381:381:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):568:568 -> a
-    381:381:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    382:382:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():21:21 -> a
-    382:382:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    382:382:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    382:382:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    383:383:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
-    383:383:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
-    383:383:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    383:383:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    383:383:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    384:384:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
-    384:384:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
-    384:384:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    384:384:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    384:384:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    385:385:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():25:25 -> a
-    385:385:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
-    385:385:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    385:385:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    386:386:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
-    386:386:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    386:386:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    387:387:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
-    387:387:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    387:387:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    387:387:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    388:388:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
-    388:388:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
-    388:388:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    388:388:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    389:389:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
-    389:389:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    389:389:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    390:390:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
-    390:390:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
-    390:390:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    390:390:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    391:395:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
-    391:395:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):569 -> a
-    391:395:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522 -> a
-    396:404:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):522:530 -> a
-    405:415:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):523:533 -> a
-    416:416:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):574:574 -> a
-    416:416:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    417:417:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.builder():26:26 -> a
-    417:417:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):574 -> a
-    417:417:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    418:418:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):574:574 -> a
-    418:418:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    419:419:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
-    419:419:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    419:419:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):575 -> a
-    419:419:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    420:420:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
-    420:420:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
-    420:420:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
-    420:420:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):575 -> a
-    420:420:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    421:421:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
-    421:421:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):575 -> a
-    421:421:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535 -> a
-    422:430:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):535:543 -> a
-    431:448:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):536:553 -> a
-    449:450:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):594:595 -> a
-    449:450:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;Lcom/android/tools/r8/internal/rE;)Lcom/android/tools/r8/internal/qE;"}
-    451:454:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):608:611 -> a
-    451:454:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):596 -> a
-    451:454:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    455:455:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):615:615 -> a
-    455:455:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):611 -> a
-    455:455:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):596 -> a
-    455:455:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    456:458:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):596:598 -> a
-    456:458:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    459:459:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    459:459:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):599 -> a
+    346:346:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):230 -> a
+    346:346:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    347:347:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
+    347:347:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
+    347:347:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):230 -> a
+    347:347:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    348:348:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.setAnnotatedByPattern(com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):48:48 -> a
+    348:348:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.copyFrom(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):33 -> a
+    348:348:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):230 -> a
+    348:348:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    349:349:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getAnyInstance():49:49 -> a
+    349:349:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern.any():10 -> a
+    349:349:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):231 -> a
+    349:349:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    350:350:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern$Builder.build():54:54 -> a
+    350:350:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):232 -> a
+    350:350:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    351:353:void com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.onTargetHolders(java.util.function.Consumer):232:234 -> a
+    351:353:void computeTargets(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Set,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,java.util.Map,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback):424 -> a
+    354:354:void lambda$computeTargets$10(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):426:426 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;Lcom/android/tools/r8/internal/dH;)V"}
+    355:355:void createUnconditionalRules(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set):436:436 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/Set;)V"}
+    356:364:void lambda$createUnconditionalRules$11(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):442:450 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+    365:376:void lambda$createUnconditionalRules$11(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):444:455 -> a
+    377:377:void lambda$createConditionalRules$12(java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):494:494 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+    378:381:void createDependentRules(java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Set,java.util.Set):515:518 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/PG;Ljava/util/HashSet;Ljava/util/Set;)V"}
+    382:389:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):524:531 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+    390:390:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):579:579 -> a
+    390:390:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    391:391:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.builder():29:29 -> a
+    391:391:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):579 -> a
+    391:391:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    392:392:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):579:579 -> a
+    392:392:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    393:393:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():21:21 -> a
+    393:393:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    393:393:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    393:393:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    394:394:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.any():18:18 -> a
+    394:394:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():23 -> a
+    394:394:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    394:394:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    394:394:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    395:395:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.any():10:10 -> a
+    395:395:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():24 -> a
+    395:395:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    395:395:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    395:395:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    396:396:void com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.<init>():25:25 -> a
+    396:396:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.builder():11 -> a
+    396:396:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    396:396:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    397:397:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73:73 -> a
+    397:397:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    397:397:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    398:398:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isInstanceInitializer():91:91 -> a
+    398:398:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
+    398:398:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    398:398:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    399:399:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isClassInitializer():87:87 -> a
+    399:399:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():73 -> a
+    399:399:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    399:399:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    400:400:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74:74 -> a
+    400:400:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    400:400:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    401:401:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
+    401:401:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():74 -> a
+    401:401:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    401:401:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    402:406:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern$Builder.build():75:79 -> a
+    402:406:com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern copyMethodFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):580 -> a
+    402:406:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533 -> a
+    407:415:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):533:541 -> a
+    416:426:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):534:544 -> a
+    427:427:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):585:585 -> a
+    427:427:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    428:428:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.builder():26:26 -> a
+    428:428:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):585 -> a
+    428:428:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    429:429:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):585:585 -> a
+    429:429:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    430:430:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():23:23 -> a
+    430:430:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    430:430:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):586 -> a
+    430:430:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    431:431:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.any():9:9 -> a
+    431:431:void com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.<init>():24 -> a
+    431:431:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.builder():11 -> a
+    431:431:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):586 -> a
+    431:431:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    432:432:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern$Builder.build():62:62 -> a
+    432:432:com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern copyFieldFromMember(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):586 -> a
+    432:432:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546 -> a
+    433:441:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):546:554 -> a
+    442:459:void lambda$createDependentRules$13(java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):547:564 -> a
+    460:461:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):605:606 -> a
+    460:461:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sG;Lcom/android/tools/r8/internal/FE;)Lcom/android/tools/r8/internal/EE;"}
+    462:463:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):619:620 -> a
+    462:463:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):607 -> a
+    462:463:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    464:466:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):607:609 -> a
+    464:466:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    467:467:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    467:467:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):610 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    459:459:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    460:460:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):599:599 -> a
-    460:460:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    461:461:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):33:33 -> a
-    461:461:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600 -> a
+    467:467:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    468:468:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):610:610 -> a
+    468:468:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    469:469:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    469:469:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    461:461:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    462:462:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    462:462:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):33 -> a
+    469:469:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    470:470:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    470:470:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    462:462:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600 -> a
-    462:462:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    463:463:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):33:33 -> a
-    463:463:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600 -> a
-    463:463:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    464:464:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    464:464:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600 -> a
+    470:470:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611 -> a
+    470:470:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    471:471:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    471:471:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611 -> a
+    471:471:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    472:472:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    472:472:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    464:464:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    465:465:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):615:615 -> a
-    465:465:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600 -> a
-    465:465:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    466:466:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):600:600 -> a
-    466:466:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581 -> a
-    467:467:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):581:581 -> a
-    468:468:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    468:468:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):582 -> a
+    472:472:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    473:473:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):626:626 -> a
+    473:473:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611 -> a
+    473:473:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    474:474:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):611:611 -> a
+    474:474:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    475:475:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592:592 -> a
+    476:476:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    476:476:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):593 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    469:469:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    469:469:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):582 -> a
-    470:470:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    470:470:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):582 -> a
+    477:477:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    477:477:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):593 -> a
+    478:478:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    478:478:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):593 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    471:473:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):582:584 -> a
-    1:1:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239:239 -> b
-    1:1:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/qE;)Lcom/android/tools/r8/internal/SG;"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> b
-    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> b
+    479:481:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):593:595 -> a
+    482:482:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):626:626 -> a
+    482:482:java.util.Collection getBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):622 -> a
+    482:482:java.util.Set getTransitiveBindingReferences(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):607 -> a
+    482:482:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol getClassItemBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):592 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250:250 -> b
+    1:1:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FE;Lcom/android/tools/r8/internal/EE;)Lcom/android/tools/r8/internal/cH;"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> b
+    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> b
-    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> b
-    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> b
-    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> b
-    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> b
-    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159 -> b
+    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> b
+    2:2:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> b
+    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> b
+    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> b
+    3:3:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> b
+    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> b
-    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):159:160 -> b
-    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239 -> b
-    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-    7:7:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):239:239 -> b
-    7:7:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):288 -> b
-com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers -> com.android.tools.r8.internal.SG:
+    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> b
+    4:4:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):170:171 -> b
+    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250 -> b
+    5:6:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+    7:7:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers.create(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol,com.android.tools.r8.relocated.keepanno.ast.KeepBindings):250:250 -> b
+    7:7:com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers lambda$doSplit$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):299 -> b
+com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$BindingUsers -> com.android.tools.r8.internal.cH:
 # {"id":"sourceFile","fileName":"KeepRuleExtractor.java"}
     com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder holder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dH;"}
     java.util.Set conditionRefs -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     java.util.Map targetRefs -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():232:232 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):242:242 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TG;)V"}
-    2:10:void <init>(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):235:243 -> <init>
-    1:1:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):252:252 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():54:54 -> a
-    2:2:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):252 -> a
+    1:1:void <clinit>():243:243 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):253:253 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;)V"}
+    2:10:void <init>(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder):246:254 -> <init>
+    1:1:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):263:263 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():55:55 -> a
+    2:2:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):263 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):252:252 -> a
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():58:58 -> a
-    4:4:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):253 -> a
+    3:3:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):263:263 -> a
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():59:59 -> a
+    4:4:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):264 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:7:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):254:256 -> a
-    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():54:54 -> a
-    8:8:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):257 -> a
-    9:9:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):257:257 -> a
+    5:7:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):265:267 -> a
+    8:8:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():55:55 -> a
+    8:8:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):268 -> a
+    9:9:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):268:268 -> a
     10:10:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    10:10:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):257 -> a
+    10:10:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):268 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):257:257 -> a
-    12:12:java.util.Set lambda$addTarget$0(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):256:256 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/FG;)Ljava/util/Set;"}
-com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder -> com.android.tools.r8.internal.TG:
+    11:11:void addTarget(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):268:268 -> a
+    12:12:java.util.Set lambda$addTarget$0(com.android.tools.r8.relocated.keepanno.ast.KeepOptions):267:267 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PG;)Ljava/util/Set;"}
+com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder -> com.android.tools.r8.internal.dH:
 # {"id":"sourceFile","fileName":"KeepRuleExtractor.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern itemPattern -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():155:155 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):163:165 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wE;)V"}
-com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback -> com.android.tools.r8.internal.UG:
+    1:1:void <clinit>():166:166 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern):174:176 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KE;)V"}
+com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$OnTargetCallback -> com.android.tools.r8.internal.eH:
 # {"id":"sourceFile","fileName":"KeepRuleExtractor.java"}
     void accept(com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions -> R8$$REMOVED$$CLASS$$226:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions -> R8$$REMOVED$$CLASS$$215:
 # {"id":"sourceFile","fileName":"KeepRuleExtractorOptions.java"}
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule -> com.android.tools.r8.internal.sW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule -> com.android.tools.r8.internal.wW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo metaInfo -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wF;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/FG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PG;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):100:102 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;)V"}
     1:23:void groupByKinds(java.util.List):40:62 -> a
     24:24:void groupByKinds(java.util.List):42:42 -> a
     25:25:void lambda$groupByKinds$0(java.util.IdentityHashMap,com.android.tools.r8.relocated.keepanno.keeprules.PgRule):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/sW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/wW;)V"}
     26:26:int lambda$groupByKinds$1(com.android.tools.r8.relocated.keepanno.keeprules.PgRule):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sW;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wW;)I"}
     27:27:java.util.function.BiConsumer classNamePrinter(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):117:117 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;)Ljava/util/function/BiConsumer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;)Ljava/util/function/BiConsumer;"}
     28:28:void lambda$classNamePrinter$3(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RG;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bH;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bH;)V"}
     29:29:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> a
     29:29:void lambda$classNamePrinter$3(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):120 -> a
     30:30:void lambda$classNamePrinter$3(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):119:119 -> a
     31:31:java.util.List getConditionMembers():172:172 -> a
     32:32:void printConditionHolder(java.lang.StringBuilder):180:180 -> a
     33:33:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     java.lang.String getConsequenceKeepType() -> b
     void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     1:14:int lambda$groupByKinds$2(com.android.tools.r8.relocated.keepanno.keeprules.PgRule):46:59 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sW;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wW;)I"}
     15:15:void printRule(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):129:129 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;)V"}
     16:16:boolean com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo.hasContext():57:57 -> b
@@ -260976,35 +260631,35 @@
     java.util.List getTargetMembers() -> c
     void printTargetHolder(java.lang.StringBuilder) -> c
     1:1:boolean hasCondition():0:0 -> d
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgConditionalRule -> com.android.tools.r8.internal.nW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgConditionalRule -> com.android.tools.r8.internal.rW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern classCondition -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern classTarget -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
     java.util.Map memberPatterns -> f
     java.util.List memberConditions -> g
     java.util.List memberTargets -> h
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind keepKind -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):325:325 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+    2:2:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> <init>
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):326 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):326:326 -> <init>
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> <init>
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> <init>
     4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):327 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):327:331 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> a
     1:1:void printClassName(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bH;)V"}
     2:2:void printClassName(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):382:382 -> a
     3:3:java.util.List getConditionMembers():341:341 -> a
     4:4:void printConditionHolder(java.lang.StringBuilder):346:346 -> a
     5:5:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):351:351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     6:6:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> a
     6:6:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):353 -> a
     7:7:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):352:352 -> a
@@ -261013,7 +260668,7 @@
     2:2:java.lang.String getConsequenceKeepType():366 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):376:376 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     4:4:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> b
     4:4:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):378 -> b
     5:5:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):377:377 -> b
@@ -261029,17 +260684,17 @@
     7:7:void com.android.tools.r8.relocated.keepanno.keeprules.PgRule.printNonEmptyMembersPatternAsDefaultInitWorkaround(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):91:91 -> c
     7:7:void printTargetHolder(java.lang.StringBuilder):360 -> c
     8:8:java.util.List getTargetMembers():371:371 -> c
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgDependentMembersRule -> com.android.tools.r8.internal.oW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgDependentMembersRule -> com.android.tools.r8.internal.sW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern holderNamePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern holderPattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
     java.util.Map memberPatterns -> f
     java.util.List memberConditions -> g
     java.util.List memberTargets -> h
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind keepKind -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     int nextBackReferenceNumber -> j
     java.lang.String holderBackReferencePattern -> k
     java.util.Map membersBackReferencePatterns -> l
@@ -261047,20 +260702,20 @@
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():400:400 -> <clinit>
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):422:422 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/FG;Lcom/android/tools/r8/internal/TG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/PG;Lcom/android/tools/r8/internal/dH;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
     2:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):409:411 -> <init>
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> <init>
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> <init>
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> <init>
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> <init>
     5:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):423 -> <init>
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> <init>
-    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> <init>
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> <init>
+    6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):423 -> <init>
     7:12:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):423:428 -> <init>
     1:1:java.util.List getConditionMembers():451:451 -> a
     2:2:void printConditionHolder(java.lang.StringBuilder):461:461 -> a
     3:3:void lambda$printConditionHolder$0(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):465:465 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bH;)V"}
     4:4:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withBackReferences(java.lang.StringBuilder,java.util.function.Supplier):16:16 -> a
     4:4:void lambda$printConditionHolder$0(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):466 -> a
     5:5:void lambda$printConditionHolder$0(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):467:467 -> a
@@ -261068,7 +260723,7 @@
     6:6:void lambda$printConditionHolder$0(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):468 -> a
     7:7:void lambda$printConditionHolder$0(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):468:468 -> a
     8:9:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):474:475 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     10:10:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withBackReferences(java.lang.StringBuilder,java.util.function.Supplier):16:16 -> a
     10:10:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):476 -> a
     11:12:void printConditionMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):477:478 -> a
@@ -261080,12 +260735,12 @@
     2:2:java.lang.String getConsequenceKeepType():446 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:8:void lambda$printTargetHolder$1(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):487:492 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/RG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/bH;)V"}
     9:9:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> b
     9:9:void lambda$printTargetHolder$1(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):493 -> b
     10:10:void lambda$printTargetHolder$1(java.lang.StringBuilder,java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):492:492 -> b
     11:18:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):503:510 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     19:19:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> b
     19:19:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):512 -> b
     20:20:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):511:511 -> b
@@ -261103,14 +260758,14 @@
     8:8:void printTargetHolder(java.lang.StringBuilder):497 -> c
     1:2:boolean hasCondition():439:440 -> d
     1:1:int getNextBackReferenceNumber():432:432 -> e
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgKeepAttributeRule -> com.android.tools.r8.internal.pW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgKeepAttributeRule -> com.android.tools.r8.internal.tW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     java.util.Set attributes -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():250:250 -> <clinit>
     1:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,java.util.Set,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):258:260 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Ljava/util/HashSet;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Ljava/util/HashSet;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo com.android.tools.r8.relocated.keepanno.keeprules.PgRule.getMetaInfo():107:107 -> b
     1:1:void printRule(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):265 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;)V"}
@@ -261154,28 +260809,28 @@
     22:22:void printRule(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):271:271 -> b
     23:23:java.lang.String getConsequenceKeepType():277:277 -> b
     24:24:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):292:292 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     1:1:java.util.List getTargetMembers():282:282 -> c
     2:2:void printTargetHolder(java.lang.StringBuilder):287:287 -> c
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgUnconditionalRule -> com.android.tools.r8.internal.qW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule$PgUnconditionalRule -> com.android.tools.r8.internal.uW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern holderNamePattern -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RG;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bH;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern holderPattern -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KE;"}
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind targetKeepKind -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     java.util.List targetMembers -> g
     java.util.Map memberPatterns -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():200:200 -> <clinit>
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):215:216 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kF;Lcom/android/tools/r8/internal/TG;Lcom/android/tools/r8/internal/FG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/rW;)V"}
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():169:169 -> <init>
-    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wF;Lcom/android/tools/r8/internal/dH;Lcom/android/tools/r8/internal/PG;Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/vW;)V"}
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getClassItemPattern():180:180 -> <init>
+    3:3:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> <init>
     3:3:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):217 -> <init>
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> <init>
-    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():173 -> <init>
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> <init>
+    4:4:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder.getNamePattern():184 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):217 -> <init>
     5:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractor$Holder,com.android.tools.r8.relocated.keepanno.ast.KeepOptions,java.util.Map,java.util.List,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):217:221 -> <init>
@@ -261184,7 +260839,7 @@
     2:2:java.lang.String getConsequenceKeepType():226 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):244:244 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/qE;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/EE;)V"}
     4:4:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> b
     4:4:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):246 -> b
     5:5:void printTargetMember(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):245:245 -> b
@@ -261200,86 +260855,86 @@
     7:7:void printTargetHolder(java.lang.StringBuilder):238 -> c
     8:8:void com.android.tools.r8.relocated.keepanno.keeprules.PgRule.printNonEmptyMembersPatternAsDefaultInitWorkaround(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind):91:91 -> c
     8:8:void printTargetHolder(java.lang.StringBuilder):238 -> c
-com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind -> com.android.tools.r8.internal.rW:
+com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind -> com.android.tools.r8.internal.vW:
 # {"id":"sourceFile","fileName":"PgRule.java"}
     java.lang.String ruleKind -> b
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind JUST_MEMBERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind CLASS_OR_MEMBERS -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind CLASS_AND_MEMBERS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     com.android.tools.r8.relocated.keepanno.keeprules.PgRule$TargetKeepKind CHECK_DISCARD -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vW;"}
     1:4:void <clinit>():66:69 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.String):73:74 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;)V"}
-com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter -> com.android.tools.r8.internal.ba0:
+com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter -> com.android.tools.r8.internal.fa0:
 # {"id":"sourceFile","fileName":"RulePrinter.java"}
     java.lang.StringBuilder builder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
     1:2:void <init>(java.lang.StringBuilder):21:22 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter allowBackReferencesIf(boolean):26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/fa0;"}
     2:5:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter append(java.lang.String):30:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fa0;"}
     6:6:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendAnyParameters():58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):37:37 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendDoubleStar():46:46 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendPercent():54:54 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendStar():42:42 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendTripleStar():50:50 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
-com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter -> com.android.tools.r8.internal.Z90:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
+com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter -> com.android.tools.r8.internal.da0:
 # {"id":"sourceFile","fileName":"RulePrinter.java"}
     java.util.function.Supplier nextNumberGenerator -> c
     java.lang.StringBuilder backref -> d
     1:1:void <init>(java.lang.StringBuilder,java.util.function.Supplier):68:68 -> <init>
     2:6:void <init>(java.lang.StringBuilder,java.util.function.Supplier):65:69 -> <init>
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendAnyParameters():109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter allowBackReferencesIf(boolean):114:114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):83:83 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.appendWithoutBackReferenceAssert(java.lang.String):37:37 -> b
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):84 -> b
     3:3:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendDoubleStar():94:94 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter addBackRef(java.lang.String):77:77 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Z90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/da0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.appendWithoutBackReferenceAssert(java.lang.String):37:37 -> c
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter addBackRef(java.lang.String):78 -> c
     3:3:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendPercent():104:104 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendStar():89:89 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendTripleStar():99:99 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
-com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$SkipBackreferencePrinter -> com.android.tools.r8.internal.aa0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
+com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$SkipBackreferencePrinter -> com.android.tools.r8.internal.ea0:
 # {"id":"sourceFile","fileName":"RulePrinter.java"}
     com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter printer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/da0;"}
     1:2:void <init>(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter$BackReferencePrinter):122:123 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/da0;)V"}
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendAnyParameters():154:154 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> a
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendAnyParameters():154 -> a
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendDoubleStar():139:139 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     3:3:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> b
     3:3:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendDoubleStar():139 -> b
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendPercent():149:149 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> c
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendPercent():149 -> c
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendStar():134:134 -> d
@@ -261287,17 +260942,17 @@
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> d
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendStar():134 -> d
     1:1:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendTripleStar():144:144 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fa0;"}
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendWithoutBackReferenceAssert(java.lang.String):128:128 -> e
     2:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter appendTripleStar():144 -> e
-com.android.tools.r8.relocated.keepanno.keeprules.RulePrintingUtils -> com.android.tools.r8.internal.ca0:
+com.android.tools.r8.relocated.keepanno.keeprules.RulePrintingUtils -> com.android.tools.r8.internal.ga0:
 # {"id":"sourceFile","fileName":"RulePrintingUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
+    1:1:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
     1:1:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/wE;Ljava/util/function/BiConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Lcom/android/tools/r8/internal/KE;Ljava/util/function/BiConsumer;)V"}
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.OptionalPattern.isPresent():29:29 -> a
     2:2:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):102 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -261305,10 +260960,10 @@
     5:5:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter.withoutBackReferences(java.lang.StringBuilder):11:11 -> a
     5:5:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):104 -> a
     6:9:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):104:107 -> a
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
     10:10:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):108 -> a
     11:11:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):108:108 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():98:98 -> a
+    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():89:89 -> a
     12:12:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):109 -> a
     13:13:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):110:110 -> a
     14:14:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
@@ -261323,7 +260978,7 @@
     18:18:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):113 -> a
     19:19:java.lang.StringBuilder printClassHeader(java.lang.StringBuilder,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,java.util.function.BiConsumer):112:112 -> a
     20:20:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberClause(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;Lcom/android/tools/r8/internal/ba0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;Lcom/android/tools/r8/internal/fa0;)V"}
     21:21:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
     21:21:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberClause(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):120 -> a
     22:24:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberClause(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):123:125 -> a
@@ -261473,7 +261128,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:100:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberClause(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.keeprules.KeepRuleExtractorOptions):138:140 -> a
     101:101:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printStringPattern(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):189:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/WG;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/gH;)Lcom/android/tools/r8/internal/fa0;"}
     102:102:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern.asExactString():96:96 -> a
     102:102:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printStringPattern(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):190 -> a
     103:103:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printStringPattern(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):190:190 -> a
@@ -261484,13 +261139,13 @@
     108:108:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printStringPattern(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):196 -> a
     109:109:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printStringPattern(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):197:197 -> a
     110:110:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):221:221 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/dH;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/nH;)Lcom/android/tools/r8/internal/fa0;"}
     111:111:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):220:220 -> a
     112:112:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$2(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):224:224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/RG;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/bH;)Lcom/android/tools/r8/internal/fa0;"}
     113:113:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printPrimitiveType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):229:229 -> a
     113:113:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$0(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/PG;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/ZG;)Lcom/android/tools/r8/internal/fa0;"}
     114:114:boolean com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern.isAny():78:78 -> a
     114:114:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printPrimitiveType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):229 -> a
     114:114:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$0(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):222 -> a
@@ -261509,7 +261164,7 @@
     128:128:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$0(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):222 -> a
     129:129:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printArrayType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):240:240 -> a
     129:129:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$1(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/lE;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/zE;)Lcom/android/tools/r8/internal/fa0;"}
     130:130:boolean com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern.isAny():30:30 -> a
     130:130:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printArrayType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):240 -> a
     130:130:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$1(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):223 -> a
@@ -261538,7 +261193,7 @@
     139:139:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printArrayType(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):244:244 -> a
     139:139:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter lambda$printType$1(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):223 -> a
     140:140:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberAccess(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):251:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/jG;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/vG;)V"}
     141:141:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.isAnyVisibility():63:63 -> a
     141:141:void printVisibilityModifiers(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -261566,7 +261221,7 @@
     157:157:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberAccess(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):259 -> a
     158:158:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printMemberAccess(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):259:259 -> a
     159:159:void printModifier(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,java.lang.String):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/IO;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/MO;Ljava/lang/String;)V"}
     160:160:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> a
     160:160:void printModifier(com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern,java.lang.String):286 -> a
     161:161:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isOnlyNegative():0:0 -> a
@@ -261584,7 +261239,7 @@
     207:207:java.lang.String arrayDescriptorToJavaType(java.lang.String):406 -> a
     208:208:java.lang.String arrayDescriptorToJavaType(java.lang.String):413:413 -> a
     1:2:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printClassName(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter):316:317 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ba0;Lcom/android/tools/r8/internal/RG;)Lcom/android/tools/r8/internal/ba0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fa0;Lcom/android/tools/r8/internal/bH;)Lcom/android/tools/r8/internal/fa0;"}
     3:3:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern.getPackagePattern():100:100 -> b
     3:3:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printClassName(com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter):319 -> b
     4:11:com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter printPackagePrefix(com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern,com.android.tools.r8.relocated.keepanno.keeprules.RulePrinter):325:332 -> b
@@ -261606,17 +261261,17 @@
     12:15:java.lang.String escapeChar(char):58:61 -> c
     12:15:java.lang.String escapeLineBreaks(java.lang.String):74 -> c
     16:21:java.lang.String escapeLineBreaks(java.lang.String):76:81 -> c
-com.android.tools.r8.relocated.keepanno.utils.Unimplemented -> com.android.tools.r8.internal.Ij0:
+com.android.tools.r8.relocated.keepanno.utils.Unimplemented -> com.android.tools.r8.internal.Mj0:
 # {"id":"sourceFile","fileName":"Unimplemented.java"}
     1:1:void <init>():7:7 -> <init>
 com.android.tools.r8.relocator.Relocator -> com.android.tools.r8.relocator.Relocator:
 # {"id":"sourceFile","fileName":"Relocator.java"}
     1:4:void lambda$run$0(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):48:51 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     1:1:void lambda$run$1(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):66:66 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     1:5:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):75:79 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/relocator/RelocatorCommand;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/iB;)V"}
     6:9:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.createForRelocator(com.android.tools.r8.graph.AppInfo):324:327 -> c
     6:9:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):80 -> c
     10:11:com.android.tools.r8.ir.desugar.TypeRewriter com.android.tools.r8.graph.AppView.defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):250:251 -> c
@@ -261647,17 +261302,17 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.graph.DexItemFactory factory -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.ClassFileConsumer consumer -> e
     com.android.tools.r8.utils.AndroidApp app -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/utils/i;"}
     com.android.tools.r8.relocator.RelocatorMapping mapping -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I40;"}
     int threadCount -> h
     java.util.Set OPTIONS_WITH_PARAMETER -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.lang.String USAGE_MESSAGE -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():44:44 -> <clinit>
@@ -261670,7 +261325,7 @@
     11:11:void <clinit>():53:53 -> <clinit>
     1:9:void <init>(boolean,boolean):76:84 -> <init>
     10:18:void <init>(com.android.tools.r8.relocator.RelocatorMapping,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ClassFileConsumer,int):93:101 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E40;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/ClassFileConsumer;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I40;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/ClassFileConsumer;I)V"}
     1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():105:105 -> builder
     2:2:void com.android.tools.r8.relocator.RelocatorCommand$Builder.<init>():187:187 -> builder
     2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():105 -> builder
@@ -261683,7 +261338,7 @@
     1:1:com.android.tools.r8.graph.DexItemFactory getFactory():121:121 -> getFactory
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
     1:9:com.android.tools.r8.utils.InternalOptions getInternalOptions():146:154 -> getInternalOptions
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> getInternalOptions
     10:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():154 -> getInternalOptions
     11:11:com.android.tools.r8.utils.InternalOptions getInternalOptions():154:154 -> getInternalOptions
@@ -261701,9 +261356,9 @@
     18:18:com.android.tools.r8.utils.InternalOptions getInternalOptions():155 -> getInternalOptions
     19:26:com.android.tools.r8.utils.InternalOptions getInternalOptions():155:162 -> getInternalOptions
     1:1:com.android.tools.r8.relocator.RelocatorMapping getMapping():167:167 -> getMapping
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/E40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/I40;"}
     1:1:com.android.tools.r8.utils.Reporter getReporter():117:117 -> getReporter
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:int getThreadCount():129:129 -> getThreadCount
     1:1:boolean isPrintHelp():137:137 -> isPrintHelp
     1:1:boolean isPrintVersion():141:141 -> isPrintVersion
@@ -261713,13 +261368,13 @@
     com.android.tools.r8.utils.AndroidApp$Builder app -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/utils/i$a;"}
     com.android.tools.r8.utils.Reporter reporter -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder packageMapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder classMapping -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder subPackageMapping -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Au;"}
     com.android.tools.r8.ClassFileConsumer consumer -> f
     int threadCount -> g
     boolean printVersion -> h
@@ -261740,7 +261395,7 @@
     10:10:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):339:339 -> a
     10:10:void lambda$addProgramFile$1(java.nio.file.Path):269 -> a
     11:15:void lambda$build$2(com.android.tools.r8.utils.Box):316:320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;)V"}
     16:17:void validate():306:307 -> a
     16:17:void lambda$build$2(com.android.tools.r8.utils.Box):321 -> a
     18:20:void lambda$build$2(com.android.tools.r8.utils.Box):322:324 -> a
@@ -261802,23 +261457,23 @@
 com.android.tools.r8.relocator.RelocatorCommandLine -> com.android.tools.r8.relocator.a:
 # {"id":"sourceFile","fileName":"RelocatorCommandLine.java"}
     1:11:void run(java.lang.String[]):31:41 -> a
-com.android.tools.r8.relocator.RelocatorMapping -> com.android.tools.r8.internal.E40:
+com.android.tools.r8.relocator.RelocatorMapping -> com.android.tools.r8.internal.I40:
 # {"id":"sourceFile","fileName":"RelocatorMapping.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap packageMappings -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap classMappings -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap subPackageMappings -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     java.util.concurrent.ConcurrentHashMap stringToPackageReferenceCache -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):42:42 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;)V"}
     2:11:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap):36:45 -> <init>
     1:1:java.util.Map getPackageMappings():56:56 -> a
     2:18:com.android.tools.r8.naming.NamingLens compute(com.android.tools.r8.graph.AppView):61:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/D40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/H40;"}
     19:19:void com.android.tools.r8.graph.DexItemFactory.forAllTypes(java.util.function.Consumer):3420:3420 -> a
     19:19:com.android.tools.r8.naming.NamingLens compute(com.android.tools.r8.graph.AppView):77 -> a
     20:20:com.android.tools.r8.naming.NamingLens compute(com.android.tools.r8.graph.AppView):81:81 -> a
@@ -261834,7 +261489,7 @@
     77:77:void computePackageMapping(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.Map,java.util.Map):153:153 -> a
     1:1:void lambda$compute$1(com.android.tools.r8.graph.DexItemFactory,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexType):79:79 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.relocator.RelocatorMapping$RelocatorNamingLens -> com.android.tools.r8.internal.D40:
+com.android.tools.r8.relocator.RelocatorMapping$RelocatorNamingLens -> com.android.tools.r8.internal.H40:
 # {"id":"sourceFile","fileName":"RelocatorMapping.java"}
     java.util.Map typeMappings -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
@@ -261846,25 +261501,25 @@
     2:2:com.android.tools.r8.graph.DexString internalLookupClassDescriptor(com.android.tools.r8.graph.DexType):184:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/H2;"}
     3:3:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):189:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/gB;)Lcom/android/tools/r8/graph/H2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Z3;Lcom/android/tools/r8/internal/iB;)Lcom/android/tools/r8/graph/H2;"}
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):194:194 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/H2;"}
     5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):199:199 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.L40:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.P40:
 # {"id":"sourceFile","fileName":"Repackaging.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y2;"}
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/J40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N40;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():61:61 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView):67:71 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:11:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     12:34:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):94:116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;)V"}
     35:36:com.android.tools.r8.repackaging.RepackagingLens com.android.tools.r8.repackaging.RepackagingLens$Builder.buildEmpty(com.android.tools.r8.graph.AppView):117:118 -> a
@@ -261872,8 +261527,8 @@
     37:44:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):119:126 -> a
     45:45:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):125:125 -> a
     46:46:com.android.tools.r8.repackaging.RepackagingLens repackageClasses(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3$a;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/R40;"}
-    47:47:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1546:1546 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3$a;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/V40;"}
+    47:47:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1552:1552 -> a
     47:47:com.android.tools.r8.repackaging.RepackagingLens repackageClasses(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):133 -> a
     48:51:com.android.tools.r8.repackaging.RepackagingLens repackageClasses(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):136:139 -> a
     52:55:com.android.tools.r8.graph.SortedProgramPackageCollection com.android.tools.r8.graph.SortedProgramPackageCollection.createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
@@ -262078,7 +261733,7 @@
     166:166:com.android.tools.r8.repackaging.RepackagingLens repackageClasses(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):156:156 -> a
     167:167:boolean lambda$repackageClasses$0(java.util.Map$Entry):144:144 -> a
     168:175:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):277:284 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/F5;Ljava/lang/String;Lcom/android/tools/r8/internal/Gs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/F5;Ljava/lang/String;Lcom/android/tools/r8/internal/Is;)V"}
     176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.EnclosingMethodAttribute.getEnclosingClass():64:64 -> a
     176:176:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -262091,7 +261746,7 @@
     187:194:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):298:305 -> a
     195:195:java.lang.Object com.android.tools.r8.com.google.common.collect.HashBiMap.put(java.lang.Object,java.lang.Object):296:296 -> a
     195:195:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):303 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.H40:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.L40:
 # {"id":"sourceFile","fileName":"Repackaging.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():95:95 -> <clinit>
@@ -262105,14 +261760,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):98:98 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.I40:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.M40:
 # {"id":"sourceFile","fileName":"Repackaging.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y2;"}
     com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy packageMinificationStrategy -> e
@@ -262137,7 +261792,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     48:51:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):393:396 -> a
     52:67:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):434:449 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Ljava/lang/String;Lcom/android/tools/r8/internal/Gs;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Ljava/lang/String;Lcom/android/tools/r8/internal/Is;)Lcom/android/tools/r8/graph/I2;"}
     68:72:boolean isRepackageTypeUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.BiMap):462:466 -> a
     68:72:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):455 -> a
     73:73:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.graph.AppInfoWithClassHierarchy.getMissingClasses():152:152 -> a
@@ -262159,17 +261814,17 @@
     2:2:java.util.Set com.android.tools.r8.graph.ProgramPackage.classesInPackage():68:68 -> b
     2:2:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):407 -> b
     3:15:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):407:419 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.J40:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.N40:
 # {"id":"sourceFile","fileName":"Repackaging.java"}
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.K40:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.O40:
 # {"id":"sourceFile","fileName":"Repackaging.java"}
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U40;"}
     1:1:void <clinit>():160:160 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$Builder):172:176 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gs;Lcom/android/tools/r8/internal/Q40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Is;Lcom/android/tools/r8/internal/U40;)V"}
     1:1:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):186:186 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/l1;)V"}
     2:2:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):98:98 -> a
@@ -262214,16 +261869,16 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):181:181 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.M40:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Q40:
 # {"id":"sourceFile","fileName":"RepackagingAnnotationTracer.java"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W40;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingUseRegistry):25:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/S40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/W40;)V"}
     1:1:void trace(com.android.tools.r8.graph.DexAnnotationSet):31:31 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;)V"}
     2:2:void trace(com.android.tools.r8.graph.ParameterAnnotationsList):35:35 -> a
@@ -262281,7 +261936,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     140:140:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> a
     140:140:void lambda$traceDexValue$0(com.android.tools.r8.graph.DexType):101 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.O40:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.S40:
 # {"id":"sourceFile","fileName":"RepackagingConstraintGraph.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -262291,7 +261946,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Set pinnedNodes -> d
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R40;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramPackage):48:48 -> <init>
@@ -262301,7 +261956,7 @@
     10:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramPackage):51 -> <init>
     12:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramPackage):51:52 -> <init>
     1:1:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)Lcom/android/tools/r8/internal/N40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)Lcom/android/tools/r8/internal/R40;"}
     2:2:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):141:141 -> a
     2:2:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -262330,14 +261985,14 @@
     58:58:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):139 -> a
     59:60:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):139:140 -> a
     61:61:void lambda$registerReferencesFromClass$0(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):115:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S40;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W40;Lcom/android/tools/r8/graph/I2;)V"}
     62:62:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> a
     62:62:void lambda$registerReferencesFromClass$0(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     63:63:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> a
     63:63:void lambda$registerReferencesFromClass$0(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):115 -> a
     64:64:void lambda$registerReferencesFromClass$2(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):135:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S40;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/Z3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W40;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/Z3;)V"}
     65:69:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):144:148 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
     70:70:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> a
@@ -262349,20 +262004,20 @@
     88:88:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):169 -> a
     89:96:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):175:182 -> a
     1:1:void lambda$registerReferencesFromClass$1(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):123:123 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S40;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W40;Lcom/android/tools/r8/graph/I2;)V"}
     2:2:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> b
     2:2:void lambda$registerReferencesFromClass$1(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):123 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> b
     3:3:void lambda$registerReferencesFromClass$1(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):123 -> b
     1:1:void lambda$registerReferencesFromMethod$3(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):162:162 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S40;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W40;Lcom/android/tools/r8/graph/I2;)V"}
     2:2:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> c
     2:2:void lambda$registerReferencesFromMethod$3(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):162 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens):285:285 -> c
     3:3:void lambda$registerReferencesFromMethod$3(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):162 -> c
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.N40:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.R40:
 # {"id":"sourceFile","fileName":"RepackagingConstraintGraph.java"}
     com.android.tools.r8.graph.DexDefinition definitionForDebugging -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/b1;"}
@@ -262371,16 +262026,16 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)V"}
     2:5:void <init>(com.android.tools.r8.graph.DexDefinition):209:212 -> <init>
     1:1:java.lang.String toString():226:226 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.R40:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.V40:
 # {"id":"sourceFile","fileName":"RepackagingLens.java"}
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap newTypes -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f6;"}
     java.util.Map packageRenamings -> o
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84:84 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/d6;Lcom/android/tools/r8/internal/d6;Lcom/android/tools/r8/internal/d6;Ljava/util/Map;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/f6;Lcom/android/tools/r8/internal/f6;Lcom/android/tools/r8/internal/f6;Ljava/util/Map;)V"}
     2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):34:35 -> <init>
     1:1:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     1:1:java.lang.String lookupPackageName(java.lang.String):40 -> a
@@ -262400,47 +262055,47 @@
     22:22:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):82:82 -> a
     1:1:boolean isRepackagingLens():50:50 -> o
     1:1:boolean isEmpty():45:45 -> r
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.Q40:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.U40:
 # {"id":"sourceFile","fileName":"RepackagingLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newTypes -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():88:88 -> <clinit>
     1:7:void <init>():88:94 -> <init>
-com.android.tools.r8.repackaging.RepackagingLens$Builder$1 -> com.android.tools.r8.internal.P40:
+com.android.tools.r8.repackaging.RepackagingLens$Builder$1 -> com.android.tools.r8.internal.T40:
 # {"id":"sourceFile","fileName":"RepackagingLens.java"}
     1:1:void <init>(com.android.tools.r8.repackaging.RepackagingLens$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):118:118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;)V"}
     1:1:boolean isLegitimateToHaveEmptyMappings():127:127 -> q
     1:1:boolean isEmpty():122:122 -> r
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.S40:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.W40:
 # {"id":"sourceFile","fileName":"RepackagingUseRegistry.java"}
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/i;"}
     com.android.tools.r8.utils.InternalOptions options -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S40;"}
     com.android.tools.r8.graph.lens.InitClassLens initClassLens -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Iv;"}
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node node -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R40;"}
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node missingTypeNode -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R40;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.ProgramMethod methodContext -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/C5;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():38:38 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingConstraintGraph,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):55:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/O40;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/N40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/S40;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/R40;)V"}
     5:5:com.android.tools.r8.graph.lens.InitClassLens com.android.tools.r8.graph.AppView.initClassLens():704:704 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingConstraintGraph,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):59 -> <init>
     6:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.repackaging.RepackagingConstraintGraph,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):59:71 -> <init>
@@ -262488,11 +262143,11 @@
     77:77:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):170 -> a
     78:84:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):90:96 -> a
     78:84:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):170 -> a
-    85:85:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    85:85:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     85:85:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:85:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):170 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     86:86:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):97 -> a
     86:86:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):170 -> a
     87:89:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):97:99 -> a
@@ -262616,43 +262271,43 @@
     9:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):219 -> h
     1:1:void registerFieldAccess(com.android.tools.r8.graph.DexField):108:108 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)V"}
-com.android.tools.r8.repackaging.RepackagingUtils -> com.android.tools.r8.internal.T40:
+com.android.tools.r8.repackaging.RepackagingUtils -> com.android.tools.r8.internal.X40:
 # {"id":"sourceFile","fileName":"RepackagingUtils.java"}
     1:11:boolean isPackageNameKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions):14:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/iB;)Z"}
     12:17:boolean isPackageNameKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions):23:28 -> a
-com.android.tools.r8.resourceshrinker.EntryWrapper -> com.android.tools.r8.internal.un:
+com.android.tools.r8.resourceshrinker.EntryWrapper -> com.android.tools.r8.internal.wn:
 # {"id":"sourceFile","fileName":"ResourceTableUtil.kt"}
     int id -> a
     java.lang.String packageName -> b
     java.lang.String type -> c
     com.android.tools.r8.com.android.aapt.Resources$Entry entry -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o60;"}
     1:5:void <init>(int,java.lang.String,java.lang.String,com.android.tools.r8.com.android.aapt.Resources$Entry):97:101 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/k60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Lcom/android/tools/r8/internal/o60;)V"}
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.resourceshrinker.NoDebugReporter -> com.android.tools.r8.internal.DQ:
+com.android.tools.r8.resourceshrinker.NoDebugReporter -> com.android.tools.r8.internal.HQ:
 # {"id":"sourceFile","fileName":"ShrinkerDebugReporter.kt"}
     com.android.tools.r8.resourceshrinker.NoDebugReporter INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HQ;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     1:1:void close():32:32 -> close
-com.android.tools.r8.resourceshrinker.PossibleResourcesMarker -> com.android.tools.r8.internal.bX:
+com.android.tools.r8.resourceshrinker.PossibleResourcesMarker -> com.android.tools.r8.internal.fX:
 # {"id":"sourceFile","fileName":"PossibleResourcesMarker.java"}
     com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter debugReporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HQ;"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore resourceStore -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B50;"}
     java.util.Set strings -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     boolean foundWebContent -> d
     java.util.regex.Pattern FORMAT -> e
     1:1:void <clinit>():44:44 -> <clinit>
     1:5:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.util.Set,boolean):87:91 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DQ;Lcom/android/tools/r8/internal/x50;Ljava/util/HashSet;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HQ;Lcom/android/tools/r8/internal/B50;Ljava/util/HashSet;Z)V"}
     1:1:void markPossibleResourcesReachable():95:95 -> a
     2:2:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
     2:2:void markPossibleResourcesReachable():96 -> a
@@ -262665,7 +262320,7 @@
     7:7:void markPossibleResourcesReachable():98 -> a
     8:57:void markPossibleResourcesReachable():98:147 -> a
     58:58:java.lang.String lambda$markPossibleResourcesReachable$0(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Ljava/lang/String;"}
     59:59:boolean lambda$markPossibleResourcesReachable$1(int,java.lang.String):114:114 -> a
     60:82:java.util.stream.Stream lambda$markPossibleResourcesReachable$4(java.util.Set,java.lang.String):117:139 -> a
     83:84:java.util.stream.Stream possibleIntResource(java.lang.String):218:219 -> a
@@ -262717,15 +262372,15 @@
     136:136:java.util.stream.Stream lambda$markPossibleResourcesReachable$4(java.util.Set,java.lang.String):140:140 -> a
     137:151:java.util.stream.Stream lambda$markPossibleResourcesReachable$4(java.util.Set,java.lang.String):129:143 -> a
     152:152:java.lang.String lambda$markPossibleResourcesReachable$2(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource,java.lang.String):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;Ljava/lang/String;)Ljava/lang/String;"}
     153:153:void lambda$markPossibleResourcesReachable$3(java.lang.String,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):143:143 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/C50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/G50;)V"}
     154:154:void com.android.tools.r8.resourceshrinker.NoDebugReporter.debug(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:0 -> a
     154:154:void lambda$markPossibleResourcesReachable$3(java.lang.String,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):143 -> a
     155:155:boolean lambda$possibleFormatting$8(java.util.regex.Pattern,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):184:184 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/regex/Pattern;Lcom/android/tools/r8/internal/C50;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/regex/Pattern;Lcom/android/tools/r8/internal/G50;)Z"}
     156:156:java.util.stream.Stream lambda$possibleTypedResource$10(java.lang.String,com.android.tools.r8.com.google.common.collect.ListMultimap):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ZK;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/dL;)Ljava/util/stream/Stream;"}
     157:169:java.lang.String convertFormatStringToRegexp(java.lang.String):232:244 -> a
     170:173:boolean appendEscapedPattern(java.lang.String,java.lang.StringBuilder,int,int):363:366 -> a
     170:173:java.lang.String convertFormatStringToRegexp(java.lang.String):247 -> a
@@ -262740,7 +262395,7 @@
     414:417:java.lang.String convertFormatStringToRegexp(java.lang.String):342 -> a
     418:421:java.lang.String convertFormatStringToRegexp(java.lang.String):351:354 -> a
     1:1:boolean lambda$possiblePrefixMatch$7(java.lang.String,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):174:174 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/C50;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/G50;)Z"}
     2:3:java.util.stream.Stream possibleFormatting(java.lang.String):182:183 -> b
     4:4:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> b
     4:4:java.util.stream.Stream possibleFormatting(java.lang.String):183 -> b
@@ -262760,7 +262415,7 @@
     26:28:java.util.stream.Stream possibleTypedResource(java.util.Set,java.lang.String):208:210 -> b
     29:29:java.util.stream.Stream possibleTypedResource(java.util.Set,java.lang.String):197:197 -> b
     30:30:boolean lambda$possibleTypedResource$9(java.lang.String,com.android.tools.r8.com.google.common.collect.ListMultimap):209:209 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ZK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/dL;)Z"}
     1:11:java.util.stream.Stream possibleWebResources(java.util.Set,java.lang.String):153:163 -> c
     12:12:java.util.Collection com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResourceMaps():205:205 -> c
     12:12:java.util.stream.Stream possibleWebResources(java.util.Set,java.lang.String):163 -> c
@@ -262769,7 +262424,7 @@
     13:13:java.util.stream.Stream possibleWebResources(java.util.Set,java.lang.String):163 -> c
     14:18:java.util.stream.Stream possibleWebResources(java.util.Set,java.lang.String):163:167 -> c
     19:19:boolean lambda$possibleWebResources$5(java.lang.String,com.android.tools.r8.com.google.common.collect.ListMultimap):164:164 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ZK;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/dL;)Z"}
     20:20:java.util.stream.Stream possiblePrefixMatch(java.lang.String):173:173 -> c
     21:21:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> c
     21:21:java.util.stream.Stream possiblePrefixMatch(java.lang.String):173 -> c
@@ -262778,11 +262433,11 @@
     22:22:java.util.stream.Stream possiblePrefixMatch(java.lang.String):173 -> c
     23:24:java.util.stream.Stream possiblePrefixMatch(java.lang.String):173:174 -> c
     1:1:java.util.stream.Stream lambda$possibleWebResources$6(java.lang.String,com.android.tools.r8.com.google.common.collect.ListMultimap):165:165 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ZK;)Ljava/util/stream/Stream;"}
-com.android.tools.r8.resourceshrinker.ResourceShrinkerImplKt -> com.android.tools.r8.internal.m50:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/dL;)Ljava/util/stream/Stream;"}
+com.android.tools.r8.resourceshrinker.ResourceShrinkerImplKt -> com.android.tools.r8.internal.q50:
 # {"id":"sourceFile","fileName":"ResourceShrinkerImpl.kt"}
     1:1:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):306:306 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x50;Ljava/lang/String;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B50;Ljava/lang/String;)Z"}
     2:2:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String,java.lang.String):294:294 -> a
     2:2:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):307 -> a
     3:5:com.android.tools.r8.com.android.resources.ResourceFolderType com.android.tools.r8.com.android.resources.ResourceFolderType.getFolderType(java.lang.String):88:90 -> a
@@ -262810,14 +262465,14 @@
     74:75:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):307 -> a
     76:76:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String,java.lang.String):302:302 -> a
     76:76:boolean isJarPathReachable(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore,java.lang.String):307 -> a
-com.android.tools.r8.resourceshrinker.ResourceShrinkerModel -> com.android.tools.r8.internal.n50:
+com.android.tools.r8.resourceshrinker.ResourceShrinkerModel -> com.android.tools.r8.internal.r50:
 # {"id":"sourceFile","fileName":"ResourceShrinkerModel.java"}
     com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter debugReporter -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HQ;"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore resourceStore -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B50;"}
     com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses obfuscatedClasses -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DS;"}
     java.util.Set strings -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     boolean foundGetIdentifier -> e
@@ -262832,7 +262487,7 @@
     5:5:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):50 -> <init>
     6:12:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):52:58 -> <init>
     1:1:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore getResourceStore():68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/x50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/B50;"}
     2:2:java.lang.String lambda$keepPossiblyReferencedResources$0(java.lang.String):155:155 -> a
     1:1:void keepPossiblyReferencedResources():142:142 -> b
     2:2:boolean com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getSafeMode():97:97 -> b
@@ -262845,12 +262500,12 @@
     14:14:boolean lambda$keepPossiblyReferencedResources$1(java.lang.String):156:156 -> b
     1:9:java.lang.String lambda$keepPossiblyReferencedResources$3():150:158 -> c
     10:10:java.lang.String lambda$keepPossiblyReferencedResources$2(java.lang.String):157:157 -> c
-com.android.tools.r8.resourceshrinker.ResourceTableUtilKt -> com.android.tools.r8.internal.z50:
+com.android.tools.r8.resourceshrinker.ResourceTableUtilKt -> com.android.tools.r8.internal.D50:
 # {"id":"sourceFile","fileName":"ResourceTableUtil.kt"}
     1:1:com.android.tools.r8.com.android.aapt.Resources$ResourceTable nullOutEntriesWithIds(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,java.util.List):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Ljava/util/List;)Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Ljava/util/List;)Lcom/android/tools/r8/internal/w70;"}
     2:2:com.android.tools.r8.com.android.aapt.Resources$ResourceTable nullOutEntriesWithIds(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,java.util.List,boolean):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Ljava/util/List;Z)Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Ljava/util/List;Z)Lcom/android/tools/r8/internal/w70;"}
     3:24:java.util.Map calculatePackageMappings(java.util.List):71:92 -> a
     3:24:com.android.tools.r8.com.android.aapt.Resources$ResourceTable nullOutEntriesWithIds(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,java.util.List,boolean):44 -> a
     25:26:com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder com.android.tools.r8.com.android.aapt.Resources$ResourceTable.toBuilder():4107:4108 -> a
@@ -262979,26 +262634,26 @@
     346:347:com.android.tools.r8.com.android.aapt.Resources$ResourceTable nullOutEntriesWithIds(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,java.util.List,boolean):59 -> a
     348:350:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.com.android.aapt.Resources$ResourceTable$Builder.build():4209:4211 -> a
     348:350:com.android.tools.r8.com.android.aapt.Resources$ResourceTable nullOutEntriesWithIds(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,java.util.List,boolean):67 -> a
-com.android.tools.r8.resourceshrinker.ResourceTableUtilKt$entriesSequence$1 -> com.android.tools.r8.internal.y50:
+com.android.tools.r8.resourceshrinker.ResourceTableUtilKt$entriesSequence$1 -> com.android.tools.r8.internal.C50:
 # {"id":"sourceFile","fileName":"ResourceTableUtil.kt"}
     java.lang.Object L$1 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/Iterator;"}
     java.lang.Object L$2 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T60;"}
     java.lang.Object L$3 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/Iterator;"}
     java.lang.Object L$4 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l80;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p80;"}
     java.lang.Object L$5 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/Iterator;"}
     int label -> h
     java.lang.Object L$0 -> i
     com.android.tools.r8.com.android.aapt.Resources$ResourceTable $this_entriesSequence -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w70;"}
     1:1:void <init>(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Lcom/android/tools/r8/internal/Xg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Lcom/android/tools/r8/internal/Zg;)V"}
     1:1:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation create(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aa0;Lcom/android/tools/r8/internal/Aa0;)Lcom/android/tools/r8/internal/Xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ea0;Lcom/android/tools/r8/internal/Ea0;)Lcom/android/tools/r8/internal/Zg;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation create(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> a
     2:2:java.lang.Object invoke(com.android.tools.r8.jetbrains.kotlin.sequences.SequenceScope,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0 -> a
     2:2:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
@@ -263047,16 +262702,16 @@
     28:31:java.lang.Object com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator.yield(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):164:167 -> b
     28:31:java.lang.Object invokeSuspend(java.lang.Object):26 -> b
     32:32:java.lang.Object invokeSuspend(java.lang.Object) -> b
-com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder -> com.android.tools.r8.internal.b10:
+com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder -> com.android.tools.r8.internal.f10:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree resourceRoot -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e50;"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 resourceTableProducer -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yq;"}
     1:3:void <init>(com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):59:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a50;Lcom/android/tools/r8/internal/Wq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e50;Lcom/android/tools/r8/internal/Yq;)V"}
     1:1:void buildGraph(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r50;)V"}
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.entriesSequence(com.android.tools.r8.com.android.aapt.Resources$ResourceTable):21:21 -> a
     2:2:void buildGraph(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):76 -> a
     3:3:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.sequence(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):26:26 -> a
@@ -263102,14 +262757,14 @@
     19:19:void buildGraph(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):83 -> a
     20:20:void com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder.findReferences():180:180 -> a
     20:20:void buildGraph(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):83 -> a
-com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder$buildGraph$1 -> com.android.tools.r8.internal.a10:
+com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder$buildGraph$1 -> com.android.tools.r8.internal.e10:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.ResourceShrinkerModel $model -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r50;"}
     com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder this$0 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f10;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel,com.android.tools.r8.resourceshrinker.graph.ProtoResourcesGraphBuilder):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n50;Lcom/android/tools/r8/internal/b10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r50;Lcom/android/tools/r8/internal/f10;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):77:77 -> a
     2:2:com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder invoke(com.android.tools.r8.resourceshrinker.EntryWrapper):0:0 -> a
     2:2:java.lang.Object invoke(java.lang.Object):77 -> a
@@ -263139,29 +262794,29 @@
     11:11:java.lang.Object invoke(java.lang.Object):77 -> a
     12:12:com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder invoke(com.android.tools.r8.resourceshrinker.EntryWrapper):79:79 -> a
     12:12:java.lang.Object invoke(java.lang.Object):77 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder -> com.android.tools.r8.internal.X30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder -> com.android.tools.r8.internal.b40:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree resourcesRoot -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e50;"}
     com.android.tools.r8.resourceshrinker.ResourceShrinkerModel model -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r50;"}
     com.android.tools.r8.com.android.aapt.Resources$Entry entry -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k60;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o60;"}
     com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource current -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G50;"}
     com.android.tools.r8.jetbrains.kotlin.Lazy webTokenizers$delegate -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/og0;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:20:void <init>(com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel,com.android.tools.r8.com.android.aapt.Resources$Entry,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):90:109 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a50;Lcom/android/tools/r8/internal/n50;Lcom/android/tools/r8/internal/k60;Lcom/android/tools/r8/internal/C50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e50;Lcom/android/tools/r8/internal/r50;Lcom/android/tools/r8/internal/o60;Lcom/android/tools/r8/internal/G50;)V"}
     21:21:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0) -> <init>
     21:21:void <init>(com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel,com.android.tools.r8.com.android.aapt.Resources$Entry,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):109 -> <init>
     22:22:void <init>(com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel,com.android.tools.r8.com.android.aapt.Resources$Entry,com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):109:109 -> <init>
     1:120:void findFromReference(com.android.tools.r8.com.android.aapt.Resources$Reference):201:320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p70;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t70;)V"}
     121:121:void findFromReference(com.android.tools.r8.com.android.aapt.Resources$Reference):210:210 -> a
     122:123:void findFromFile(com.android.tools.r8.com.android.aapt.Resources$FileReference):214:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v60;)V"}
     124:124:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):21:21 -> a
     124:124:void findFromFile(com.android.tools.r8.com.android.aapt.Resources$FileReference):215 -> a
     125:125:void findFromFile(com.android.tools.r8.com.android.aapt.Resources$FileReference):216:216 -> a
@@ -263223,7 +262878,7 @@
     528:528:void findFromFile(com.android.tools.r8.com.android.aapt.Resources$FileReference):222 -> a
     529:529:void findFromFile(com.android.tools.r8.com.android.aapt.Resources$FileReference):222:222 -> a
     530:536:void fillFromXmlNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode):228:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K80;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O80;)V"}
     537:537:void maybeWearAppReference(com.android.tools.r8.com.android.aapt.Resources$XmlElement):284:284 -> a
     537:537:void fillFromXmlNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode):234 -> a
     538:538:java.util.List com.android.tools.r8.com.android.aapt.Resources$XmlElement.getChildList():47549:47549 -> a
@@ -263308,27 +262963,27 @@
     1145:1147:void maybeAndroidResUrl(java.lang.String,boolean):276:278 -> a
     1148:1148:boolean com.android.tools.r8.com.android.aapt.Resources$Item.hasRef():20759:20759 -> a
     1148:1148:void findFromItem(com.android.tools.r8.com.android.aapt.Resources$Item):186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x60;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B60;)V"}
     1149:1153:void findFromItem(com.android.tools.r8.com.android.aapt.Resources$Item):186:190 -> a
     1154:1154:com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getDebugReporter():63:63 -> a
     1154:1154:void findFromItem(com.android.tools.r8.com.android.aapt.Resources$Item):190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1155:1155:void findFromItem(com.android.tools.r8.com.android.aapt.Resources$Item):190:190 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion -> com.android.tools.r8.internal.H30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion -> com.android.tools.r8.internal.L30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     1:1:void <init>():96:96 -> <init>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findAndroidResReferencesInText$1 -> com.android.tools.r8.internal.I30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findAndroidResReferencesInText$1 -> com.android.tools.r8.internal.M30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     int I$0 -> c
     int label -> d
     java.lang.Object L$0 -> e
     java.lang.String $text -> f
     1:1:void <init>(java.lang.String,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Xg;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Zg;)V"}
     1:1:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation create(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Aa0;Lcom/android/tools/r8/internal/Aa0;)Lcom/android/tools/r8/internal/Xg;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ea0;Lcom/android/tools/r8/internal/Ea0;)Lcom/android/tools/r8/internal/Zg;"}
     2:2:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation create(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0:0 -> a
     2:2:java.lang.Object invoke(com.android.tools.r8.jetbrains.kotlin.sequences.SequenceScope,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):0 -> a
     2:2:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
@@ -263342,34 +262997,34 @@
     14:17:java.lang.Object com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator.yield(java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):164:167 -> b
     14:17:java.lang.Object invokeSuspend(java.lang.Object):312 -> b
     18:18:java.lang.Object invokeSuspend(java.lang.Object):315:315 -> b
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findFromFile$content$2 -> com.android.tools.r8.internal.J30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findFromFile$content$2 -> com.android.tools.r8.internal.N30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     byte[] $bytes -> b
     1:1:void <init>(byte[]):0:0 -> <init>
     1:1:java.lang.String invoke():215:215 -> a
     1:1:java.lang.Object invoke():215 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findFromReference$1 -> com.android.tools.r8.internal.K30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findFromReference$1 -> com.android.tools.r8.internal.O30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findFromReference$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/K30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):209:209 -> a
     2:211:java.lang.Boolean invoke(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):0:209 -> a
     2:211:java.lang.Object invoke(java.lang.Object):209 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$1 -> com.android.tools.r8.internal.L30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$1 -> com.android.tools.r8.internal.P30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):156:156 -> a
     2:2:com.android.tools.r8.com.android.aapt.Resources$Value invoke(com.android.tools.r8.com.android.aapt.Resources$ConfigValue):156:156 -> a
     2:2:java.lang.Object invoke(java.lang.Object):156 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2 -> com.android.tools.r8.internal.P30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2 -> com.android.tools.r8.internal.T30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):157:157 -> a
@@ -263386,134 +263041,119 @@
     4:4:java.lang.Object invoke(java.lang.Object):157 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):164:164 -> a
     5:5:java.lang.Object invoke(java.lang.Object):157 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.asSequence(java.lang.Object[]):24040:24040 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.sequenceOf(java.lang.Object[]):37 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):164 -> a
-    6:6:java.lang.Object invoke(java.lang.Object):157 -> a
-    7:7:boolean com.android.tools.r8.com.android.aapt.Resources$CompoundValue.hasStyle():22863:22863 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):165 -> a
+    6:6:boolean com.android.tools.r8.com.android.aapt.Resources$CompoundValue.hasStyle():22863:22863 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6:6:java.lang.Object invoke(java.lang.Object):157 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166:166 -> a
     7:7:java.lang.Object invoke(java.lang.Object):157 -> a
-    8:8:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166:166 -> a
+    8:8:com.android.tools.r8.com.android.aapt.Resources$Item$Builder com.android.tools.r8.com.android.aapt.Resources$Item.newBuilder():21210:21210 -> a
+    8:8:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
+    8:8:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
     8:8:java.lang.Object invoke(java.lang.Object):157 -> a
-    9:9:com.android.tools.r8.com.android.aapt.Resources$Item$Builder com.android.tools.r8.com.android.aapt.Resources$Item.newBuilder():21210:21210 -> a
-    9:9:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
-    9:9:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
-    9:9:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    9:9:java.lang.Object invoke(java.lang.Object):157 -> a
-    10:15:com.android.tools.r8.com.android.aapt.Resources$Item$Builder com.android.tools.r8.com.android.aapt.Resources$Item$Builder.setRef(com.android.tools.r8.com.android.aapt.Resources$Reference):21510:21515 -> a
-    10:15:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
-    10:15:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
-    10:15:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    10:15:java.lang.Object invoke(java.lang.Object):157 -> a
-    16:17:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item$Builder.build():21289:21290 -> a
-    16:17:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
-    16:17:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
-    16:17:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    16:17:java.lang.Object invoke(java.lang.Object):157 -> a
-    18:18:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166:166 -> a
-    18:18:java.lang.Object invoke(java.lang.Object):157 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.asSequence(java.lang.Object[]):24040:24040 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.sequenceOf(java.lang.Object[]):37 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    9:14:com.android.tools.r8.com.android.aapt.Resources$Item$Builder com.android.tools.r8.com.android.aapt.Resources$Item$Builder.setRef(com.android.tools.r8.com.android.aapt.Resources$Reference):21510:21515 -> a
+    9:14:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
+    9:14:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
+    9:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    9:14:java.lang.Object invoke(java.lang.Object):157 -> a
+    15:16:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item$Builder.build():21289:21290 -> a
+    15:16:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
+    15:16:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
+    15:16:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    15:16:java.lang.Object invoke(java.lang.Object):157 -> a
+    17:18:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166:167 -> a
+    17:18:java.lang.Object invoke(java.lang.Object):157 -> a
+    19:19:java.util.List com.android.tools.r8.com.android.aapt.Resources$Style.getEntryList():38252:38252 -> a
+    19:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:java.lang.Object invoke(java.lang.Object):157 -> a
     20:20:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167:167 -> a
     20:20:java.lang.Object invoke(java.lang.Object):157 -> a
-    21:21:java.util.List com.android.tools.r8.com.android.aapt.Resources$Style.getEntryList():38252:38252 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
     21:21:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:java.lang.Object invoke(java.lang.Object):157 -> a
     22:22:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167:167 -> a
     22:22:java.lang.Object invoke(java.lang.Object):157 -> a
-    23:23:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.flatMap(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):876:876 -> a
     23:23:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167 -> a
     23:23:java.lang.Object invoke(java.lang.Object):157 -> a
-    24:24:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167:167 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761:2761 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
     24:24:java.lang.Object invoke(java.lang.Object):157 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.flatMap(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):876:876 -> a
-    25:25:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):167 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82:82 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
+    25:25:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
     25:25:java.lang.Object invoke(java.lang.Object):157 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761:2761 -> a
-    26:26:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    26:26:java.lang.Object invoke(java.lang.Object):157 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.asSequence(java.lang.Object[]):24040:24040 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.sequenceOf(java.lang.Object[]):37 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
-    27:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    27:27:java.lang.Object invoke(java.lang.Object):157 -> a
-    28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82:82 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):95:96 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
+    26:27:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    26:27:java.lang.Object invoke(java.lang.Object):157 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence.flatten$kotlin_stdlib(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):219:219 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):96 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
     28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
     28:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
     28:28:java.lang.Object invoke(java.lang.Object):157 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):95:96 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
-    29:30:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
-    29:30:java.lang.Object invoke(java.lang.Object):157 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence.flatten$kotlin_stdlib(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):219:219 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):96 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
-    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):98:98 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    29:29:java.lang.Object invoke(java.lang.Object):157 -> a
+    30:30:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item$Builder.build():21291:21291 -> a
+    30:30:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
+    30:30:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
+    30:30:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    30:30:java.lang.Object invoke(java.lang.Object):157 -> a
+    31:31:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getArray():22934:22934 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
     31:31:java.lang.Object invoke(java.lang.Object):157 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):98:98 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):2761 -> a
-    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    32:32:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$Array.getDefaultInstance():43455:43455 -> a
+    32:32:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getArray():22936 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
     32:32:java.lang.Object invoke(java.lang.Object):157 -> a
-    33:33:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item$Builder.build():21291:21291 -> a
-    33:33:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
-    33:33:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
-    33:33:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):166 -> a
+    33:33:java.util.List com.android.tools.r8.com.android.aapt.Resources$Array.getElementList():42726:42726 -> a
+    33:33:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:java.lang.Object invoke(java.lang.Object):157 -> a
-    34:34:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getArray():22934:22934 -> a
-    34:34:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174:174 -> a
     34:34:java.lang.Object invoke(java.lang.Object):157 -> a
-    35:35:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$Array.getDefaultInstance():43455:43455 -> a
-    35:35:com.android.tools.r8.com.android.aapt.Resources$Array com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getArray():22936 -> a
+    35:35:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
     35:35:java.lang.Object invoke(java.lang.Object):157 -> a
-    36:36:java.util.List com.android.tools.r8.com.android.aapt.Resources$Array.getElementList():42726:42726 -> a
-    36:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    36:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174:174 -> a
     36:36:java.lang.Object invoke(java.lang.Object):157 -> a
-    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174:174 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
     37:37:java.lang.Object invoke(java.lang.Object):157 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
-    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
+    38:38:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getPlural():22965:22965 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
     38:38:java.lang.Object invoke(java.lang.Object):157 -> a
-    39:39:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174:174 -> a
+    39:39:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$Plural.getDefaultInstance():45797:45797 -> a
+    39:39:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getPlural():22967 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
     39:39:java.lang.Object invoke(java.lang.Object):157 -> a
-    40:40:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
-    40:40:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):174 -> a
+    40:40:java.util.List com.android.tools.r8.com.android.aapt.Resources$Plural.getEntryList():45068:45068 -> a
+    40:40:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:java.lang.Object invoke(java.lang.Object):157 -> a
-    41:41:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getPlural():22965:22965 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
+    41:41:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176:176 -> a
     41:41:java.lang.Object invoke(java.lang.Object):157 -> a
-    42:42:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$Plural.getDefaultInstance():45797:45797 -> a
-    42:42:com.android.tools.r8.com.android.aapt.Resources$Plural com.android.tools.r8.com.android.aapt.Resources$CompoundValue.getPlural():22967 -> a
+    42:42:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
     42:42:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
     42:42:java.lang.Object invoke(java.lang.Object):157 -> a
-    43:43:java.util.List com.android.tools.r8.com.android.aapt.Resources$Plural.getEntryList():45068:45068 -> a
-    43:43:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    43:43:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176:176 -> a
     43:43:java.lang.Object invoke(java.lang.Object):157 -> a
-    44:44:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176:176 -> a
+    44:44:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
+    44:44:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
     44:44:java.lang.Object invoke(java.lang.Object):157 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
-    45:45:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
+    45:45:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):177:177 -> a
     45:45:java.lang.Object invoke(java.lang.Object):157 -> a
-    46:46:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176:176 -> a
-    46:46:java.lang.Object invoke(java.lang.Object):157 -> a
-    47:47:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
-    47:47:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):176 -> a
-    47:47:java.lang.Object invoke(java.lang.Object):157 -> a
-    48:48:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Value):177:177 -> a
-    48:48:java.lang.Object invoke(java.lang.Object):157 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$1 -> com.android.tools.r8.internal.M30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$1 -> com.android.tools.r8.internal.Q30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):167:167 -> a
@@ -263536,55 +263176,53 @@
     11:12:java.lang.Object invoke(java.lang.Object):167 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):170:170 -> a
     13:13:java.lang.Object invoke(java.lang.Object):167 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.asSequence(java.lang.Object[]):24040:24040 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.sequenceOf(java.lang.Object[]):37 -> a
-    14:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):168 -> a
+    14:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):168:168 -> a
     14:14:java.lang.Object invoke(java.lang.Object):167 -> a
     15:15:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.com.android.aapt.Resources$Item$Builder.build():21291:21291 -> a
     15:15:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.asItem(com.android.tools.r8.com.android.aapt.Resources$Reference):106 -> a
     15:15:com.android.tools.r8.com.android.aapt.Resources$Item com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion.access$asItem(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$Companion,com.android.tools.r8.com.android.aapt.Resources$Reference):96 -> a
     15:15:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Style$Entry):170 -> a
     15:15:java.lang.Object invoke(java.lang.Object):167 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$2 -> com.android.tools.r8.internal.N30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$2 -> com.android.tools.r8.internal.R30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$2 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):174:174 -> a
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item invoke(com.android.tools.r8.com.android.aapt.Resources$Array$Element):174:174 -> a
     2:2:java.lang.Object invoke(java.lang.Object):174 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$3 -> com.android.tools.r8.internal.O30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$3 -> com.android.tools.r8.internal.S30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$findReferences$2$3 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/O30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):176:176 -> a
     2:2:com.android.tools.r8.com.android.aapt.Resources$Item invoke(com.android.tools.r8.com.android.aapt.Resources$Plural$Entry):176:176 -> a
     2:2:java.lang.Object invoke(java.lang.Object):176 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$1 -> com.android.tools.r8.internal.Q30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$1 -> com.android.tools.r8.internal.U30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/U30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):264:264 -> a
     2:266:java.util.List invoke(java.lang.String):0:264 -> a
     2:266:java.lang.Object invoke(java.lang.Object):264 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$2 -> com.android.tools.r8.internal.R30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$2 -> com.android.tools.r8.internal.V30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$2 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/R30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/V30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):265:265 -> a
     2:267:java.lang.Boolean invoke(java.util.List):0:265 -> a
     2:267:java.lang.Object invoke(java.lang.Object):265 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$3 -> com.android.tools.r8.internal.S30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$3 -> com.android.tools.r8.internal.W30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$3 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/S30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):266:266 -> a
@@ -263597,10 +263235,10 @@
     272:272:java.lang.Object invoke(java.lang.Object):266 -> a
     273:273:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.util.List):267:267 -> a
     273:273:java.lang.Object invoke(java.lang.Object):266 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$4 -> com.android.tools.r8.internal.T30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$4 -> com.android.tools.r8.internal.X30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$4 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/T30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X30;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):272:272 -> a
@@ -263611,12 +263249,12 @@
     3:3:java.lang.Object invoke(java.lang.Object):272 -> a
     4:4:java.lang.Boolean invoke(com.android.tools.r8.jetbrains.kotlin.Pair):272:272 -> a
     4:4:java.lang.Object invoke(java.lang.Object):272 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$5 -> com.android.tools.r8.internal.U30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$maybeAndroidResUrl$5 -> com.android.tools.r8.internal.Y30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b40;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b40;)V"}
     1:1:java.lang.Object invoke(java.lang.Object):273:273 -> a
     2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.jetbrains.kotlin.Pair):0:0 -> a
     2:2:java.lang.Object invoke(java.lang.Object):273 -> a
@@ -263642,20 +263280,20 @@
     10:10:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
     10:10:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.jetbrains.kotlin.Pair):273 -> a
     10:10:java.lang.Object invoke(java.lang.Object):273 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$webTokenizers$2 -> com.android.tools.r8.internal.W30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$webTokenizers$2 -> com.android.tools.r8.internal.a40:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b40;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b40;)V"}
     1:1:com.android.tools.r8.com.android.ide.common.resources.usage.WebTokenizers invoke():110:110 -> a
     1:1:java.lang.Object invoke():109 -> a
-com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$webTokenizers$2$1 -> com.android.tools.r8.internal.V30:
+com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder$webTokenizers$2$1 -> com.android.tools.r8.internal.Z30:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder this$0 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X30;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b40;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder):110:110 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/X30;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b40;)V"}
     1:2:void referencedStringFromWebContent(java.lang.String):143:144 -> a
     3:3:com.android.tools.r8.resourceshrinker.ResourceShrinkerModel com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder.access$getModel$p(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder):90:90 -> a
     3:3:void referencedStringFromWebContent(java.lang.String):144 -> a
@@ -263692,10 +263330,10 @@
     1369:1369:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder.access$getCurrent$p(com.android.tools.r8.resourceshrinker.graph.ReferencesForResourceFinder):90:90 -> b
     1369:1369:void referencedUrl(java.lang.String):134 -> b
     1370:1374:void referencedUrl(java.lang.String):134:138 -> b
-com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree -> com.android.tools.r8.internal.a50:
+com.android.tools.r8.resourceshrinker.graph.ResFolderFileTree -> com.android.tools.r8.internal.e50:
 # {"id":"sourceFile","fileName":"ProtoResourcesGraphBuilder.kt"}
     byte[] getEntryByName(java.lang.String) -> a
-com.android.tools.r8.resourceshrinker.obfuscation.ClassAndMethod -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.resourceshrinker.obfuscation.ClassAndMethod -> com.android.tools.r8.internal.Ub:
 # {"id":"sourceFile","fileName":"ObfuscatedClasses.kt"}
     java.lang.String className -> a
     java.lang.String methodName -> b
@@ -263703,21 +263341,21 @@
     1:1:boolean equals(java.lang.Object):0:0 -> equals
     1:1:int hashCode():0:0 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses -> com.android.tools.r8.internal.zS:
+com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses -> com.android.tools.r8.internal.DS:
 # {"id":"sourceFile","fileName":"ObfuscatedClasses.kt"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap obfuscatedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap obfuscatedMethods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses NO_OBFUSCATION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DS;"}
     1:1:void <clinit>():26:26 -> <clinit>
     2:2:com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder.build():88:88 -> <clinit>
     2:2:void <clinit>():26 -> <clinit>
     3:3:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder):22:22 -> <init>
     1:1:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CS;)V"}
     2:2:java.util.Map com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder.getObfuscatedClasses():55:55 -> <init>
     2:2:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder):29 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -263729,22 +263367,22 @@
     4:4:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
     5:5:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder):30:30 -> <init>
     5:5:void <init>(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):0 -> <init>
-com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder -> com.android.tools.r8.internal.yS:
+com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses$Builder -> com.android.tools.r8.internal.CS:
 # {"id":"sourceFile","fileName":"ObfuscatedClasses.kt"}
     java.util.Map obfuscatedClasses -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     java.util.Map obfuscatedMethods -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     com.android.tools.r8.jetbrains.kotlin.Pair currentClassMapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NV;"}
     1:4:void <init>():53:56 -> <init>
-com.android.tools.r8.resourceshrinker.obfuscation.ProguardMappingsRecorder -> com.android.tools.r8.internal.KY:
+com.android.tools.r8.resourceshrinker.obfuscation.ProguardMappingsRecorder -> com.android.tools.r8.internal.OY:
 # {"id":"sourceFile","fileName":"ProguardMappingsRecorder.kt"}
     java.util.List mappingLines -> a
     1:1:void <init>(java.util.List):29:29 -> <init>
     1:31:com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses extractObfuscatedResourceClasses$resourceshrinker():47:77 -> a
     1:31:void recordObfuscationMappings(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p10;)V"}
     32:32:boolean isMethodMapping(java.lang.String):60:60 -> a
     32:32:com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses extractObfuscatedResourceClasses$resourceshrinker():50 -> a
     32:32:void recordObfuscationMappings(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):35 -> a
@@ -263822,7 +263460,7 @@
     1619:1619:void recordObfuscationMappings(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):35 -> a
     1620:1620:void com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.setObfuscatedClasses(com.android.tools.r8.resourceshrinker.obfuscation.ObfuscatedClasses):78:78 -> a
     1620:1620:void recordObfuscationMappings(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):35 -> a
-com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker -> com.android.tools.r8.internal.oJ:
+com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker -> com.android.tools.r8.internal.sJ:
 # {"id":"sourceFile","fileName":"LegacyResourceShrinker.java"}
     java.util.Map dexInputs -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -263838,34 +263476,34 @@
     1:7:void <init>(java.util.Map,java.util.List,java.util.List,java.util.Map,java.util.List,java.util.List):117:123 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/HashMap;Ljava/util/ArrayList;Ljava/util/List;)V"}
     1:14:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():131:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rJ;"}
     15:20:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():143:148 -> a
     21:34:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():147:160 -> a
     35:40:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():158:163 -> a
     41:70:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():161:190 -> a
     71:75:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult run():189:193 -> a
     76:76:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes lambda$run$0(com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mJ;)Lcom/android/tools/r8/internal/mJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qJ;)Lcom/android/tools/r8/internal/qJ;"}
     77:77:byte[] lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.lang.String):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Ljava/lang/String;)[B"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Ljava/lang/String;)[B"}
     78:78:byte[] com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes.getBytes():307:307 -> a
     78:78:byte[] lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.lang.String):168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     79:79:com.android.tools.r8.com.android.aapt.Resources$ResourceTable lambda$run$3(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):168:168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Lcom/android/tools/r8/internal/n50;)Lcom/android/tools/r8/internal/s70;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Lcom/android/tools/r8/internal/r50;)Lcom/android/tools/r8/internal/w70;"}
     80:83:java.util.List getResourceIdsToRemove(java.util.List):197:200 -> a
     84:84:boolean lambda$getResourceIdsToRemove$5(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):198:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Z"}
     85:129:java.io.Reader getUtfReader(byte[]):213:257 -> a
     130:138:java.io.Reader getUtfReader(byte[]):237:245 -> a
     139:141:java.io.Reader getUtfReader(byte[]):229:231 -> a
     142:186:java.io.Reader getUtfReader(byte[]):221:265 -> a
     1:1:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes lambda$run$1(com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes):163:163 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mJ;)Lcom/android/tools/r8/internal/mJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qJ;)Lcom/android/tools/r8/internal/qJ;"}
     2:2:void lambda$run$4(java.util.List):178:178 -> b
     3:3:java.lang.Integer lambda$getResourceIdsToRemove$6(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):199:199 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Ljava/lang/Integer;"}
-com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder -> com.android.tools.r8.internal.lJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Ljava/lang/Integer;"}
+com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder -> com.android.tools.r8.internal.pJ:
 # {"id":"sourceFile","fileName":"LegacyResourceShrinker.java"}
     java.util.Map dexInputs -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -263883,10 +263521,10 @@
     1:1:void <init>():67:67 -> <init>
     2:7:void <init>():59:64 -> <init>
     1:1:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$Builder addDexInput(java.lang.String,byte[]):86:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[B)Lcom/android/tools/r8/internal/lJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[B)Lcom/android/tools/r8/internal/pJ;"}
     2:3:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker build():101:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oJ;"}
-com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes -> com.android.tools.r8.internal.mJ:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sJ;"}
+com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$PathAndBytes -> com.android.tools.r8.internal.qJ:
 # {"id":"sourceFile","fileName":"LegacyResourceShrinker.java"}
     byte[] bytes -> a
     java.nio.file.Path path -> b
@@ -263895,19 +263533,19 @@
     1:3:void <init>(byte[],java.nio.file.Path):292:294 -> <init>
     1:1:byte[] getBytes():307:307 -> a
     1:2:java.lang.String getPathWithoutRes():302:303 -> b
-com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult -> com.android.tools.r8.internal.nJ:
+com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult -> com.android.tools.r8.internal.rJ:
 # {"id":"sourceFile","fileName":"LegacyResourceShrinker.java"}
     java.util.Set resFolderEntriesToKeep -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.Map resourceTableInProtoFormat -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
     1:3:void <init>(java.util.Set,java.util.Map):274:276 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ev;Ljava/util/AbstractMap;)V"}
-com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState -> com.android.tools.r8.internal.m10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gv;Ljava/util/AbstractMap;)V"}
+com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState -> com.android.tools.r8.internal.q10:
 # {"id":"sourceFile","fileName":"R8ResourceShrinkerState.java"}
     java.util.function.Function errorHandler -> a
     com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel r8ResourceShrinkerModel -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p10;"}
     java.util.Map xmlFileProviders -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.List manifestProviders -> d
@@ -263917,7 +263555,7 @@
     java.util.Map resourceTables -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$ClassReferenceCallback enqueuerCallback -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/o10;"}
     java.util.Map resourceIdToXmlFiles -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     java.util.Set packageNames -> i
@@ -263940,164 +263578,160 @@
     7:7:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResource(int):101:101 -> a
     7:7:void trace(int):81 -> a
     8:8:void trace(int):85:85 -> a
-    9:11:java.util.Map getResourceIdToXmlFiles():254:256 -> a
+    9:11:java.util.Map getResourceIdToXmlFiles():259:261 -> a
     9:11:void traceXmlForResourceId(int):211 -> a
     9:11:void trace(int):86 -> a
     12:12:java.util.List com.android.tools.r8.com.android.aapt.Resources$ResourceTable.getPackageList():3696:3696 -> a
-    12:12:java.util.Map getResourceIdToXmlFiles():257 -> a
+    12:12:java.util.Map getResourceIdToXmlFiles():262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:void traceXmlForResourceId(int):211 -> a
     12:12:void trace(int):86 -> a
-    13:13:java.util.Map getResourceIdToXmlFiles():257:257 -> a
+    13:13:java.util.Map getResourceIdToXmlFiles():262:262 -> a
     13:13:void traceXmlForResourceId(int):211 -> a
     13:13:void trace(int):86 -> a
     14:14:java.util.List com.android.tools.r8.com.android.aapt.Resources$Package.getTypeList():6675:6675 -> a
-    14:14:java.util.Map getResourceIdToXmlFiles():258 -> a
+    14:14:java.util.Map getResourceIdToXmlFiles():263 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void traceXmlForResourceId(int):211 -> a
     14:14:void trace(int):86 -> a
-    15:15:java.util.Map getResourceIdToXmlFiles():258:258 -> a
+    15:15:java.util.Map getResourceIdToXmlFiles():263:263 -> a
     15:15:void traceXmlForResourceId(int):211 -> a
     15:15:void trace(int):86 -> a
     16:16:java.util.List com.android.tools.r8.com.android.aapt.Resources$Type.getEntryList():8592:8592 -> a
-    16:16:java.util.Map getResourceIdToXmlFiles():259 -> a
+    16:16:java.util.Map getResourceIdToXmlFiles():264 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:void traceXmlForResourceId(int):211 -> a
     16:16:void trace(int):86 -> a
-    17:17:java.util.Map getResourceIdToXmlFiles():259:259 -> a
+    17:17:java.util.Map getResourceIdToXmlFiles():264:264 -> a
     17:17:void traceXmlForResourceId(int):211 -> a
     17:17:void trace(int):86 -> a
     18:18:java.util.List com.android.tools.r8.com.android.aapt.Resources$Entry.getConfigValueList():16182:16182 -> a
-    18:18:java.util.Map getResourceIdToXmlFiles():260 -> a
+    18:18:java.util.Map getResourceIdToXmlFiles():265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:void traceXmlForResourceId(int):211 -> a
     18:18:void trace(int):86 -> a
-    19:21:java.util.Map getResourceIdToXmlFiles():260:262 -> a
+    19:21:java.util.Map getResourceIdToXmlFiles():265:267 -> a
     19:21:void traceXmlForResourceId(int):211 -> a
     19:21:void trace(int):86 -> a
     22:22:boolean com.android.tools.r8.com.android.aapt.Resources$Value.hasItem():19288:19288 -> a
-    22:22:java.util.Map getResourceIdToXmlFiles():263 -> a
+    22:22:java.util.Map getResourceIdToXmlFiles():268 -> a
     22:22:void traceXmlForResourceId(int):211 -> a
     22:22:void trace(int):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    23:23:java.util.Map getResourceIdToXmlFiles():264:264 -> a
+    23:23:java.util.Map getResourceIdToXmlFiles():269:269 -> a
     23:23:void traceXmlForResourceId(int):211 -> a
     23:23:void trace(int):86 -> a
     24:24:boolean com.android.tools.r8.com.android.aapt.Resources$Item.hasFile():20883:20883 -> a
-    24:24:java.util.Map getResourceIdToXmlFiles():265 -> a
+    24:24:java.util.Map getResourceIdToXmlFiles():270 -> a
     24:24:void traceXmlForResourceId(int):211 -> a
     24:24:void trace(int):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    25:25:java.util.Map getResourceIdToXmlFiles():266:266 -> a
+    25:25:java.util.Map getResourceIdToXmlFiles():271:271 -> a
     25:25:void traceXmlForResourceId(int):211 -> a
     25:25:void trace(int):86 -> a
     26:26:com.android.tools.r8.com.android.aapt.Resources$FileReference$Type com.android.tools.r8.com.android.aapt.Resources$FileReference.getType():30067:30067 -> a
-    26:26:java.util.Map getResourceIdToXmlFiles():267 -> a
+    26:26:java.util.Map getResourceIdToXmlFiles():272 -> a
     26:26:void traceXmlForResourceId(int):211 -> a
     26:26:void trace(int):86 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     27:27:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109:109 -> a
-    27:27:java.util.Map getResourceIdToXmlFiles():268 -> a
+    27:27:java.util.Map getResourceIdToXmlFiles():273 -> a
     27:27:void traceXmlForResourceId(int):211 -> a
     27:27:void trace(int):86 -> a
     28:28:int com.android.tools.r8.com.android.aapt.Resources$PackageId.getId():5942:5942 -> a
     28:28:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:java.util.Map getResourceIdToXmlFiles():268 -> a
+    28:28:java.util.Map getResourceIdToXmlFiles():273 -> a
     28:28:void traceXmlForResourceId(int):211 -> a
     28:28:void trace(int):86 -> a
     29:29:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109:109 -> a
-    29:29:java.util.Map getResourceIdToXmlFiles():268 -> a
+    29:29:java.util.Map getResourceIdToXmlFiles():273 -> a
     29:29:void traceXmlForResourceId(int):211 -> a
     29:29:void trace(int):86 -> a
     30:30:int com.android.tools.r8.com.android.aapt.Resources$TypeId.getId():7890:7890 -> a
     30:30:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:java.util.Map getResourceIdToXmlFiles():268 -> a
+    30:30:java.util.Map getResourceIdToXmlFiles():273 -> a
     30:30:void traceXmlForResourceId(int):211 -> a
     30:30:void trace(int):86 -> a
     31:31:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109:109 -> a
-    31:31:java.util.Map getResourceIdToXmlFiles():268 -> a
+    31:31:java.util.Map getResourceIdToXmlFiles():273 -> a
     31:31:void traceXmlForResourceId(int):211 -> a
     31:31:void trace(int):86 -> a
     32:32:int com.android.tools.r8.com.android.aapt.Resources$EntryId.getId():15175:15175 -> a
     32:32:int com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.toIdentifier(com.android.tools.r8.com.android.aapt.Resources$Package,com.android.tools.r8.com.android.aapt.Resources$Type,com.android.tools.r8.com.android.aapt.Resources$Entry):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:java.util.Map getResourceIdToXmlFiles():268 -> a
+    32:32:java.util.Map getResourceIdToXmlFiles():273 -> a
     32:32:void traceXmlForResourceId(int):211 -> a
     32:32:void trace(int):86 -> a
-    33:44:java.util.Map getResourceIdToXmlFiles():269:280 -> a
+    33:44:java.util.Map getResourceIdToXmlFiles():274:285 -> a
     33:44:void traceXmlForResourceId(int):211 -> a
     33:44:void trace(int):86 -> a
-    45:47:void traceXmlForResourceId(int):211:213 -> a
-    45:47:void trace(int):86 -> a
-    48:49:com.android.tools.r8.com.android.aapt.Resources$XmlNode com.android.tools.r8.com.android.aapt.Resources$XmlNode.parseFrom(java.io.InputStream):46311:46312 -> a
-    48:49:void traceXml(java.lang.String,java.io.InputStream):220 -> a
-    48:49:void traceXmlForResourceId(int):214 -> a
-    48:49:void trace(int):86 -> a
-    50:52:void traceXml(java.lang.String,java.io.InputStream):221:223 -> a
-    50:52:void traceXmlForResourceId(int):214 -> a
-    50:52:void trace(int):86 -> a
-    53:56:void trace(int):87:90 -> a
-    57:70:byte[] getXmlOrResFileBytes(java.lang.String):157:170 -> a
-    71:71:com.android.tools.r8.com.android.aapt.Resources$ResourceTable lambda$setupReferences$1(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Lcom/android/tools/r8/internal/n50;)Lcom/android/tools/r8/internal/s70;"}
-    72:72:void lambda$shrinkModel$2(java.util.Map,java.util.List,com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.FeatureSplit):194:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/s70;Lcom/android/tools/r8/FeatureSplit;)V"}
-    73:73:void lambda$shrinkModel$2(java.util.Map,java.util.List,com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.FeatureSplit):192:192 -> a
-    74:78:void tryEnqueuerOnString(java.lang.String,java.lang.String):231:235 -> a
-    79:79:void lambda$visitNode$3(java.lang.String,java.lang.String,java.lang.String):247:247 -> a
-    80:80:void lambda$visitNode$4(java.lang.String,com.android.tools.r8.com.android.aapt.Resources$XmlNode):250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/K80;)V"}
-    81:81:java.util.List getResourcesToRemove():284:284 -> a
-    82:82:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> a
-    82:82:java.util.List getResourcesToRemove():284 -> a
+    45:48:void traceXmlForResourceId(int):211:214 -> a
+    45:48:void trace(int):86 -> a
+    49:52:void trace(int):87:90 -> a
+    53:66:byte[] getXmlOrResFileBytes(java.lang.String):157:170 -> a
+    67:67:com.android.tools.r8.com.android.aapt.Resources$ResourceTable lambda$setupReferences$1(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):176:176 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Lcom/android/tools/r8/internal/r50;)Lcom/android/tools/r8/internal/w70;"}
+    68:68:void lambda$shrinkModel$2(java.util.Map,java.util.List,com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.FeatureSplit):194:194 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/List;Lcom/android/tools/r8/internal/w70;Lcom/android/tools/r8/FeatureSplit;)V"}
+    69:69:void lambda$shrinkModel$2(java.util.Map,java.util.List,com.android.tools.r8.com.android.aapt.Resources$ResourceTable,com.android.tools.r8.FeatureSplit):192:192 -> a
+    70:74:void tryEnqueuerOnString(java.lang.String,java.lang.String):236:240 -> a
+    75:75:void lambda$visitNode$4(java.lang.String,java.lang.String,java.lang.String):252:252 -> a
+    76:76:void lambda$visitNode$5(java.lang.String,com.android.tools.r8.com.android.aapt.Resources$XmlNode):255:255 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/O80;)V"}
+    77:77:java.util.List getResourcesToRemove():289:289 -> a
+    78:78:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> a
+    78:78:java.util.List getResourcesToRemove():289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    83:83:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
-    83:83:java.util.List getResourcesToRemove():284 -> a
+    79:79:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
+    79:79:java.util.List getResourcesToRemove():289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    84:84:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
-    84:84:java.util.List getResourcesToRemove():284 -> a
-    85:89:java.util.List getResourcesToRemove():284:288 -> a
-    90:90:boolean lambda$getResourcesToRemove$5(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):285:285 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Z"}
-    91:91:boolean com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource.isPublic():383:383 -> a
-    91:91:boolean lambda$getResourcesToRemove$5(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):285 -> a
+    80:80:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
+    80:80:java.util.List getResourcesToRemove():289 -> a
+    81:85:java.util.List getResourcesToRemove():289:293 -> a
+    86:86:boolean lambda$getResourcesToRemove$6(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):290:290 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Z"}
+    87:87:boolean com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource.isPublic():383:383 -> a
+    87:87:boolean lambda$getResourcesToRemove$6(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):290 -> a
+    88:89:com.android.tools.r8.com.android.aapt.Resources$XmlNode com.android.tools.r8.com.android.aapt.Resources$XmlNode.parseFrom(java.io.InputStream):46311:46312 -> a
+    88:89:void traceXml(java.lang.String,java.io.InputStream):220 -> a
+    90:97:void traceXml(java.lang.String,java.io.InputStream):221:228 -> a
     1:3:void setupReferences():175:177 -> b
-    4:5:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):240:241 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/K80;)V"}
+    4:5:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):245:246 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/O80;)V"}
     6:6:java.util.List com.android.tools.r8.com.android.aapt.Resources$XmlElement.getAttributeList():47489:47489 -> b
-    6:6:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):242 -> b
-    7:12:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):242:247 -> b
+    6:6:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247 -> b
+    7:12:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247:252 -> b
     13:15:java.util.Set getPackageNames():124:126 -> b
-    13:15:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247 -> b
+    13:15:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):252 -> b
     16:16:java.util.List com.android.tools.r8.com.android.aapt.Resources$ResourceTable.getPackageList():3696:3696 -> b
     16:16:java.util.Set getPackageNames():127 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247 -> b
+    16:16:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):252 -> b
     17:22:java.util.Set getPackageNames():127:132 -> b
-    17:22:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247 -> b
-    23:23:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):247:247 -> b
+    17:22:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):252 -> b
+    23:23:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):252:252 -> b
     24:24:java.util.List com.android.tools.r8.com.android.aapt.Resources$XmlElement.getChildList():47549:47549 -> b
-    24:24:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):250 -> b
-    25:25:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):250:250 -> b
-    26:26:boolean lambda$getResourcesToRemove$6(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):286:286 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Z"}
-    1:1:java.lang.Integer lambda$getResourcesToRemove$7(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):287:287 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)Ljava/lang/Integer;"}
-    2:4:void updateModelWithManifestReferences():294:296 -> c
+    24:24:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):255 -> b
+    25:25:void visitNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,java.lang.String):255:255 -> b
+    26:26:boolean lambda$getResourcesToRemove$7(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):291:291 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Z"}
+    1:1:java.lang.Integer lambda$getResourcesToRemove$8(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):292:292 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)Ljava/lang/Integer;"}
+    2:4:void updateModelWithManifestReferences():299:301 -> c
     2:4:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():182 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/nJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rJ;"}
     5:6:com.android.tools.r8.com.android.aapt.Resources$XmlNode com.android.tools.r8.com.android.aapt.Resources$XmlNode.parseFrom(java.io.InputStream):46311:46312 -> c
-    5:6:void updateModelWithManifestReferences():296 -> c
+    5:6:void updateModelWithManifestReferences():301 -> c
     5:6:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():182 -> c
-    7:7:void updateModelWithManifestReferences():296:296 -> c
+    7:7:void updateModelWithManifestReferences():301:301 -> c
     7:7:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():182 -> c
-    8:8:void updateModelWithManifestReferences():295:295 -> c
+    8:8:void updateModelWithManifestReferences():300:300 -> c
     8:8:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():182 -> c
-    9:12:void updateModelWithKeepXmlReferences():301:304 -> c
+    9:12:void updateModelWithKeepXmlReferences():306:309 -> c
     9:12:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():183 -> c
-    13:13:void updateModelWithKeepXmlReferences():303:303 -> c
+    13:13:void updateModelWithKeepXmlReferences():308:308 -> c
     13:13:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():183 -> c
     14:14:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():184:184 -> c
     15:15:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> c
@@ -264124,110 +263758,107 @@
     26:29:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():186 -> c
     30:40:com.android.tools.r8.resourceshrinker.r8integration.LegacyResourceShrinker$ShrinkerResult shrinkModel():187:197 -> c
     1:1:void lambda$traceKeepXmlAndManifest$0(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):110:110 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C50;)V"}
-    2:5:void updateModelWithKeepXmlReferences():301:304 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)V"}
+    2:5:void updateModelWithKeepXmlReferences():306:309 -> d
     2:5:void traceKeepXmlAndManifest():102 -> d
-    6:6:void updateModelWithKeepXmlReferences():303:303 -> d
+    6:6:void updateModelWithKeepXmlReferences():308:308 -> d
     6:6:void traceKeepXmlAndManifest():102 -> d
     7:7:void traceKeepXmlAndManifest():107:107 -> d
     8:8:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> d
     8:8:void traceKeepXmlAndManifest():108 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:12:void traceKeepXmlAndManifest():109:112 -> d
-    13:14:com.android.tools.r8.com.android.aapt.Resources$XmlNode com.android.tools.r8.com.android.aapt.Resources$XmlNode.parseFrom(java.io.InputStream):46311:46312 -> d
-    13:14:void traceXml(java.lang.String,java.io.InputStream):220 -> d
-    13:14:void traceKeepXmlAndManifest():112 -> d
-    15:17:void traceXml(java.lang.String,java.io.InputStream):221:223 -> d
-    15:17:void traceKeepXmlAndManifest():112 -> d
-    18:18:void traceKeepXmlAndManifest():104:104 -> d
-com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$ClassReferenceCallback -> com.android.tools.r8.internal.k10:
+    13:13:void traceKeepXmlAndManifest():104:104 -> d
+    1:1:void lambda$traceXml$3(com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource):226:226 -> e
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G50;)V"}
+com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$ClassReferenceCallback -> com.android.tools.r8.internal.o10:
 # {"id":"sourceFile","fileName":"R8ResourceShrinkerState.java"}
     boolean tryClass(java.lang.String,com.android.tools.r8.origin.Origin) -> a
-com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel -> com.android.tools.r8.internal.l10:
+com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel -> com.android.tools.r8.internal.p10:
 # {"id":"sourceFile","fileName":"R8ResourceShrinkerState.java"}
     java.util.Map stringResourcesWithSingleValue -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
-    1:1:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):330:330 -> <init>
+    1:1:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):335:335 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    2:2:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):326:326 -> <init>
+    2:2:void <init>(com.android.tools.r8.resourceshrinker.ShrinkerDebugReporter,boolean):331:331 -> <init>
     1:1:java.lang.String com.android.tools.r8.resourceshrinker.EntryWrapper.getType():100:100 -> a
-    1:1:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):353 -> a
+    1:1:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):358 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/un;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/wn;)V"}
     2:2:com.android.tools.r8.com.android.resources.ResourceType com.android.tools.r8.com.android.resources.ResourceType.fromClassName(java.lang.String):201:201 -> a
-    2:2:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):353 -> a
+    2:2:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):358 -> a
     3:3:com.android.tools.r8.com.android.aapt.Resources$Entry com.android.tools.r8.resourceshrinker.EntryWrapper.getEntry():101:101 -> a
-    3:3:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):354 -> a
+    3:3:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):359 -> a
     4:4:int com.android.tools.r8.resourceshrinker.EntryWrapper.getId():98:98 -> a
-    4:4:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):355 -> a
-    5:5:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):368:368 -> a
-    5:5:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    4:4:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):360 -> a
+    5:5:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):373:373 -> a
+    5:5:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     6:6:java.util.List com.android.tools.r8.com.android.aapt.Resources$Entry.getConfigValueList():16182:16182 -> a
-    6:6:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):368 -> a
-    6:6:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
-    7:8:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):368:369 -> a
-    7:8:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    6:6:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):373 -> a
+    6:6:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
+    7:8:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):373:374 -> a
+    7:8:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     9:9:com.android.tools.r8.com.android.aapt.Resources$ConfigValue com.android.tools.r8.com.android.aapt.Resources$Entry.getConfigValue(int):16219:16219 -> a
-    9:9:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):370 -> a
-    9:9:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
-    10:11:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):371:372 -> a
-    10:11:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    9:9:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):375 -> a
+    9:9:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
+    10:11:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376:377 -> a
+    10:11:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     12:12:boolean com.android.tools.r8.com.android.aapt.Resources$Value.hasItem():19288:19288 -> a
-    12:12:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):373 -> a
-    12:12:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    12:12:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):378 -> a
+    12:12:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):374:374 -> a
-    13:13:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    13:13:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):379:379 -> a
+    13:13:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     14:14:boolean com.android.tools.r8.com.android.aapt.Resources$Item.hasStr():20790:20790 -> a
-    14:14:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):375 -> a
+    14:14:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):380 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
-    15:15:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376:376 -> a
-    15:15:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    14:14:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
+    15:15:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381:381 -> a
+    15:15:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     16:17:com.android.tools.r8.com.android.aapt.Resources$String com.android.tools.r8.com.android.aapt.Resources$Item.getStr():20798:20799 -> a
-    16:17:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376 -> a
-    16:17:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    16:17:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381 -> a
+    16:17:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     18:18:com.android.tools.r8.com.android.aapt.Resources$String com.android.tools.r8.com.android.aapt.Resources$String.getDefaultInstance():27332:27332 -> a
     18:18:com.android.tools.r8.com.android.aapt.Resources$String com.android.tools.r8.com.android.aapt.Resources$Item.getStr():20801 -> a
-    18:18:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376 -> a
-    18:18:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    18:18:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381 -> a
+    18:18:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
     19:19:java.lang.String com.android.tools.r8.com.android.aapt.Resources$String.getValue():26898:26898 -> a
-    19:19:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376 -> a
-    19:19:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
+    19:19:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381 -> a
+    19:19:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     20:26:java.lang.String com.android.tools.r8.com.android.aapt.Resources$String.getValue():26899:26905 -> a
-    20:26:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376 -> a
-    20:26:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
-    27:27:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):376:376 -> a
-    27:27:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):356 -> a
-    28:28:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):357:357 -> a
+    20:26:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381 -> a
+    20:26:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
+    27:27:void recordSingleValueResources(com.android.tools.r8.com.android.resources.ResourceType,com.android.tools.r8.com.android.aapt.Resources$Entry,int):381:381 -> a
+    27:27:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361 -> a
+    28:28:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):362:362 -> a
     29:29:java.lang.String com.android.tools.r8.resourceshrinker.EntryWrapper.getPackageName():99:99 -> a
-    29:29:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):360 -> a
-    30:30:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):361:361 -> a
+    29:29:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):365 -> a
+    30:30:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):366:366 -> a
     31:31:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceUsageModel$Resource com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.addResource(com.android.tools.r8.com.android.resources.ResourceType,java.lang.String,java.lang.String,int):104:104 -> a
-    31:31:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):358 -> a
-    32:32:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):349:349 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s70;Z)V"}
+    31:31:void lambda$instantiateFromResourceTable$0(boolean,com.android.tools.r8.resourceshrinker.EntryWrapper):363 -> a
+    32:32:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):354:354 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w70;Z)V"}
     33:33:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.resourceshrinker.ResourceTableUtilKt.entriesSequence(com.android.tools.r8.com.android.aapt.Resources$ResourceTable):21:21 -> a
-    33:33:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):349 -> a
+    33:33:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):354 -> a
     34:34:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):37:37 -> a
-    34:34:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():699 -> a
-    34:34:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):350 -> a
+    34:34:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():23 -> a
+    34:34:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):355 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation com.android.tools.r8.jetbrains.kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt.createCoroutineUnintercepted(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):163:163 -> a
     35:35:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):38 -> a
-    35:35:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():699 -> a
-    35:35:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):350 -> a
+    35:35:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():23 -> a
+    35:35:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):355 -> a
     36:36:void com.android.tools.r8.jetbrains.kotlin.sequences.SequenceBuilderIterator.setNextStep(com.android.tools.r8.jetbrains.kotlin.coroutines.Continuation):108:108 -> a
     36:36:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt.iterator(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2):38 -> a
-    36:36:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():699 -> a
-    36:36:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):350 -> a
-    37:38:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):350:351 -> a
+    36:36:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1.iterator():23 -> a
+    36:36:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):355 -> a
+    37:38:void instantiateFromResourceTable(com.android.tools.r8.com.android.aapt.Resources$ResourceTable,boolean):355:356 -> a
 com.android.tools.r8.resourceshrinker.usages.AnalysisAdapter -> com.android.tools.r8.internal.m2:
 # {"id":"sourceFile","fileName":"r8ResourceShrinker.kt"}
     com.android.tools.r8.resourceshrinker.usages.AnalysisCallback impl -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ml;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.usages.AnalysisCallback):39:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml;)V"}
     1:1:void endMethodVisit(com.android.tools.r8.references.MethodReference):57:57 -> endMethodVisit
     2:2:void com.android.tools.r8.resourceshrinker.usages.DexFileAnalysisCallback.endMethodVisit(com.android.tools.r8.references.MethodReference):181:181 -> endMethodVisit
     2:2:void endMethodVisit(com.android.tools.r8.references.MethodReference):57 -> endMethodVisit
@@ -264486,15 +264117,15 @@
     3:4:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsKt.setOf(java.lang.Object[]):44 -> <clinit>
     3:4:void <clinit>():24 -> <clinit>
     5:5:void <clinit>():24:24 -> <clinit>
-com.android.tools.r8.resourceshrinker.usages.DexFileAnalysisCallback -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.resourceshrinker.usages.DexFileAnalysisCallback -> com.android.tools.r8.internal.Ml:
 # {"id":"sourceFile","fileName":"DexUsageRecorder.kt"}
     com.android.tools.r8.resourceshrinker.ResourceShrinkerModel model -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p10;"}
     boolean isRClass -> b
     com.android.tools.r8.resourceshrinker.usages.MethodVisitingStatus visitingMethod -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DO;"}
     1:20:void <init>(java.nio.file.Path,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):59:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/l10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/p10;)V"}
     1:2:boolean shouldIgnoreField():186:187 -> a
     3:3:boolean com.android.tools.r8.resourceshrinker.usages.MethodVisitingStatus.isVisiting():77:77 -> a
     3:3:boolean shouldIgnoreField():187 -> a
@@ -264506,116 +264137,140 @@
     8:8:boolean com.android.tools.r8.resourceshrinker.usages.MethodVisitingStatus.isVisiting():77:77 -> a
     8:8:boolean shouldIgnoreField():190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.resourceshrinker.usages.DexFileAnalysisCallback$Companion -> R8$$REMOVED$$CLASS$$227:
+com.android.tools.r8.resourceshrinker.usages.DexFileAnalysisCallback$Companion -> R8$$REMOVED$$CLASS$$216:
 # {"id":"sourceFile","fileName":"DexUsageRecorder.kt"}
-com.android.tools.r8.resourceshrinker.usages.MethodVisitingStatus -> com.android.tools.r8.internal.zO:
+com.android.tools.r8.resourceshrinker.usages.MethodVisitingStatus -> com.android.tools.r8.internal.DO:
 # {"id":"sourceFile","fileName":"r8ResourceShrinker.kt"}
     boolean isVisiting -> a
     java.lang.String methodName -> b
     1:1:void <init>(boolean,java.lang.String):77:77 -> <init>
     1:1:void <init>(boolean,java.lang.String,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):77 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt -> com.android.tools.r8.internal.SY:
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt -> com.android.tools.r8.internal.WY:
 # {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
     1:1:boolean com.android.tools.r8.com.android.aapt.Resources$XmlNode.hasElement():46055:46055 -> a
-    1:1:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K80;Lcom/android/tools/r8/internal/n50;)V"}
-    2:2:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):44:44 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):42 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O80;Lcom/android/tools/r8/internal/r50;)Lcom/android/tools/r8/internal/Da0;"}
+    2:2:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45:45 -> a
     3:3:java.util.List com.android.tools.r8.com.android.aapt.Resources$XmlElement.getAttributeList():47489:47489 -> a
-    3:3:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):44 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):44:44 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45:45 -> a
     5:5:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
-    5:5:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):44 -> a
-    6:6:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45:45 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):46:46 -> a
     7:7:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filter(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):435:435 -> a
-    7:7:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):45 -> a
-    8:8:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):46:46 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):46 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):47:47 -> a
     9:9:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
-    9:9:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):46 -> a
-    10:10:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):47:47 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):47 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):48:48 -> a
     11:11:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.filter(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):435:435 -> a
-    11:11:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):47 -> a
-    12:12:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):48:48 -> a
+    11:11:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):48 -> a
+    12:12:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):49:49 -> a
     13:13:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.map(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1074:1074 -> a
-    13:13:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):48 -> a
-    14:14:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):49:49 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):49 -> a
+    14:14:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):50:50 -> a
     15:15:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.flatMap(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):876:876 -> a
-    15:15:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):49 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):50 -> a
     16:16:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.sequences.FlatteningSequence.iterator():298:298 -> a
-    16:16:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):60 -> a
-    17:17:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):60:60 -> a
-    18:19:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):56:57 -> a
+    16:16:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):61 -> a
+    17:17:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):61:61 -> a
+    18:19:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):57:58 -> a
     20:20:java.util.List com.android.tools.r8.com.android.aapt.Resources$XmlElement.getChildList():47549:47549 -> a
-    20:20:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):57 -> a
+    20:20:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:26:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):57:62 -> a
-    27:27:void recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):57:57 -> a
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$1 -> com.android.tools.r8.internal.NY:
+    21:28:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58:65 -> a
+    29:29:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58:58 -> a
+    30:31:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):129:130 -> a
+    30:31:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):66 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.asSequence(java.lang.Iterable):3527:3527 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    33:33:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749:2749 -> a
+    33:33:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82:82 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749 -> a
+    34:34:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    35:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):95:96 -> a
+    35:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
+    35:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749 -> a
+    35:36:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence.flatten$kotlin_stdlib(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):219:219 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):96 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749 -> a
+    37:37:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten$SequencesKt__SequencesKt(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):98:98 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt__SequencesKt.flatten(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence):82 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence com.android.tools.r8.jetbrains.kotlin.sequences.SequencesKt___SequencesKt.plus(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,java.lang.Iterable):2749 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):58 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence recordUsagesFromNode(com.android.tools.r8.com.android.aapt.Resources$XmlNode,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):43:43 -> a
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$1 -> com.android.tools.r8.internal.RY:
 # {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
-    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$1 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NY;"}
-    1:1:void <clinit>():0:0 -> <clinit>
-    1:1:void <init>():0:0 -> <init>
-    1:1:java.lang.Object invoke(java.lang.Object):45:45 -> a
-    2:2:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):45:45 -> a
-    2:2:java.lang.Object invoke(java.lang.Object):45 -> a
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$2 -> com.android.tools.r8.internal.OY:
-# {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
-    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$2 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/OY;"}
+    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$1 INSTANCE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RY;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):46:46 -> a
-    2:2:com.android.tools.r8.com.android.aapt.Resources$Item invoke(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):46:46 -> a
+    2:2:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):46:46 -> a
     2:2:java.lang.Object invoke(java.lang.Object):46 -> a
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$3 -> com.android.tools.r8.internal.PY:
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$2 -> com.android.tools.r8.internal.SY:
 # {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
-    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$3 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PY;"}
+    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$2 INSTANCE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/SY;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):47:47 -> a
-    2:2:boolean com.android.tools.r8.com.android.aapt.Resources$Item.hasRef():20759:20759 -> a
-    2:2:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$Item):47 -> a
+    2:2:com.android.tools.r8.com.android.aapt.Resources$Item invoke(com.android.tools.r8.com.android.aapt.Resources$XmlAttribute):47:47 -> a
     2:2:java.lang.Object invoke(java.lang.Object):47 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$Item):47:47 -> a
-    3:3:java.lang.Object invoke(java.lang.Object):47 -> a
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$4 -> com.android.tools.r8.internal.QY:
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$3 -> com.android.tools.r8.internal.TY:
 # {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
-    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$4 INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QY;"}
+    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$3 INSTANCE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TY;"}
     1:1:void <clinit>():0:0 -> <clinit>
     1:1:void <init>():0:0 -> <init>
     1:1:java.lang.Object invoke(java.lang.Object):48:48 -> a
-    2:2:com.android.tools.r8.com.android.aapt.Resources$Reference invoke(com.android.tools.r8.com.android.aapt.Resources$Item):48:48 -> a
+    2:2:boolean com.android.tools.r8.com.android.aapt.Resources$Item.hasRef():20759:20759 -> a
+    2:2:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$Item):48 -> a
     2:2:java.lang.Object invoke(java.lang.Object):48 -> a
-com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$5 -> com.android.tools.r8.internal.RY:
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    3:3:java.lang.Boolean invoke(com.android.tools.r8.com.android.aapt.Resources$Item):48:48 -> a
+    3:3:java.lang.Object invoke(java.lang.Object):48 -> a
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$4 -> com.android.tools.r8.internal.UY:
+# {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
+    com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$4 INSTANCE -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UY;"}
+    1:1:void <clinit>():0:0 -> <clinit>
+    1:1:void <init>():0:0 -> <init>
+    1:1:java.lang.Object invoke(java.lang.Object):49:49 -> a
+    2:2:com.android.tools.r8.com.android.aapt.Resources$Reference invoke(com.android.tools.r8.com.android.aapt.Resources$Item):49:49 -> a
+    2:2:java.lang.Object invoke(java.lang.Object):49 -> a
+com.android.tools.r8.resourceshrinker.usages.ProtoAndroidManifestUsageRecorderKt$recordUsagesFromNode$reachableResources$5 -> com.android.tools.r8.internal.VY:
 # {"id":"sourceFile","fileName":"ProtoAndroidManifestUsageRecorder.kt"}
     com.android.tools.r8.resourceshrinker.ResourceShrinkerModel $model -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r50;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n50;)V"}
-    1:1:java.lang.Object invoke(java.lang.Object):49:49 -> a
-    2:4:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Reference):52:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p70;)Lcom/android/tools/r8/internal/re;"}
-com.android.tools.r8.resourceshrinker.usages.R8ResourceShrinker -> com.android.tools.r8.internal.j10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r50;)V"}
+    1:1:java.lang.Object invoke(java.lang.Object):50:50 -> a
+    2:4:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence invoke(com.android.tools.r8.com.android.aapt.Resources$Reference):53:55 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/t70;)Lcom/android/tools/r8/internal/te;"}
+com.android.tools.r8.resourceshrinker.usages.R8ResourceShrinker -> com.android.tools.r8.internal.n10:
 # {"id":"sourceFile","fileName":"r8ResourceShrinker.kt"}
     1:5:void runResourceShrinkerAnalysis(byte[],java.nio.file.Path,com.android.tools.r8.resourceshrinker.usages.AnalysisCallback):31:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLjava/nio/file/Path;Lcom/android/tools/r8/internal/Kl;)V"}
-com.android.tools.r8.resourceshrinker.usages.R8ResourceShrinker$runResourceShrinkerAnalysis$provider$1 -> com.android.tools.r8.internal.i10:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLjava/nio/file/Path;Lcom/android/tools/r8/internal/Ml;)V"}
+com.android.tools.r8.resourceshrinker.usages.R8ResourceShrinker$runResourceShrinkerAnalysis$provider$1 -> com.android.tools.r8.internal.m10:
 # {"id":"sourceFile","fileName":"r8ResourceShrinker.kt"}
     com.android.tools.r8.ProgramResource $resource -> a
     1:1:void <init>(com.android.tools.r8.ProgramResource):0:0 -> <init>
     1:1:java.util.Collection getProgramResources():32:32 -> getProgramResources
     2:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):22:22 -> getProgramResources
     2:2:java.util.Collection getProgramResources():32 -> getProgramResources
-com.android.tools.r8.resourceshrinker.usages.ToolsAttributeUsageRecorderKt -> com.android.tools.r8.internal.nh0:
+com.android.tools.r8.resourceshrinker.usages.ToolsAttributeUsageRecorderKt -> com.android.tools.r8.internal.rh0:
 # {"id":"sourceFile","fileName":"ToolsAttributeUsageRecorder.kt"}
     1:16:com.android.tools.r8.com.google.common.collect.ImmutableMap processResourceToolsAttributes(java.io.Reader):68:83 -> a
     1:16:void processRawXml(java.io.Reader,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/Reader;Lcom/android/tools/r8/internal/n50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/io/Reader;Lcom/android/tools/r8/internal/r50;)V"}
     17:17:com.android.tools.r8.com.google.common.collect.ImmutableMap processResourceToolsAttributes(java.io.Reader):81:81 -> a
     17:17:void processRawXml(java.io.Reader,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):55 -> a
     18:41:com.android.tools.r8.com.google.common.collect.ImmutableMap processResourceToolsAttributes(java.io.Reader):69:92 -> a
@@ -264623,12 +264278,12 @@
     42:42:void processRawXml(java.io.Reader,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):55:55 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMap processResourceToolsAttributes(java.io.Reader):69:69 -> a
     43:43:void processRawXml(java.io.Reader,com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):55 -> a
-com.android.tools.r8.resourceshrinker.usages.ToolsAttributeUsageRecorderKt$processRawXml$1 -> com.android.tools.r8.internal.mh0:
+com.android.tools.r8.resourceshrinker.usages.ToolsAttributeUsageRecorderKt$processRawXml$1 -> com.android.tools.r8.internal.qh0:
 # {"id":"sourceFile","fileName":"ToolsAttributeUsageRecorder.kt"}
     com.android.tools.r8.resourceshrinker.ResourceShrinkerModel $model -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n50;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/r50;"}
     1:1:void <init>(com.android.tools.r8.resourceshrinker.ResourceShrinkerModel):0:0 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n50;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/r50;)V"}
     1:1:void accept(java.lang.Object,java.lang.Object):55:55 -> accept
     2:4:void accept(java.lang.String,java.lang.String):56:58 -> accept
     2:4:void accept(java.lang.Object,java.lang.Object):55 -> accept
@@ -264865,24 +264520,24 @@
     1:1:com.android.tools.r8.retrace.MappingPartitionFromKeySupplier getMappingPartitionFromKeySupplier():81:81 -> getMappingPartitionFromKeySupplier
     1:1:com.android.tools.r8.retrace.PartitionMappingSupplier$NoMetadataBuilder noMetadataBuilder(com.android.tools.r8.naming.MapVersion):99:99 -> noMetadataBuilder
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):15:15 -> registerClassUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):15:15 -> registerClassUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplier registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):48:48 -> registerClassUse
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):15:15 -> registerFieldUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/FieldReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/FieldReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):15:15 -> registerFieldUse
     3:3:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase.registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):124:124 -> registerFieldUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplier registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):72 -> registerFieldUse
     4:4:com.android.tools.r8.retrace.PartitionMappingSupplier registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):72:72 -> registerFieldUse
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):15:15 -> registerMethodUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):15:15 -> registerMethodUse
     3:3:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase.registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):120:120 -> registerMethodUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplier registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):60 -> registerMethodUse
     4:4:com.android.tools.r8.retrace.PartitionMappingSupplier registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):60:60 -> registerMethodUse
     1:1:com.android.tools.r8.retrace.PartitionMappingSupplier self():0:0 -> self
     2:2:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase self():15:15 -> self
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kW;"}
 com.android.tools.r8.retrace.PartitionMappingSupplier$Builder -> com.android.tools.r8.retrace.PartitionMappingSupplier$Builder:
 # {"id":"sourceFile","fileName":"PartitionMappingSupplier.java"}
     byte[] metadata -> a
@@ -264910,24 +264565,24 @@
     1:1:com.android.tools.r8.retrace.PartitionMappingSupplierAsync$Builder builder():75:75 -> builder
     1:1:com.android.tools.r8.retrace.Retracer createRetracer(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):81:81 -> createRetracer
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):15:15 -> registerClassUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):15:15 -> registerClassUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplierAsync registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):44:44 -> registerClassUse
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):15:15 -> registerFieldUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/FieldReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/FieldReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):15:15 -> registerFieldUse
     3:3:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase.registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):124:124 -> registerFieldUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplierAsync registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):66 -> registerFieldUse
     4:4:com.android.tools.r8.retrace.PartitionMappingSupplierAsync registerFieldUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.FieldReference):66:66 -> registerFieldUse
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):15:15 -> registerMethodUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/kW;"}
     2:2:com.android.tools.r8.retrace.MappingSupplierBase registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):15:15 -> registerMethodUse
     3:3:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase.registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):120:120 -> registerMethodUse
     3:3:com.android.tools.r8.retrace.PartitionMappingSupplierAsync registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):55 -> registerMethodUse
     4:4:com.android.tools.r8.retrace.PartitionMappingSupplierAsync registerMethodUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.MethodReference):55:55 -> registerMethodUse
     1:1:com.android.tools.r8.retrace.PartitionMappingSupplierAsync self():0:0 -> self
     2:2:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase self():15:15 -> self
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kW;"}
 com.android.tools.r8.retrace.PartitionMappingSupplierAsync$Builder -> com.android.tools.r8.retrace.PartitionMappingSupplierAsync$Builder:
 # {"id":"sourceFile","fileName":"PartitionMappingSupplierAsync.java"}
     byte[] metadata -> a
@@ -264949,12 +264604,12 @@
 # {"id":"sourceFile","fileName":"PartitionedToProguardMappingConverter.java"}
     com.android.tools.r8.StringConsumer consumer -> a
     com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase partitionMappingSupplier -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kW;"}
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     1:4:void <init>(com.android.tools.r8.StringConsumer,com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase,com.android.tools.r8.DiagnosticsHandler):31:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/gW;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/StringConsumer;Lcom/android/tools/r8/internal/kW;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
     1:15:void run(com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):56:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uM;Lcom/android/tools/r8/retrace/MappingPartitionFromKeySupplier;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yM;Lcom/android/tools/r8/retrace/MappingPartitionFromKeySupplier;)V"}
     16:28:void run(com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):68:80 -> a
     29:29:void com.android.tools.r8.retrace.PartitionedToProguardMappingConverter$ProguardMapWriter.finished(com.android.tools.r8.DiagnosticsHandler):120:120 -> a
     29:29:void run(com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):80 -> a
@@ -264987,13 +264642,13 @@
 # {"id":"sourceFile","fileName":"PartitionedToProguardMappingConverter.java"}
     com.android.tools.r8.StringConsumer consumer -> a
     com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase partitionSupplier -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kW;"}
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     1:1:void <init>():128:128 -> <init>
     1:1:com.android.tools.r8.retrace.PartitionedToProguardMappingConverter$Builder setConsumer(com.android.tools.r8.StringConsumer):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/StringConsumer;)Lcom/android/tools/r8/retrace/c$a;"}
     2:2:com.android.tools.r8.retrace.PartitionedToProguardMappingConverter$Builder setPartitionMappingSupplier(com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gW;)Lcom/android/tools/r8/retrace/c$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kW;)Lcom/android/tools/r8/retrace/c$a;"}
     3:3:com.android.tools.r8.retrace.PartitionedToProguardMappingConverter$Builder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):145:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/retrace/c$a;"}
     4:4:com.android.tools.r8.retrace.PartitionedToProguardMappingConverter build():150:150 -> a
@@ -265005,7 +264660,7 @@
     1:3:void <init>(com.android.tools.r8.StringConsumer,com.android.tools.r8.DiagnosticsHandler):107:109 -> <init>
     1:1:com.android.tools.r8.retrace.PartitionedToProguardMappingConverter$ProguardMapWriter accept(java.lang.String):114:114 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/db;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fb;"}
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):120:120 -> finished
 com.android.tools.r8.retrace.PrepareMappingPartitionsCallback -> com.android.tools.r8.retrace.PrepareMappingPartitionsCallback:
 # {"id":"sourceFile","fileName":"PrepareMappingPartitionsCallback.java"}
@@ -265254,7 +264909,7 @@
     1:1:java.lang.Object com.android.tools.r8.utils.Box.getAndSet(java.lang.Object):49 -> a
     1:1:java.util.List lambda$setStackTrace$0(com.android.tools.r8.utils.Box):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;)Ljava/util/List;"}
     2:2:java.lang.Object com.android.tools.r8.utils.BoxBase.getAndSet(java.lang.Object):47:47 -> a
     2:2:java.lang.Object com.android.tools.r8.utils.Box.getAndSet(java.lang.Object):49 -> a
     2:2:java.util.List lambda$setStackTrace$0(com.android.tools.r8.utils.Box):122 -> a
@@ -265515,121 +265170,121 @@
     4:4:com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl.create(java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):25:25 -> retraceParsed
     4:4:com.android.tools.r8.retrace.RetraceStackFrameResultWithContext retraceParsed(java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):96 -> retraceParsed
     1:6:void retraceSupplier(com.android.tools.r8.retrace.StreamSupplier,java.util.function.Consumer):124:129 -> retraceSupplier
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.ki:
 # {"id":"sourceFile","fileName":"Definition.java"}
     com.android.tools.r8.references.ClassReference getHolderClass() -> getHolderClass
     java.lang.String getName() -> getName
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.ip:
 # {"id":"sourceFile","fileName":"FieldDefinition.java"}
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/fp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/ip;"}
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition asFullFieldDefinition():30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ep;"}
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.dp:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hp;"}
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.gp:
 # {"id":"sourceFile","fileName":"FieldDefinition.java"}
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:3:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String):37:39 -> <init>
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/fp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/ip;"}
     2:2:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference):54 -> a
     1:5:boolean equals(java.lang.Object):63:67 -> equals
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():49:49 -> getHolderClass
     1:1:java.lang.String getName():44:44 -> getName
     1:1:int hashCode():72:72 -> hashCode
-com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.ep:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.hp:
 # {"id":"sourceFile","fileName":"FieldDefinition.java"}
     com.android.tools.r8.references.FieldReference fieldReference -> a
     1:2:void <init>(com.android.tools.r8.references.FieldReference):80:81 -> <init>
     1:1:com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition asFullFieldDefinition():91:91 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ep;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hp;"}
     2:3:com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference):106:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/fp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/ip;"}
     4:4:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.FieldReference):20:20 -> a
     4:4:com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference):106 -> a
     1:5:boolean equals(java.lang.Object):120:124 -> equals
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():101:101 -> getHolderClass
     1:1:java.lang.String getName():96:96 -> getName
     1:1:int hashCode():129:129 -> hashCode
-com.android.tools.r8.retrace.internal.MappingPartitionImpl -> com.android.tools.r8.internal.rM:
+com.android.tools.r8.retrace.internal.MappingPartitionImpl -> com.android.tools.r8.internal.vM:
 # {"id":"sourceFile","fileName":"MappingPartitionImpl.java"}
     java.lang.String key -> a
     byte[] payload -> b
     1:3:void <init>(java.lang.String,byte[]):14:16 -> <init>
     1:1:java.lang.String getKey():21:21 -> getKey
     1:1:byte[] getPayload():26:26 -> getPayload
-com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy -> com.android.tools.r8.internal.sM:
+com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy -> com.android.tools.r8.internal.wM:
 # {"id":"sourceFile","fileName":"MappingPartitionKeyStrategy.java"}
     int serializedKey -> b
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy UNKNOWN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy OBFUSCATED_TYPE_NAME_AS_KEY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy OBFUSCATED_TYPE_NAME_AS_KEY_WITH_PARTITIONS -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy DEFAULT_STRATEGY -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy[] $VALUES -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/wM;"}
     1:3:void <clinit>():8:10 -> <clinit>
     4:9:void <clinit>():7:12 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):17:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy getByKey(int):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/wM;"}
     2:2:com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy getByKey(int):26:26 -> a
     3:3:com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy getByKey(int):24:24 -> a
     4:4:com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy getDefaultStrategy():37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sM;"}
-com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal -> com.android.tools.r8.internal.uM:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wM;"}
+com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal -> com.android.tools.r8.internal.yM:
 # {"id":"sourceFile","fileName":"MappingPartitionMetadataInternal.java"}
     byte[] MAGIC -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:java.util.Collection getPartitionKeys():38:38 -> a
     2:15:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal deserialize(com.android.tools.r8.dex.CompatByteBuffer,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.DiagnosticsHandler):62:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/uM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/yM;"}
     16:28:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal deserialize(com.android.tools.r8.dex.CompatByteBuffer,com.android.tools.r8.naming.MapVersion,com.android.tools.r8.DiagnosticsHandler):71:83 -> a
     com.android.tools.r8.naming.MapVersion getMapVersion() -> b
     1:1:boolean canGetAdditionalInfo():42:42 -> c
     1:1:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo com.android.tools.r8.retrace.internal.MetadataAdditionalInfo.create(java.util.List,java.util.Set):127:127 -> d
     1:1:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo getAdditionalInfo():46 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MN;"}
     1:1:boolean canGetPartitionKeys():34:34 -> e
-com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$1 -> com.android.tools.r8.internal.tM:
+com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$1 -> com.android.tools.r8.internal.xM:
 # {"id":"sourceFile","fileName":"MappingPartitionMetadataInternal.java"}
     int[] $SwitchMap$com$android$tools$r8$retrace$internal$MappingPartitionKeyStrategy -> a
     1:1:com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy[] com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy.values():7:7 -> <clinit>
     1:1:void <clinit>():69 -> <clinit>
     2:2:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata -> com.android.tools.r8.internal.uM$a:
+com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata -> com.android.tools.r8.internal.yM$a:
 # {"id":"sourceFile","fileName":"MappingPartitionMetadataInternal.java"}
     com.android.tools.r8.naming.MapVersion mapVersion -> b
     1:2:void <init>(com.android.tools.r8.naming.MapVersion):90:91 -> <init>
     1:1:byte[] com.android.tools.r8.dex.CompatByteBuffer.array():62:62 -> a
     1:1:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata deserialize(com.android.tools.r8.dex.CompatByteBuffer):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;)Lcom/android/tools/r8/internal/uM$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;)Lcom/android/tools/r8/internal/yM$a;"}
     2:2:byte[] com.android.tools.r8.dex.CompatByteBuffer.array():62:62 -> a
     2:2:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata deserialize(com.android.tools.r8.dex.CompatByteBuffer):122 -> a
     3:4:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata deserialize(com.android.tools.r8.dex.CompatByteBuffer):123:124 -> a
     5:5:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadata create(com.android.tools.r8.naming.MapVersion):128:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;)Lcom/android/tools/r8/internal/uM$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;)Lcom/android/tools/r8/internal/yM$a;"}
     1:1:com.android.tools.r8.naming.MapVersion getMapVersion():101:101 -> b
     1:8:byte[] getBytes():109:116 -> getBytes
-com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames -> com.android.tools.r8.internal.vM:
+com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames -> com.android.tools.r8.internal.zM:
 # {"id":"sourceFile","fileName":"MappingPartitionMetadataInternal.java"}
     com.android.tools.r8.naming.MapVersion mapVersion -> b
     com.android.tools.r8.retrace.internal.MetadataPartitionCollection metadataPartitionCollection -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN;"}
     com.android.tools.r8.retrace.internal.MetadataAdditionalInfo metadataAdditionalInfo -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MN;"}
     1:4:void <init>(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.retrace.internal.MetadataPartitionCollection,com.android.tools.r8.retrace.internal.MetadataAdditionalInfo):142:145 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/MN;Lcom/android/tools/r8/internal/IN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/MapVersion;Lcom/android/tools/r8/internal/QN;Lcom/android/tools/r8/internal/MN;)V"}
     1:1:java.util.Collection getPartitionKeys():173:173 -> a
     2:3:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames deserialize(com.android.tools.r8.dex.CompatByteBuffer):207:208 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;)Lcom/android/tools/r8/internal/vM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/s;)Lcom/android/tools/r8/internal/zM;"}
     4:4:com.android.tools.r8.retrace.internal.MetadataPartitionCollection$LazyMetadataPartitionCollection com.android.tools.r8.retrace.internal.MetadataPartitionCollection$LazyMetadataPartitionCollection.create(com.android.tools.r8.dex.CompatByteBuffer):66:66 -> a
     4:4:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames deserialize(com.android.tools.r8.dex.CompatByteBuffer):210 -> a
     5:5:byte[] com.android.tools.r8.dex.CompatByteBuffer.getBytesOfIntSize():165:165 -> a
@@ -265657,7 +265312,7 @@
     1:1:com.android.tools.r8.naming.MapVersion getMapVersion():163:163 -> b
     1:1:boolean canGetAdditionalInfo():178:178 -> c
     1:1:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo getAdditionalInfo():183:183 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MN;"}
     1:1:boolean canGetPartitionKeys():168:168 -> e
     1:4:byte[] getBytes():191:194 -> getBytes
     5:5:int com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy.getSerializedKey():33:33 -> getBytes
@@ -265674,13 +265329,13 @@
     12:12:void com.android.tools.r8.retrace.internal.MetadataPartitionCollection.serialize(java.io.DataOutputStream):33:33 -> getBytes
     12:12:byte[] getBytes():196 -> getBytes
     13:17:byte[] getBytes():197:201 -> getBytes
-com.android.tools.r8.retrace.internal.MappingSupplierInternal -> com.android.tools.r8.internal.wM:
+com.android.tools.r8.retrace.internal.MappingSupplierInternal -> com.android.tools.r8.internal.AM:
 # {"id":"sourceFile","fileName":"MappingSupplierInternal.java"}
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/k;"}
     java.lang.String getSourceFileForClass(java.lang.String) -> b
-com.android.tools.r8.retrace.internal.MappingSupplierInternalImpl -> com.android.tools.r8.internal.xM:
+com.android.tools.r8.retrace.internal.MappingSupplierInternalImpl -> com.android.tools.r8.internal.BM:
 # {"id":"sourceFile","fileName":"MappingSupplierInternalImpl.java"}
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/b;"}
@@ -265689,14 +265344,14 @@
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):22:22 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/naming/k;"}
     2:2:com.android.tools.r8.retrace.internal.MappingSupplierInternal createInternal(com.android.tools.r8.naming.ClassNameMapper):36:36 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;)Lcom/android/tools/r8/internal/wM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;)Lcom/android/tools/r8/internal/AM;"}
     1:1:java.lang.String getSourceFileForClass(java.lang.String):27:27 -> b
     2:2:java.lang.String com.android.tools.r8.naming.ClassNameMapper.getSourceFile(java.lang.String):310:310 -> b
     2:2:java.lang.String getSourceFileForClass(java.lang.String):27 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:java.lang.String com.android.tools.r8.naming.ClassNameMapper.getSourceFile(java.lang.String):310:310 -> b
     3:3:java.lang.String getSourceFileForClass(java.lang.String):27 -> b
-com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName -> com.android.tools.r8.internal.aN:
+com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName -> com.android.tools.r8.internal.eN:
 # {"id":"sourceFile","fileName":"MemberNamingWithMappedRangesOfName.java"}
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName mappedRangesOfName -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k$c;"}
@@ -265709,7 +265364,7 @@
     2:2:java.util.List getMappedRangesWithNoMinifiedRangeAndPositionZero():38:38 -> a
     1:2:java.util.List mappedRangesWithNoMinifiedRange():29:30 -> b
     3:3:java.util.List mappedRangesWithNoMinifiedRange():29:29 -> b
-com.android.tools.r8.retrace.internal.MetadataAdditionalInfo -> com.android.tools.r8.internal.IN:
+com.android.tools.r8.retrace.internal.MetadataAdditionalInfo -> com.android.tools.r8.internal.MN:
 # {"id":"sourceFile","fileName":"MetadataAdditionalInfo.java"}
     java.util.List preamble -> a
     java.util.Set obfuscatedPackages -> b
@@ -265725,27 +265380,27 @@
     12:12:void serialize(java.io.DataOutputStream):86 -> a
     13:17:void serialize(java.io.DataOutputStream):85:89 -> a
     18:39:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo deserialize(byte[],java.util.function.Predicate):94:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLjava/util/function/Predicate;)Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([BLjava/util/function/Predicate;)Lcom/android/tools/r8/internal/MN;"}
     40:50:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo deserialize(byte[],java.util.function.Predicate):109:119 -> a
     51:70:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo deserialize(byte[],java.util.function.Predicate):103:122 -> a
     1:1:java.util.Collection getPreamble():62:62 -> b
     1:1:boolean hasObfuscatedPackages():66:66 -> c
     1:1:boolean hasPreamble():58:58 -> d
-com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes -> com.android.tools.r8.internal.GN:
+com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes -> com.android.tools.r8.internal.KN:
 # {"id":"sourceFile","fileName":"MetadataAdditionalInfo.java"}
     int serializedKey -> b
     com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes UNKNOWN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KN;"}
     com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes PREAMBLE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KN;"}
     com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes OBFUSCATED_PACKAGES -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KN;"}
     1:3:void <clinit>():29:31 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):35:36 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:5:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes getByKey(int):41:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/GN;"}
-com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$LazyMetadataAdditionalInfo -> com.android.tools.r8.internal.HN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/KN;"}
+com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$LazyMetadataAdditionalInfo -> com.android.tools.r8.internal.LN:
 # {"id":"sourceFile","fileName":"MetadataAdditionalInfo.java"}
     byte[] bytes -> c
     java.util.Map metadataAdditionalInfo -> d
@@ -265754,60 +265409,60 @@
     2:7:void <init>(byte[]):133:138 -> <init>
     1:3:java.util.Set getObfuscatedPackages():164:166 -> a
     4:5:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo getMetadataAdditionalInfo(com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes):170:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GN;)Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KN;)Lcom/android/tools/r8/internal/MN;"}
     6:6:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo getMetadataAdditionalInfo(com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes):170:170 -> a
     7:7:com.android.tools.r8.retrace.internal.MetadataAdditionalInfo lambda$getMetadataAdditionalInfo$1(com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes,java.lang.Integer):173:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GN;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/IN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KN;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/MN;"}
     8:8:boolean lambda$getMetadataAdditionalInfo$0(com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes,com.android.tools.r8.retrace.internal.MetadataAdditionalInfo$AdditionalInfoTypes):174:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GN;Lcom/android/tools/r8/internal/GN;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KN;Lcom/android/tools/r8/internal/KN;)Z"}
     1:3:java.util.Collection getPreamble():150:152 -> b
     1:3:boolean hasObfuscatedPackages():157:159 -> c
     1:3:boolean hasPreamble():143:145 -> d
-com.android.tools.r8.retrace.internal.MetadataPartitionCollection -> com.android.tools.r8.internal.MN:
+com.android.tools.r8.retrace.internal.MetadataPartitionCollection -> com.android.tools.r8.internal.QN:
 # {"id":"sourceFile","fileName":"MetadataPartitionCollection.java"}
     java.util.Collection partitionKeys -> a
     1:2:void <init>(java.util.Collection):22:23 -> <init>
     1:1:java.util.Collection getPartitionKeys():27:27 -> a
     2:3:com.android.tools.r8.retrace.internal.MetadataPartitionCollection deserialize(byte[]):38:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/MN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([B)Lcom/android/tools/r8/internal/QN;"}
     4:4:com.android.tools.r8.retrace.internal.MetadataPartitionCollection create(java.util.Collection):43:43 -> a
     4:4:com.android.tools.r8.retrace.internal.MetadataPartitionCollection deserialize(byte[]):39 -> a
-com.android.tools.r8.retrace.internal.MetadataPartitionCollection$LazyMetadataPartitionCollection -> com.android.tools.r8.internal.LN:
+com.android.tools.r8.retrace.internal.MetadataPartitionCollection$LazyMetadataPartitionCollection -> com.android.tools.r8.internal.PN:
 # {"id":"sourceFile","fileName":"MetadataPartitionCollection.java"}
     byte[] bytes -> b
     com.android.tools.r8.retrace.internal.MetadataPartitionCollection metadataPartitionCollection -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QN;"}
     1:1:void <init>(byte[]):52:52 -> <init>
     2:6:void <init>(byte[]):49:53 -> <init>
     1:5:java.util.Collection getPartitionKeys():58:62 -> a
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.UN:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.YN:
 # {"id":"sourceFile","fileName":"MethodDefinition.java"}
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/YN;"}
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition():28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TN;"}
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.SN:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XN;"}
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.WN:
 # {"id":"sourceFile","fileName":"MethodDefinition.java"}
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String name -> b
     1:3:void <init>(com.android.tools.r8.references.ClassReference,java.lang.String):38:40 -> <init>
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference):55:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/YN;"}
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference):55 -> a
     1:5:boolean equals(java.lang.Object):64:68 -> equals
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():45:45 -> getHolderClass
     1:1:java.lang.String getName():50:50 -> getName
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.TN:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.XN:
 # {"id":"sourceFile","fileName":"MethodDefinition.java"}
     com.android.tools.r8.references.MethodReference methodReference -> a
     1:2:void <init>(com.android.tools.r8.references.MethodReference):81:82 -> <init>
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition():102:102 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XN;"}
     2:7:com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference):107:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/YN;"}
     8:8:com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference):108:108 -> a
     9:9:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.MethodReference):20:20 -> a
     9:9:com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference):107 -> a
@@ -265815,7 +265470,7 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():87:87 -> getHolderClass
     1:1:java.lang.String getName():92:92 -> getName
     1:1:int hashCode():134:134 -> hashCode
-com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase -> com.android.tools.r8.internal.gW:
+com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase -> com.android.tools.r8.internal.kW:
 # {"id":"sourceFile","fileName":"PartitionMappingSupplierBase.java"}
     com.android.tools.r8.retrace.RegisterMappingPartitionCallback registerCallback -> a
     com.android.tools.r8.retrace.PrepareMappingPartitionsCallback prepareCallback -> b
@@ -265830,9 +265485,9 @@
     java.util.Set builtKeys -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     com.android.tools.r8.utils.Box mappingPartitionMetadataCache -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     com.android.tools.r8.utils.Box typeNameCouldHavePartitionCache -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     1:1:void <init>(com.android.tools.r8.retrace.RegisterMappingPartitionCallback,com.android.tools.r8.retrace.PrepareMappingPartitionsCallback,com.android.tools.r8.retrace.FinishedPartitionMappingCallback,boolean,byte[],com.android.tools.r8.naming.MapVersion):63:63 -> <init>
     2:20:void <init>(com.android.tools.r8.retrace.RegisterMappingPartitionCallback,com.android.tools.r8.retrace.PrepareMappingPartitionsCallback,com.android.tools.r8.retrace.FinishedPartitionMappingCallback,boolean,byte[],com.android.tools.r8.naming.MapVersion):51:69 -> <init>
     1:1:com.android.tools.r8.naming.ClassNameMapper$Builder com.android.tools.r8.naming.ClassNameMapper$Builder.setBuildPreamble(boolean):72:72 -> a
@@ -265842,21 +265497,21 @@
     2:2:java.util.function.Predicate getPartitionPredicate(java.util.Set):113:113 -> a
     3:3:boolean lambda$getPartitionPredicate$0(java.util.Set,java.lang.String):115:115 -> a
     1:16:com.android.tools.r8.retrace.internal.RetracerImpl createRetracerFromPartitionSupplier(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):163:178 -> createRetracerFromPartitionSupplier
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/retrace/MappingPartitionFromKeySupplier;)Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/retrace/MappingPartitionFromKeySupplier;)Lcom/android/tools/r8/internal/Q90;"}
     17:35:com.android.tools.r8.retrace.internal.RetracerImpl createRetracerFromPartitionSupplier(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):176:194 -> createRetracerFromPartitionSupplier
     36:36:com.android.tools.r8.retrace.internal.RetracerImpl createRetracerFromPartitionSupplier(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.MappingPartitionFromKeySupplier):193:193 -> createRetracerFromPartitionSupplier
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):199:199 -> finished
     1:1:java.util.Set getMapVersions(com.android.tools.r8.DiagnosticsHandler):154:154 -> getMapVersions
     2:2:java.util.Set getMapVersions(com.android.tools.r8.DiagnosticsHandler):153:153 -> getMapVersions
     1:8:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal getMetadata(com.android.tools.r8.DiagnosticsHandler):73:80 -> getMetadata
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/uM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/yM;"}
     9:9:com.android.tools.r8.dex.CompatByteBuffer com.android.tools.r8.dex.CompatByteBuffer.wrapOrNull(byte[]):31:31 -> getMetadata
     9:9:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal getMetadata(com.android.tools.r8.DiagnosticsHandler):82 -> getMetadata
     10:10:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal getMetadata(com.android.tools.r8.DiagnosticsHandler):82:82 -> getMetadata
     11:15:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal getMetadata(com.android.tools.r8.DiagnosticsHandler):81:85 -> getMetadata
     1:1:com.android.tools.r8.retrace.PartitionMappingSupplier getPartitionMappingSupplier():158:158 -> getPartitionMappingSupplier
     1:1:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):90:90 -> registerClassUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/kW;"}
     2:7:boolean isPotentialRetraceClass(com.android.tools.r8.DiagnosticsHandler,java.lang.String):98:103 -> registerClassUse
     2:7:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):91 -> registerClassUse
     8:16:java.util.Set getPackagesWithClasses(com.android.tools.r8.DiagnosticsHandler):135:143 -> registerClassUse
@@ -265868,11 +265523,11 @@
     23:23:boolean isPotentialRetraceClass(com.android.tools.r8.DiagnosticsHandler,java.lang.String):109:109 -> registerClassUse
     23:23:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):91 -> registerClassUse
     1:4:com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase registerKeyUse(java.lang.String):128:131 -> registerKeyUse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/kW;"}
     com.android.tools.r8.retrace.internal.PartitionMappingSupplierBase self() -> self
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kW;"}
     1:2:void verifyMappingFileHash(com.android.tools.r8.DiagnosticsHandler):148:149 -> verifyMappingFileHash
-com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText -> com.android.tools.r8.internal.CY:
+com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText -> com.android.tools.r8.internal.GY:
 # {"id":"sourceFile","fileName":"ProguardMapPartitionerOnClassNameToText.java"}
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> a
     java.util.function.Consumer mappingPartitionConsumer -> b
@@ -265880,9 +265535,9 @@
     boolean allowEmptyMappedRanges -> d
     boolean allowExperimentalMapping -> e
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy mappingPartitionKeyStrategy -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     1:7:void <init>(com.android.tools.r8.retrace.ProguardMapProducer,java.util.function.Consumer,com.android.tools.r8.DiagnosticsHandler,boolean,boolean,com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy):57:63 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/ProguardMapProducer;Ljava/util/function/Consumer;Lcom/android/tools/r8/DiagnosticsHandler;ZZLcom/android/tools/r8/internal/sM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/ProguardMapProducer;Ljava/util/function/Consumer;Lcom/android/tools/r8/DiagnosticsHandler;ZZLcom/android/tools/r8/internal/wM;)V"}
     1:1:com.android.tools.r8.naming.ClassNameMapper$Builder com.android.tools.r8.naming.ClassNameMapper$Builder.setBuildPreamble(boolean):72:72 -> a
     1:1:void lambda$getPartitionsFromStringBackedProguardMapProducer$1(com.android.tools.r8.naming.ClassNameMapper$Builder):105 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -265890,7 +265545,7 @@
     2:2:com.android.tools.r8.naming.ClassNameMapper$Builder com.android.tools.r8.naming.ClassNameMapper$Builder.setAddVersionAsPreamble(boolean):77:77 -> a
     2:2:void lambda$getPartitionsFromStringBackedProguardMapProducer$1(com.android.tools.r8.naming.ClassNameMapper$Builder):105 -> a
     3:3:com.android.tools.r8.naming.ClassNameMapper getPartitionsFromInternalProguardMapProducer(com.android.tools.r8.utils.TriConsumer):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/naming/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;)Lcom/android/tools/r8/naming/b;"}
     4:4:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.retrace.internal.ProguardMapProducerInternal.getClassNameMapper():22:22 -> a
     4:4:com.android.tools.r8.naming.ClassNameMapper getPartitionsFromInternalProguardMapProducer(com.android.tools.r8.utils.TriConsumer):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -265899,9 +265554,9 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:com.android.tools.r8.naming.ClassNameMapper getPartitionsFromInternalProguardMapProducer(com.android.tools.r8.utils.TriConsumer):80:81 -> a
     8:8:void lambda$getPartitionsFromInternalProguardMapProducer$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.naming.ClassNameMapper,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper):83:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/naming/b;Ljava/lang/String;Lcom/android/tools/r8/naming/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/naming/b;Ljava/lang/String;Lcom/android/tools/r8/naming/k;)V"}
     9:22:void lambda$getPartitionsFromStringBackedProguardMapProducer$2(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.naming.ClassNameMapper,java.lang.String,java.util.List):109:122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/naming/b;Ljava/lang/String;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/naming/b;Ljava/lang/String;Ljava/util/List;)V"}
     23:23:void lambda$run$4(java.util.HashSet,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashSet;Lcom/android/tools/r8/naming/b;Lcom/android/tools/r8/naming/k;Ljava/lang/String;)V"}
     24:24:com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation.builder():56:56 -> a
@@ -265917,7 +265572,7 @@
     49:49:java.lang.String com.android.tools.r8.naming.ClassNameMapper.getSourceFile(java.lang.String):310:310 -> a
     49:49:void lambda$run$3(com.android.tools.r8.naming.ClassNameMapper,java.util.Set,com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.lang.String):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Ljava/util/Set;Lcom/android/tools/r8/internal/eW;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;Ljava/util/Set;Lcom/android/tools/r8/internal/iW;Ljava/lang/String;)V"}
     50:50:java.lang.String com.android.tools.r8.naming.ClassNameMapper.getSourceFile(java.lang.String):310:310 -> a
     50:50:void lambda$run$3(com.android.tools.r8.naming.ClassNameMapper,java.util.Set,com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.lang.String):140 -> a
     51:51:void lambda$run$3(com.android.tools.r8.naming.ClassNameMapper,java.util.Set,com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.lang.String):140:140 -> a
@@ -265929,7 +265584,7 @@
     54:54:com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder.addClassToFileNameMapping(java.lang.String,java.lang.String):85:85 -> a
     54:54:void lambda$run$3(com.android.tools.r8.naming.ClassNameMapper,java.util.Set,com.android.tools.r8.naming.mappinginformation.PartitionFileNameInformation$Builder,java.lang.String):141 -> a
     1:18:com.android.tools.r8.naming.ClassNameMapper getPartitionsFromStringBackedProguardMapProducer(com.android.tools.r8.utils.TriConsumer):89:106 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;)Lcom/android/tools/r8/naming/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;)Lcom/android/tools/r8/naming/b;"}
     1:3:com.android.tools.r8.retrace.MappingPartitionMetadata run():130:132 -> run
     4:7:com.android.tools.r8.naming.ClassNameMapper getPartitionsFromProguardMapProducer(com.android.tools.r8.utils.TriConsumer):68:71 -> run
     4:7:com.android.tools.r8.retrace.MappingPartitionMetadata run():133 -> run
@@ -265944,16 +265599,16 @@
     20:20:com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames com.android.tools.r8.retrace.internal.MappingPartitionMetadataInternal$ObfuscatedTypeNameAsKeyMetadataWithPartitionNames.create(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.retrace.internal.MetadataPartitionCollection,com.android.tools.r8.retrace.internal.MetadataAdditionalInfo):152:152 -> run
     20:20:com.android.tools.r8.retrace.MappingPartitionMetadata run():168 -> run
     21:24:com.android.tools.r8.retrace.MappingPartitionMetadata run():174:177 -> run
-com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$PartitionLineReader -> com.android.tools.r8.internal.BY:
+com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$PartitionLineReader -> com.android.tools.r8.internal.FY:
 # {"id":"sourceFile","fileName":"ProguardMapPartitionerOnClassNameToText.java"}
     com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering lineReader -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/LY;"}
     java.util.Map readSections -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashMap;"}
     java.util.List currentList -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:1:void <init>(com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering):187:187 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LY;)V"}
     2:7:void <init>(com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering):184:189 -> <init>
     1:5:java.lang.String readLine():194:198 -> a
     6:6:boolean com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering.isClassMapping():254:254 -> a
@@ -265962,7 +265617,7 @@
     7:10:java.lang.String readLine():199:202 -> a
     11:11:void forEachClassMapping(java.util.function.BiConsumer):212:212 -> a
     1:1:void close():208:208 -> close
-com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl -> com.android.tools.r8.internal.CY$a:
+com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl -> com.android.tools.r8.internal.GY$a:
 # {"id":"sourceFile","fileName":"ProguardMapPartitionerOnClassNameToText.java"}
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> a
     java.util.function.Consumer mappingPartitionConsumer -> b
@@ -265973,36 +265628,36 @@
     2:6:void <init>(com.android.tools.r8.DiagnosticsHandler):223:227 -> <init>
     1:1:com.android.tools.r8.retrace.ProguardMapPartitioner build():216:216 -> build
     2:8:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText build():260:266 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GY;"}
     1:1:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl setAllowEmptyMappedRanges(boolean):247:247 -> setAllowEmptyMappedRanges
     1:1:com.android.tools.r8.retrace.ProguardMapPartitionerBuilder setAllowEmptyMappedRanges(boolean):216 -> setAllowEmptyMappedRanges
     1:1:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl setAllowExperimentalMapping(boolean):254:254 -> setAllowExperimentalMapping
     1:1:com.android.tools.r8.retrace.ProguardMapPartitionerBuilder setAllowExperimentalMapping(boolean):216 -> setAllowExperimentalMapping
     1:1:com.android.tools.r8.retrace.ProguardMapPartitionerBuilder setPartitionConsumer(java.util.function.Consumer):216:216 -> setPartitionConsumer
     2:2:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl setPartitionConsumer(java.util.function.Consumer):233:233 -> setPartitionConsumer
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/CY$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/GY$a;"}
     1:1:com.android.tools.r8.retrace.ProguardMapPartitionerBuilder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):216:216 -> setProguardMapProducer
     2:2:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImpl setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):240:240 -> setProguardMapProducer
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/ProguardMapProducer;)Lcom/android/tools/r8/internal/CY$a;"}
-com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImplInternal -> com.android.tools.r8.internal.CY$b:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/ProguardMapProducer;)Lcom/android/tools/r8/internal/GY$a;"}
+com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImplInternal -> com.android.tools.r8.internal.GY$b:
 # {"id":"sourceFile","fileName":"ProguardMapPartitionerOnClassNameToText.java"}
     com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy mappingPartitionKeyStrategy -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):279:279 -> <init>
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):276:276 -> <init>
     1:1:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText$ProguardMapPartitionerBuilderImplInternal setMappingPartitionKeyStrategy(com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy):284:284 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sM;)Lcom/android/tools/r8/internal/CY$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wM;)Lcom/android/tools/r8/internal/GY$b;"}
     1:1:com.android.tools.r8.retrace.ProguardMapPartitioner build():272:272 -> build
     2:2:com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText build():290:290 -> build
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
-com.android.tools.r8.retrace.internal.ProguardMapProducerInternal -> com.android.tools.r8.internal.DY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/GY;"}
+com.android.tools.r8.retrace.internal.ProguardMapProducerInternal -> com.android.tools.r8.internal.HY:
 # {"id":"sourceFile","fileName":"ProguardMapProducerInternal.java"}
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/b;"}
     1:2:void <init>(com.android.tools.r8.naming.ClassNameMapper):17:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b;)V"}
     1:1:java.io.InputStream get():27:27 -> get
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering -> com.android.tools.r8.internal.HY:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering -> com.android.tools.r8.internal.LY:
 # {"id":"sourceFile","fileName":"ProguardMapReaderWithFiltering.java"}
     int startIndex -> a
     int endIndex -> b
@@ -266144,11 +265799,11 @@
     int getEndIndex() -> c
     int getStartIndex() -> d
     byte[] read() -> e
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState -> com.android.tools.r8.internal.EY:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState -> com.android.tools.r8.internal.IY:
 # {"id":"sourceFile","fileName":"ProguardMapReaderWithFiltering.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():57:57 -> <clinit>
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringInputBuffer -> com.android.tools.r8.internal.FY:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringInputBuffer -> com.android.tools.r8.internal.JY:
 # {"id":"sourceFile","fileName":"ProguardMapReaderWithFiltering.java"}
     java.io.InputStream inputStream -> i
     byte[] buffer -> j
@@ -266164,7 +265819,7 @@
     1:1:int getStartIndex():432:432 -> d
     1:11:byte[] read():408:418 -> e
     12:22:byte[] read():417:427 -> e
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringMappedBuffer -> com.android.tools.r8.internal.GY:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringMappedBuffer -> com.android.tools.r8.internal.KY:
 # {"id":"sourceFile","fileName":"ProguardMapReaderWithFiltering.java"}
     java.nio.channels.FileChannel fileChannel -> i
     java.nio.MappedByteBuffer mappedByteBuffer -> j
@@ -266190,7 +265845,7 @@
     13:14:byte readByte():370:371 -> e
     13:14:byte[] read():339 -> e
     15:20:byte[] read():343:348 -> e
-com.android.tools.r8.retrace.internal.ProguardMappingSupplierBuilderImpl -> com.android.tools.r8.internal.IY:
+com.android.tools.r8.retrace.internal.ProguardMappingSupplierBuilderImpl -> com.android.tools.r8.internal.MY:
 # {"id":"sourceFile","fileName":"ProguardMappingSupplierBuilderImpl.java"}
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> a
     boolean allowExperimental -> b
@@ -266203,7 +265858,7 @@
     1:1:com.android.tools.r8.retrace.MappingSupplierBuilder setAllowExperimental(boolean):10 -> setAllowExperimental
     1:1:com.android.tools.r8.retrace.ProguardMappingSupplier$Builder setLoadAllDefinitions(boolean):36:36 -> setLoadAllDefinitions
     1:1:com.android.tools.r8.retrace.ProguardMappingSupplier$Builder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):30:30 -> setProguardMapProducer
-com.android.tools.r8.retrace.internal.ProguardMappingSupplierImpl -> com.android.tools.r8.internal.JY:
+com.android.tools.r8.retrace.internal.ProguardMappingSupplierImpl -> com.android.tools.r8.internal.NY:
 # {"id":"sourceFile","fileName":"ProguardMappingSupplierImpl.java"}
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> a
     boolean allowExperimental -> b
@@ -266219,7 +265874,7 @@
     1:1:void <init>(com.android.tools.r8.retrace.ProguardMapProducer,boolean,boolean):57:57 -> <init>
     2:18:void <init>(com.android.tools.r8.retrace.ProguardMapProducer,boolean,boolean):44:60 -> <init>
     1:1:com.android.tools.r8.retrace.ProguardMappingSupplier registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/JY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/NY;"}
     2:2:boolean hasClassMappingFor(java.lang.String):64:64 -> a
     2:2:com.android.tools.r8.retrace.ProguardMappingSupplier registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):70 -> a
     3:3:com.android.tools.r8.retrace.ProguardMappingSupplier registerClassUse(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.references.ClassReference):71:71 -> a
@@ -266229,7 +265884,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/b$a;)V"}
     1:1:com.android.tools.r8.retrace.Retracer createRetracer(com.android.tools.r8.DiagnosticsHandler):37:37 -> createRetracer
     2:5:com.android.tools.r8.retrace.internal.RetracerImpl createRetracer(com.android.tools.r8.DiagnosticsHandler):118:121 -> createRetracer
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/Q90;"}
     6:19:com.android.tools.r8.retrace.internal.RetracerImpl createRetracer(com.android.tools.r8.DiagnosticsHandler):120:133 -> createRetracer
     20:24:com.android.tools.r8.naming.MapVersion getMapVersion():157:161 -> createRetracer
     20:24:com.android.tools.r8.retrace.internal.RetracerImpl createRetracer(com.android.tools.r8.DiagnosticsHandler):137 -> createRetracer
@@ -266269,10 +265924,10 @@
     24:25:void verifyMappingFileHash(com.android.tools.r8.DiagnosticsHandler):96 -> verifyMappingFileHash
     26:26:void verifyMappingFileHash(com.android.tools.r8.DiagnosticsHandler):96:96 -> verifyMappingFileHash
     27:40:void verifyMappingFileHash(com.android.tools.r8.DiagnosticsHandler):90:103 -> verifyMappingFileHash
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.Y80:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.c90:
 # {"id":"sourceFile","fileName":"RetraceAbortException.java"}
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceBase -> com.android.tools.r8.internal.a90:
+com.android.tools.r8.retrace.internal.RetraceBase -> com.android.tools.r8.internal.e90:
 # {"id":"sourceFile","fileName":"RetraceBase.java"}
     com.android.tools.r8.retrace.StackTraceLineParser stackTraceLineParser -> a
     com.android.tools.r8.retrace.MappingSupplierBase mappingSupplier -> b
@@ -266281,12 +265936,12 @@
     1:2:void lambda$parse$0(java.lang.Object,int):64:65 -> a
     3:5:void lambda$parse$0(java.lang.Object,int):64:66 -> a
     6:38:com.android.tools.r8.retrace.RetraceStackTraceContext lambda$retraceStackTraceParsedWithRetracer$2(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy):97:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxyRetracer;Lcom/android/tools/r8/internal/Z80;Ljava/util/List;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/retrace/RetraceStackTraceContext;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxyRetracer;Lcom/android/tools/r8/internal/d90;Ljava/util/List;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/retrace/RetraceStackTraceContext;"}
     39:39:com.android.tools.r8.retrace.internal.RetraceStackFrameAmbiguousResultWithContextImpl com.android.tools.r8.retrace.internal.RetraceStackFrameAmbiguousResultWithContextImpl.create(java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):28:28 -> a
     39:39:com.android.tools.r8.retrace.RetraceStackTraceContext lambda$retraceStackTraceParsedWithRetracer$2(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy):127 -> a
     40:47:com.android.tools.r8.retrace.RetraceStackTraceContext lambda$retraceStackTraceParsedWithRetracer$2(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy):126:133 -> a
     48:49:void lambda$retraceStackTraceParsedWithRetracer$1(java.util.Set,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,com.android.tools.r8.utils.Box,java.util.List,java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):106:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/Z80;Lcom/android/tools/r8/internal/k7;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/d90;Lcom/android/tools/r8/internal/m7;Ljava/util/List;Ljava/util/List;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)V"}
     50:50:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     50:50:void lambda$retraceStackTraceParsedWithRetracer$1(java.util.Set,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,com.android.tools.r8.utils.Box,java.util.List,java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):107 -> a
     51:57:void lambda$retraceStackTraceParsedWithRetracer$1(java.util.Set,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,com.android.tools.r8.utils.Box,java.util.List,java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):107:113 -> a
@@ -266300,13 +265955,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     67:70:void lambda$retraceStackTraceParsedWithRetracer$1(java.util.Set,com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence,com.android.tools.r8.utils.Box,java.util.List,java.util.List,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):119:122 -> a
     71:78:void lambda$retraceFrameWithRetracer$3(java.util.List,java.util.Map,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):148:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Map;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Map;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)V"}
     79:79:void lambda$retraceFrameWithRetracer$4(java.util.List,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):163:163 -> a
     80:80:com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl.create(java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):25:25 -> a
     80:80:void lambda$retraceFrameWithRetracer$4(java.util.List,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):162 -> a
     81:81:void lambda$retraceFrameWithRetracer$4(java.util.List,java.util.Map,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):161:161 -> a
     82:83:java.lang.Object lambda$retraceLineWithRetracer$5(com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):176:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;)Ljava/lang/Object;"}
     1:10:java.util.List parse(java.util.List):60:69 -> parse
     11:11:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):73:73 -> parse
     1:1:void registerUses(java.util.List):77:77 -> registerUses
@@ -266320,7 +265975,7 @@
     1:7:com.android.tools.r8.retrace.RetraceStackTraceResult retraceStackTraceParsedWithRetracer(com.android.tools.r8.retrace.Retracer,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):86:92 -> retraceStackTraceParsedWithRetracer
     8:8:com.android.tools.r8.retrace.RetraceStackTraceResult com.android.tools.r8.retrace.internal.RetraceStackTraceResultImpl.create(java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):26:26 -> retraceStackTraceParsedWithRetracer
     8:8:com.android.tools.r8.retrace.RetraceStackTraceResult retraceStackTraceParsedWithRetracer(com.android.tools.r8.retrace.Retracer,java.util.List,com.android.tools.r8.retrace.RetraceStackTraceContext):135 -> retraceStackTraceParsedWithRetracer
-com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence -> com.android.tools.r8.internal.Z80:
+com.android.tools.r8.retrace.internal.RetraceBase$RetraceStackTraceElementProxyEquivalence -> com.android.tools.r8.internal.d90:
 # {"id":"sourceFile","fileName":"RetraceBase.java"}
     boolean isVerbose -> a
     boolean $assertionsDisabled -> b
@@ -266336,19 +265991,19 @@
     95:96:boolean doEquivalent(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy):291 -> a
     97:97:java.lang.String lambda$doEquivalent$0(com.android.tools.r8.retrace.RetraceStackTraceElementProxy):203:203 -> a
     98:100:boolean testNotEqualProperty(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceElementProxy,java.util.function.Function,java.util.function.Function):316:318 -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.d90:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.h90:
 # {"id":"sourceFile","fileName":"RetraceClassResultImpl.java"}
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k;"}
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     1:4:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):40:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/Q90;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fp;)Lcom/android/tools/r8/internal/f90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ip;)Lcom/android/tools/r8/internal/j90;"}
     2:4:java.util.List lookupMemberNamingsForFieldDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.FieldDefinition):74:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/fp;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/ip;)Ljava/util/List;"}
     5:5:boolean com.android.tools.r8.retrace.internal.FieldDefinition.isFullFieldDefinition():0:0 -> a
     5:5:java.util.List lookupMemberNamingsForFieldDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.FieldDefinition):79 -> a
     6:6:java.util.List lookupMemberNamingsForFieldDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.FieldDefinition):82:82 -> a
@@ -266361,9 +266016,9 @@
     16:16:boolean lambda$lookupMemberNamingsForFieldDefinition$0(com.android.tools.r8.naming.MemberNaming$FieldSignature,com.android.tools.r8.naming.MemberNaming):86:86 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$a;Lcom/android/tools/r8/naming/V;)Z"}
     17:17:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UN;)Lcom/android/tools/r8/internal/l90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;)Lcom/android/tools/r8/internal/p90;"}
     18:23:java.util.List lookupMappedRangesForMethodDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.MethodDefinition):116:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/UN;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/YN;)Ljava/util/List;"}
     24:24:boolean com.android.tools.r8.retrace.internal.MethodDefinition.isFullMethodDefinition():0:0 -> a
     24:24:java.util.List lookupMappedRangesForMethodDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.MethodDefinition):122 -> a
     25:25:java.util.List lookupMappedRangesForMethodDefinition(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.MethodDefinition):125:125 -> a
@@ -266374,7 +266029,7 @@
     38:40:boolean lambda$lookupMappedRangesForMethodDefinition$1(com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):130:132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/k$c;)Z"}
     41:41:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$lookupMappedRangesForMethodDefinition$2(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/naming/k$c;)Lcom/android/tools/r8/internal/aN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/naming/k$c;)Lcom/android/tools/r8/internal/eN;"}
     42:42:com.android.tools.r8.naming.MemberNaming com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName.getMemberNaming(com.android.tools.r8.naming.ClassNamingForNameMapper):308:308 -> a
     42:42:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$lookupMappedRangesForMethodDefinition$2(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -266382,7 +266037,7 @@
     43:46:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$lookupMappedRangesForMethodDefinition$2(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):138 -> a
     47:47:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$lookupMappedRangesForMethodDefinition$2(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):138:138 -> a
     48:48:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):160:160 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ii;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/b90;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ki;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/f90;)Ljava/lang/Object;"}
     49:52:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():212:215 -> a
     49:52:java.util.stream.Stream internalStream():208 -> a
     49:52:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):161 -> a
@@ -266397,9 +266052,9 @@
     55:55:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):161 -> a
     56:58:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):161:163 -> a
     59:59:void lambda$lookup$3(com.android.tools.r8.retrace.internal.Definition,java.util.List,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):162:162 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ii;Ljava/util/List;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/c90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ki;Ljava/util/List;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/g90;)V"}
     1:8:void lookupElement(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.Definition,java.util.List,java.util.function.BiFunction):146:153 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ii;Ljava/util/List;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/c90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ki;Ljava/util/List;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/g90;)V"}
     1:1:boolean isEmpty():199:199 -> isEmpty
     1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):53:53 -> lookupField
     1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):33 -> lookupField
@@ -266459,34 +266114,34 @@
     6:6:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl createElement():214:214 -> stream
     6:6:java.util.stream.Stream stream():204 -> stream
     7:7:java.util.stream.Stream stream():204:204 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.b90:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.f90:
 # {"id":"sourceFile","fileName":"RetraceClassResultImpl.java"}
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.internal.RetracerImpl) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d90;Ljava/util/List;Ljava/lang/Object;Lcom/android/tools/r8/internal/M90;)Ljava/lang/Object;"}
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.c90:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h90;Ljava/util/List;Ljava/lang/Object;Lcom/android/tools/r8/internal/Q90;)Ljava/lang/Object;"}
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.g90:
 # {"id":"sourceFile","fileName":"RetraceClassResultImpl.java"}
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h90;"}
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F90;"}
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k;"}
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):237:240 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d90;Lcom/android/tools/r8/internal/B90;Lcom/android/tools/r8/naming/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h90;Lcom/android/tools/r8/internal/F90;Lcom/android/tools/r8/naming/k;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):276:276 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dp;)Lcom/android/tools/r8/internal/f90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gp;)Lcom/android/tools/r8/internal/j90;"}
     2:4:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):298:300 -> a
     2:4:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):276 -> a
     5:5:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):276:276 -> a
     6:6:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.FieldDefinition):278:278 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/fp;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/ip;)Ljava/util/List;"}
     7:7:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):288:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/SN;)Lcom/android/tools/r8/internal/l90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WN;)Lcom/android/tools/r8/internal/p90;"}
     8:10:java.lang.Object lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):298:300 -> a
     8:10:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):288 -> a
     11:11:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):288:288 -> a
     12:12:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.MethodDefinition):290:290 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/UN;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/internal/YN;)Ljava/util/List;"}
     1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl getParentResult():255:255 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetraceResult getParentResult():228 -> getParentResult
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getRetracedClass():245:245 -> getRetracedClass
@@ -266576,19 +266231,19 @@
     3:3:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):228 -> lookupMethod
     4:4:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):284:284 -> lookupMethod
     4:4:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):228 -> lookupMethod
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.f90:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.j90:
 # {"id":"sourceFile","fileName":"RetraceFieldResultImpl.java"}
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ip;"}
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracerImpl):32:38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d90;Ljava/util/List;Lcom/android/tools/r8/internal/fp;Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h90;Ljava/util/List;Lcom/android/tools/r8/internal/ip;Lcom/android/tools/r8/internal/Q90;)V"}
     1:4:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):46:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;)Ljava/util/stream/Stream;"}
     5:5:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():245:245 -> a
     5:5:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):55 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -266601,7 +266256,7 @@
     9:9:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):53:53 -> a
     10:20:java.util.stream.Stream lambda$stream$1(com.android.tools.r8.utils.Pair):49:59 -> a
     21:27:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):62:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c90;Lcom/android/tools/r8/naming/V;)Lcom/android/tools/r8/internal/e90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g90;Lcom/android/tools/r8/naming/V;)Lcom/android/tools/r8/internal/i90;"}
     28:28:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):67:67 -> a
     29:29:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.naming.MemberNaming):66:66 -> a
     30:30:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl.create(com.android.tools.r8.references.ClassReference,boolean):23:23 -> a
@@ -266621,20 +266276,20 @@
     1:8:boolean isAmbiguous():88:95 -> isAmbiguous
     1:3:boolean isEmpty():100:102 -> isEmpty
     1:2:java.util.stream.Stream stream():43:44 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.e90:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.i90:
 # {"id":"sourceFile","fileName":"RetraceFieldResultImpl.java"}
     com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl fieldReference -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/E90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I90;"}
     com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceFieldResult -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/f90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j90;"}
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g90;"}
     com.android.tools.r8.naming.MemberNaming memberNaming -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/V;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():105:105 -> <clinit>
     1:5:void <init>(com.android.tools.r8.retrace.internal.RetraceFieldResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl,com.android.tools.r8.naming.MemberNaming):116:120 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/f90;Lcom/android/tools/r8/internal/c90;Lcom/android/tools/r8/internal/E90;Lcom/android/tools/r8/naming/V;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j90;Lcom/android/tools/r8/internal/g90;Lcom/android/tools/r8/internal/I90;Lcom/android/tools/r8/naming/V;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl getClassElement():146:146 -> getClassElement
     1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():105 -> getClassElement
     1:1:com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl getField():136:136 -> getField
@@ -266661,37 +266316,37 @@
     3:4:boolean isUnknown():130:131 -> isUnknown
     5:5:boolean com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl.isUnknown():0:0 -> isUnknown
     5:5:boolean isUnknown():131 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceFrameResultData -> com.android.tools.r8.internal.g90:
+com.android.tools.r8.retrace.internal.RetraceFrameResultData -> com.android.tools.r8.internal.k90:
 # {"id":"sourceFile","fileName":"RetraceFrameResultData.java"}
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl retraceClassElement -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g90;"}
     java.util.List memberNamingWithMappedRanges -> b
     java.util.OptionalInt position -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List,java.util.OptionalInt):21:24 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c90;Ljava/util/List;Ljava/util/OptionalInt;)V"}
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.j90:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g90;Ljava/util/List;Ljava/util/OptionalInt;)V"}
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.n90:
 # {"id":"sourceFile","fileName":"RetraceFrameResultImpl.java"}
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YN;"}
     java.util.List mappedRanges -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl context -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/t90;"}
     com.android.tools.r8.utils.OptionalBool isAmbiguousCache -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.internal.RetracerImpl,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl):52:52 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/UN;Lcom/android/tools/r8/internal/M90;Lcom/android/tools/r8/internal/p90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/internal/Q90;Lcom/android/tools/r8/internal/t90;)V"}
     2:15:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.internal.RetracerImpl,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl):45:58 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFrameResultData.getRetraceClassElement():64:64 -> a
     1:1:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceFrameResultData):92 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g90;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k90;)Ljava/util/stream/Stream;"}
     2:2:java.util.List com.android.tools.r8.retrace.internal.RetraceFrameResultData.getMemberNamingWithMappedRanges():68:68 -> a
     2:2:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceFrameResultData):94 -> a
     3:3:java.util.OptionalInt com.android.tools.r8.retrace.internal.RetraceFrameResultData.getPosition():72:72 -> a
@@ -266743,7 +266398,7 @@
     93:93:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceFrameResultData):106:106 -> a
     94:94:java.util.stream.Stream lambda$stream$0(com.android.tools.r8.retrace.internal.RetraceFrameResultData):98:98 -> a
     95:95:void separateAmbiguousOriginalPositions(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.Optional,java.util.List,java.util.List,java.util.OptionalInt):170:170 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c90;Ljava/util/Optional;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/OptionalInt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/g90;Ljava/util/Optional;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/OptionalInt;)V"}
     96:102:boolean isMappedRangeAmbiguous(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):78:84 -> a
     96:102:void separateAmbiguousOriginalPositions(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.Optional,java.util.List,java.util.List,java.util.OptionalInt):170 -> a
     103:105:void separateAmbiguousOriginalPositions(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.Optional,java.util.List,java.util.List,java.util.OptionalInt):179:181 -> a
@@ -266759,10 +266414,10 @@
     140:140:void lambda$separateAmbiguousOriginalPositions$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.List):196:196 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Ljava/util/List;)V"}
     141:141:void lambda$separateAmbiguousOriginalPositions$4(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt,java.util.List):202:202 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Optional;Lcom/android/tools/r8/internal/c90;Ljava/util/OptionalInt;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Optional;Lcom/android/tools/r8/internal/g90;Ljava/util/OptionalInt;Ljava/util/List;)V"}
     142:142:void lambda$separateAmbiguousOriginalPositions$4(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt,java.util.List):201:201 -> a
     143:144:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt):211:212 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Optional;Lcom/android/tools/r8/internal/c90;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/h90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Optional;Lcom/android/tools/r8/internal/g90;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/l90;"}
     145:145:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():245:245 -> a
     145:145:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -266774,7 +266429,7 @@
     148:148:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt):213 -> a
     149:152:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl elementFromMappedRanges(java.util.List,java.util.Optional,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.OptionalInt):215:218 -> a
     153:157:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):229:233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/i90;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/F90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/m90;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/J90;"}
     158:158:java.util.OptionalInt com.android.tools.r8.utils.OptionalUtils.map(java.util.OptionalInt,java.util.function.Supplier):13:13 -> a
     158:158:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):235 -> a
     159:159:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):233:233 -> a
@@ -266794,7 +266449,7 @@
     176:176:java.util.OptionalInt lambda$getRetracedMethod$6(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):254:254 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Ljava/util/OptionalInt;)Ljava/util/OptionalInt;"}
     1:1:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame lambda$separateAmbiguousOriginalPositions$1(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):173:173 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/internal/i90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/internal/m90;"}
     1:1:boolean isAmbiguous():63:63 -> isAmbiguous
     2:5:boolean computeIsAmbiguous():71:74 -> isAmbiguous
     2:5:boolean isAmbiguous():64 -> isAmbiguous
@@ -266831,21 +266486,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean isEmpty():261:261 -> isEmpty
     1:2:java.util.stream.Stream stream():89:90 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.h90:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.l90:
 # {"id":"sourceFile","fileName":"RetraceFrameResultImpl.java"}
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L90;"}
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl retraceFrameResult -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/j90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/n90;"}
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g90;"}
     java.util.List mappedRanges -> d
     java.util.Optional memberNaming -> e
     java.util.OptionalInt obfuscatedPosition -> f
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     1:8:void <init>(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,java.util.List,java.util.Optional,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetracerImpl):281:288 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/j90;Lcom/android/tools/r8/internal/c90;Lcom/android/tools/r8/internal/H90;Ljava/util/List;Ljava/util/Optional;Ljava/util/OptionalInt;Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/n90;Lcom/android/tools/r8/internal/g90;Lcom/android/tools/r8/internal/L90;Ljava/util/List;Ljava/util/Optional;Ljava/util/OptionalInt;Lcom/android/tools/r8/internal/Q90;)V"}
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange lambda$forEachRewritten$0(java.lang.Object):359:359 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/naming/k$b;"}
     2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():454:454 -> a
@@ -267027,7 +266682,7 @@
     2:2:boolean isUnknown():318 -> isUnknown
     1:3:java.util.stream.Stream stream():346:348 -> stream
     1:3:java.util.stream.Stream streamRewritten(com.android.tools.r8.retrace.RetraceStackTraceContext):388:390 -> streamRewritten
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.i90:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.m90:
 # {"id":"sourceFile","fileName":"RetraceFrameResultImpl.java"}
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange mappedRange -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k$b;"}
@@ -267035,35 +266690,35 @@
     1:3:void <init>(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):448:450 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Ljava/util/OptionalInt;)V"}
     1:3:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):460:462 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/internal/i90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;)Lcom/android/tools/r8/internal/m90;"}
     4:4:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):461:461 -> a
     5:5:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):466:466 -> a
     5:5:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):458 -> a
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.l90:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.p90:
 # {"id":"sourceFile","fileName":"RetraceMethodResultImpl.java"}
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YN;"}
     java.util.List mappedRanges -> b
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     com.android.tools.r8.utils.OptionalBool isAmbiguousCache -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.internal.RetracerImpl):43:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d90;Ljava/util/List;Lcom/android/tools/r8/internal/UN;Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h90;Ljava/util/List;Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/internal/Q90;)V"}
     2:14:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,com.android.tools.r8.retrace.internal.MethodDefinition,com.android.tools.r8.retrace.internal.RetracerImpl):37:49 -> <init>
     1:1:java.util.List com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.allRangesForLine(int):25:25 -> a
     1:1:java.util.List lambda$filterOnExistingPosition$1(int,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):198 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aN;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/eN;)Ljava/util/List;"}
     2:2:java.util.List com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.allRangesForLine(int):25:25 -> a
     2:2:java.util.List lambda$filterOnExistingPosition$1(int,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):198 -> a
     3:3:java.util.List com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.getMappedRanges():34:34 -> a
     3:3:boolean com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.isSingleCatchAllRange():46 -> a
     3:3:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$narrowByPosition$0(com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aN;)Lcom/android/tools/r8/internal/aN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eN;)Lcom/android/tools/r8/internal/eN;"}
     4:4:java.util.List com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.getMappedRanges():34:34 -> a
     4:4:boolean com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.isSingleCatchAllRange():46 -> a
     4:4:com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName lambda$narrowByPosition$0(com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):130 -> a
@@ -267091,7 +266746,7 @@
     15:15:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignatureFromMapping(com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void lambda$stream$2(java.util.Set,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):233 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/c90;Ljava/util/List;Lcom/android/tools/r8/internal/aN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/g90;Ljava/util/List;Lcom/android/tools/r8/internal/eN;)V"}
     16:17:com.android.tools.r8.naming.MemberNaming$MethodSignature getMethodSignatureFromMapping(com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):254:255 -> a
     16:17:void lambda$stream$2(java.util.Set,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):233 -> a
     18:18:java.util.List com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName.getMappedRanges():34:34 -> a
@@ -267115,7 +266770,7 @@
     25:32:void lambda$stream$2(java.util.Set,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):236:243 -> a
     33:33:void lambda$stream$2(java.util.Set,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):239:239 -> a
     34:43:void narrowMappedRangeByPosition(com.android.tools.r8.utils.Pair,java.util.function.Function,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,java.util.List):154:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;Ljava/util/function/Function;Ljava/util/OptionalInt;Lcom/android/tools/r8/internal/p90;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;Ljava/util/function/Function;Ljava/util/OptionalInt;Lcom/android/tools/r8/internal/t90;Ljava/util/ArrayList;)V"}
     44:44:boolean com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl.hasRewritePosition():52:52 -> a
     44:44:void narrowMappedRangeByPosition(com.android.tools.r8.utils.Pair,java.util.function.Function,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,java.util.List):165 -> a
     45:51:void narrowMappedRangeByPosition(com.android.tools.r8.utils.Pair,java.util.function.Function,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,java.util.List):167:173 -> a
@@ -267147,7 +266802,7 @@
     80:80:java.util.function.Function filterOnExistingPosition(int):198:198 -> a
     81:81:java.util.function.Function filterOnMappedRangesWithNoMinifiedRange():203:203 -> a
     82:114:java.util.stream.Stream lambda$stream$3(com.android.tools.r8.utils.Pair):215:247 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;)Ljava/util/stream/Stream;"}
     115:115:java.util.stream.Stream lambda$stream$3(com.android.tools.r8.utils.Pair):219:219 -> a
     116:116:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():245:245 -> a
     116:116:java.util.stream.Stream lambda$stream$3(com.android.tools.r8.utils.Pair):225 -> a
@@ -267202,23 +266857,23 @@
     1:2:boolean isEmpty():85:86 -> isEmpty
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):30:30 -> narrowByPosition
     2:20:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):92:110 -> narrowByPosition
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/j90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Ljava/util/OptionalInt;)Lcom/android/tools/r8/internal/n90;"}
     21:39:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):108:126 -> narrowByPosition
     40:52:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):125:137 -> narrowByPosition
     53:58:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):135:140 -> narrowByPosition
     1:2:java.util.stream.Stream stream():212:213 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.k90:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.o90:
 # {"id":"sourceFile","fileName":"RetraceMethodResultImpl.java"}
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/H90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L90;"}
     com.android.tools.r8.retrace.internal.RetraceMethodResultImpl retraceMethodResult -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/p90;"}
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/g90;"}
     com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName mapping -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eN;"}
     1:5:void <init>(com.android.tools.r8.retrace.internal.RetraceMethodResultImpl,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl,com.android.tools.r8.retrace.internal.MemberNamingWithMappedRangesOfName):272:276 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l90;Lcom/android/tools/r8/internal/c90;Lcom/android/tools/r8/internal/H90;Lcom/android/tools/r8/internal/aN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/p90;Lcom/android/tools/r8/internal/g90;Lcom/android/tools/r8/internal/L90;Lcom/android/tools/r8/internal/eN;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl getClassElement():309:309 -> getClassElement
     1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():261 -> getClassElement
     1:1:com.android.tools.r8.retrace.RetraceMethodResult getParentResult():304:304 -> getParentResult
@@ -267263,7 +266918,7 @@
     1:1:boolean isUnknown():294:294 -> isUnknown
     2:2:boolean com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl.isUnknown():0:0 -> isUnknown
     2:2:boolean isUnknown():294 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceStackFrameAmbiguousResultWithContextImpl -> com.android.tools.r8.internal.m90:
+com.android.tools.r8.retrace.internal.RetraceStackFrameAmbiguousResultWithContextImpl -> com.android.tools.r8.internal.q90:
 # {"id":"sourceFile","fileName":"RetraceStackFrameAmbiguousResultWithContextImpl.java"}
     com.android.tools.r8.retrace.RetraceStackTraceContext context -> a
     java.util.List result -> b
@@ -267276,7 +266931,7 @@
     1:1:boolean isAmbiguous():38:38 -> isAmbiguous
     1:1:boolean isEmpty():65:65 -> isEmpty
     1:1:int size():60:60 -> size
-com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl -> com.android.tools.r8.internal.n90:
+com.android.tools.r8.retrace.internal.RetraceStackFrameResultWithContextImpl -> com.android.tools.r8.internal.r90:
 # {"id":"sourceFile","fileName":"RetraceStackFrameResultWithContextImpl.java"}
     com.android.tools.r8.retrace.RetraceStackTraceContext context -> a
     java.util.List result -> b
@@ -267287,44 +266942,44 @@
     1:1:java.util.List getResult():35:35 -> getResult
     1:1:boolean isEmpty():55:55 -> isEmpty
     1:1:int size():45:45 -> size
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.p90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.t90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceContextImpl.java"}
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:3:void <init>(com.android.tools.r8.references.ClassReference,java.util.OptionalInt):22:24 -> <init>
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.o90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.s90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceContextImpl.java"}
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>():81:81 -> <init>
     2:2:void <init>():79:79 -> <init>
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.q90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.u90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceCurrentEvaluationInformation.java"}
     int removeInnerFramesCount -> a
     com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/q90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u90;"}
     1:1:void <clinit>():9:9 -> <clinit>
     1:2:void <init>(int):14:15 -> <init>
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> R8$$REMOVED$$CLASS$$228:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> R8$$REMOVED$$CLASS$$217:
 # {"id":"sourceFile","fileName":"RetraceStackTraceCurrentEvaluationInformation.java"}
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.s90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.w90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceElementProxyResultImpl.java"}
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:3:void <init>(java.util.stream.Stream,java.util.function.Supplier):22:24 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.create():64:64 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/r90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/v90;"}
     2:2:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38:38 -> a
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.setResultContext(java.util.function.Supplier):55:55 -> a
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38 -> a
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getResultContext():34:34 -> getResultContext
     1:1:java.util.stream.Stream stream():29:29 -> stream
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.r90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.v90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceElementProxyResultImpl.java"}
     java.util.function.Supplier resultContext -> a
     1:1:void <init>():46:46 -> <init>
-com.android.tools.r8.retrace.internal.RetraceStackTraceResultImpl -> com.android.tools.r8.internal.t90:
+com.android.tools.r8.retrace.internal.RetraceStackTraceResultImpl -> com.android.tools.r8.internal.x90:
 # {"id":"sourceFile","fileName":"RetraceStackTraceResultImpl.java"}
     java.util.List result -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -267337,7 +266992,7 @@
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getContext():31:31 -> getContext
     1:1:java.util.List getResult():36:36 -> getResult
     1:1:boolean isEmpty():46:46 -> isEmpty
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.v90:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.z90:
 # {"id":"sourceFile","fileName":"RetraceThrownExceptionResultImpl.java"}
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
@@ -267353,17 +267008,17 @@
     6:6:com.android.tools.r8.retrace.RetraceThrownExceptionElement createElement():47:47 -> stream
     6:6:java.util.stream.Stream stream():36 -> stream
     7:7:java.util.stream.Stream stream():36:36 -> stream
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.u90:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.y90:
 # {"id":"sourceFile","fileName":"RetraceThrownExceptionResultImpl.java"}
     com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl thrownExceptionResult -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/v90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/z90;"}
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/F90;"}
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k;"}
     com.android.tools.r8.references.ClassReference thrownException -> d
     1:5:void <init>(com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl,com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.references.ClassReference):65:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/v90;Lcom/android/tools/r8/internal/B90;Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/references/ClassReference;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/z90;Lcom/android/tools/r8/internal/F90;Lcom/android/tools/r8/naming/k;Lcom/android/tools/r8/references/ClassReference;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder.create():103:103 -> getContext
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl.builder():69 -> getContext
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getContext():103 -> getContext
@@ -267388,16 +267043,16 @@
     8:8:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():93 -> getSourceFile
     9:9:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():93:93 -> getSourceFile
     1:1:boolean isCompilerSynthesized():98:98 -> isCompilerSynthesized
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.x90:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.B90:
 # {"id":"sourceFile","fileName":"RetraceTypeResultImpl.java"}
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     java.util.List retracedTypeReferences -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.references.TypeReference,java.util.List,com.android.tools.r8.retrace.Retracer):33:35 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/TypeReference;Ljava/util/List;Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/TypeReference;Ljava/util/List;Lcom/android/tools/r8/internal/Q90;)V"}
     1:2:java.util.List retraceTypeReference(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):48:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/TypeReference;Lcom/android/tools/r8/internal/M90;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/TypeReference;Lcom/android/tools/r8/internal/Q90;)Ljava/util/List;"}
     3:3:com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl.create(com.android.tools.r8.references.TypeReference):21:21 -> a
     3:3:java.util.List retraceTypeReference(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):50 -> a
     4:18:java.util.List retraceTypeReference(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):50:64 -> a
@@ -267410,41 +267065,41 @@
     1:1:boolean isAmbiguous():79:79 -> isAmbiguous
     1:1:boolean isEmpty():89:89 -> isEmpty
     1:5:java.util.stream.Stream stream():70:74 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.w90:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.A90:
 # {"id":"sourceFile","fileName":"RetraceTypeResultImpl.java"}
     com.android.tools.r8.retrace.RetraceTypeResult typeResult -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/x90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B90;"}
     com.android.tools.r8.retrace.RetracedTypeReference retracedType -> b
     1:3:void <init>(com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.RetracedTypeReference):97:99 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/x90;Lcom/android/tools/r8/retrace/RetracedTypeReference;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/B90;Lcom/android/tools/r8/retrace/RetracedTypeReference;)V"}
     1:1:com.android.tools.r8.retrace.RetraceTypeResult getParentResult():109:109 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetraceResult getParentResult():92 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getType():104:104 -> getType
     1:1:boolean isCompilerSynthesized():114:114 -> isCompilerSynthesized
-com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.y90:
+com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.C90:
 # {"id":"sourceFile","fileName":"RetraceUnknownJsonMappingInformationResultImpl.java"}
     java.util.List elements -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.List):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.retrace.RetraceUnknownMappingInformationElement lambda$stream$0(com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):30:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bk0;)Lcom/android/tools/r8/retrace/RetraceUnknownMappingInformationElement;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fk0;)Lcom/android/tools/r8/retrace/RetraceUnknownMappingInformationElement;"}
     2:9:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult build(java.util.List):36:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/y90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/internal/C90;"}
     10:10:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):39:39 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     11:11:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isUnknownJsonMappingInformation():0:0 -> a
     11:11:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):39 -> a
     12:12:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):40:40 -> a
     1:2:java.util.stream.Stream stream():27:28 -> stream
-com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.z90:
+com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.D90:
 # {"id":"sourceFile","fileName":"RetraceUnknownMappingInformationElementImpl.java"}
     com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult result -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/C90;"}
     com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation mappingInformation -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fk0;"}
     1:3:void <init>(com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult,com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):19:21 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y90;Lcom/android/tools/r8/internal/bk0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/C90;Lcom/android/tools/r8/internal/fk0;)V"}
     1:1:java.lang.String getIdentifier():26:26 -> getIdentifier
     2:2:java.lang.String com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation.getId():24:24 -> getIdentifier
     2:2:java.lang.String getIdentifier():26 -> getIdentifier
@@ -267454,7 +267109,7 @@
     2:2:java.lang.String getPayLoad():31 -> getPayLoad
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getRetraceResultContext():36:36 -> getRetraceResultContext
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.A90:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.E90:
 # {"id":"sourceFile","fileName":"RetraceUtils.java"}
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
@@ -267485,7 +267140,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/references/MethodReference;"}
     106:117:com.android.tools.r8.references.MethodReference methodReferenceFromMethodSignature(com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.references.ClassReference):99:110 -> a
     118:118:com.android.tools.r8.references.MethodReference methodReferenceFromMethodSignature(com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.references.ClassReference):108:108 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.B90:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.F90:
 # {"id":"sourceFile","fileName":"RetracedClassReferenceImpl.java"}
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean hasResult -> b
@@ -267507,13 +267162,13 @@
     1:1:boolean isKnown():33:33 -> isKnown
     1:1:boolean isKnown():33:33 -> isUnknown
     1:1:boolean isUnknown():28 -> isUnknown
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.E90:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.I90:
 # {"id":"sourceFile","fileName":"RetracedFieldReferenceImpl.java"}
     1:1:void <init>():14:14 -> <init>
     1:1:boolean isUnknown():0:0 -> isKnown
     1:1:boolean isKnown():23 -> isKnown
     1:1:boolean isUnknown():0:0 -> isUnknown
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.C90:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.G90:
 # {"id":"sourceFile","fileName":"RetracedFieldReferenceImpl.java"}
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:2:void <init>(com.android.tools.r8.references.FieldReference):36:37 -> <init>
@@ -267528,12 +267183,12 @@
     2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getHolderClass():52 -> getHolderClass
     2:2:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():31 -> getHolderClass
     1:1:int hashCode():84:84 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.D90:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.H90:
 # {"id":"sourceFile","fileName":"RetracedFieldReferenceImpl.java"}
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ip;"}
     1:2:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fp;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ip;)V"}
     1:1:com.android.tools.r8.retrace.RetracedFieldReference$KnownRetracedFieldReference asKnown():88:88 -> asKnown
     1:5:boolean equals(java.lang.Object):111:115 -> equals
     1:1:java.lang.String getFieldName():103:103 -> getFieldName
@@ -267543,7 +267198,7 @@
     2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getHolderClass():98 -> getHolderClass
     2:2:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():88 -> getHolderClass
     1:1:int hashCode():120:120 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.H90:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.L90:
 # {"id":"sourceFile","fileName":"RetracedMethodReferenceImpl.java"}
     java.util.OptionalInt position -> b
     java.util.Comparator comparator -> c
@@ -267555,9 +267210,9 @@
     1:2:void <init>(java.util.OptionalInt):39:40 -> <init>
     1:1:java.lang.String lambda$static$0(com.android.tools.r8.retrace.RetracedMethodReference$KnownRetracedMethodReference):30:30 -> a
     2:2:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl asKnown():65:65 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J90;"}
     3:3:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl create(com.android.tools.r8.references.MethodReference):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/F90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/MethodReference;)Lcom/android/tools/r8/internal/J90;"}
     4:4:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl create(com.android.tools.r8.references.MethodReference,java.util.OptionalInt):187:187 -> a
     4:4:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl create(com.android.tools.r8.references.MethodReference):183 -> a
     1:1:int getOriginalPositionOrDefault(int):50:50 -> getOriginalPositionOrDefault
@@ -267565,14 +267220,14 @@
     1:1:boolean isUnknown():0:0 -> isKnown
     1:1:boolean isKnown():60 -> isKnown
     1:1:boolean isUnknown():0:0 -> isUnknown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.F90:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.J90:
 # {"id":"sourceFile","fileName":"RetracedMethodReferenceImpl.java"}
     com.android.tools.r8.references.MethodReference methodReference -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():73:73 -> <clinit>
     1:3:void <init>(com.android.tools.r8.references.MethodReference,java.util.OptionalInt):80:82 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl asKnown():97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/F90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/J90;"}
     1:1:com.android.tools.r8.retrace.RetracedMethodReference$KnownRetracedMethodReference asKnown():73:73 -> asKnown
     1:1:int compareTo(java.lang.Object):73:73 -> compareTo
     2:2:int com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl.compareTo(com.android.tools.r8.retrace.RetracedMethodReference):70:70 -> compareTo
@@ -267589,12 +267244,12 @@
     1:2:com.android.tools.r8.references.TypeReference getReturnType():112:113 -> getReturnType
     1:1:int hashCode():141:141 -> hashCode
     1:1:boolean isVoid():92:92 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.G90:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.K90:
 # {"id":"sourceFile","fileName":"RetracedMethodReferenceImpl.java"}
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YN;"}
     1:2:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt):151:152 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/UN;Ljava/util/OptionalInt;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Ljava/util/OptionalInt;)V"}
     1:1:com.android.tools.r8.retrace.RetracedMethodReference$KnownRetracedMethodReference asKnown():145:145 -> asKnown
     1:1:int compareTo(java.lang.Object):145:145 -> compareTo
     2:2:int com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl.compareTo(com.android.tools.r8.retrace.RetracedMethodReference):70:70 -> compareTo
@@ -267605,14 +267260,14 @@
     2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getHolderClass():157 -> getHolderClass
     2:2:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():145 -> getHolderClass
     1:1:java.lang.String getMethodName():162:162 -> getMethodName
-com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.I90:
+com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.M90:
 # {"id":"sourceFile","fileName":"RetracedSingleFrameImpl.java"}
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl frameElement -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l90;"}
     com.android.tools.r8.retrace.RetracedMethodReference methodReference -> b
     int index -> c
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl,com.android.tools.r8.retrace.RetracedMethodReference,int):19:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/h90;Lcom/android/tools/r8/retrace/RetracedMethodReference;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/l90;Lcom/android/tools/r8/retrace/RetracedMethodReference;I)V"}
     1:1:int getIndex():32:32 -> getIndex
     1:1:com.android.tools.r8.retrace.RetracedMethodReference getMethodReference():27:27 -> getMethodReference
     1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37:37 -> getSourceFile
@@ -267636,7 +267291,7 @@
     8:8:com.android.tools.r8.retrace.RetracedSourceFile com.android.tools.r8.retrace.internal.RetraceUtils.getSourceFile(com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.internal.RetracerImpl):71:71 -> getSourceFile
     8:8:com.android.tools.r8.retrace.RetracedSourceFile com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference):395 -> getSourceFile
     8:8:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.J90:
+com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.N90:
 # {"id":"sourceFile","fileName":"RetracedSourceFileImpl.java"}
     com.android.tools.r8.retrace.RetracedClassReference classReference -> a
     java.lang.String filename -> b
@@ -267648,7 +267303,7 @@
     9:9:java.lang.String getOrInferSourceFile(java.lang.String):41:41 -> getOrInferSourceFile
     1:1:java.lang.String getSourceFile():28:28 -> getSourceFile
     1:1:boolean hasRetraceResult():23:23 -> hasRetraceResult
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.K90:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.O90:
 # {"id":"sourceFile","fileName":"RetracedTypeReferenceImpl.java"}
     com.android.tools.r8.references.TypeReference typeReference -> a
     boolean $assertionsDisabled -> b
@@ -267660,20 +267315,20 @@
     1:1:int hashCode():62:62 -> hashCode
     1:1:boolean isVoid():30:30 -> isVoid
     1:1:com.android.tools.r8.references.TypeReference toArray(int):35:35 -> toArray
-com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.M90:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.Q90:
 # {"id":"sourceFile","fileName":"RetracerImpl.java"}
     com.android.tools.r8.retrace.internal.MappingSupplierInternal classNameMapperSupplier -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AM;"}
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():18:18 -> <clinit>
     1:4:void <init>(com.android.tools.r8.retrace.internal.MappingSupplierInternal,com.android.tools.r8.DiagnosticsHandler):24:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wM;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AM;Lcom/android/tools/r8/DiagnosticsHandler;)V"}
     1:1:com.android.tools.r8.retrace.internal.RetracerImpl createInternal(com.android.tools.r8.retrace.internal.MappingSupplierInternal,com.android.tools.r8.DiagnosticsHandler):87:87 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wM;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AM;Lcom/android/tools/r8/DiagnosticsHandler;)Lcom/android/tools/r8/internal/Q90;"}
     1:1:com.android.tools.r8.retrace.RetraceClassResult retraceClass(com.android.tools.r8.references.ClassReference):18:18 -> retraceClass
     2:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl retraceClass(com.android.tools.r8.references.ClassReference):67:68 -> retraceClass
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/d90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/h90;"}
     4:4:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.create(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):48:48 -> retraceClass
     4:4:com.android.tools.r8.retrace.internal.RetraceClassResultImpl retraceClass(com.android.tools.r8.references.ClassReference):67 -> retraceClass
     1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceField(com.android.tools.r8.references.FieldReference):62:62 -> retraceField
@@ -267720,13 +267375,13 @@
     1:2:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetraceTypeResultImpl.create(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.Retracer):41:42 -> retraceType
     1:2:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl retraceType(com.android.tools.r8.references.TypeReference):73 -> retraceType
     1:2:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):18 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.Yc0:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.cd0:
 # {"id":"sourceFile","fileName":"StackTraceElementProxyRetracerImpl.java"}
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):44:45 -> <init>
     1:1:com.android.tools.r8.retrace.RetracedTypeReference com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl.createVoid():25:25 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceFieldOrReturnType$12(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;)Lcom/android/tools/r8/internal/bd0;"}
     2:2:boolean com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl.isAmbiguous():364:364 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceFieldOrReturnType$12(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -267738,14 +267393,14 @@
     5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenReturnType(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetracedTypeReference,boolean):273:273 -> a
     5:5:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceFieldOrReturnType$12(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):245 -> a
     6:6:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s90;Lcom/android/tools/r8/retrace/RetraceClassResult;)Lcom/android/tools/r8/internal/s90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w90;Lcom/android/tools/r8/retrace/RetraceClassResult;)Lcom/android/tools/r8/internal/w90;"}
     7:7:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl.stream():29:29 -> a
     7:7:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):82 -> a
     8:9:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):82:83 -> a
     10:10:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.build():60:60 -> a
     10:10:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):92 -> a
     11:12:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenThrownExceptionElement(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):100:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceThrownExceptionElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceThrownExceptionElement;)Lcom/android/tools/r8/internal/bd0;"}
     13:13:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):549:549 -> a
     13:13:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenThrownExceptionElement(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):101 -> a
     14:14:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenThrownExceptionElement(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):102:102 -> a
@@ -267756,7 +267411,7 @@
     17:17:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenThrownExceptionElement(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):104 -> a
     18:19:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenThrownExceptionElement(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):105:106 -> a
     20:22:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceMethod(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.RetraceStackTraceContext):114:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;)Lcom/android/tools/r8/internal/s90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;)Lcom/android/tools/r8/internal/w90;"}
     23:23:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.setResultContext(java.util.function.Supplier):55:55 -> a
     23:23:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceMethod(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.RetraceStackTraceContext):116 -> a
     24:24:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl.stream():29:29 -> a
@@ -267765,10 +267420,10 @@
     27:27:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.build():60:60 -> a
     27:27:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceMethod(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.RetraceStackTraceContext):160 -> a
     28:31:java.util.stream.Stream lambda$retraceMethod$6(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):125:128 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/Xc0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/bd0;)Ljava/util/stream/Stream;"}
     32:54:java.util.stream.Stream lambda$retraceMethod$6(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):123:145 -> a
     55:55:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$3(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassElement;)Lcom/android/tools/r8/internal/bd0;"}
     56:56:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setTopFrame(boolean):590:590 -> a
     56:56:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$3(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement):135 -> a
     57:58:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$3(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement):136:137 -> a
@@ -267777,14 +267432,14 @@
     60:60:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$3(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement):139:139 -> a
     61:65:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$3(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassElement):138:142 -> a
     66:66:void lambda$retraceMethod$2(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Wc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/ad0;)V"}
     67:67:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setLineNumber(int):580:580 -> a
     67:67:void lambda$retraceMethod$2(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     68:71:java.util.stream.Stream lambda$retraceMethod$5(com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceStackTraceContext,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement):147:150 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/retrace/RetraceStackTraceContext;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;)Ljava/util/stream/Stream;"}
     72:76:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFrameElement(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedSingleFrame):169:173 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;Lcom/android/tools/r8/retrace/RetracedSingleFrame;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;Lcom/android/tools/r8/retrace/RetracedSingleFrame;)Lcom/android/tools/r8/internal/bd0;"}
     77:77:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):549:549 -> a
     77:77:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFrameElement(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedSingleFrame):173 -> a
     78:78:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethod(com.android.tools.r8.retrace.RetracedMethodReference):554:554 -> a
@@ -267798,22 +267453,22 @@
     83:83:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFrameElement(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedSingleFrame):179:179 -> a
     84:89:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFrameElement(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedSingleFrame):178:183 -> a
     90:90:void lambda$buildProxyForRewrittenFrameElement$7(com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetracedMethodReference;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Wc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetracedMethodReference;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/ad0;)V"}
     91:91:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setLineNumber(int):580:580 -> a
     91:91:void lambda$buildProxyForRewrittenFrameElement$7(com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):181 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     92:92:com.android.tools.r8.retrace.RetracedSourceFile lambda$buildProxyForRewrittenFrameElement$8(com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedMethodReference):182:182 -> a
     93:93:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceField(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassResult;)Lcom/android/tools/r8/internal/s90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/retrace/RetraceClassResult;)Lcom/android/tools/r8/internal/w90;"}
     94:94:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl.stream():29:29 -> a
     94:94:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceField(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):193 -> a
     95:96:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceField(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):193:194 -> a
     97:97:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.build():60:60 -> a
     97:97:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceField(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceClassResult):204 -> a
     98:100:java.util.stream.Stream lambda$retraceField$10(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):197:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Xc0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/bd0;)Ljava/util/stream/Stream;"}
     101:102:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFieldElement(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFieldResult,com.android.tools.r8.retrace.RetraceFieldElement):212:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceFieldResult;Lcom/android/tools/r8/retrace/RetraceFieldElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceFieldResult;Lcom/android/tools/r8/retrace/RetraceFieldElement;)Lcom/android/tools/r8/internal/bd0;"}
     103:103:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedClass(com.android.tools.r8.retrace.RetracedClassReference):549:549 -> a
     103:103:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFieldElement(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFieldResult,com.android.tools.r8.retrace.RetraceFieldElement):213 -> a
     104:104:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFieldElement(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFieldResult,com.android.tools.r8.retrace.RetraceFieldElement):214:214 -> a
@@ -267825,11 +267480,11 @@
     108:109:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenFieldElement(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFieldResult,com.android.tools.r8.retrace.RetraceFieldElement):217:218 -> a
     110:110:java.util.function.Consumer setSourceFileOnProxy(java.util.function.Supplier):223:223 -> a
     111:115:void lambda$setSourceFileOnProxy$11(java.util.function.Supplier,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):224:228 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/Wc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/internal/ad0;)V"}
     116:117:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setSourceFile(com.android.tools.r8.retrace.RetracedSourceFile):574:575 -> a
     116:117:void lambda$setSourceFileOnProxy$11(java.util.function.Supplier,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder):228 -> a
     118:123:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceFieldOrReturnType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):234:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/internal/s90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/internal/w90;"}
     124:124:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl.stream():29:29 -> a
     124:124:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceFieldOrReturnType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):242 -> a
     125:126:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceFieldOrReturnType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):242:243 -> a
@@ -267842,9 +267497,9 @@
     135:135:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.build():60:60 -> a
     135:135:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceFieldOrReturnType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):265 -> a
     136:137:java.util.stream.Stream lambda$retraceFieldOrReturnType$14(java.util.List,com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):258:259 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/retrace/RetraceTypeResult;Lcom/android/tools/r8/internal/Xc0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/retrace/RetraceTypeResult;Lcom/android/tools/r8/internal/bd0;)Ljava/util/stream/Stream;"}
     138:139:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceFieldOrReturnType$13(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.RetraceTypeElement):263:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceTypeResult;Lcom/android/tools/r8/retrace/RetraceTypeElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceTypeResult;Lcom/android/tools/r8/retrace/RetraceTypeElement;)Lcom/android/tools/r8/internal/bd0;"}
     140:140:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl buildProxyForRewrittenReturnType(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetracedTypeReference,boolean):273:273 -> a
     140:140:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceFieldOrReturnType$13(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceTypeResult,com.android.tools.r8.retrace.RetraceTypeElement):261 -> a
     141:141:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedFieldOrReturnType(com.android.tools.r8.retrace.RetracedTypeReference):564:564 -> a
@@ -267856,25 +267511,25 @@
     145:145:void lambda$retracedMethodArguments$16(java.util.List,java.util.List,com.android.tools.r8.retrace.RetraceTypeElement):295:295 -> a
     146:148:void lambda$retracedMethodArguments$15(com.android.tools.r8.retrace.RetraceTypeElement,java.util.List,java.util.List):297:299 -> a
     149:150:java.util.stream.Stream lambda$retracedMethodArguments$19(java.util.List,boolean,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):310:311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;ZLcom/android/tools/r8/internal/Xc0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;ZLcom/android/tools/r8/internal/bd0;)Ljava/util/stream/Stream;"}
     151:151:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retracedMethodArguments$18(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,boolean,java.util.List):314:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;ZLjava/util/List;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;ZLjava/util/List;)Lcom/android/tools/r8/internal/bd0;"}
     152:152:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setRetracedMethodArguments(java.util.List):569:569 -> a
     152:152:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retracedMethodArguments$18(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,boolean,java.util.List):315 -> a
     153:154:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retracedMethodArguments$18(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,boolean,java.util.List):316:317 -> a
     155:155:com.android.tools.r8.retrace.RetraceStackTraceContext com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl.getContext():481:481 -> a
     155:155:java.util.stream.Stream lambda$retraceClassOrType$1(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):87 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/Xc0;)Ljava/util/stream/Stream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/bd0;)Ljava/util/stream/Stream;"}
     156:157:java.util.stream.Stream lambda$retraceClassOrType$1(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl):87:88 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceClassOrType$0(com.android.tools.r8.retrace.RetraceClassResult,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceThrownExceptionElement):90:90 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceThrownExceptionElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceClassResult;Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceThrownExceptionElement;)Lcom/android/tools/r8/internal/bd0;"}
     2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceMethod$4(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFrameResult,com.android.tools.r8.retrace.RetraceFrameElement,com.android.tools.r8.retrace.RetracedSingleFrame):152:152 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;Lcom/android/tools/r8/retrace/RetracedSingleFrame;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/StackTraceElementProxy;Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceFrameResult;Lcom/android/tools/r8/retrace/RetraceFrameElement;Lcom/android/tools/r8/retrace/RetracedSingleFrame;)Lcom/android/tools/r8/internal/bd0;"}
     3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl lambda$retraceField$9(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl,com.android.tools.r8.retrace.RetraceFieldResult,com.android.tools.r8.retrace.RetraceFieldElement):201:201 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xc0;Lcom/android/tools/r8/retrace/RetraceFieldResult;Lcom/android/tools/r8/retrace/RetraceFieldElement;)Lcom/android/tools/r8/internal/Xc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Lcom/android/tools/r8/retrace/RetraceFieldResult;Lcom/android/tools/r8/retrace/RetraceFieldElement;)Lcom/android/tools/r8/internal/bd0;"}
     4:31:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retracedMethodArguments(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):278:305 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/s90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/internal/s90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/w90;Lcom/android/tools/r8/retrace/StackTraceElementProxy;)Lcom/android/tools/r8/internal/w90;"}
     32:32:java.util.stream.Stream com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl.stream():29:29 -> b
     32:32:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retracedMethodArguments(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):307 -> b
     33:34:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retracedMethodArguments(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.StackTraceElementProxy):307:308 -> b
@@ -267886,7 +267541,7 @@
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.build():60:60 -> retrace
     3:3:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):55 -> retrace
     4:18:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):56:70 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.Xc0:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.bd0:
 # {"id":"sourceFile","fileName":"StackTraceElementProxyRetracerImpl.java"}
     com.android.tools.r8.retrace.StackTraceElementProxy originalItem -> b
     com.android.tools.r8.retrace.RetracedClassReference retracedClass -> c
@@ -267903,7 +267558,7 @@
     1:1:void <clinit>():321:321 -> <clinit>
     1:13:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetracedMethodReference,com.android.tools.r8.retrace.RetracedFieldReference,com.android.tools.r8.retrace.RetracedTypeReference,java.util.List,com.android.tools.r8.retrace.RetracedSourceFile,int,boolean,boolean,com.android.tools.r8.retrace.RetraceStackTraceContext):347:359 -> <init>
     1:11:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder builder():460:470 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Wc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ad0;"}
     1:1:int compareTo(java.lang.Object):321:321 -> compareTo
     2:6:int compareTo(com.android.tools.r8.retrace.RetraceStackTraceElementProxy):489:493 -> compareTo
     2:6:int compareTo(java.lang.Object):321 -> compareTo
@@ -267937,7 +267592,7 @@
     1:1:boolean hasSourceFile():389:389 -> hasSourceFile
     1:1:boolean isAmbiguous():364:364 -> isAmbiguous
     1:1:boolean isTopFrame():369:369 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.Wc0:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.ad0:
 # {"id":"sourceFile","fileName":"StackTraceElementProxyRetracerImpl.java"}
     com.android.tools.r8.retrace.StackTraceElementProxy originalElement -> a
     com.android.tools.r8.retrace.RetracedClassReference classContext -> b
@@ -267955,39 +267610,39 @@
     1:1:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):544:544 -> <init>
     2:8:void <init>(com.android.tools.r8.retrace.StackTraceElementProxy):539:545 -> <init>
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder joinAmbiguous(boolean):585:585 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Wc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/ad0;"}
     2:2:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder apply(java.util.function.Consumer):600:600 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/Wc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/internal/ad0;"}
     3:3:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder applyIf(boolean,java.util.function.Consumer):606:606 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/internal/Wc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/internal/ad0;"}
     4:8:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl build():612:616 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xc0;"}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.dd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/bd0;"}
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.hd0:
 # {"id":"sourceFile","fileName":"StackTraceElementStringProxy.java"}
     java.lang.String line -> a
     java.util.List orderedIndices -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex className -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ad0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ed0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodName -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex sourceFile -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex lineNumber -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldName -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():23:23 -> <clinit>
     1:10:void <init>(java.lang.String,java.util.List,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):45:54 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/ad0;Lcom/android/tools/r8/internal/cd0;Lcom/android/tools/r8/internal/cd0;Lcom/android/tools/r8/internal/cd0;Lcom/android/tools/r8/internal/cd0;Lcom/android/tools/r8/internal/cd0;Lcom/android/tools/r8/internal/cd0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/ed0;Lcom/android/tools/r8/internal/gd0;Lcom/android/tools/r8/internal/gd0;Lcom/android/tools/r8/internal/gd0;Lcom/android/tools/r8/internal/gd0;Lcom/android/tools/r8/internal/gd0;Lcom/android/tools/r8/internal/gd0;)V"}
     1:1:java.lang.String lineNumberAsString():161:161 -> a
     2:3:java.lang.String getEntryInLine(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):165:166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cd0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gd0;)Ljava/lang/String;"}
     1:1:boolean hasClassName():63:63 -> getClassReference
     1:1:com.android.tools.r8.references.ClassReference getClassReference():98 -> getClassReference
     2:2:com.android.tools.r8.references.ClassReference getClassReference():98:98 -> getClassReference
@@ -268023,80 +267678,80 @@
     1:1:boolean hasSourceFile():73:73 -> hasSourceFile
     1:9:java.lang.String toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):149:157 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Zc0:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.dd0:
 # {"id":"sourceFile","fileName":"StackTraceElementStringProxy.java"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dd0;"}
     1:2:void <clinit>():170:171 -> <clinit>
     1:1:void <init>(java.lang.String,int):169:169 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.ad0:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.ed0:
 # {"id":"sourceFile","fileName":"StackTraceElementStringProxy.java"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType classNameType -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Zc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex NO_INDEX -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ad0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ed0;"}
     1:1:void <clinit>():403:403 -> <clinit>
     1:2:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):418:419 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/Zc0;)V"}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.bd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/dd0;)V"}
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.fd0:
 # {"id":"sourceFile","fileName":"StackTraceElementStringProxy.java"}
     java.lang.String line -> a
     java.util.List orderedIndices -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex className -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ad0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ed0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodName -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex sourceFile -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex lineNumber -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldName -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
     int lastSeenStartIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():182:182 -> <clinit>
     1:1:void <init>(java.lang.String):195:195 -> <init>
     2:13:void <init>(java.lang.String):185:196 -> <init>
     1:5:java.lang.String lambda$registerClassName$0(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType,com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):207:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zc0;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dd0;Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     6:21:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerLineNumber(int,int,boolean):247:262 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IIZ)V"}
     22:30:java.lang.String lambda$registerLineNumber$3(boolean,com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):252:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     31:47:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldName(int,int):267:283 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     48:57:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):272:281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     58:58:java.lang.String lambda$registerFieldName$4(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):277:277 -> a
     59:62:void ensureLineIndexIncreases(int):359:362 -> a
     59:62:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):201 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Zc0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/dd0;)V"}
     63:75:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):202:214 -> a
     76:76:void ensureLineIndexIncreases(int):360:360 -> a
     76:76:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerClassName(int,int,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):201 -> a
     1:13:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerFieldOrReturnType(int,int):289:301 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     14:19:java.lang.String lambda$registerFieldOrReturnType$5(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):294:299 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     1:35:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodArguments(int,int):307:341 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     36:53:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):312:329 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     54:59:int com.android.tools.r8.utils.StringUtils.firstNonWhitespaceCharacter(java.lang.String,int):463:468 -> c
     54:59:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):329 -> c
     60:67:java.lang.String lambda$registerMethodArguments$6(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):332:339 -> c
     1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodName(int,int):219:230 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     13:17:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):224:228 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
     18:18:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):227:227 -> d
     19:42:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethodReference,boolean,boolean):33:56 -> d
     19:42:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):227 -> d
@@ -268105,39 +267760,39 @@
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):235:241 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(II)V"}
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):240:240 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/dd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.cd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/retrace/RetraceStackTraceElementProxy;Lcom/android/tools/r8/internal/hd0;Ljava/lang/Boolean;)Ljava/lang/String;"}
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.gd0:
 # {"id":"sourceFile","fileName":"StackTraceElementStringProxy.java"}
     int startIndex -> a
     int endIndex -> b
     com.android.tools.r8.utils.TriFunction retracedString -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sh0;"}
     1:4:void <init>(int,int,com.android.tools.r8.utils.TriFunction):390:393 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Oh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/Sh0;)V"}
     1:1:boolean hasIndex():397:397 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.rd0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.vd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     java.util.regex.Pattern compiledPattern -> a
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup sourceFileLineNumberGroup -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/td0;"}
     java.util.List handlers -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup typeNameGroup -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ud0;"}
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup binaryNameGroup -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ed0;"}
-    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup sourceFileGroup -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/od0;"}
-    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup lineNumberGroup -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jd0;"}
-    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup fieldOrReturnTypeGroup -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/id0;"}
+    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup sourceFileGroup -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sd0;"}
+    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup lineNumberGroup -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nd0;"}
+    com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup fieldOrReturnTypeGroup -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/md0;"}
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup methodArgumentsGroup -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/od0;"}
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup methodNameGroup -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ld0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pd0;"}
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup fieldNameGroup -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ld0;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(java.lang.String):49:49 -> <init>
@@ -268146,7 +267801,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/StringBuilder;Ljava/util/ArrayList;)V"}
     29:29:int registerGroups(java.lang.String,java.lang.StringBuilder,java.util.List,int):111:111 -> a
     30:30:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup getGroupFromVariable(char):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/md0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(C)Lcom/android/tools/r8/internal/qd0;"}
     31:31:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup getGroupFromVariable(char):133:133 -> a
     32:32:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup getGroupFromVariable(char):127:127 -> a
     33:39:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup getGroupFromVariable(char):123:129 -> a
@@ -268156,118 +267811,118 @@
     59:59:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup getGroupFromVariable(char):121:121 -> a
     1:1:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16:16 -> parse
     2:2:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parse(java.lang.String):60:60 -> parse
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/dd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/hd0;"}
     3:3:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.builder(java.lang.String):58:58 -> parse
     3:3:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parse(java.lang.String):60 -> parse
     4:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parse(java.lang.String):61:69 -> parse
     13:13:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.build():346:346 -> parse
     13:13:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parse(java.lang.String):73 -> parse
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.ed0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.id0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():218:218 -> <init>
     1:1:java.lang.String subExpression():222:222 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():227:227 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zc0;"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.gd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dd0;"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.kd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():169:169 -> <init>
     1:1:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):175:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType() -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zc0;"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.fd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dd0;"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.jd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     java.lang.String val$captureGroup -> a
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kd0;"}
     1:1:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup,java.lang.String):175:175 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gd0;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kd0;Ljava/lang/String;)V"}
     1:13:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):178:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
     14:14:boolean com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType.isTypeName():178:178 -> a
     14:14:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):190 -> a
     15:17:boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):191:193 -> a
     18:18:boolean isClassHandler():199:199 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.hd0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.ld0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():251:251 -> <init>
     1:1:java.lang.String subExpression():255:255 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):260:260 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):261:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.id0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.md0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():368:368 -> <init>
     1:1:java.lang.String subExpression():372:372 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):377:377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):378:382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.jd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.nd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():294:294 -> <init>
     1:1:java.lang.String subExpression():298:298 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):303:303 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:3:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):304:304 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
     4:4:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder.getLine():366:366 -> a
     4:4:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):311 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:10:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):311:316 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.kd0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.od0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():388:388 -> <init>
     1:1:java.lang.String subExpression():392:392 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):401:401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):402:406 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.ld0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.pd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():231:231 -> <init>
     1:1:java.lang.String subExpression():235:235 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):240:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):241:245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.md0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.qd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():150:150 -> <init>
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     java.lang.String subExpression() -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.nd0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.rd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
     1:1:boolean isClassHandler():146:146 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.od0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.sd0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():271:271 -> <init>
     1:2:java.lang.String subExpression():277:278 -> a
     3:3:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):283:283 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     4:8:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):284:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.pd0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.td0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():322:322 -> <init>
     1:1:java.lang.String subExpression():326:326 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):331:331 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/rd0;"}
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):332:336 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/bd0;Ljava/util/regex/Matcher;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/fd0;Ljava/util/regex/Matcher;)Z"}
     8:20:int findEndOfSourceFile(java.lang.String):349:361 -> a
     8:20:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):336 -> a
     21:26:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):338:343 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.qd0:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.ud0:
 # {"id":"sourceFile","fileName":"StackTraceRegularExpressionParser.java"}
     1:1:void <init>():205:205 -> <init>
     1:1:java.lang.String subExpression():209:209 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():214:214 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/dd0;"}
 com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaking.a:
 # {"id":"sourceFile","fileName":"AbstractMethodRemover.java"}
     com.android.tools.r8.graph.AppView appView -> a
@@ -268347,13 +268002,13 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens lens -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fQ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jQ;"}
     com.android.tools.r8.graph.lens.GraphLens annotationLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():31:31 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):37:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/fQ;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/jQ;)V"}
     1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):44:44 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:void run(java.util.Collection,java.util.concurrent.ExecutorService):49:49 -> a
@@ -268470,7 +268125,7 @@
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M$a;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set annotationsToRetain -> d
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/r3;"}
@@ -268511,345 +268166,360 @@
     34:34:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):670:670 -> a
     34:34:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):106 -> a
     35:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):107:107 -> a
-    36:36:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():826:826 -> a
-    36:36:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):98 -> a
+    36:36:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():825:825 -> a
+    36:36:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     36:36:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):108 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():827 -> a
-    37:37:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):98 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():826 -> a
+    37:37:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):100 -> a
     37:37:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):108 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():828:828 -> a
-    38:38:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):98 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepExceptionsAttributeEnabled():827:827 -> a
+    38:38:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):100 -> a
     38:38:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):108 -> a
-    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():103:103 -> a
-    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):99 -> a
+    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():105:105 -> a
+    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo.isThrowsRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):101 -> a
     39:39:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):108 -> a
     40:40:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):697:697 -> a
     40:40:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):110 -> a
     41:43:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):111:113 -> a
     44:44:void com.android.tools.r8.graph.AppView.setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):500:500 -> a
     44:44:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):112 -> a
-    45:47:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):115:117 -> a
-    48:48:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):703:703 -> a
-    48:48:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):118 -> a
-    49:49:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):686:686 -> a
-    49:49:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):123 -> a
-    50:50:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):153:153 -> a
-    51:51:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):692:692 -> a
-    51:51:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
-    52:56:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):337:341 -> a
-    52:56:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    57:57:boolean com.android.tools.r8.graph.DexString.isNotIdenticalTo(com.android.tools.r8.graph.DexString):34:34 -> a
-    57:57:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):341 -> a
+    45:45:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):115:115 -> a
+    46:46:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):703:703 -> a
+    46:46:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):117 -> a
+    47:47:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):118:118 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepMethodParametersAttributeEnabled():832:832 -> a
+    48:48:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterNamesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:57:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    58:59:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):344:345 -> a
-    58:59:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    60:60:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
-    60:60:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):345 -> a
-    60:60:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    61:62:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):347:348 -> a
-    61:62:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    63:63:boolean com.android.tools.r8.graph.DexField.isNotIdenticalTo(com.android.tools.r8.graph.DexField):37:37 -> a
-    63:63:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):349 -> a
+    48:48:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):119 -> a
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepMethodParametersAttributeEnabled():833 -> a
+    49:49:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterNamesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):248 -> a
+    49:49:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):119 -> a
+    50:50:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepMethodParametersAttributeEnabled():834:834 -> a
+    50:50:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterNamesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):248 -> a
+    50:50:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):119 -> a
+    51:51:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterNamesRemovalAllowed():253:253 -> a
+    51:51:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterNamesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):249 -> a
+    51:51:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):119 -> a
+    52:52:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):686:686 -> a
+    52:52:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):122 -> a
+    53:53:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):152:152 -> a
+    54:54:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):692:692 -> a
+    54:54:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):131 -> a
+    55:59:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):336:340 -> a
+    55:59:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    60:60:boolean com.android.tools.r8.graph.DexString.isNotIdenticalTo(com.android.tools.r8.graph.DexString):34:34 -> a
+    60:60:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):340 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):133 -> a
-    64:71:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):136:143 -> a
-    72:72:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
-    72:72:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):143 -> a
-    73:73:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):318:318 -> a
-    73:73:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    74:74:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> a
-    74:74:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():31 -> a
-    74:74:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):318 -> a
-    74:74:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
+    60:60:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    61:62:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):343:344 -> a
+    61:62:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    63:63:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
+    63:63:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):344 -> a
+    63:63:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    64:65:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):346:347 -> a
+    64:65:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    66:66:boolean com.android.tools.r8.graph.DexField.isNotIdenticalTo(com.android.tools.r8.graph.DexField):37:37 -> a
+    66:66:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):348 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    66:66:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):132 -> a
+    67:74:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):135:142 -> a
+    75:75:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
+    75:75:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):142 -> a
+    76:76:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):317:317 -> a
+    76:76:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    77:77:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> a
+    77:77:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():31 -> a
+    77:77:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):317 -> a
+    77:77:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    75:75:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> a
-    75:75:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():31 -> a
-    75:75:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):318 -> a
-    75:75:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    76:76:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():32:32 -> a
-    76:76:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):318 -> a
-    76:76:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    77:78:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):319:320 -> a
-    77:78:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    79:79:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isMethod():55:55 -> a
-    79:79:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):320 -> a
-    79:79:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    80:81:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):322:323 -> a
-    80:81:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):146 -> a
-    82:82:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):149:149 -> a
-    83:83:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):163:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;ZLcom/android/tools/r8/graph/p0;Lcom/android/tools/r8/shaking/n1;Lcom/android/tools/r8/internal/gB;)Z"}
-    84:84:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():59:59 -> a
-    84:84:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):163 -> a
-    85:85:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):164:164 -> a
-    86:86:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepMethodInfo.internalParameterAnnotationsInfo():107:107 -> a
-    86:86:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):86 -> a
-    86:86:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):166 -> a
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleParameterAnnotationsEnabled():858:858 -> a
-    87:87:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):87 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):166 -> a
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleParameterAnnotationsEnabled():858:858 -> a
-    88:88:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):87 -> a
-    88:88:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):166 -> a
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleParameterAnnotationsEnabled():848:848 -> a
+    78:78:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isComposableOptimizationPassEnabled():36:36 -> a
+    78:78:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():31 -> a
+    78:78:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):317 -> a
+    78:78:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    79:79:boolean com.android.tools.r8.optimize.compose.JetpackComposeOptions.isAnyOptimizationsEnabled():32:32 -> a
+    79:79:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):317 -> a
+    79:79:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    80:81:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):318:319 -> a
+    80:81:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    82:82:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isMethod():55:55 -> a
+    82:82:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):319 -> a
+    82:82:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    83:84:boolean isComposableAnnotationToRetain(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.utils.InternalOptions):321:322 -> a
+    83:84:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):145 -> a
+    85:85:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.Enqueuer$Mode,com.android.tools.r8.shaking.KeepInfo):148:148 -> a
+    86:86:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):162:162 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;ZLcom/android/tools/r8/graph/p0;Lcom/android/tools/r8/shaking/n1;Lcom/android/tools/r8/internal/iB;)Z"}
+    87:87:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():59:59 -> a
+    87:87:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):162 -> a
+    88:88:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):163:163 -> a
+    89:89:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepMethodInfo.internalParameterAnnotationsInfo():109:109 -> a
     89:89:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):88 -> a
-    89:89:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):166 -> a
-    90:90:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):82:82 -> a
-    90:90:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):166 -> a
-    91:91:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169:169 -> a
-    92:92:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalTypeAnnotationsInfo():138:138 -> a
-    92:92:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):128 -> a
-    92:92:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):170 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleTypeAnnotationsEnabled():863:863 -> a
-    93:93:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):129 -> a
+    89:89:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):165 -> a
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleParameterAnnotationsEnabled():864:864 -> a
+    90:90:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:93:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):170 -> a
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleTypeAnnotationsEnabled():863:863 -> a
-    94:94:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):129 -> a
-    94:94:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):170 -> a
-    95:95:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleTypeAnnotationsEnabled():868:868 -> a
-    95:95:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):130 -> a
-    95:95:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):170 -> a
-    96:96:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):124:124 -> a
-    96:96:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):170 -> a
-    97:97:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalAnnotationsInfo():134:134 -> a
-    97:97:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):115 -> a
-    97:97:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):172 -> a
+    90:90:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):165 -> a
+    91:91:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleParameterAnnotationsEnabled():864:864 -> a
+    91:91:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):89 -> a
+    91:91:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):165 -> a
+    92:92:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleParameterAnnotationsEnabled():854:854 -> a
+    92:92:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):90 -> a
+    92:92:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):165 -> a
+    93:93:boolean com.android.tools.r8.shaking.KeepMethodInfo.isParameterAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):84:84 -> a
+    93:93:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):165 -> a
+    94:94:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):168:168 -> a
+    95:95:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalTypeAnnotationsInfo():138:138 -> a
+    95:95:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):128 -> a
+    95:95:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():853:853 -> a
-    98:98:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):116 -> a
+    96:96:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleTypeAnnotationsEnabled():869:869 -> a
+    96:96:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    98:98:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):172 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():853:853 -> a
-    99:99:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):116 -> a
-    99:99:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):172 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleAnnotationsEnabled():843:843 -> a
-    100:100:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):117 -> a
-    100:100:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):172 -> a
-    101:101:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):111:111 -> a
-    101:101:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):172 -> a
-    102:102:com.android.tools.r8.shaking.AnnotationRemover ensureValid():186:186 -> a
+    96:96:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169 -> a
+    97:97:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleTypeAnnotationsEnabled():869:869 -> a
+    97:97:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):129 -> a
+    97:97:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169 -> a
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleTypeAnnotationsEnabled():874:874 -> a
+    98:98:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):130 -> a
+    98:98:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169 -> a
+    99:99:boolean com.android.tools.r8.shaking.KeepInfo.isTypeAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):124:124 -> a
+    99:99:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):169 -> a
+    100:100:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalAnnotationsInfo():134:134 -> a
+    100:100:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):115 -> a
+    100:100:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):171 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    101:101:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():859:859 -> a
+    101:101:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):116 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    101:101:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):171 -> a
+    102:102:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():859:859 -> a
+    102:102:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):116 -> a
+    102:102:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):171 -> a
+    103:103:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeInvisibleAnnotationsEnabled():849:849 -> a
+    103:103:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):117 -> a
+    103:103:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):171 -> a
+    104:104:boolean com.android.tools.r8.shaking.KeepInfo.isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean):111:111 -> a
+    104:104:boolean shouldKeepNormalAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.utils.InternalOptions):171 -> a
+    105:105:com.android.tools.r8.shaking.AnnotationRemover ensureValid():185:185 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/h;"}
-    103:103:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):147:147 -> a
-    103:103:com.android.tools.r8.shaking.AnnotationRemover ensureValid():186 -> a
+    106:106:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:144 -> a
+    106:106:com.android.tools.r8.shaking.AnnotationRemover ensureValid():185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:107:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):147:150 -> a
-    104:107:com.android.tools.r8.shaking.AnnotationRemover ensureValid():186 -> a
-    109:109:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):152:152 -> a
-    109:109:com.android.tools.r8.shaking.AnnotationRemover ensureValid():186 -> a
+    107:110:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:147 -> a
+    107:110:com.android.tools.r8.shaking.AnnotationRemover ensureValid():185 -> a
+    112:112:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):149:149 -> a
+    112:112:com.android.tools.r8.shaking.AnnotationRemover ensureValid():185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    110:122:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):152:164 -> a
-    110:122:com.android.tools.r8.shaking.AnnotationRemover ensureValid():186 -> a
-    123:124:void run(java.util.concurrent.ExecutorService):191:192 -> a
-    125:125:void run(java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":322,"2":323,"3":324},"outline":"Lcom/android/tools/r8/K;a(Lcom/android/tools/r8/graph/y;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;)V"}
-    321:321:void run(java.util.concurrent.ExecutorService):196:196 -> a
-    322:322:void run(java.util.concurrent.ExecutorService):194:194 -> a
-    323:323:void run(java.util.concurrent.ExecutorService):194:194 -> a
-    324:324:void run(java.util.concurrent.ExecutorService):191:191 -> a
-    325:333:void run(com.android.tools.r8.graph.DexProgramClass):200:208 -> a
+    113:117:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):149:153 -> a
+    113:117:com.android.tools.r8.shaking.AnnotationRemover ensureValid():185 -> a
+    118:119:void run(java.util.concurrent.ExecutorService):190:191 -> a
+    120:120:void run(java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":316,"2":317,"3":318},"outline":"Lcom/android/tools/r8/K;a(Lcom/android/tools/r8/graph/y;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/concurrent/ExecutorService;)V"}
+    315:315:void run(java.util.concurrent.ExecutorService):195:195 -> a
+    316:316:void run(java.util.concurrent.ExecutorService):193:193 -> a
+    317:317:void run(java.util.concurrent.ExecutorService):193:193 -> a
+    318:318:void run(java.util.concurrent.ExecutorService):190:190 -> a
+    319:327:void run(com.android.tools.r8.graph.DexProgramClass):199:207 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-    334:336:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):210:212 -> a
+    328:330:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):209:211 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/B5;)V"}
-    337:337:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
-    337:337:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):213 -> a
-    338:338:void lambda$verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo$2(com.android.tools.r8.graph.ProgramMember):223:223 -> a
+    331:331:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
+    331:331:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):212 -> a
+    332:332:void lambda$verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo$2(com.android.tools.r8.graph.ProgramMember):222:222 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B5;)V"}
-    339:339:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):235:235 -> a
-    339:339:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
+    333:333:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):234:234 -> a
+    333:333:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/graph/B5;)V"}
-    340:340:com.android.tools.r8.shaking.KeepMemberInfo com.android.tools.r8.shaking.KeepInfoCollection.getMemberInfo(com.android.tools.r8.graph.ProgramMember):122:122 -> a
-    340:340:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):235 -> a
-    340:340:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    341:342:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):236:237 -> a
-    341:342:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    343:343:void com.android.tools.r8.graph.ProgramMember.clearGenericSignature():27:27 -> a
-    343:343:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):238 -> a
-    343:343:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    344:344:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):240:240 -> a
-    344:344:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    345:345:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
-    345:345:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29 -> a
+    334:334:com.android.tools.r8.shaking.KeepMemberInfo com.android.tools.r8.shaking.KeepInfoCollection.getMemberInfo(com.android.tools.r8.graph.ProgramMember):122:122 -> a
+    334:334:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):234 -> a
+    334:334:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    335:336:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):235:236 -> a
+    335:336:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    337:337:void com.android.tools.r8.graph.ProgramMember.clearGenericSignature():27:27 -> a
+    337:337:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    337:337:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    338:338:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239:239 -> a
+    338:338:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    339:339:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
+    339:339:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    345:345:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):241 -> a
-    345:345:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    346:346:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29:29 -> a
-    346:346:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):241 -> a
-    346:346:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    347:347:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
-    347:347:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):242 -> a
-    347:347:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    348:348:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):245:245 -> a
-    348:348:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    349:349:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
-    349:349:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29 -> a
+    339:339:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):240 -> a
+    339:339:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    340:340:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29:29 -> a
+    340:340:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):240 -> a
+    340:340:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    341:341:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
+    341:341:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):241 -> a
+    341:341:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    342:342:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244:244 -> a
+    342:342:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    343:343:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> a
+    343:343:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    349:349:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):246 -> a
-    349:349:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    350:350:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29:29 -> a
-    350:350:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):246 -> a
-    350:350:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    351:351:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):247:247 -> a
-    351:351:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):207 -> a
-    352:357:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):265:270 -> a
+    343:343:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):245 -> a
+    343:343:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    344:344:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):29:29 -> a
+    344:344:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):245 -> a
+    344:344:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    345:345:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):246:246 -> a
+    345:345:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):206 -> a
+    346:351:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:269 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e1;)Lcom/android/tools/r8/graph/e1;"}
-    358:359:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
-    358:359:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270 -> a
-    360:360:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):273:273 -> a
-    361:366:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):272:277 -> a
-    367:367:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):276:276 -> a
-    368:368:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:273 -> a
+    352:353:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
+    352:353:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269 -> a
+    354:354:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):272:272 -> a
+    355:360:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):271:276 -> a
+    361:361:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):275:275 -> a
+    362:362:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):272:272 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/t0;)Lcom/android/tools/r8/graph/t0;"}
-    369:369:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):302:302 -> a
+    363:363:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):301:301 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t0;Lcom/android/tools/r8/graph/j1;)Z"}
-    370:371:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):307:308 -> a
+    364:365:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):306:307 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/n1;)V"}
-    372:372:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$5(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):309:309 -> a
+    366:366:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$5(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):308:308 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/n1;Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/graph/p0;)Lcom/android/tools/r8/graph/r0;"}
-    373:382:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):360:369 -> a
+    367:376:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):359:368 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/f1;)V"}
-    383:383:boolean com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature.isValid():162:162 -> a
-    383:383:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):369 -> a
+    377:377:boolean com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature.isValid():162:162 -> a
+    377:377:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    384:387:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):369:372 -> a
-    388:388:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():873:873 -> a
-    388:388:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):128 -> a
-    388:388:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):372 -> a
+    378:381:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):368:371 -> a
+    382:382:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():879:879 -> a
+    382:382:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):128 -> a
+    382:382:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):371 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    389:389:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():874:874 -> a
-    389:389:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):128 -> a
-    389:389:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):372 -> a
-    390:390:boolean com.android.tools.r8.shaking.KeepClassInfo.internalIsPermittedSubclassesRemovalAllowed():133:133 -> a
-    390:390:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):129 -> a
-    390:390:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):372 -> a
-    391:391:void com.android.tools.r8.graph.DexClass.clearPermittedSubclasses():1067:1067 -> a
-    391:391:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):373 -> a
-    392:392:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362:362 -> a
+    383:383:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():880:880 -> a
+    383:383:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):128 -> a
+    383:383:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):371 -> a
+    384:384:boolean com.android.tools.r8.shaking.KeepClassInfo.internalIsPermittedSubclassesRemovalAllowed():133:133 -> a
+    384:384:boolean com.android.tools.r8.shaking.KeepClassInfo.isPermittedSubclassesRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):129 -> a
+    384:384:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):371 -> a
+    385:385:void com.android.tools.r8.graph.DexClass.clearPermittedSubclasses():1067:1067 -> a
+    385:385:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):372 -> a
+    386:386:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361:361 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f1;Lcom/android/tools/r8/graph/e3;)Z"}
-    393:393:boolean com.android.tools.r8.utils.InternalOptions.isKeepEnclosingMethodAttributeEnabled():833:833 -> a
-    393:393:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):246 -> a
+    387:387:boolean com.android.tools.r8.utils.InternalOptions.isKeepEnclosingMethodAttributeEnabled():839:839 -> a
+    387:387:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    393:393:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    394:394:boolean com.android.tools.r8.utils.InternalOptions.isKeepEnclosingMethodAttributeEnabled():833:833 -> a
-    394:394:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):246 -> a
-    394:394:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    395:395:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
-    395:395:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):249 -> a
-    395:395:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    396:396:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252:252 -> a
-    396:396:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    397:397:boolean com.android.tools.r8.graph.EnclosingMethodAttribute.isEnclosingPinned(com.android.tools.r8.graph.AppView):104:104 -> a
-    397:397:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252 -> a
+    387:387:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    388:388:boolean com.android.tools.r8.utils.InternalOptions.isKeepEnclosingMethodAttributeEnabled():839:839 -> a
+    388:388:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):246 -> a
+    388:388:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    389:389:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
+    389:389:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):249 -> a
+    389:389:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    390:390:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252:252 -> a
+    390:390:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    391:391:boolean com.android.tools.r8.graph.EnclosingMethodAttribute.isEnclosingPinned(com.android.tools.r8.graph.AppView):104:104 -> a
+    391:391:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    397:397:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    398:401:boolean com.android.tools.r8.graph.EnclosingMethodAttribute.isEnclosingPinned(com.android.tools.r8.graph.AppView):105:108 -> a
-    398:401:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252 -> a
-    398:401:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):362 -> a
-    402:402:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368:368 -> a
+    391:391:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    392:395:boolean com.android.tools.r8.graph.EnclosingMethodAttribute.isEnclosingPinned(com.android.tools.r8.graph.AppView):105:108 -> a
+    392:395:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):252 -> a
+    392:395:boolean lambda$stripAttributes$6(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):361 -> a
+    396:396:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367:367 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/Z3;)Z"}
-    403:410:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):381:388 -> a
-    403:410:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    411:411:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
-    411:411:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388 -> a
-    411:411:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    412:413:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388:389 -> a
-    412:413:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    414:414:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():838:838 -> a
-    414:414:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):265 -> a
+    397:404:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):380:387 -> a
+    397:404:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    405:405:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
+    405:405:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):387 -> a
+    405:405:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    406:407:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):387:388 -> a
+    406:407:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    408:408:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():844:844 -> a
+    408:408:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    414:414:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):389 -> a
-    414:414:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    415:415:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():838:838 -> a
-    415:415:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):265 -> a
-    415:415:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):389 -> a
-    415:415:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    416:416:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
-    416:416:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):268 -> a
-    416:416:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):389 -> a
-    416:416:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    417:417:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):273:273 -> a
-    417:417:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):389 -> a
-    417:417:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    418:422:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):390:394 -> a
-    418:422:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    423:423:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
-    423:423:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):394 -> a
-    423:423:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    424:430:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):394:400 -> a
-    424:430:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    431:431:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
-    431:431:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):400 -> a
-    431:431:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    432:439:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):400:407 -> a
-    432:439:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
+    408:408:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388 -> a
+    408:408:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    409:409:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():844:844 -> a
+    409:409:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):265 -> a
+    409:409:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388 -> a
+    409:409:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    410:410:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
+    410:410:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):268 -> a
+    410:410:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388 -> a
+    410:410:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    411:411:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):273:273 -> a
+    411:411:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):388 -> a
+    411:411:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    412:416:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):389:393 -> a
+    412:416:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    417:417:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
+    417:417:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):393 -> a
+    417:417:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    418:424:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):393:399 -> a
+    418:424:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    425:425:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
+    425:425:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):399 -> a
+    425:425:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    426:433:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):399:406 -> a
+    426:433:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    434:434:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
+    434:434:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):406 -> a
+    434:434:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    435:439:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):406:410 -> a
+    435:439:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
     440:440:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
-    440:440:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):407 -> a
-    440:440:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    441:445:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):407:411 -> a
-    441:445:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    446:446:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):118:118 -> a
-    446:446:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):411 -> a
-    446:446:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    447:448:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):411:412 -> a
-    447:448:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):368 -> a
-    449:450:void clearAnnotations(com.android.tools.r8.graph.AppView):417:418 -> a
+    440:440:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):410 -> a
+    440:440:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    441:442:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):410:411 -> a
+    441:442:boolean lambda$stripAttributes$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):367 -> a
+    443:444:void clearAnnotations(com.android.tools.r8.graph.AppView):416:417 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    451:451:void com.android.tools.r8.graph.DexDefinition.clearAnnotations():40:40 -> a
-    451:451:void clearAnnotations(com.android.tools.r8.graph.AppView):418 -> a
-    452:452:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
-    452:452:void com.android.tools.r8.graph.DexDefinition.clearAnnotations():40 -> a
-    452:452:void clearAnnotations(com.android.tools.r8.graph.AppView):418 -> a
-    453:453:void clearAnnotations(com.android.tools.r8.graph.AppView):419:419 -> a
+    445:445:void com.android.tools.r8.graph.DexDefinition.clearAnnotations():40:40 -> a
+    445:445:void clearAnnotations(com.android.tools.r8.graph.AppView):417 -> a
+    446:446:void com.android.tools.r8.graph.DexDefinition.setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> a
+    446:446:void com.android.tools.r8.graph.DexDefinition.clearAnnotations():40 -> a
+    446:446:void clearAnnotations(com.android.tools.r8.graph.AppView):417 -> a
+    447:447:void clearAnnotations(com.android.tools.r8.graph.AppView):418:418 -> a
     1:1:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):66:66 -> b
-    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):257 -> b
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):256 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/n1;Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/graph/p0;)Lcom/android/tools/r8/graph/r0;"}
-    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):181:182 -> b
-    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):176 -> b
+    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):180:181 -> b
+    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):175 -> b
     2:3:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):68 -> b
-    2:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):257 -> b
+    2:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):256 -> b
     4:4:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):68:68 -> b
-    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):257 -> b
+    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):256 -> b
     5:5:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):67:67 -> b
-    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):257 -> b
-    6:6:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):259:259 -> b
-    7:7:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():219:219 -> b
+    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):256 -> b
+    6:6:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,com.android.tools.r8.shaking.KeepInfo):258:258 -> b
+    7:7:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():218:218 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     8:8:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.graph.DexProgramClass.getKotlinInfo():572:572 -> b
-    8:8:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():220 -> b
+    8:8:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():219 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:10:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():220:221 -> b
-    11:25:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):288:302 -> b
+    9:10:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():219:220 -> b
+    11:25:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):287:301 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/t0;)Lcom/android/tools/r8/graph/t0;"}
 com.android.tools.r8.shaking.AnnotationRemover$Builder -> com.android.tools.r8.shaking.g:
 # {"id":"sourceFile","fileName":"AnnotationRemover.java"}
     java.util.Set annotationsToRetain -> a
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M$a;"}
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):433:433 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):432:432 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M$a;)V"}
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):429:434 -> <init>
-    1:1:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):447:447 -> a
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):428:433 -> <init>
+    1:1:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):446:446 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Set;)Lcom/android/tools/r8/shaking/h;"}
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.i:
 # {"id":"sourceFile","fileName":"AppInfoWithLiveness.java"}
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nX;"}
     java.util.Set lockCandidates -> B
     java.util.Map initClassReferences -> C
     java.util.Set recordFieldValuesReferences -> D
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     java.util.Set prunedTypes -> F
     java.util.Map switchMaps -> G
     com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> H
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/t4;"}
     com.android.tools.r8.cf.CfVersion largestInputCfVersion -> I
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean $assertionsDisabled -> J
     java.util.Set deadProtoTypes -> j
     java.util.Set liveTypes -> k
@@ -268873,7 +268543,7 @@
     java.util.Set reprocess -> z
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Set):211:211 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/a;Lcom/android/tools/r8/internal/ld;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/shaking/e2;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/graph/j3;Lcom/android/tools/r8/graph/o5;Ljava/util/Map;Lcom/android/tools/r8/shaking/p1;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/jX;Lcom/android/tools/r8/internal/CS;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/a;Lcom/android/tools/r8/internal/nd;Lcom/android/tools/r8/shaking/Y1;Lcom/android/tools/r8/shaking/e2;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/graph/j3;Lcom/android/tools/r8/graph/o5;Ljava/util/Map;Lcom/android/tools/r8/shaking/p1;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/nX;Lcom/android/tools/r8/internal/GS;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Set;)V"}
     2:358:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Set):179:535 -> <init>
     359:383:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Set):212:236 -> <init>
     384:384:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):487:487 -> <init>
@@ -268891,16 +268561,16 @@
     771:771:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):516:516 -> <init>
     1:1:boolean com.android.tools.r8.utils.collections.ThrowingSet.isThrowingSet(java.util.Set):24:24 -> a
     1:1:java.util.Set pruneItems(java.util.Set,java.util.Set,com.android.tools.r8.threading.TaskCollection):344 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/wg0;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Ag0;)Ljava/util/Set;"}
     2:3:java.util.Set pruneItems(java.util.Set,java.util.Set,com.android.tools.r8.threading.TaskCollection):344:345 -> a
     4:4:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/h;"}
     5:5:com.android.tools.r8.graph.AppInfo rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):89:89 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Y1;)Lcom/android/tools/r8/graph/h;"}
     6:6:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedFields():117:117 -> a
     6:6:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():121 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.threading.TaskCollection):366 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CS;Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/wg0;)Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GS;Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/Ag0;)Lcom/android/tools/r8/internal/GS;"}
     7:7:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMethods():125:125 -> a
     7:7:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():121 -> a
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.threading.TaskCollection):366 -> a
@@ -268908,7 +268578,7 @@
     9:9:java.util.Set com.android.tools.r8.graph.PrunedItems.getRemovedFields():133:133 -> a
     9:9:void lambda$pruneMapFromMembers$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):369 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/CS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/GS;)V"}
     10:10:void lambda$pruneMapFromMembers$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):369:369 -> a
     11:11:java.util.Set com.android.tools.r8.graph.PrunedItems.getRemovedMethods():137:137 -> a
     11:11:void lambda$pruneMapFromMembers$2(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):370 -> a
@@ -268922,7 +268592,7 @@
     18:18:boolean lambda$pruneCallSites$0(com.android.tools.r8.graph.PrunedItems,java.util.Map$Entry):318:318 -> a
     19:22:void lambda$pruneItems$1(java.util.Set,java.util.Set):347:350 -> a
     23:24:java.util.Map pruneMap(java.util.Map,java.util.Set,com.android.tools.r8.threading.TaskCollection):378:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Set;Lcom/android/tools/r8/internal/wg0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Set;Lcom/android/tools/r8/internal/Ag0;)Ljava/util/Map;"}
     25:28:void lambda$pruneMap$3(java.util.Map,java.util.Set):381:384 -> a
     29:32:void notifyTreePrunerFinished(com.android.tools.r8.shaking.Enqueuer$Mode):401:404 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M$a;)V"}
@@ -268972,7 +268642,7 @@
     88:89:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1270 -> a
     90:90:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1271:1271 -> a
     91:91:com.android.tools.r8.utils.collections.DexClassAndMethodSet lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):654:654 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/El;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/Gl;"}
     92:96:java.util.List com.android.tools.r8.ir.desugar.LambdaDescriptor.getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):446:450 -> a
     92:96:com.android.tools.r8.utils.collections.DexClassAndMethodSet lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):655 -> a
     97:100:com.android.tools.r8.utils.collections.DexClassAndMethodSet lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):656:659 -> a
@@ -269067,7 +268737,7 @@
     191:191:void lambda$prunedCopyFrom$7(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):925:925 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/shaking/o1;)V"}
     192:200:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):949:957 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/c3;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/i;"}
     201:201:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):952:952 -> a
     202:204:boolean com.android.tools.r8.graph.lens.GraphLens.assertFieldsNotModified(java.lang.Iterable):481:483 -> a
     202:204:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):952 -> a
@@ -269121,9 +268791,9 @@
     263:263:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexReference,java.util.List):983:983 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Ljava/util/List;)Lcom/android/tools/r8/shaking/A3;"}
     264:264:java.util.Map rewriteInitClassReferences(com.android.tools.r8.graph.lens.GraphLens):998:998 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;)Ljava/util/IdentityHashMap;"}
     265:265:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$10(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1002:1002 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yl0;Lcom/android/tools/r8/internal/Yl0;)Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cm0;Lcom/android/tools/r8/internal/cm0;)Lcom/android/tools/r8/internal/cm0;"}
     266:266:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
     266:266:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$10(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1002 -> a
     267:268:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$10(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1002:1003 -> a
@@ -269137,9 +268807,9 @@
     274:274:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$10(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1008 -> a
     275:275:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$10(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1012:1012 -> a
     276:280:com.android.tools.r8.graph.DexClassAndMethod lookupSingleVirtualTargetForTesting(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1071:1075 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/shaking/S1;Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/graph/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/shaking/S1;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/graph/H0;"}
     281:286:com.android.tools.r8.graph.DexClassAndMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1095:1100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/shaking/S1;Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/graph/H0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/shaking/S1;Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/graph/H0;"}
     287:287:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection com.android.tools.r8.graph.AppView.getOpenClosedInterfacesCollection():901:901 -> a
     287:287:com.android.tools.r8.graph.DexClassAndMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1102 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -269208,7 +268878,7 @@
     402:407:com.android.tools.r8.graph.DexClassAndMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1187:1192 -> a
     408:408:com.android.tools.r8.graph.DexClassAndMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1134:1134 -> a
     409:409:com.android.tools.r8.ir.analysis.type.DynamicType lambda$lookupSingleVirtualTarget$11(com.android.tools.r8.ir.analysis.type.DynamicType):1103:1103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dm;)Lcom/android/tools/r8/internal/Dm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fm;)Lcom/android/tools/r8/internal/Fm;"}
     410:410:void forEachReferencedClasspathClass(java.util.function.Consumer):1250:1250 -> a
     411:411:java.util.Collection com.android.tools.r8.graph.DirectMappedDexApplication.classpathClasses():61:61 -> a
     411:411:void forEachReferencedClasspathClass(java.util.function.Consumer):1250 -> a
@@ -269217,7 +268887,7 @@
     413:413:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1258:1258 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):89:89 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/graph/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/graph/j;"}
     2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):89:89 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Y1;)Lcom/android/tools/r8/graph/j;"}
     3:4:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):749:750 -> b
@@ -269283,7 +268953,7 @@
     9:9:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):820 -> c
     10:15:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):820:825 -> c
     16:19:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):914:917 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/i;"}
     20:20:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.PrunedItems.getPrunedApp():97:97 -> c
     20:20:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):917 -> c
     21:29:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):917:925 -> c
@@ -269596,11 +269266,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):56:57 -> a
     9:9:com.android.tools.r8.shaking.AssumeInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/l;"}
     10:10:com.android.tools.r8.shaking.AssumeInfoCollection lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/l;"}
     11:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/internal/B4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/internal/B4;)V"}
     12:14:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.lens.GraphLens):172:174 -> a
     12:14:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):80 -> a
     15:15:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens):111:111 -> a
@@ -269630,7 +269300,7 @@
     26:27:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):81 -> a
     28:29:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):82:83 -> a
     30:42:com.android.tools.r8.shaking.AssumeInfoCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):89:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/l;"}
     43:43:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):93:93 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Ljava/util/Map;Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/internal/B4;)V"}
     44:44:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):129:129 -> a
@@ -269653,7 +269323,7 @@
     53:54:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):94 -> a
     55:56:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):95:96 -> a
     1:10:com.android.tools.r8.shaking.AssumeInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):76:85 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/l;"}
 com.android.tools.r8.shaking.AssumeInfoCollection$Builder -> com.android.tools.r8.shaking.k:
 # {"id":"sourceFile","fileName":"AssumeInfoCollection.java"}
     java.util.Map backing -> a
@@ -269679,7 +269349,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.CheckEnumUnboxedRule$Builder -> com.android.tools.r8.shaking.m:
 # {"id":"sourceFile","fileName":"CheckEnumUnboxedRule.java"}
@@ -269706,7 +269376,7 @@
     com.android.tools.r8.graph.DexField clinitField -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/l1;"}
     com.android.tools.r8.graph.lens.InitClassLens$Builder lensBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Fv;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Hv;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):29:29 -> <init>
@@ -269727,7 +269397,7 @@
     14:14:void run(java.util.concurrent.ExecutorService):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:22:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):45:52 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Yl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/cm0;)V"}
     23:23:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexEncodedField.getOptimizationInfo():104:104 -> a
     23:23:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):54 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -269782,7 +269452,7 @@
     int $r8$clinit -> s
       # {"id":"com.android.tools.r8.synthesized"}
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):74:88 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;Lcom/android/tools/r8/shaking/r;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;Lcom/android/tools/r8/shaking/r;)V"}
     1:7:java.lang.String typeString():111:117 -> D
     8:8:java.lang.String typeString():113:113 -> D
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():96:96 -> F
@@ -269831,7 +269501,7 @@
     1:1:java.util.Set getTargets():39:39 -> a
     2:2:java.util.Map getSourcesTargeting(com.android.tools.r8.experimental.graphinfo.GraphNode):43:43 -> a
     1:6:void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo):29:34 -> acceptEdge
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/hs;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/js;)V"}
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):30:30 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> c
 com.android.tools.r8.shaking.ComputeApiLevelUseRegistry -> com.android.tools.r8.shaking.u:
@@ -269869,7 +269539,7 @@
     26:29:void setMaxApiReferenceLevelForGuard(com.android.tools.r8.graph.DexType):177:180 -> a
     26:29:void registerExceptionGuard(com.android.tools.r8.graph.DexType):147 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3122:3122 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():3128:3128 -> a
     30:30:void setMaxApiReferenceLevelForGuard(com.android.tools.r8.graph.DexType):180 -> a
     30:30:void registerExceptionGuard(com.android.tools.r8.graph.DexType):147 -> a
     31:32:void setMaxApiReferenceLevelForGuard(com.android.tools.r8.graph.DexType):181:182 -> a
@@ -269911,7 +269581,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():89:89 -> D
 com.android.tools.r8.shaking.ConvertCheckNotNullRule$Builder -> com.android.tools.r8.shaking.v:
 # {"id":"sourceFile","fileName":"ConvertCheckNotNullRule.java"}
@@ -270115,7 +269785,7 @@
     101:101:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1756:1756 -> a
     101:101:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):172 -> a
     102:103:void registerInliningPosition(com.android.tools.r8.ir.code.Position):111:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)V"}
     104:104:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     104:104:void registerInliningPosition(com.android.tools.r8.ir.code.Position):112 -> a
     105:105:void registerInliningPosition(com.android.tools.r8.ir.code.Position):112:112 -> a
@@ -270398,7 +270068,7 @@
     14:15:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22 -> a
     16:16:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):761:761 -> a
     16:16:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22 -> a
-com.android.tools.r8.shaking.DelayedRootSetActionItem -> R8$$REMOVED$$CLASS$$229:
+com.android.tools.r8.shaking.DelayedRootSetActionItem -> R8$$REMOVED$$CLASS$$218:
 # {"id":"sourceFile","fileName":"DelayedRootSetActionItem.java"}
 com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.z:
 # {"id":"sourceFile","fileName":"DelayedRootSetActionItem.java"}
@@ -270427,15 +270097,15 @@
     com.android.tools.r8.shaking.MinimumKeepInfoCollection createInnerBacking() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/c2;"}
     1:1:void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.utils.TriConsumer):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/internal/Nh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/internal/Rh0;)V"}
     2:2:void lambda$forEach$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/shaking/c2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/shaking/c2;)V"}
     3:3:void lambda$forEach$0(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
     4:4:void lambda$forEach$1(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
     5:5:void lambda$forEach$2(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):80:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
     6:6:com.android.tools.r8.shaking.MinimumKeepInfoCollection get(com.android.tools.r8.shaking.EnqueuerEvent):84:84 -> a
     6:6:com.android.tools.r8.shaking.KeepInfo$Joiner internalRemove(com.android.tools.r8.shaking.EnqueuerEvent,java.util.function.Function):169 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/shaking/m1;"}
@@ -270507,7 +270177,7 @@
     50:50:com.android.tools.r8.shaking.KeepMethodInfo$Joiner lambda$remove$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.MinimumKeepInfoCollection):160 -> a
     51:51:void removeIf(java.util.function.Predicate):164:164 -> a
     52:52:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/B;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/B;"}
     53:53:int size():197:197 -> a
     53:53:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):182 -> a
     54:54:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection create(int):49:49 -> a
@@ -270517,7 +270187,7 @@
     56:56:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):183 -> a
     57:57:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):192:192 -> a
     58:58:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):185:185 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/shaking/c2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/shaking/c2;)V"}
     59:59:boolean com.android.tools.r8.shaking.EnqueuerEvent.isNoSuchEvent():0:0 -> a
     59:59:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):186 -> a
     60:61:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):188:189 -> a
@@ -270652,7 +270322,7 @@
     java.util.Set analyses -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashSet;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> c0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ZJ;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dK;"}
     java.util.Set fieldAccessAnalyses -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedHashSet;"}
     java.util.Map reachableVirtualTargets -> d0
@@ -270700,30 +270370,30 @@
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/T5;"}
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> p0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/B9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/D9;"}
     com.android.tools.r8.utils.InternalOptions options -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet pendingCodeDesugaring -> q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/l4;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet pendingMethodMove -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory useRegistryFactory -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/d0;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> s0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     com.android.tools.r8.shaking.AnnotationRemover$Builder annotationRemoverBuilder -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/g;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> t0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/KA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MA;"}
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/I;"}
     java.lang.Thread mainThreadForTesting -> u0
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j3;"}
     com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions profileCollectionAdditions -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cY;"}
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder objectAllocationInfoCollection -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/n5;"}
     java.util.Map syntheticInterfaceMethodBridges -> w0
@@ -270735,7 +270405,7 @@
     java.util.List keepDeclarations -> z
     1:1:void <clinit>():216:216 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):503:503 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/T5;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/shaking/M$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/T5;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Lcom/android/tools/r8/shaking/M$a;)V"}
     2:34:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):262:294 -> <init>
     35:35:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():468:468 -> <init>
     35:35:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):301 -> <init>
@@ -270954,12 +270624,12 @@
     27:29:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4935:4937 -> a
     30:30:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry.getFactory():39:39 -> a
     30:30:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):581 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hr;)Lcom/android/tools/r8/shaking/d0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jr;)Lcom/android/tools/r8/shaking/d0;"}
     31:31:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
     31:31:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):3201 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/w2;)V"}
     32:44:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):3202:3214 -> a
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
     45:45:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):3215 -> a
@@ -271002,7 +270672,7 @@
     71:71:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolutionPair():200:200 -> a
     71:71:void lambda$registerFieldAccess$9(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/y3$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/y3$a;)V"}
     72:72:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolutionPair():200:200 -> a
     72:72:void lambda$registerFieldAccess$9(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1204 -> a
     73:73:void lambda$registerFieldAccess$9(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1205:1205 -> a
@@ -271010,7 +270680,7 @@
     74:74:void lambda$registerFieldAccess$9(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1205 -> a
     75:75:void lambda$registerFieldAccess$9(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1206:1206 -> a
     76:76:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):536:536 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
     77:78:com.android.tools.r8.graph.analysis.EnqueuerAnalysis com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.createEnqueuerAnalysis():134:135 -> a
     77:78:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):536 -> a
     79:79:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
@@ -271023,2075 +270693,2046 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/C5;)Z"}
     86:92:void addEffectivelyLiveOriginalMethod(com.android.tools.r8.graph.ProgramMethod):681:687 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-    93:93:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> a
-    93:93:void lambda$traceStaticFieldRead$38(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2052 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;)V"}
-    94:94:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> a
-    94:94:void lambda$traceStaticFieldRead$38(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2052 -> a
-    95:95:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> a
-    95:95:void lambda$traceStaticFieldRead$38(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2052 -> a
-    96:96:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> a
-    96:96:void lambda$traceStaticFieldRead$38(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2052 -> a
-    97:97:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> a
-    97:97:void lambda$handleJavaLangReflectProxyNewProxyInstance$147(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5557 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
-    98:98:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> a
-    98:98:void lambda$handleJavaLangReflectProxyNewProxyInstance$147(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5557 -> a
-    99:99:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> a
-    99:99:void lambda$handleJavaLangReflectProxyNewProxyInstance$147(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5557 -> a
-    100:105:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):710:715 -> a
-    106:106:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFromXml com.android.tools.r8.shaking.KeepReason.reflectiveUseFromXml(com.android.tools.r8.origin.Origin):88:88 -> a
-    106:106:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):717 -> a
-    107:107:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> a
-    107:107:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> a
-    107:107:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):720 -> a
-    108:108:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> a
-    108:108:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):720 -> a
-    109:109:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> a
-    109:109:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):721 -> a
-    110:110:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):722:722 -> a
-    111:111:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> a
-    111:111:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):723 -> a
-    112:112:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4004:4004 -> a
-    112:112:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):718 -> a
-    113:113:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    113:113:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):724 -> a
-    114:117:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):724:727 -> a
-    118:122:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):725:729 -> a
-    123:123:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
-    123:123:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
-    124:124:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> a
-    124:124:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
-    125:125:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> a
-    125:125:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
-    126:126:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729:729 -> a
-    127:127:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    127:127:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    127:127:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732 -> a
-    128:128:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    128:128:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732 -> a
-    129:129:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732:732 -> a
-    130:130:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    130:130:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):731 -> a
-    131:132:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):733:734 -> a
-    133:133:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):759:759 -> a
+    93:98:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):710:715 -> a
+    99:99:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFromXml com.android.tools.r8.shaking.KeepReason.reflectiveUseFromXml(com.android.tools.r8.origin.Origin):88:88 -> a
+    99:99:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):717 -> a
+    100:100:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> a
+    100:100:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> a
+    100:100:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):720 -> a
+    101:101:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> a
+    101:101:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):720 -> a
+    102:104:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):721:723 -> a
+    105:105:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4004:4004 -> a
+    105:105:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):718 -> a
+    106:106:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    106:106:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):724 -> a
+    107:110:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):724:727 -> a
+    111:115:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):725:729 -> a
+    116:116:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
+    116:116:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
+    117:117:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> a
+    117:117:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
+    118:118:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> a
+    118:118:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729 -> a
+    119:119:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):729:729 -> a
+    120:120:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    120:120:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    120:120:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732 -> a
+    121:121:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    121:121:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732 -> a
+    122:122:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):732:732 -> a
+    123:123:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    123:123:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):731 -> a
+    124:125:boolean recordReferenceFromResources(java.lang.String,com.android.tools.r8.origin.Origin):733:734 -> a
+    126:126:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):759:759 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/z5;)V"}
-    134:137:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):767:770 -> a
+    127:130:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):767:770 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/z5;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)V"}
-    138:138:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):788:788 -> a
+    131:131:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):788:788 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/graph/E0;"}
-    139:139:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):806:806 -> a
+    132:132:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):806:806 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/z5;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/graph/E0;"}
-    140:140:boolean verifyIsMainThread():2157:2157 -> a
-    140:140:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):806 -> a
-    141:142:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):807:808 -> a
-    143:143:void lambda$internalDefinitionFor$2(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexClass):820:820 -> a
+    133:133:boolean verifyIsMainThread():2157:2157 -> a
+    133:133:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):806 -> a
+    134:135:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):807:808 -> a
+    136:136:void lambda$internalDefinitionFor$2(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexClass):820:820 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/z5;Lcom/android/tools/r8/graph/E0;)V"}
-    144:144:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):855:855 -> a
+    137:137:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):855:855 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Ljava/util/function/Predicate;)Z"}
-    145:145:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
-    145:145:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):857 -> a
-    146:149:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):856:859 -> a
-    150:150:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> a
-    150:150:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
+    138:138:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
+    138:138:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):857 -> a
+    139:142:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):856:859 -> a
+    143:143:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> a
+    143:143:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    151:151:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> a
-    151:151:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
-    152:152:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.asFieldJoinerOrNull(com.android.tools.r8.shaking.KeepInfo$Joiner):601:601 -> a
-    152:152:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
-    153:153:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):860:860 -> a
-    154:154:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):876:876 -> a
+    144:144:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> a
+    144:144:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
+    145:145:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.asFieldJoinerOrNull(com.android.tools.r8.shaking.KeepInfo$Joiner):520:520 -> a
+    145:145:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):859 -> a
+    146:146:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):860:860 -> a
+    147:147:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):876:876 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;ZLjava/util/function/BiConsumer;)V"}
-    155:156:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object,java.util.Set):49:50 -> a
-    155:156:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):877 -> a
-    157:159:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):878:880 -> a
-    160:165:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):893:898 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/xm0;Ljava/util/function/BiConsumer;Z)V"}
-    166:170:void handleLibraryTypeInheritingFromProgramType(com.android.tools.r8.graph.DexLibraryClass):978:982 -> a
-    166:170:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):898 -> a
-    171:197:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):900:926 -> a
-    198:198:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):923:923 -> a
-    199:199:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):900:900 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/mn;)V"}
-    200:204:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):910:914 -> a
+    148:149:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object,java.util.Set):49:50 -> a
+    148:149:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):877 -> a
+    150:152:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):878:880 -> a
+    153:158:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):893:898 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/Bm0;Ljava/util/function/BiConsumer;Z)V"}
+    159:163:void handleLibraryTypeInheritingFromProgramType(com.android.tools.r8.graph.DexLibraryClass):978:982 -> a
+    159:163:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):898 -> a
+    164:190:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):900:926 -> a
+    191:191:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):923:923 -> a
+    192:192:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):900:900 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;Lcom/android/tools/r8/internal/on;)V"}
+    193:197:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):910:914 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/H0;)V"}
-    205:212:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):911:918 -> a
-    213:213:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):917:917 -> a
-    214:220:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):936:942 -> a
+    198:205:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):911:918 -> a
+    206:206:void lambda$processNewLiveNonProgramType$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):917:917 -> a
+    207:213:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):936:942 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/h0;Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;)V"}
-    221:221:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
-    221:221:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):943 -> a
+    214:214:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
+    214:214:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):943 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    222:222:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
-    222:222:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):943 -> a
-    223:227:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):944:948 -> a
-    228:229:void lambda$addNonProgramClassToWorklist$6(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):950:951 -> a
+    215:215:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):509:509 -> a
+    215:215:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):943 -> a
+    216:220:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):944:948 -> a
+    221:222:void lambda$addNonProgramClassToWorklist$6(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):950:951 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/E0;)V"}
-    230:230:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):1030:1030 -> a
+    223:223:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):1030:1030 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;)V"}
-    231:231:void lambda$enqueueAllIfNotShrinking$8(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1032:1032 -> a
+    224:224:void lambda$enqueueAllIfNotShrinking$8(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1032:1032 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;)V"}
-    232:232:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
+    225:225:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/graph/b1;)V"}
-    233:233:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
-    233:233:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
-    234:234:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
-    235:235:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
-    235:235:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
-    236:236:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):126:126 -> a
-    236:236:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
+    226:226:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
+    226:226:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
+    227:227:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
+    228:228:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
+    228:228:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
+    229:229:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):126:126 -> a
+    229:229:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:237:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):127:127 -> a
-    237:237:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
-    238:241:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):115:118 -> a
-    238:241:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):128 -> a
-    238:241:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
-    242:242:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
-    243:243:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    243:243:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1048 -> a
+    230:230:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):127:127 -> a
+    230:230:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
+    231:234:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):115:118 -> a
+    231:234:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):128 -> a
+    231:234:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047 -> a
+    235:235:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1047:1047 -> a
+    236:236:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    236:236:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1048 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    244:244:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    244:244:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1048 -> a
-    245:252:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1049:1056 -> a
-    253:253:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    253:253:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    253:253:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1057 -> a
-    254:254:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    254:254:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1057 -> a
-    255:256:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1058:1059 -> a
-    257:257:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:651 -> a
-    257:257:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1060 -> a
+    237:237:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    237:237:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1048 -> a
+    238:245:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1049:1056 -> a
+    246:246:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    246:246:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    246:246:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1057 -> a
+    247:247:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    247:247:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1057 -> a
+    248:249:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1058:1059 -> a
+    250:250:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:570 -> a
+    250:250:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1060 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    258:259:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:652 -> a
-    258:259:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1060 -> a
-    260:260:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> a
-    260:260:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1063 -> a
+    251:252:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:571 -> a
+    251:252:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1060 -> a
+    253:253:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> a
+    253:253:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1063 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    261:264:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1063:1066 -> a
-    265:269:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1064:1068 -> a
-    270:270:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    270:270:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1067 -> a
-    271:271:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071:1071 -> a
-    272:272:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802:802 -> a
-    272:272:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
-    273:273:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):454:454 -> a
-    273:273:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802 -> a
+    254:257:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1063:1066 -> a
+    258:262:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1064:1068 -> a
+    263:263:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    263:263:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1067 -> a
+    264:264:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071:1071 -> a
+    265:265:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802:802 -> a
+    265:265:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
+    266:266:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):454:454 -> a
+    266:266:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    273:273:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
-    274:274:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):454:454 -> a
-    274:274:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802 -> a
-    274:274:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
-    275:275:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1072:1072 -> a
-    276:276:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    276:276:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    276:276:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074 -> a
-    277:277:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    277:277:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074 -> a
-    278:278:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074:1074 -> a
-    279:279:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    279:279:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1073 -> a
-    280:280:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198:1198 -> a
+    266:266:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
+    267:267:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):454:454 -> a
+    267:267:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):802 -> a
+    267:267:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1071 -> a
+    268:268:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1072:1072 -> a
+    269:269:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    269:269:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    269:269:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074 -> a
+    270:270:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    270:270:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074 -> a
+    271:271:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1074:1074 -> a
+    272:272:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    272:272:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):1073 -> a
+    273:273:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198:1198 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;ZZ)Z"}
-    281:281:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    281:281:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198 -> a
+    274:274:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    274:274:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    282:282:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    282:282:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198 -> a
-    283:300:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1200:1217 -> a
-    301:301:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184:1184 -> a
-    301:301:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    302:302:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    302:302:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
+    275:275:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    275:275:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1198 -> a
+    276:293:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1200:1217 -> a
+    294:294:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184:1184 -> a
+    294:294:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    295:295:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    295:295:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    302:302:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    303:303:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    303:303:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
-    303:303:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    304:304:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188:1188 -> a
-    304:304:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    305:305:void com.android.tools.r8.graph.FieldAccessInfoImpl.<init>(com.android.tools.r8.graph.DexField):51:51 -> a
-    305:305:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188 -> a
-    305:305:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    306:306:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1189:1189 -> a
-    306:306:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
-    307:310:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1222:1225 -> a
-    311:311:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.hasReflectiveRead():221:221 -> a
-    311:311:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1230 -> a
-    312:312:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveRead():225:225 -> a
-    312:312:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1231 -> a
-    313:313:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1235:1235 -> a
-    314:314:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveWrite():234:234 -> a
-    314:314:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1236 -> a
-    315:315:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):342:342 -> a
+    295:295:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    296:296:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    296:296:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
+    296:296:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    297:297:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188:1188 -> a
+    297:297:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    298:298:void com.android.tools.r8.graph.FieldAccessInfoImpl.<init>(com.android.tools.r8.graph.DexField):51:51 -> a
+    298:298:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188 -> a
+    298:298:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    299:299:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1189:1189 -> a
+    299:299:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1218 -> a
+    300:303:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1222:1225 -> a
+    304:304:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.hasReflectiveRead():221:221 -> a
+    304:304:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1230 -> a
+    305:305:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveRead():225:225 -> a
+    305:305:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1231 -> a
+    306:306:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1235:1235 -> a
+    307:307:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveWrite():234:234 -> a
+    307:307:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1236 -> a
+    308:308:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):342:342 -> a
+    308:308:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
+    309:309:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
+    309:309:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):342 -> a
+    309:309:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
+    310:312:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):343:345 -> a
+    310:312:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
+    313:313:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
+    313:313:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):345 -> a
+    313:313:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
+    314:314:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):346:346 -> a
+    314:314:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
+    315:315:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:352 -> a
     315:315:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
     316:316:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    316:316:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):342 -> a
+    316:316:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352 -> a
     316:316:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    317:319:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):343:345 -> a
+    317:319:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):353:355 -> a
     317:319:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
     320:320:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    320:320:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):345 -> a
+    320:320:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):355 -> a
     320:320:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    321:321:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):346:346 -> a
+    321:321:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):356:356 -> a
     321:321:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    322:322:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352:352 -> a
-    322:322:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    323:323:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> a
-    323:323:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):352 -> a
-    323:323:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    324:326:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):353:355 -> a
-    324:326:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    327:327:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> a
-    327:327:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):355 -> a
-    327:327:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    328:328:boolean com.android.tools.r8.graph.FieldAccessInfoImpl.recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):356:356 -> a
-    328:328:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1242 -> a
-    329:329:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249:1249 -> a
+    322:322:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249:1249 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;)V"}
-    330:330:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    330:330:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
+    323:323:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    323:323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    331:331:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
-    331:331:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
-    332:332:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    332:332:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
-    333:335:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249:1251 -> a
-    336:336:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):963:963 -> a
-    336:336:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1251 -> a
-    337:341:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1253:1257 -> a
-    342:342:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    342:342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1257 -> a
-    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1257:1257 -> a
-    344:344:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():110:110 -> a
-    344:344:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1259 -> a
-    345:346:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1259:1260 -> a
-    347:347:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    347:347:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1260 -> a
-    348:348:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1261:1261 -> a
-    349:349:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():313:313 -> a
-    349:349:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1262 -> a
+    324:324:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
+    324:324:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
+    325:325:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    325:325:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249 -> a
+    326:328:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1249:1251 -> a
+    329:329:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):963:963 -> a
+    329:329:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1251 -> a
+    330:334:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1253:1257 -> a
+    335:335:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    335:335:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1257 -> a
+    336:336:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1257:1257 -> a
+    337:337:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():110:110 -> a
+    337:337:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1259 -> a
+    338:339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1259:1260 -> a
+    340:340:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    340:340:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1260 -> a
+    341:341:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1261:1261 -> a
+    342:342:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():313:313 -> a
+    342:342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    350:350:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():313:313 -> a
-    350:350:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1262 -> a
-    351:358:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1263:1270 -> a
-    359:359:boolean com.android.tools.r8.utils.InternalOptions$DesugarState.isOff():168:168 -> a
-    359:359:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1270 -> a
-    360:360:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1270:1270 -> a
-    361:363:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2997:2999 -> a
-    361:363:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1272 -> a
-    364:364:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    364:364:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3029 -> a
-    364:364:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
-    365:365:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3029:3029 -> a
-    365:365:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
-    366:366:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3028:3028 -> a
-    366:366:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
-    367:394:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1274:1301 -> a
-    395:395:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    395:395:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1568 -> a
-    395:395:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1289 -> a
-    396:396:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1567:1567 -> a
-    396:396:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1289 -> a
-    397:397:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    397:397:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1542 -> a
-    397:397:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1295 -> a
-    398:398:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1541:1541 -> a
-    398:398:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1295 -> a
-    399:399:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298:1298 -> a
-    400:400:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    400:400:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1734 -> a
-    400:400:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
-    401:403:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1742:1744 -> a
-    401:403:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
-    401:403:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
-    404:404:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    404:404:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1745 -> a
-    404:404:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
-    404:404:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
-    405:408:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1745:1748 -> a
-    405:408:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
-    405:408:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
-    409:409:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1746:1746 -> a
-    409:409:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
-    409:409:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
-    410:410:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    410:410:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1651 -> a
-    410:410:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1292 -> a
-    411:411:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1650:1650 -> a
-    411:411:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1292 -> a
-    412:412:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    412:412:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1594 -> a
-    412:412:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1286 -> a
-    413:413:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1593:1593 -> a
-    413:413:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1286 -> a
-    414:414:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1304:1304 -> a
-    415:415:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$10(com.android.tools.r8.graph.DexCallSite):1274:1274 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)Lcom/android/tools/r8/internal/yY;"}
-    416:416:void lambda$traceCallSite$11(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    343:343:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():313:313 -> a
+    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1262 -> a
+    344:351:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1263:1270 -> a
+    352:352:boolean com.android.tools.r8.utils.InternalOptions$DesugarState.isOff():168:168 -> a
+    352:352:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1270 -> a
+    353:353:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1270:1270 -> a
+    354:356:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2997:2999 -> a
+    354:356:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1272 -> a
+    357:357:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
+    357:357:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3029 -> a
+    357:357:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
+    358:358:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3029:3029 -> a
+    358:358:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
+    359:359:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):3028:3028 -> a
+    359:359:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1273 -> a
+    360:387:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1274:1301 -> a
+    388:388:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
+    388:388:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1568 -> a
+    388:388:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1289 -> a
+    389:389:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1567:1567 -> a
+    389:389:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1289 -> a
+    390:390:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
+    390:390:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1542 -> a
+    390:390:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1295 -> a
+    391:391:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1541:1541 -> a
+    391:391:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1295 -> a
+    392:392:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298:1298 -> a
+    393:393:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
+    393:393:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1734 -> a
+    393:393:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
+    394:396:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1742:1744 -> a
+    394:396:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
+    394:396:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
+    397:397:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    397:397:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1745 -> a
+    397:397:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
+    397:397:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
+    398:401:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1745:1748 -> a
+    398:401:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
+    398:401:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
+    402:402:com.android.tools.r8.graph.DexClass traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1746:1746 -> a
+    402:402:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1733 -> a
+    402:402:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1298 -> a
+    403:403:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
+    403:403:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1651 -> a
+    403:403:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1292 -> a
+    404:404:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1650:1650 -> a
+    404:404:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1292 -> a
+    405:405:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
+    405:405:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1594 -> a
+    405:405:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1286 -> a
+    406:406:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1593:1593 -> a
+    406:406:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1286 -> a
+    407:407:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1304:1304 -> a
+    408:408:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$10(com.android.tools.r8.graph.DexCallSite):1274:1274 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D0;)Lcom/android/tools/r8/internal/CY;"}
+    409:409:void lambda$traceCallSite$11(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1275:1275 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/I2;)V"}
-    417:420:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1311:1314 -> a
+    410:413:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1311:1314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;)V"}
-    421:421:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    421:421:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    421:421:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-    422:422:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    422:422:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-    423:423:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowClosedWorldReasoning():699:699 -> a
-    423:423:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    424:424:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowClosedWorldReasoning():699:699 -> a
-    424:424:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-    425:425:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClosedWorldReasoning(boolean):345:345 -> a
-    425:425:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowClosedWorldReasoning():354 -> a
-    425:425:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowClosedWorldReasoning():699 -> a
-    425:425:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    426:426:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowClosedWorldReasoning():700:700 -> a
-    426:426:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
-    427:427:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    427:427:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1313 -> a
-    428:428:void lambda$traceCheckCast$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1322:1322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/nn;)V"}
-    429:429:void lambda$traceConstClass$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerConstClassAnalysis):1337:1337 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/sn;)V"}
-    430:430:void com.android.tools.r8.features.IsolatedFeatureSplitsChecker.traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):180:180 -> a
-    430:430:void lambda$traceConstClass$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerConstClassAnalysis):1337 -> a
-    431:435:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1346:1350 -> a
-    431:435:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1335 -> a
+    414:414:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    414:414:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    414:414:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
+    415:415:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    415:415:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315 -> a
+    416:416:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1315:1315 -> a
+    417:417:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    417:417:void lambda$disableClosedWorldReasoning$12(com.android.tools.r8.graph.MethodResolutionResult):1313 -> a
+    418:418:void lambda$traceCheckCast$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1322:1322 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
+    419:419:void lambda$traceConstClass$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerConstClassAnalysis):1337:1337 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/un;)V"}
+    420:420:void com.android.tools.r8.features.IsolatedFeatureSplitsChecker.traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):180:180 -> a
+    420:420:void lambda$traceConstClass$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerConstClassAnalysis):1337 -> a
+    421:425:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1346:1350 -> a
+    421:425:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1335 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Ljava/util/ListIterator;Z)V"}
-    436:437:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1336:1337 -> a
-    438:450:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1367:1379 -> a
+    426:427:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1336:1337 -> a
+    428:440:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1367:1379 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/ListIterator;)Z"}
-    451:451:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
-    451:451:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380 -> a
+    441:441:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
+    441:441:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    452:452:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
-    452:452:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380 -> a
-    453:460:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380:1387 -> a
-    461:461:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1372:1372 -> a
+    442:442:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1978:1978 -> a
+    442:442:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380 -> a
+    443:450:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1380:1387 -> a
+    451:451:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1372:1372 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/code/c;)Z"}
-    462:462:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    462:462:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1372 -> a
-    463:463:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1373:1373 -> a
-    464:464:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    464:464:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1373 -> a
-    465:465:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1394:1394 -> a
+    452:452:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    452:452:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1372 -> a
+    453:453:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1373:1373 -> a
+    454:454:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    454:454:boolean lambda$isConstClassMaybeUsedAsLock$16(com.android.tools.r8.dex.code.CfOrDexInstruction):1373 -> a
+    455:455:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1394:1394 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Z)Lcom/android/tools/r8/graph/E0;"}
-    466:466:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1494:1494 -> a
-    466:466:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1395 -> a
-    467:473:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1396:1402 -> a
-    474:474:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404:1404 -> a
+    456:456:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1494:1494 -> a
+    456:456:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1395 -> a
+    457:463:com.android.tools.r8.graph.DexClass internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1396:1402 -> a
+    464:464:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404:1404 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/K1;"}
-    475:475:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):205:205 -> a
-    475:475:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
+    465:465:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):205:205 -> a
+    465:465:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    477:478:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):207:208 -> a
-    477:478:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
-    479:479:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):206:206 -> a
-    479:479:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
-    480:480:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404:1404 -> a
-    481:481:void lambda$traceInstanceOf$18(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1500:1500 -> a
+    467:468:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):207:208 -> a
+    467:468:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
+    469:469:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):206:206 -> a
+    469:469:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404 -> a
+    470:470:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1404:1404 -> a
+    471:471:void lambda$traceInstanceOf$18(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1500:1500 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/sn;)V"}
+    472:472:void lambda$traceExceptionGuard$19(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1507:1507 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/qn;)V"}
-    482:482:void lambda$traceExceptionGuard$19(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1507:1507 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/on;)V"}
-    483:483:void lambda$traceInvokeDirect$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1516:1516 -> a
+    473:473:void lambda$traceInvokeDirect$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1516:1516 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;)V"}
-    484:486:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1528:1530 -> a
+    474:476:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1528:1530 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Y1;)Z"}
-    487:487:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1532:1532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Y1;Lcom/android/tools/r8/internal/Gr;)Ljava/lang/Boolean;"}
-    488:488:boolean lambda$registerDeferredActionForDeadProtoBuilder$21(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1533:1533 -> a
+    477:477:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1532:1532 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Y1;Lcom/android/tools/r8/internal/Ir;)Ljava/lang/Boolean;"}
+    478:478:boolean lambda$registerDeferredActionForDeadProtoBuilder$21(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1533:1533 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Y1;)Z"}
-    489:495:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1550:1556 -> a
+    479:485:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1550:1556 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/shaking/x1;)V"}
-    496:502:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1680:1686 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/PW;)V"}
-    503:503:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
-    503:503:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1686 -> a
-    504:504:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1686:1686 -> a
-    505:505:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
-    505:505:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1687 -> a
-    506:506:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1687:1687 -> a
-    507:507:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():89:89 -> a
-    507:507:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1688 -> a
-    508:508:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692:1692 -> a
-    509:509:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
-    509:509:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692 -> a
-    510:512:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692:1694 -> a
-    513:513:void markEffectivelyLiveOriginalReference(com.android.tools.r8.graph.OriginalFieldWitness):1703:1703 -> a
+    486:492:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1680:1686 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/TW;)V"}
+    493:493:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
+    493:493:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1686 -> a
+    494:494:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1686:1686 -> a
+    495:495:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
+    495:495:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1687 -> a
+    496:496:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1687:1687 -> a
+    497:497:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.getCallerPosition():89:89 -> a
+    497:497:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1688 -> a
+    498:498:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692:1692 -> a
+    499:499:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
+    499:499:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692 -> a
+    500:502:void traceMethodPosition(com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):1692:1694 -> a
+    503:503:void markEffectivelyLiveOriginalReference(com.android.tools.r8.graph.OriginalFieldWitness):1703:1703 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/t5;)V"}
-    514:515:void markEffectivelyLiveOriginalReference(com.android.tools.r8.graph.DexReference):1709:1710 -> a
+    504:505:void markEffectivelyLiveOriginalReference(com.android.tools.r8.graph.DexReference):1709:1710 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)V"}
-    516:516:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867:1867 -> a
+    506:506:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867:1867 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;)V"}
-    517:517:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1140:1140 -> a
-    517:517:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867 -> a
-    518:525:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1871:1878 -> a
-    526:526:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> a
-    526:526:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1878 -> a
-    527:527:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    527:527:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3975 -> a
+    507:507:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1140:1140 -> a
+    507:507:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867 -> a
+    508:515:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1871:1878 -> a
+    516:516:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> a
+    516:516:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1878 -> a
+    517:517:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    517:517:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3975 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m4;)V"}
-    528:529:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3975:3976 -> a
-    530:555:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1880:1905 -> a
+    518:519:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3975:3976 -> a
+    520:545:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1880:1905 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;Lcom/android/tools/r8/graph/y3$a;)V"}
-    556:558:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> a
-    556:558:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1905 -> a
-    559:560:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1908:1909 -> a
-    561:561:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1908:1908 -> a
-    562:562:void lambda$traceInstanceFieldRead$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1882:1882 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
-    563:563:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008:2008 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3;Lcom/android/tools/r8/internal/wr;)Ljava/lang/Boolean;"}
-    564:565:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):253:254 -> a
-    564:565:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008 -> a
-    566:566:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008:2008 -> a
-    567:567:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071:2071 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/wr;)V"}
-    568:568:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    568:568:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
-    568:568:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
+    546:548:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> a
+    546:548:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1905 -> a
+    549:550:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1908:1909 -> a
+    551:551:void lambda$traceInstanceFieldRead$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1908:1908 -> a
+    552:552:void lambda$traceInstanceFieldRead$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1882:1882 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
+    553:553:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008:2008 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3;Lcom/android/tools/r8/internal/yr;)Ljava/lang/Boolean;"}
+    554:555:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):253:254 -> a
+    554:555:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008 -> a
+    556:556:java.lang.Boolean lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2008:2008 -> a
+    557:557:void lambda$traceStaticFieldRead$38(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2052:2052 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;)V"}
+    558:558:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071:2071 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yr;)V"}
+    559:559:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    559:559:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
+    559:559:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    569:569:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    569:569:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
-    569:569:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
-    570:570:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236:236 -> a
-    570:570:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
-    571:571:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):212:212 -> a
-    571:571:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
-    571:571:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
-    572:572:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):237:237 -> a
-    572:572:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
-    573:585:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2190:2202 -> a
+    560:560:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    560:560:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
+    560:560:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
+    561:561:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236:236 -> a
+    561:561:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
+    562:562:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):212:212 -> a
+    562:562:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):236 -> a
+    562:562:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
+    563:563:void com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):237:237 -> a
+    563:563:void lambda$traceStaticFieldRead$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2071 -> a
+    564:576:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2190:2202 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;)V"}
-    586:586:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> a
+    577:577:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/y5;)V"}
-    587:594:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2227:2234 -> a
+    578:585:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2227:2234 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/s4;Lcom/android/tools/r8/shaking/M0;)V"}
-    595:611:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2232:2248 -> a
-    612:618:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2247:2253 -> a
-    619:664:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2252:2297 -> a
-    665:711:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2342 -> a
-    712:725:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1107:1120 -> a
-    712:725:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
-    726:726:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    726:726:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    726:726:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121 -> a
-    726:726:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
-    727:727:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    727:727:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121 -> a
-    727:727:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
-    728:728:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121:1121 -> a
-    728:728:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
-    729:729:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    729:729:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1119 -> a
-    729:729:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
-    730:732:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2347:2349 -> a
-    733:733:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():832:832 -> a
-    733:733:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350 -> a
-    734:744:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350:2360 -> a
-    745:749:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1127:1131 -> a
-    745:749:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2359 -> a
-    750:750:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2362:2362 -> a
-    751:751:void lambda$markTypeAsLive$48(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2362:2362 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/mn;)V"}
-    752:757:void processDeferredAnnotations(java.util.Map,java.util.function.Function):2368:2373 -> a
+    586:602:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2232:2248 -> a
+    603:609:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2247:2253 -> a
+    610:655:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2252:2297 -> a
+    656:702:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2296:2342 -> a
+    703:716:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1107:1120 -> a
+    703:716:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
+    717:717:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    717:717:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    717:717:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121 -> a
+    717:717:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
+    718:718:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    718:718:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121 -> a
+    718:718:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
+    719:719:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1121:1121 -> a
+    719:719:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
+    720:720:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    720:720:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1119 -> a
+    720:720:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2343 -> a
+    721:723:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2347:2349 -> a
+    724:724:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():832:832 -> a
+    724:724:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350 -> a
+    725:735:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2350:2360 -> a
+    736:740:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1127:1131 -> a
+    736:740:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2359 -> a
+    741:741:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2362:2362 -> a
+    742:742:void lambda$markTypeAsLive$48(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2362:2362 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/on;)V"}
+    743:748:void processDeferredAnnotations(java.util.Map,java.util.function.Function):2368:2373 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/function/Function;)V"}
-    758:760:void processDeferredAnnotations(java.util.Map,java.util.function.Function):2372:2374 -> a
-    761:761:boolean lambda$processDeferredAnnotations$49(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):2373:2373 -> a
+    749:751:void processDeferredAnnotations(java.util.Map,java.util.function.Function):2372:2374 -> a
+    752:752:boolean lambda$processDeferredAnnotations$49(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):2373:2373 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/r0;)Z"}
-    762:762:void lambda$processDeferredAnnotations$51(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):2376:2376 -> a
+    753:753:void lambda$processDeferredAnnotations$51(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):2376:2376 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/r0;Ljava/util/List;)V"}
-    763:763:void lambda$processDeferredAnnotations$50(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2379:2379 -> a
+    754:754:void lambda$processDeferredAnnotations$50(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2379:2379 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;Ljava/util/function/Function;Lcom/android/tools/r8/graph/y5;)V"}
-    764:764:void lambda$processDeferredAnnotations$50(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2378:2378 -> a
-    765:768:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2385:2388 -> a
+    755:755:void lambda$processDeferredAnnotations$50(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2378:2378 -> a
+    756:759:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2385:2388 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;)V"}
-    769:771:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2387:2389 -> a
-    772:772:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
-    772:772:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2389 -> a
-    773:773:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$52(com.android.tools.r8.graph.DexType):2388:2388 -> a
+    760:762:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2387:2389 -> a
+    763:763:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
+    763:763:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2389 -> a
+    764:764:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$52(com.android.tools.r8.graph.DexType):2388:2388 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/shaking/s4;"}
-    774:774:void com.android.tools.r8.shaking.ScopedDexMethodSet.<init>():28:28 -> a
-    774:774:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$52(com.android.tools.r8.graph.DexType):2388 -> a
-    775:775:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):2394:2394 -> a
+    765:765:void com.android.tools.r8.shaking.ScopedDexMethodSet.<init>():28:28 -> a
+    765:765:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$52(com.android.tools.r8.graph.DexType):2388 -> a
+    766:766:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):2394:2394 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/s4;Lcom/android/tools/r8/shaking/D1;)V"}
-    776:778:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2396:2398 -> a
+    767:769:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2396:2398 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/s4;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)Z"}
-    779:779:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):523:523 -> a
-    779:779:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2398 -> a
+    770:770:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):523:523 -> a
+    770:770:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2398 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    783:784:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527:528 -> a
-    783:784:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2398 -> a
-    785:788:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2494:2497 -> a
+    774:775:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527:528 -> a
+    774:775:boolean lambda$ensureMethodsContinueToWidenAccess$53(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2398 -> a
+    776:779:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2494:2497 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/graph/p0;)V"}
-    789:789:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
-    789:789:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2497 -> a
+    780:780:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
+    780:780:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2497 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    790:790:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
-    790:790:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2497 -> a
-    791:791:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2529:2529 -> a
-    791:791:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
-    792:792:boolean com.android.tools.r8.shaking.AnnotationRemover$Builder.isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):438:438 -> a
-    792:792:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2530 -> a
+    781:781:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
+    781:781:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2497 -> a
+    782:782:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2529:2529 -> a
+    782:782:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
+    783:783:boolean com.android.tools.r8.shaking.AnnotationRemover$Builder.isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):437:437 -> a
+    783:783:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2530 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    792:792:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
-    793:793:boolean com.android.tools.r8.shaking.AnnotationRemover$Builder.isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):438:438 -> a
-    793:793:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2530 -> a
-    793:793:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
-    794:798:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2531:2535 -> a
-    794:798:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
-    799:799:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501:2501 -> a
-    800:800:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():59:59 -> a
-    800:800:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501 -> a
-    801:815:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501:2515 -> a
-    816:816:boolean com.android.tools.r8.shaking.GraphReporter.hasKeptGraphConsumer():349:349 -> a
-    816:816:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):378 -> a
+    783:783:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
+    784:784:boolean com.android.tools.r8.shaking.AnnotationRemover$Builder.isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):437:437 -> a
+    784:784:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2530 -> a
+    784:784:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
+    785:789:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2531:2535 -> a
+    785:789:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2498 -> a
+    790:790:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501:2501 -> a
+    791:791:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():59:59 -> a
+    791:791:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501 -> a
+    792:806:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2501:2515 -> a
+    807:807:boolean com.android.tools.r8.shaking.GraphReporter.hasKeptGraphConsumer():349:349 -> a
+    807:807:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):378 -> a
+    807:807:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    808:809:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):380:381 -> a
+    808:809:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
+    810:810:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):27:27 -> a
+    810:810:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):381 -> a
+    810:810:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
+    811:815:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):379:383 -> a
+    811:815:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
+    816:816:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.referencedInAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):68:68 -> a
+    816:816:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):384 -> a
     816:816:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    817:818:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):380:381 -> a
-    817:818:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-    819:819:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):27:27 -> a
-    819:819:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):381 -> a
-    819:819:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-    820:824:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):379:383 -> a
-    820:824:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-    825:825:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.referencedInAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):68:68 -> a
-    825:825:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):384 -> a
-    825:825:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-    826:826:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):382:382 -> a
-    826:826:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
-    827:829:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2519:2521 -> a
-    830:830:java.util.List lambda$processAnnotation$58(com.android.tools.r8.graph.DexAnnotation):2505:2505 -> a
+    817:817:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):382:382 -> a
+    817:817:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2515 -> a
+    818:820:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2519:2521 -> a
+    821:821:java.util.List lambda$processAnnotation$58(com.android.tools.r8.graph.DexAnnotation):2505:2505 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;)Ljava/util/List;"}
-    831:832:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2555:2556 -> a
+    822:823:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2555:2556 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/y3;"}
-    833:833:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> a
-    833:833:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2556 -> a
+    824:824:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> a
+    824:824:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2556 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    834:834:void lambda$resolveField$60(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2563:2563 -> a
+    825:825:void lambda$resolveField$60(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2563:2563 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/s3;)V"}
-    835:836:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):775:776 -> a
-    835:836:void lambda$resolveField$60(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2564 -> a
-    837:837:void lambda$resolveMethod$62(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2581:2581 -> a
+    826:827:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):775:776 -> a
+    826:827:void lambda$resolveField$60(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2564 -> a
+    828:828:void lambda$resolveMethod$62(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2581:2581 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/U4$a;)V"}
-    838:840:void lambda$resolveMethod$62(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2580:2582 -> a
-    841:843:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2590:2592 -> a
+    829:831:void lambda$resolveMethod$62(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2580:2582 -> a
+    832:834:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2590:2592 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;Z)Lcom/android/tools/r8/graph/U4;"}
-    844:844:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):258:258 -> a
-    844:844:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2592 -> a
+    835:835:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):258:258 -> a
+    835:835:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2592 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    845:845:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2594:2594 -> a
+    836:836:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2594:2594 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;)V"}
-    846:846:boolean com.android.tools.r8.graph.MethodResolutionResult.isArrayCloneMethodResult():0:0 -> a
-    846:846:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2594 -> a
-    847:851:void checkAccess(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3717:3721 -> a
-    847:851:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2595 -> a
-    852:852:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2597:2597 -> a
-    853:853:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2596:2596 -> a
-    854:855:void lambda$resolveMethod$64(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2601:2602 -> a
+    837:837:boolean com.android.tools.r8.graph.MethodResolutionResult.isArrayCloneMethodResult():0:0 -> a
+    837:837:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2594 -> a
+    838:842:void checkAccess(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3717:3721 -> a
+    838:842:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2595 -> a
+    843:843:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2597:2597 -> a
+    844:844:void lambda$resolveMethod$63(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2596:2596 -> a
+    845:846:void lambda$resolveMethod$64(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2601:2602 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/U4$a;)V"}
-    856:857:com.android.tools.r8.graph.MethodResolutionResult handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2609:2610 -> a
+    847:848:com.android.tools.r8.graph.MethodResolutionResult handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2609:2610 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x1;)Lcom/android/tools/r8/graph/U4;"}
-    858:876:void lambda$handleInvokeOfStaticTarget$65(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2612:2630 -> a
+    849:867:void lambda$handleInvokeOfStaticTarget$65(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2612:2630 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/U4;)V"}
-    877:878:com.android.tools.r8.graph.MethodResolutionResult handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2739:2740 -> a
+    868:869:com.android.tools.r8.graph.MethodResolutionResult handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2739:2740 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/K1;)Lcom/android/tools/r8/graph/U4;"}
-    879:908:void lambda$handleInvokeOfDirectTarget$66(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.MethodResolutionResult):2742:2771 -> a
+    870:899:void lambda$handleInvokeOfDirectTarget$66(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.MethodResolutionResult):2742:2771 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/U4;)V"}
-    909:909:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2778:2778 -> a
+    900:900:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2778:2778 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/q2;)V"}
-    910:910:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    910:910:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2784 -> a
-    911:911:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2784:2784 -> a
-    912:912:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    912:912:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2789 -> a
-    913:950:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2789:2826 -> a
-    951:953:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2838:2840 -> a
+    901:901:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    901:901:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2784 -> a
+    902:902:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2784:2784 -> a
+    903:903:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    903:903:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2789 -> a
+    904:941:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2789:2826 -> a
+    942:944:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2838:2840 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/K1;)V"}
-    954:954:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
-    954:954:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    955:955:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
-    955:955:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
+    945:945:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
+    945:945:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    946:946:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
+    946:946:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    955:955:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    956:956:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
-    956:956:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    957:957:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2842:2842 -> a
-    958:958:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> a
-    958:958:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2842 -> a
-    959:959:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2848:2848 -> a
-    960:960:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2844:2844 -> a
+    946:946:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    947:947:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
+    947:947:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    948:948:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2842:2842 -> a
+    949:949:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> a
+    949:949:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2842 -> a
+    950:950:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2848:2848 -> a
+    951:951:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2844:2844 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M0;Lcom/android/tools/r8/graph/A5;)V"}
-    961:961:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
-    961:961:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
-    962:962:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
-    962:962:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
+    952:952:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
+    952:952:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
+    953:953:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
+    953:953:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    962:962:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
-    963:963:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
-    963:963:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
-    964:964:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995:4995 -> a
-    964:964:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    965:965:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184:1184 -> a
-    965:965:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    965:965:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    966:966:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    966:966:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
+    953:953:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
+    954:954:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
+    954:954:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2845 -> a
+    955:955:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995:4995 -> a
+    955:955:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    956:956:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184:1184 -> a
+    956:956:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    956:956:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    957:957:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    957:957:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    966:966:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    966:966:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    967:967:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    967:967:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
-    967:967:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    967:967:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    968:968:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188:1188 -> a
-    968:968:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    968:968:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    969:969:void com.android.tools.r8.graph.FieldAccessInfoImpl.<init>(com.android.tools.r8.graph.DexField):51:51 -> a
-    969:969:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188 -> a
-    969:969:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    969:969:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    970:970:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1189:1189 -> a
-    970:970:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
-    970:970:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    971:971:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveRead():225:225 -> a
-    971:971:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4996 -> a
-    971:971:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    972:972:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveWrite():234:234 -> a
-    972:972:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4997 -> a
-    972:972:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    973:976:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4999:5002 -> a
-    973:976:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
-    977:977:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2850:2850 -> a
+    957:957:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    957:957:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    958:958:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    958:958:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1184 -> a
+    958:958:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    958:958:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    959:959:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188:1188 -> a
+    959:959:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    959:959:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    960:960:void com.android.tools.r8.graph.FieldAccessInfoImpl.<init>(com.android.tools.r8.graph.DexField):51:51 -> a
+    960:960:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1188 -> a
+    960:960:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    960:960:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    961:961:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1189:1189 -> a
+    961:961:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4995 -> a
+    961:961:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    962:962:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveRead():225:225 -> a
+    962:962:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4996 -> a
+    962:962:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    963:963:void com.android.tools.r8.graph.FieldAccessInfoImpl.setHasReflectiveWrite():234:234 -> a
+    963:963:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4997 -> a
+    963:963:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    964:967:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4999:5002 -> a
+    964:967:void lambda$keepClassAndAllMembers$69(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2846 -> a
+    968:968:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2850:2850 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M0;Lcom/android/tools/r8/graph/C5;)V"}
-    978:978:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
-    978:978:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
-    979:979:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
-    979:979:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
+    969:969:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> a
+    969:969:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
+    970:970:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
+    970:970:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    979:979:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
-    980:980:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
-    980:980:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
-    981:989:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4970:4978 -> a
-    981:989:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
-    990:991:boolean com.android.tools.r8.graph.DexEncodedMethod.isNonAbstractVirtualMethod():504:505 -> a
-    990:991:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4982 -> a
-    990:991:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
-    992:999:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4982:4989 -> a
-    992:999:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
-    1000:1002:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2857:2859 -> a
+    970:970:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
+    971:971:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2833:2833 -> a
+    971:971:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2851 -> a
+    972:980:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4970:4978 -> a
+    972:980:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
+    981:982:boolean com.android.tools.r8.graph.DexEncodedMethod.isNonAbstractVirtualMethod():504:505 -> a
+    981:982:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4982 -> a
+    981:982:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
+    983:990:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4982:4989 -> a
+    983:990:void lambda$keepClassAndAllMembers$70(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2852 -> a
+    991:993:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2857:2859 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/z5;)V"}
-    1003:1005:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> a
-    1003:1005:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2859 -> a
-    1006:1006:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2862:2862 -> a
-    1007:1007:void lambda$recordNonProgramClass$71(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2872:2872 -> a
+    994:996:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> a
+    994:996:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2859 -> a
+    997:997:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2862:2862 -> a
+    998:998:void lambda$recordNonProgramClass$71(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2872:2872 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/z5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/h0;)V"}
-    1008:1008:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885:2885 -> a
-    1008:1008:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
+    999:999:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885:2885 -> a
+    999:999:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/z5;)V"}
-    1009:1009:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
-    1009:1009:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
+    1000:1000:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
+    1000:1000:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1009:1009:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
-    1010:1010:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
-    1010:1010:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
-    1010:1010:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
-    1011:1011:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885:2885 -> a
-    1011:1011:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
-    1011:1011:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
+    1000:1000:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
+    1001:1001:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
+    1001:1001:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
+    1001:1001:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2889 -> a
+    1002:1002:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885:2885 -> a
+    1002:1002:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
+    1002:1002:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/h0;)V"}
-    1012:1012:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
-    1012:1012:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
+    1003:1003:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
+    1003:1003:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1012:1012:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
-    1012:1012:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
-    1013:1013:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
-    1013:1013:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
-    1013:1013:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
-    1013:1013:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
-    1014:1014:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938:2938 -> a
+    1003:1003:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
+    1003:1003:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
+    1004:1004:void com.android.tools.r8.shaking.MissingClasses$Builder.ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> a
+    1004:1004:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2885 -> a
+    1004:1004:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2893 -> a
+    1004:1004:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2898 -> a
+    1005:1005:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938:2938 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/shaking/K1;)V"}
-    1015:1015:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1015:1015:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938 -> a
+    1006:1006:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1006:1006:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1016:1016:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1016:1016:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938 -> a
-    1017:1023:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938:2944 -> a
-    1024:1025:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2971:2972 -> a
-    1024:1025:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2948 -> a
-    1026:1028:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2953:2955 -> a
-    1029:1029:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1029:1029:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033 -> a
+    1007:1007:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1007:1007:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938 -> a
+    1008:1014:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2938:2944 -> a
+    1015:1016:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2971:2972 -> a
+    1015:1016:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2948 -> a
+    1017:1019:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2953:2955 -> a
+    1020:1020:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1020:1020:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1029:1029:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1030:1030:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1030:1030:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033 -> a
-    1030:1030:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1031:1032:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033:3034 -> a
-    1031:1032:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1033:1033:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    1033:1033:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3036 -> a
-    1033:1033:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1034:1034:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3036:3036 -> a
-    1034:1034:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1035:1035:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3035:3035 -> a
-    1035:1035:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
-    1036:1039:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3234:3237 -> a
-    1036:1039:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
-    1040:1040:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):47:47 -> a
-    1040:1040:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3237 -> a
-    1040:1040:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
-    1041:1041:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
-    1041:1041:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3238 -> a
-    1041:1041:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
-    1042:1050:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3238:3246 -> a
-    1042:1050:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
-    1051:1051:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250:3250 -> a
-    1051:1051:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
-    1052:1052:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1052:1052:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250 -> a
+    1020:1020:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1021:1021:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1021:1021:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033 -> a
+    1021:1021:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1022:1023:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3033:3034 -> a
+    1022:1023:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1024:1024:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    1024:1024:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3036 -> a
+    1024:1024:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1025:1025:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3036:3036 -> a
+    1025:1025:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1026:1026:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3035:3035 -> a
+    1026:1026:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2958 -> a
+    1027:1030:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3234:3237 -> a
+    1027:1030:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
+    1031:1031:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):47:47 -> a
+    1031:1031:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3237 -> a
+    1031:1031:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
+    1032:1032:java.util.Iterator com.android.tools.r8.utils.collections.ProgramFieldSet.iterator():79:79 -> a
+    1032:1032:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3238 -> a
+    1032:1032:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
+    1033:1041:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3238:3246 -> a
+    1033:1041:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2960 -> a
+    1042:1042:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250:3250 -> a
+    1042:1042:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
+    1043:1043:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1043:1043:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1052:1052:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
-    1053:1053:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1053:1053:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250 -> a
-    1053:1053:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
-    1054:1056:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250:3252 -> a
-    1054:1056:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
-    1057:1057:void lambda$processNewlyInstantiatedClass$72(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2946:2946 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/mn;)V"}
-    1058:1058:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986:2986 -> a
+    1043:1043:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
+    1044:1044:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1044:1044:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250 -> a
+    1044:1044:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
+    1045:1047:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3250:3252 -> a
+    1045:1047:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2962 -> a
+    1048:1048:void lambda$processNewlyInstantiatedClass$72(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2946:2946 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/on;)V"}
+    1049:1049:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986:2986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/M0;)V"}
-    1059:1059:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1059:1059:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986 -> a
+    1050:1050:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1050:1050:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1060:1060:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1060:1060:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986 -> a
-    1061:1063:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986:2988 -> a
-    1064:1064:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):402:402 -> a
-    1064:1064:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
-    1065:1065:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1065:1065:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403 -> a
+    1051:1051:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1051:1051:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986 -> a
+    1052:1054:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2986:2988 -> a
+    1055:1055:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):402:402 -> a
+    1055:1055:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
+    1056:1056:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1056:1056:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1065:1065:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
-    1066:1066:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    1066:1066:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403 -> a
-    1066:1066:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
-    1067:1069:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403:405 -> a
-    1067:1069:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
-    1070:1070:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2991:2991 -> a
-    1071:1072:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):3256:3257 -> a
-    1071:1072:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2992 -> a
-    1073:1091:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):3004:3022 -> a
+    1056:1056:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
+    1057:1057:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    1057:1057:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403 -> a
+    1057:1057:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
+    1058:1060:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):403:405 -> a
+    1058:1060:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2988 -> a
+    1061:1061:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2991:2991 -> a
+    1062:1063:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):3256:3257 -> a
+    1062:1063:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2992 -> a
+    1064:1082:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):3004:3022 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)V"}
-    1092:1093:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3055:3056 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/E0;)V"}
-    1094:1102:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3140:3148 -> a
-    1094:1102:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1103:1103:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():529:529 -> a
-    1103:1103:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148 -> a
+    1083:1084:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3055:3056 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/E0;)V"}
+    1085:1093:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3140:3148 -> a
+    1085:1093:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1094:1094:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():529:529 -> a
+    1094:1094:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1103:1103:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1104:1104:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():530:530 -> a
-    1104:1104:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148 -> a
-    1104:1104:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1105:1111:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148:3154 -> a
-    1105:1111:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1112:1122:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3151:3161 -> a
-    1112:1122:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1123:1123:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    1123:1123:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3161 -> a
-    1123:1123:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1124:1126:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3161:3163 -> a
-    1124:1126:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1127:1131:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3162:3166 -> a
-    1127:1131:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1132:1138:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3165:3171 -> a
-    1132:1138:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1139:1139:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3168:3168 -> a
-    1139:1139:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
-    1140:1143:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3060:3063 -> a
-    1144:1144:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3075 -> a
+    1094:1094:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1095:1095:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():530:530 -> a
+    1095:1095:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148 -> a
+    1095:1095:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1096:1102:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3148:3154 -> a
+    1096:1102:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1103:1113:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3151:3161 -> a
+    1103:1113:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1114:1114:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    1114:1114:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3161 -> a
+    1114:1114:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1115:1117:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3161:3163 -> a
+    1115:1117:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1118:1122:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3162:3166 -> a
+    1118:1122:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1123:1129:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3165:3171 -> a
+    1123:1129:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1130:1130:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):3168:3168 -> a
+    1130:1130:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3058 -> a
+    1131:1134:void lambda$transitionMethodsForInstantiatedObject$73(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexClass):3060:3063 -> a
+    1135:1135:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3075 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/D2;)V"}
-    1145:1145:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    1145:1145:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075 -> a
-    1146:1147:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3076 -> a
-    1148:1148:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3075 -> a
-    1149:1149:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):3070:3070 -> a
-    1149:1149:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3077 -> a
-    1150:1151:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3077:3078 -> a
-    1152:1152:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3080:3080 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/shaking/N;Lcom/android/tools/r8/internal/yY;)V"}
-    1153:1153:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1153:1153:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081 -> a
+    1136:1136:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    1136:1136:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075 -> a
+    1137:1138:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3076 -> a
+    1139:1139:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3075:3075 -> a
+    1140:1140:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):3070:3070 -> a
+    1140:1140:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3077 -> a
+    1141:1142:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):3077:3078 -> a
+    1143:1143:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3080:3080 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/shaking/N;Lcom/android/tools/r8/internal/CY;)V"}
+    1144:1144:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1144:1144:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1154:1154:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1154:1154:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081 -> a
-    1155:1162:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081:3088 -> a
-    1163:1165:void lambda$markProgramMethodOverridesAsLive$80(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):3091:3093 -> a
+    1145:1145:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1145:1145:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081 -> a
+    1146:1153:void lambda$markProgramMethodOverridesAsLive$81(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):3081:3088 -> a
+    1154:1156:void lambda$markProgramMethodOverridesAsLive$80(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):3091:3093 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/U4;)V"}
-    1166:1169:void lambda$markProgramMethodOverridesAsLive$80(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):3093:3096 -> a
-    1170:1180:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3098:3108 -> a
+    1157:1160:void lambda$markProgramMethodOverridesAsLive$80(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):3093:3096 -> a
+    1161:1171:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3098:3108 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/D2;Ljava/util/List;)V"}
-    1181:1181:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
-    1181:1181:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3108 -> a
-    1182:1182:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3118:3118 -> a
-    1183:1184:void lambda$markProgramMethodOverridesAsLive$74(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3103:3104 -> a
+    1172:1172:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
+    1172:1172:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3108 -> a
+    1173:1173:void lambda$markProgramMethodOverridesAsLive$79(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):3118:3118 -> a
+    1174:1175:void lambda$markProgramMethodOverridesAsLive$74(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3103:3104 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
-    1185:1185:boolean lambda$markProgramMethodOverridesAsLive$75(com.android.tools.r8.graph.DexDefinition):3107:3107 -> a
+    1176:1176:boolean lambda$markProgramMethodOverridesAsLive$75(com.android.tools.r8.graph.DexDefinition):3107:3107 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)Z"}
-    1186:1186:void lambda$markProgramMethodOverridesAsLive$77(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):3110:3110 -> a
+    1177:1177:void lambda$markProgramMethodOverridesAsLive$77(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):3110:3110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/D4;)V"}
-    1187:1190:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113:3116 -> a
+    1178:1181:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113:3116 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/M0;"}
-    1191:1191:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
-    1191:1191:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
+    1182:1182:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
+    1182:1182:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1192:1195:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):273:276 -> a
-    1192:1195:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
-    1196:1196:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):274:274 -> a
-    1196:1196:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
-    1197:1197:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3122:3122 -> a
+    1183:1186:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):273:276 -> a
+    1183:1186:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
+    1187:1187:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):274:274 -> a
+    1187:1187:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$76(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):3113 -> a
+    1188:1188:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3122:3122 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/List;Lcom/android/tools/r8/graph/j1;)V"}
-    1198:1205:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3121:3128 -> a
-    1206:1206:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3126:3126 -> a
-    1207:1207:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3180:3180 -> a
+    1189:1196:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3121:3128 -> a
+    1197:1197:void lambda$markProgramMethodOverridesAsLive$78(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):3126:3126 -> a
+    1198:1198:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3180:3180 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/U4;)V"}
-    1208:1219:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5007:5018 -> a
-    1208:1219:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1220:1221:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():529:530 -> a
-    1220:1221:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5018 -> a
-    1220:1221:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1222:1222:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5022:5022 -> a
-    1222:1222:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1223:1223:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5058:5058 -> a
-    1223:1223:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
-    1223:1223:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1224:1224:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
-    1224:1224:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
+    1199:1210:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5007:5018 -> a
+    1199:1210:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1211:1212:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivateMethod():529:530 -> a
+    1211:1212:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5018 -> a
+    1211:1212:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1213:1213:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5022:5022 -> a
+    1213:1213:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1214:1214:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5058:5058 -> a
+    1214:1214:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
+    1214:1214:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1215:1215:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
+    1215:1215:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1224:1224:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
-    1224:1224:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1225:1225:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
-    1225:1225:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
-    1225:1225:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
-    1225:1225:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1226:1231:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5061:5066 -> a
-    1226:1231:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
-    1226:1231:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1232:1246:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5029:5043 -> a
-    1232:1246:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1247:1252:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3187:3192 -> a
-    1253:1253:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    1253:1253:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3192 -> a
-    1254:1254:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3195:3195 -> a
-    1255:1255:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3194:3194 -> a
-    1256:1256:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5058:5058 -> a
-    1256:1256:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
-    1256:1256:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1257:1257:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
-    1257:1257:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
+    1215:1215:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
+    1215:1215:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1216:1216:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
+    1216:1216:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
+    1216:1216:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
+    1216:1216:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1217:1222:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5061:5066 -> a
+    1217:1222:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5028 -> a
+    1217:1222:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1223:1237:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5029:5043 -> a
+    1223:1237:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1238:1243:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3187:3192 -> a
+    1244:1244:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    1244:1244:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3192 -> a
+    1245:1245:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3195:3195 -> a
+    1246:1246:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3194:3194 -> a
+    1247:1247:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5058:5058 -> a
+    1247:1247:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
+    1247:1247:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1248:1248:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
+    1248:1248:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1257:1257:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
-    1257:1257:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1258:1258:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
-    1258:1258:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
-    1258:1258:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
-    1258:1258:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1259:1264:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5061:5066 -> a
-    1259:1264:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
-    1259:1264:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1265:1267:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047:5049 -> a
-    1265:1267:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
-    1268:1268:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190:3190 -> a
+    1248:1248:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
+    1248:1248:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1249:1249:java.util.Set com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexType):132:132 -> a
+    1249:1249:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5059 -> a
+    1249:1249:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
+    1249:1249:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1250:1255:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):5061:5066 -> a
+    1250:1255:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047 -> a
+    1250:1255:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1256:1258:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):5047:5049 -> a
+    1256:1258:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):3184 -> a
+    1259:1259:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190:3190 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/V0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/M0;"}
-    1269:1269:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287:287 -> a
-    1269:1269:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
+    1260:1260:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287:287 -> a
+    1260:1260:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1270:1270:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287:287 -> a
-    1270:1270:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
-    1271:1271:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    1271:1271:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287 -> a
-    1271:1271:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
-    1272:1273:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):289:290 -> a
-    1272:1273:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
-    1274:1274:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):288:288 -> a
-    1274:1274:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
-    1275:1277:void lambda$markOverridesAsLibraryMethodOverrides$83(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):3220:3222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/I2;)V"}
-    1278:1278:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3332:3332 -> a
+    1261:1261:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287:287 -> a
+    1261:1261:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
+    1262:1262:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    1262:1262:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):287 -> a
+    1262:1262:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
+    1263:1264:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):289:290 -> a
+    1263:1264:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
+    1265:1265:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):288:288 -> a
+    1265:1265:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$82(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):3190 -> a
+    1266:1268:void lambda$markOverridesAsLibraryMethodOverrides$83(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):3220:3222 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/I2;)V"}
+    1269:1269:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3332:3332 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;)V"}
-    1279:1282:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):5714:5717 -> a
-    1279:1282:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3332 -> a
-    1283:1285:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3337:3339 -> a
-    1286:1286:boolean com.android.tools.r8.graph.DexValue.isDexValueResourceNumber():0:0 -> a
-    1286:1286:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3339 -> a
-    1287:1288:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3339:3340 -> a
-    1289:1289:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3337:3337 -> a
-    1290:1293:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3314:3317 -> a
-    1290:1293:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
-    1294:1294:boolean com.android.tools.r8.graph.DexEncodedField.hasOriginalFieldWitness():379:379 -> a
-    1294:1294:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3317 -> a
+    1270:1273:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):5714:5717 -> a
+    1270:1273:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3332 -> a
+    1274:1276:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3337:3339 -> a
+    1277:1277:boolean com.android.tools.r8.graph.DexValue.isDexValueResourceNumber():0:0 -> a
+    1277:1277:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3339 -> a
+    1278:1279:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3339:3340 -> a
+    1280:1280:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3337:3337 -> a
+    1281:1284:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3314:3317 -> a
+    1281:1284:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
+    1285:1285:boolean com.android.tools.r8.graph.DexEncodedField.hasOriginalFieldWitness():379:379 -> a
+    1285:1285:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3317 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1294:1294:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
-    1295:1295:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3318 -> a
-    1295:1295:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
-    1296:1296:com.android.tools.r8.graph.OriginalFieldWitness com.android.tools.r8.graph.DexEncodedField.getOriginalFieldWitness():375:375 -> a
-    1296:1296:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318 -> a
+    1285:1285:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
+    1286:1286:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3318 -> a
+    1286:1286:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
+    1287:1287:com.android.tools.r8.graph.OriginalFieldWitness com.android.tools.r8.graph.DexEncodedField.getOriginalFieldWitness():375:375 -> a
+    1287:1287:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1296:1296:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
-    1297:1299:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3320 -> a
-    1297:1299:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
-    1300:1300:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3344:3344 -> a
-    1301:1301:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> a
-    1301:1301:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
-    1302:1302:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    1302:1302:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> a
-    1302:1302:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
-    1303:1304:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> a
-    1303:1304:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
-    1305:1307:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3346:3348 -> a
-    1308:1308:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.empty():40:40 -> a
-    1308:1308:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3348 -> a
-    1309:1309:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3348:3348 -> a
-    1310:1310:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.contains(com.android.tools.r8.graph.ProgramField):66:66 -> a
-    1310:1310:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3349 -> a
+    1287:1287:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
+    1288:1290:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3320 -> a
+    1288:1290:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3341 -> a
+    1291:1291:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3344:3344 -> a
+    1292:1292:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> a
+    1292:1292:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
+    1293:1293:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    1293:1293:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> a
+    1293:1293:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
+    1294:1295:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> a
+    1294:1295:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3345 -> a
+    1296:1298:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3346:3348 -> a
+    1299:1299:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.empty():40:40 -> a
+    1299:1299:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3348 -> a
+    1300:1300:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3348:3348 -> a
+    1301:1301:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.contains(com.android.tools.r8.graph.ProgramField):66:66 -> a
+    1301:1301:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3349 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1311:1311:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.contains(com.android.tools.r8.graph.ProgramField):66:66 -> a
-    1311:1311:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3349 -> a
-    1312:1312:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> a
-    1312:1312:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
-    1313:1313:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    1313:1313:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> a
-    1313:1313:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
-    1314:1315:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> a
-    1314:1315:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
-    1316:1317:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3354:3355 -> a
-    1318:1318:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():832:832 -> a
-    1318:1318:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3356 -> a
-    1319:1323:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3356:3360 -> a
-    1324:1324:void lambda$markFieldAsLive$84(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3360:3360 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/mn;)V"}
-    1325:1325:void lambda$markFieldAsReachable$86(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3386:3386 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/mn;)V"}
-    1326:1327:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> a
-    1326:1327:void lambda$traceInstanceFieldRead$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1913 -> a
+    1302:1302:boolean com.android.tools.r8.utils.collections.ProgramFieldSet.contains(com.android.tools.r8.graph.ProgramField):66:66 -> a
+    1302:1302:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3349 -> a
+    1303:1303:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> a
+    1303:1303:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
+    1304:1304:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    1304:1304:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> a
+    1304:1304:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
+    1305:1306:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> a
+    1305:1306:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3350 -> a
+    1307:1308:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3354:3355 -> a
+    1309:1309:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():832:832 -> a
+    1309:1309:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3356 -> a
+    1310:1314:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3356:3360 -> a
+    1315:1315:void lambda$markFieldAsLive$84(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3360:3360 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/on;)V"}
+    1316:1316:void lambda$markFieldAsReachable$86(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3386:3386 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/internal/on;)V"}
+    1317:1318:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> a
+    1317:1318:void lambda$traceInstanceFieldRead$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1913 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/s3;)V"}
-    1328:1328:void lambda$traceInstanceFieldRead$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1914:1914 -> a
-    1329:1329:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430:3430 -> a
+    1319:1319:void lambda$traceInstanceFieldRead$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1914:1914 -> a
+    1320:1320:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430:3430 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g1;)Z"}
-    1330:1330:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    1330:1330:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430 -> a
+    1321:1321:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    1321:1321:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1331:1331:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    1331:1331:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430 -> a
-    1332:1332:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497:3497 -> a
+    1322:1322:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    1322:1322:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3430 -> a
+    1323:1323:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497:3497 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-    1333:1333:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1333:1333:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497 -> a
+    1324:1324:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1324:1324:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1334:1334:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1334:1334:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497 -> a
-    1335:1335:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
-    1335:1335:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4382 -> a
+    1325:1325:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1325:1325:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3497 -> a
+    1326:1326:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
+    1326:1326:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4382 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-    1336:1336:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385:4385 -> a
-    1337:1337:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
-    1337:1337:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385 -> a
+    1327:1327:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385:4385 -> a
+    1328:1328:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
+    1328:1328:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1338:1338:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
-    1338:1338:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385 -> a
-    1339:1342:boolean isReachable(com.android.tools.r8.graph.Definition):3558:3561 -> a
+    1329:1329:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
+    1329:1329:void lambda$desugar$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4385 -> a
+    1330:1333:boolean isReachable(com.android.tools.r8.graph.Definition):3558:3561 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o0;)Z"}
-    1343:1344:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3513:3514 -> a
-    1343:1344:boolean isReachable(com.android.tools.r8.graph.Definition):3561 -> a
-    1345:1346:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3553:3554 -> a
-    1345:1346:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3515 -> a
-    1345:1346:boolean isReachable(com.android.tools.r8.graph.Definition):3561 -> a
-    1347:1351:boolean isReachable(com.android.tools.r8.graph.Definition):3564:3568 -> a
-    1352:1352:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439:3439 -> a
-    1352:1352:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
-    1353:1353:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> a
-    1353:1353:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439 -> a
-    1353:1353:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
-    1354:1354:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> a
-    1354:1354:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> a
-    1354:1354:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439 -> a
-    1354:1354:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
-    1355:1355:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
-    1355:1355:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
-    1356:1357:boolean isReachable(com.android.tools.r8.graph.Definition):3571:3572 -> a
-    1358:1358:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
-    1358:1358:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
-    1359:1359:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509:3509 -> a
-    1359:1359:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
-    1360:1360:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505:3505 -> a
-    1360:1360:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
-    1360:1360:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
-    1361:1361:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1361:1361:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
+    1334:1335:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3513:3514 -> a
+    1334:1335:boolean isReachable(com.android.tools.r8.graph.Definition):3561 -> a
+    1336:1337:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3553:3554 -> a
+    1336:1337:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3515 -> a
+    1336:1337:boolean isReachable(com.android.tools.r8.graph.Definition):3561 -> a
+    1338:1342:boolean isReachable(com.android.tools.r8.graph.Definition):3564:3568 -> a
+    1343:1343:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439:3439 -> a
+    1343:1343:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
+    1344:1344:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> a
+    1344:1344:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439 -> a
+    1344:1344:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
+    1345:1345:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> a
+    1345:1345:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> a
+    1345:1345:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3439 -> a
+    1345:1345:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
+    1346:1346:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):3435:3435 -> a
+    1346:1346:boolean isReachable(com.android.tools.r8.graph.Definition):3569 -> a
+    1347:1348:boolean isReachable(com.android.tools.r8.graph.Definition):3571:3572 -> a
+    1349:1349:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
+    1349:1349:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
+    1350:1350:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509:3509 -> a
+    1350:1350:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
+    1351:1351:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505:3505 -> a
+    1351:1351:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
+    1351:1351:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
+    1352:1352:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1352:1352:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1361:1361:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
-    1361:1361:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
-    1362:1362:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1362:1362:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
-    1362:1362:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
-    1362:1362:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
-    1363:1363:boolean isReachable(com.android.tools.r8.graph.Definition):3577:3577 -> a
-    1364:1365:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3553:3554 -> a
-    1364:1365:boolean isReachable(com.android.tools.r8.graph.Definition):3577 -> a
-    1366:1366:void forAllLiveClasses(java.util.function.Consumer):3581:3581 -> a
-    1367:1367:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1367:1367:void forAllLiveClasses(java.util.function.Consumer):3581 -> a
+    1352:1352:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
+    1352:1352:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
+    1353:1353:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1353:1353:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
+    1353:1353:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3509 -> a
+    1353:1353:boolean isReachable(com.android.tools.r8.graph.Definition):3573 -> a
+    1354:1354:boolean isReachable(com.android.tools.r8.graph.Definition):3577:3577 -> a
+    1355:1356:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3553:3554 -> a
+    1355:1356:boolean isReachable(com.android.tools.r8.graph.Definition):3577 -> a
+    1357:1357:void forAllLiveClasses(java.util.function.Consumer):3581:3581 -> a
+    1358:1358:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1358:1358:void forAllLiveClasses(java.util.function.Consumer):3581 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1368:1368:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1368:1368:void forAllLiveClasses(java.util.function.Consumer):3581 -> a
-    1369:1369:void forAllLiveClasses(java.util.function.Consumer):3581:3581 -> a
-    1370:1380:com.android.tools.r8.graph.MethodResolutionResult markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3587:3597 -> a
+    1359:1359:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1359:1359:void forAllLiveClasses(java.util.function.Consumer):3581 -> a
+    1360:1360:void forAllLiveClasses(java.util.function.Consumer):3581:3581 -> a
+    1361:1371:com.android.tools.r8.graph.MethodResolutionResult markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3587:3597 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/K1;)Lcom/android/tools/r8/graph/U4;"}
-    1381:1384:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3599:3602 -> a
+    1372:1375:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3599:3602 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;ZLcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/U4;)V"}
-    1385:1385:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getInitialResolutionHolder():450:450 -> a
-    1385:1385:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3609 -> a
+    1376:1376:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult.getInitialResolutionHolder():450:450 -> a
+    1376:1376:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3609 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1386:1392:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3609:3615 -> a
-    1393:1393:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():143:143 -> a
-    1393:1393:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3623 -> a
+    1377:1383:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3609:3615 -> a
+    1384:1384:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():143:143 -> a
+    1384:1384:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3623 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1394:1394:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3626:3626 -> a
-    1395:1395:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):3070:3070 -> a
-    1395:1395:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3629 -> a
-    1396:1420:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3629:3653 -> a
-    1421:1421:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
-    1421:1421:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3660 -> a
-    1422:1422:void lambda$markVirtualMethodAsReachable$89(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3657:3657 -> a
+    1385:1385:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3626:3626 -> a
+    1386:1386:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):3070:3070 -> a
+    1386:1386:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3629 -> a
+    1387:1411:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3629:3653 -> a
+    1412:1412:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
+    1412:1412:void lambda$markVirtualMethodAsReachable$93(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3660 -> a
+    1413:1413:void lambda$markVirtualMethodAsReachable$89(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3657:3657 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"}
-    1423:1423:void lambda$markVirtualMethodAsReachable$92(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3662:3662 -> a
+    1414:1414:void lambda$markVirtualMethodAsReachable$92(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3662:3662 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/D4;)V"}
-    1424:1425:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665:3666 -> a
+    1415:1416:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665:3666 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/M0;"}
-    1426:1426:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
-    1426:1426:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
+    1417:1417:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):272:272 -> a
+    1417:1417:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1427:1430:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):273:276 -> a
-    1427:1430:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
-    1431:1431:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):274:274 -> a
-    1431:1431:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
-    1432:1435:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3673:3676 -> a
+    1418:1421:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):273:276 -> a
+    1418:1421:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
+    1422:1422:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):274:274 -> a
+    1422:1422:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$91(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3665 -> a
+    1423:1426:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3673:3676 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D4;Ljava/util/function/Function;)V"}
-    1436:1436:void lambda$markVirtualDispatchTargetAsLive$96(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3676:3676 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D4;Lcom/android/tools/r8/internal/mn;)V"}
-    1437:1441:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3681:3685 -> a
-    1437:1441:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
+    1427:1427:void lambda$markVirtualDispatchTargetAsLive$96(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3676:3676 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D4;Lcom/android/tools/r8/internal/on;)V"}
+    1428:1432:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3681:3685 -> a
+    1428:1432:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/y4;)V"}
-    1442:1442:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    1442:1442:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3686 -> a
-    1442:1442:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
-    1443:1443:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3687:3687 -> a
-    1443:1443:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
-    1444:1444:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3702:3702 -> a
+    1433:1433:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    1433:1433:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3686 -> a
+    1433:1433:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
+    1434:1434:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3687:3687 -> a
+    1434:1434:void lambda$markVirtualDispatchTargetAsLive$94(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3674 -> a
+    1435:1435:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3702:3702 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/y5;)V"}
-    1445:1445:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
-    1445:1445:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3703 -> a
-    1446:1447:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3703:3704 -> a
-    1448:1450:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3709:3711 -> a
-    1448:1450:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
+    1436:1436:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.AppView):19:19 -> a
+    1436:1436:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3703 -> a
+    1437:1438:void checkAccess(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):3703:3704 -> a
+    1439:1441:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3709:3711 -> a
+    1439:1441:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;)V"}
-    1451:1451:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolvedField():185:185 -> a
-    1451:1451:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3711 -> a
-    1451:1451:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
-    1452:1452:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3711:3711 -> a
-    1452:1452:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
-    1453:1453:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getInitialResolutionHolder():175:175 -> a
-    1453:1453:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3713 -> a
-    1453:1453:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
-    1454:1454:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3713:3713 -> a
-    1454:1454:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
-    1455:1455:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolutionPair():200:200 -> a
-    1455:1455:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2560 -> a
-    1456:1456:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2560:2560 -> a
-    1457:1458:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):775:776 -> a
-    1457:1458:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2559 -> a
-    1459:1463:void checkAccess(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3717:3721 -> a
-    1459:1463:void lambda$resolveMethod$61(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2576 -> a
+    1442:1442:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolvedField():185:185 -> a
+    1442:1442:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3711 -> a
+    1442:1442:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
+    1443:1443:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3711:3711 -> a
+    1443:1443:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
+    1444:1444:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getInitialResolutionHolder():175:175 -> a
+    1444:1444:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3713 -> a
+    1444:1444:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
+    1445:1445:void checkAccess(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3713:3713 -> a
+    1445:1445:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2558 -> a
+    1446:1446:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult.getResolutionPair():200:200 -> a
+    1446:1446:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2560 -> a
+    1447:1447:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2560:2560 -> a
+    1448:1449:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):775:776 -> a
+    1448:1449:void lambda$resolveField$59(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2559 -> a
+    1450:1454:void checkAccess(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition):3717:3721 -> a
+    1450:1454:void lambda$resolveMethod$61(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2576 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;)V"}
-    1464:1464:void lambda$resolveMethod$61(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2577:2577 -> a
-    1465:1465:void lambda$markFailedMethodResolutionTargets$97(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):3731:3731 -> a
+    1455:1455:void lambda$resolveMethod$61(com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):2577:2577 -> a
+    1456:1456:void lambda$markFailedMethodResolutionTargets$97(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):3731:3731 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/I2;)V"}
-    1466:1469:void lambda$markFailedMethodResolutionTargets$98(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3733:3736 -> a
+    1457:1460:void lambda$markFailedMethodResolutionTargets$98(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3733:3736 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/j1;)V"}
-    1470:1479:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3790:3799 -> a
+    1461:1470:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3790:3799 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/U4;)V"}
-    1480:1509:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3796:3825 -> a
-    1510:1510:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751:5751 -> a
-    1510:1510:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3825 -> a
-    1511:1511:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1511:1511:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751 -> a
-    1511:1511:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3825 -> a
-    1512:1512:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-    1512:1512:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3826 -> a
-    1513:1514:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3826:3827 -> a
-    1515:1515:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-    1515:1515:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3828 -> a
-    1516:1516:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3828:3828 -> a
-    1517:1517:void lambda$markSuperMethodAsReachable$100(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3811:3811 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/mn;)V"}
-    1518:1518:void lambda$markSuperMethodAsReachable$100(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3810:3810 -> a
-    1519:1519:void lambda$markSuperMethodAsReachable$103(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):3834:3834 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
-    1520:1520:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857:3857 -> a
+    1471:1500:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3796:3825 -> a
+    1501:1501:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751:5751 -> a
+    1501:1501:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3825 -> a
+    1502:1502:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1502:1502:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751 -> a
+    1502:1502:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3825 -> a
+    1503:1503:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
+    1503:1503:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3826 -> a
+    1504:1505:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3826:3827 -> a
+    1506:1506:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
+    1506:1506:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3828 -> a
+    1507:1507:void lambda$markSuperMethodAsReachable$102(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3828:3828 -> a
+    1508:1508:void lambda$markSuperMethodAsReachable$100(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3811:3811 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/U4$c;Lcom/android/tools/r8/internal/on;)V"}
+    1509:1509:void lambda$markSuperMethodAsReachable$100(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3810:3810 -> a
+    1510:1510:void lambda$markSuperMethodAsReachable$103(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):3834:3834 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tn;)V"}
+    1511:1511:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857:3857 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/graph/j1;)V"}
-    1521:1521:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    1521:1521:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857 -> a
+    1512:1512:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
+    1512:1512:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1522:1522:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
-    1522:1522:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857 -> a
-    1523:1530:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3869:3876 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l4;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/c0;"}
-    1531:1531:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    1531:1531:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876 -> a
+    1513:1513:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
+    1513:1513:void lambda$traceMainDex$105(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3857 -> a
+    1514:1521:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3869:3876 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l4;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/c0;"}
+    1522:1522:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    1522:1522:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1532:1532:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    1532:1532:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876 -> a
-    1533:1534:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876:3877 -> a
-    1535:1535:boolean com.android.tools.r8.utils.InternalOptions.hasProguardConfiguration():228:228 -> a
-    1535:1535:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3877 -> a
+    1523:1523:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    1523:1523:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876 -> a
+    1524:1525:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3876:3877 -> a
+    1526:1526:boolean com.android.tools.r8.utils.InternalOptions.hasProguardConfiguration():228:228 -> a
+    1526:1526:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3877 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1536:1536:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3877:3877 -> a
-    1537:1537:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1011:1011 -> a
-    1537:1537:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3878 -> a
+    1527:1527:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3877:3877 -> a
+    1528:1528:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions com.android.tools.r8.utils.InternalOptions.kotlinOptimizationOptions():1017:1017 -> a
+    1528:1528:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3878 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1538:1539:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3878:3879 -> a
-    1540:1540:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
-    1540:1540:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3879 -> a
-    1541:1543:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3886:3888 -> a
-    1544:1544:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
-    1544:1544:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3888 -> a
-    1545:1546:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3890:3891 -> a
-    1547:1547:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
-    1547:1547:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3891 -> a
-    1548:1559:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3893:3904 -> a
-    1560:1570:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3903:3913 -> a
-    1571:1571:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.getApplicableRules():326:326 -> a
-    1571:1571:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3913 -> a
-    1572:1589:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3913:3930 -> a
-    1590:1592:void traceManifests(com.android.tools.r8.utils.Timing):3966:3968 -> a
-    1590:1592:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
-    1593:1593:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState com.android.tools.r8.graph.AppView.getResourceShrinkerState():924:924 -> a
-    1593:1593:void traceManifests(com.android.tools.r8.utils.Timing):3968 -> a
+    1529:1530:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3878:3879 -> a
+    1531:1531:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
+    1531:1531:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3879 -> a
+    1532:1534:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3886:3888 -> a
+    1535:1535:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
+    1535:1535:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3888 -> a
+    1536:1537:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3890:3891 -> a
+    1538:1538:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):591:591 -> a
+    1538:1538:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3891 -> a
+    1539:1550:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3893:3904 -> a
+    1551:1561:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3903:3913 -> a
+    1562:1562:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.getApplicableRules():326:326 -> a
+    1562:1562:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3913 -> a
+    1563:1580:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3913:3930 -> a
+    1581:1583:void traceManifests(com.android.tools.r8.utils.Timing):3966:3968 -> a
+    1581:1583:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
+    1584:1584:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState com.android.tools.r8.graph.AppView.getResourceShrinkerState():924:924 -> a
+    1584:1584:void traceManifests(com.android.tools.r8.utils.Timing):3968 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1593:1593:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
-    1594:1595:void traceManifests(com.android.tools.r8.utils.Timing):3968:3969 -> a
-    1594:1595:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
-    1596:1599:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3932:3935 -> a
-    1600:1600:void finalizeLibraryMethodOverrideInformation():4460:4460 -> a
-    1600:1600:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
-    1601:1601:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1601:1601:void finalizeLibraryMethodOverrideInformation():4460 -> a
+    1584:1584:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
+    1585:1586:void traceManifests(com.android.tools.r8.utils.Timing):3968:3969 -> a
+    1585:1586:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
+    1587:1590:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3932:3935 -> a
+    1591:1591:void finalizeLibraryMethodOverrideInformation():4460:4460 -> a
+    1591:1591:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
+    1592:1592:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1592:1592:void finalizeLibraryMethodOverrideInformation():4460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1601:1601:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
-    1602:1602:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1602:1602:void finalizeLibraryMethodOverrideInformation():4460 -> a
-    1602:1602:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
-    1603:1606:void finalizeLibraryMethodOverrideInformation():4460:4463 -> a
-    1603:1606:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
-    1607:1612:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3937:3942 -> a
-    1613:1613:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState com.android.tools.r8.graph.AppView.getResourceShrinkerState():924:924 -> a
-    1613:1613:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1592:1592:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
+    1593:1593:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1593:1593:void finalizeLibraryMethodOverrideInformation():4460 -> a
+    1593:1593:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
+    1594:1597:void finalizeLibraryMethodOverrideInformation():4460:4463 -> a
+    1594:1597:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3936 -> a
+    1598:1603:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3937:3942 -> a
+    1604:1604:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState com.android.tools.r8.graph.AppView.getResourceShrinkerState():924:924 -> a
+    1604:1604:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1614:1614:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942:3942 -> a
-    1615:1615:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):310:310 -> a
-    1615:1615:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1605:1605:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942:3942 -> a
+    1606:1606:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315:315 -> a
+    1606:1606:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1616:1616:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):311:311 -> a
-    1616:1616:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1617:1617:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():320:320 -> a
-    1617:1617:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315 -> a
-    1617:1617:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1618:1618:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> a
-    1618:1618:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():320 -> a
+    1607:1607:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):316:316 -> a
+    1607:1607:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1608:1608:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():325:325 -> a
+    1608:1608:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):320 -> a
+    1608:1608:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1609:1609:com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore com.android.tools.r8.resourceshrinker.ResourceShrinkerModel.getResourceStore():68:68 -> a
+    1609:1609:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():325 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1618:1618:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315 -> a
-    1618:1618:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1619:1619:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
-    1619:1619:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():320 -> a
+    1609:1609:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):320 -> a
+    1609:1609:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1610:1610:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
+    1610:1610:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():325 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1619:1619:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315 -> a
-    1619:1619:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1620:1620:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
-    1620:1620:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():320 -> a
-    1620:1620:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315 -> a
-    1620:1620:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1621:1622:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():320:321 -> a
-    1621:1622:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):315 -> a
-    1621:1622:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
-    1623:1624:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3944:3945 -> a
-    1625:1626:boolean verifyKeptGraph():4470:4471 -> a
-    1625:1626:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
-    1627:1627:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1627:1627:boolean verifyKeptGraph():4471 -> a
+    1610:1610:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):320 -> a
+    1610:1610:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1611:1611:java.util.List com.android.tools.r8.com.android.ide.common.resources.usage.ResourceStore.getResources():61:61 -> a
+    1611:1611:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():325 -> a
+    1611:1611:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):320 -> a
+    1611:1611:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1612:1613:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.clearReachableBits():325:326 -> a
+    1612:1613:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.enqueuerDone(boolean):320 -> a
+    1612:1613:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
+    1614:1615:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3944:3945 -> a
+    1616:1617:boolean verifyKeptGraph():4470:4471 -> a
+    1616:1617:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
+    1618:1618:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1618:1618:boolean verifyKeptGraph():4471 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1627:1627:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
-    1628:1628:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1628:1628:boolean verifyKeptGraph():4471 -> a
-    1628:1628:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
-    1629:1630:boolean verifyKeptGraph():4471:4472 -> a
-    1629:1630:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
-    1631:1633:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3946:3948 -> a
-    1634:1634:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
-    1634:1634:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
-    1635:1635:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
-    1635:1635:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1618:1618:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
+    1619:1619:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1619:1619:boolean verifyKeptGraph():4471 -> a
+    1619:1619:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
+    1620:1621:boolean verifyKeptGraph():4471:4472 -> a
+    1620:1621:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3945 -> a
+    1622:1624:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3946:3948 -> a
+    1625:1625:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
+    1625:1625:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1626:1626:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
+    1626:1626:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1636:1636:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
-    1636:1636:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
-    1637:1637:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
-    1637:1637:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
-    1638:1638:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
-    1638:1638:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1627:1627:com.android.tools.r8.shaking.ProguardCompatibilityActions com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.build():73:73 -> a
+    1627:1627:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1628:1628:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
+    1628:1628:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1629:1629:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
+    1629:1629:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1639:1639:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
-    1639:1639:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
-    1640:1640:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):845:845 -> a
-    1640:1640:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1630:1630:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):844:844 -> a
+    1630:1630:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
+    1631:1631:void com.android.tools.r8.graph.AppView.setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):845:845 -> a
+    1631:1631:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1641:1644:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3950:3953 -> a
-    1645:1645:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():255:255 -> a
-    1645:1645:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3953 -> a
-    1646:1649:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3958:3961 -> a
-    1650:1650:void lambda$traceApplication$109(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3939:3939 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mn;)V"}
-    1651:1651:void lambda$traceApplication$110(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):3940:3940 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pn;)V"}
-    1652:1652:void includeMinimumKeepInfo(com.android.tools.r8.shaking.MinimumKeepInfoCollection):3984:3984 -> a
+    1632:1635:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3950:3953 -> a
+    1636:1636:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():255:255 -> a
+    1636:1636:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3953 -> a
+    1637:1640:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3958:3961 -> a
+    1641:1641:void lambda$traceApplication$109(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3939:3939 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/on;)V"}
+    1642:1642:void lambda$traceApplication$110(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):3940:3940 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rn;)V"}
+    1643:1643:void includeMinimumKeepInfo(com.android.tools.r8.shaking.MinimumKeepInfoCollection):3984:3984 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;)V"}
-    1653:1653:void lambda$includeMinimumKeepInfo$111(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3986:3986 -> a
+    1644:1644:void lambda$includeMinimumKeepInfo$111(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3986:3986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
-    1654:1654:void lambda$includeMinimumKeepInfo$112(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3987:3987 -> a
+    1645:1645:void lambda$includeMinimumKeepInfo$112(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3987:3987 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
-    1655:1660:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3992:3997 -> a
+    1646:1651:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3992:3997 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
-    1661:1661:void lambda$applyMinimumKeepInfo$114(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3996:3996 -> a
+    1652:1652:void lambda$applyMinimumKeepInfo$114(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3996:3996 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;Lcom/android/tools/r8/shaking/e1;)V"}
-    1662:1662:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011:4011 -> a
+    1653:1653:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011:4011 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
-    1663:1663:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
-    1663:1663:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011 -> a
+    1654:1654:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
+    1654:1654:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1664:1664:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
-    1664:1664:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011 -> a
-    1665:1667:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4012:4014 -> a
-    1668:1668:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1668:1668:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4015 -> a
-    1669:1669:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1669:1669:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4015 -> a
+    1655:1655:boolean com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.contains(java.lang.Object):5687:5687 -> a
+    1655:1655:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4011 -> a
+    1656:1658:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4012:4014 -> a
+    1659:1659:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1659:1659:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4015 -> a
+    1660:1660:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1660:1660:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4015 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1670:1670:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016:4016 -> a
-    1671:1671:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
-    1671:1671:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016 -> a
+    1661:1661:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016:4016 -> a
+    1662:1662:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
+    1662:1662:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1672:1672:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> a
-    1672:1672:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
+    1663:1663:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> a
+    1663:1663:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1672:1672:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016 -> a
-    1673:1673:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4018:4018 -> a
-    1674:1679:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):4049:4054 -> a
+    1663:1663:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4016 -> a
+    1664:1664:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4018:4018 -> a
+    1665:1670:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):4049:4054 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
-    1680:1680:void lambda$applyMinimumKeepInfo$116(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4053:4053 -> a
+    1671:1671:void lambda$applyMinimumKeepInfo$116(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4053:4053 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;Lcom/android/tools/r8/shaking/j1;)V"}
-    1681:1681:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065:4065 -> a
+    1672:1672:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065:4065 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
-    1682:1682:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> a
-    1682:1682:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065 -> a
-    1683:1683:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> a
-    1683:1683:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> a
-    1683:1683:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065 -> a
-    1684:1686:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4066:4068 -> a
-    1687:1687:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1687:1687:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4069 -> a
-    1688:1688:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1688:1688:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4069 -> a
+    1673:1673:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> a
+    1673:1673:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065 -> a
+    1674:1674:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> a
+    1674:1674:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> a
+    1674:1674:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4065 -> a
+    1675:1677:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4066:4068 -> a
+    1678:1678:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1678:1678:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4069 -> a
+    1679:1679:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1679:1679:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4069 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1689:1689:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070:4070 -> a
-    1690:1690:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
-    1690:1690:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070 -> a
+    1680:1680:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070:4070 -> a
+    1681:1681:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
+    1681:1681:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1691:1691:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> a
-    1691:1691:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
+    1682:1682:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> a
+    1682:1682:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1691:1691:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070 -> a
-    1692:1692:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4072:4072 -> a
-    1693:1693:void lambda$applyMinimumKeepInfo$118(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4103:4103 -> a
+    1682:1682:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4070 -> a
+    1683:1683:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4072:4072 -> a
+    1684:1684:void lambda$applyMinimumKeepInfo$118(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4103:4103 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;Lcom/android/tools/r8/shaking/u1;)V"}
-    1694:1694:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    1685:1685:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    1695:1695:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117:4117 -> a
+    1686:1686:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117:4117 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    1696:1696:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751:5751 -> a
-    1696:1696:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117 -> a
-    1697:1697:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    1697:1697:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751 -> a
-    1697:1697:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117 -> a
-    1698:1698:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4120:4120 -> a
-    1699:1699:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1699:1699:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4121 -> a
-    1700:1700:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    1700:1700:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4121 -> a
+    1687:1687:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751:5751 -> a
+    1687:1687:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117 -> a
+    1688:1688:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    1688:1688:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.ProgramMethod):5751 -> a
+    1688:1688:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4117 -> a
+    1689:1689:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4120:4120 -> a
+    1690:1690:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1690:1690:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4121 -> a
+    1691:1691:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    1691:1691:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1701:1701:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122:4122 -> a
-    1702:1702:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
-    1702:1702:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122 -> a
+    1692:1692:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122:4122 -> a
+    1693:1693:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
+    1693:1693:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1703:1703:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> a
-    1703:1703:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
+    1694:1694:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> a
+    1694:1694:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1703:1703:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122 -> a
-    1704:1710:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4118:4124 -> a
-    1711:1711:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4160:4160 -> a
+    1694:1694:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4122 -> a
+    1695:1701:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):4118:4124 -> a
+    1702:1702:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4160:4160 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/U;)V"}
-    1712:1712:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.remove(com.android.tools.r8.shaking.EnqueuerEvent):148:148 -> a
-    1712:1712:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4161 -> a
+    1703:1703:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.remove(com.android.tools.r8.shaking.EnqueuerEvent):148:148 -> a
+    1703:1703:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1713:1713:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.remove(com.android.tools.r8.shaking.EnqueuerEvent):148:148 -> a
-    1713:1713:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4161 -> a
-    1714:1714:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4163:4163 -> a
-    1715:1715:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339:4339 -> a
+    1704:1704:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.remove(com.android.tools.r8.shaking.EnqueuerEvent):148:148 -> a
+    1704:1704:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4161 -> a
+    1705:1705:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):4163:4163 -> a
+    1706:1706:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339:4339 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;)V"}
-    1716:1716:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    1716:1716:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
+    1707:1707:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    1707:1707:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1717:1717:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    1717:1717:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
-    1718:1718:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339:4339 -> a
-    1719:1719:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    1719:1719:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
+    1708:1708:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    1708:1708:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
+    1709:1709:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339:4339 -> a
+    1710:1710:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    1710:1710:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1720:1720:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    1720:1720:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
-    1721:1723:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4344:4346 -> a
-    1724:1724:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1724:1724:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346 -> a
+    1711:1711:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    1711:1711:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4339 -> a
+    1712:1714:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4344:4346 -> a
+    1715:1715:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1715:1715:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1725:1725:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1725:1725:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346 -> a
-    1726:1753:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346:4373 -> a
-    1754:1754:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):98:98 -> a
-    1754:1754:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
-    1755:1755:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):50:50 -> a
-    1755:1755:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
-    1755:1755:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
-    1756:1756:boolean com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions.isNop():0:0 -> a
-    1756:1756:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):50 -> a
-    1756:1756:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
-    1756:1756:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
-    1757:1758:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):53:54 -> a
-    1757:1758:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
-    1757:1758:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
-    1759:1763:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4390:4394 -> a
-    1764:1775:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4391:4402 -> a
-    1776:1783:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4399:4406 -> a
-    1784:1784:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1784:1784:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406 -> a
+    1716:1716:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1716:1716:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346 -> a
+    1717:1744:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4346:4373 -> a
+    1745:1745:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):98:98 -> a
+    1745:1745:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
+    1746:1746:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):50:50 -> a
+    1746:1746:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
+    1746:1746:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
+    1747:1747:boolean com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions.isNop():0:0 -> a
+    1747:1747:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):50 -> a
+    1747:1747:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
+    1747:1747:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
+    1748:1749:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingCfInstructionDesugaringEventConsumer.attach(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):53:54 -> a
+    1748:1749:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):106 -> a
+    1748:1749:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4374 -> a
+    1750:1754:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4390:4394 -> a
+    1755:1766:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4391:4402 -> a
+    1767:1774:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4399:4406 -> a
+    1775:1775:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1775:1775:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1785:1785:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    1785:1785:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406 -> a
-    1786:1788:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406:4408 -> a
-    1789:1789:com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.getHelper():81:81 -> a
-    1789:1789:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4410 -> a
+    1776:1776:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    1776:1776:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406 -> a
+    1777:1779:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4406:4408 -> a
+    1780:1780:com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper com.android.tools.r8.ir.desugar.itf.InterfaceProcessor.getHelper():81:81 -> a
+    1780:1780:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4410 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1790:1792:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4411:4413 -> a
-    1793:1793:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
-    1793:1793:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4413 -> a
+    1781:1783:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4411:4413 -> a
+    1784:1784:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
+    1784:1784:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4413 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1794:1794:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
-    1794:1794:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4413 -> a
-    1795:1795:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
-    1795:1795:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4415 -> a
-    1796:1796:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4416:4416 -> a
-    1797:1797:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):4235:4235 -> a
-    1797:1797:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4418 -> a
-    1798:1801:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4421:4424 -> a
-    1802:1802:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    1802:1802:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4424 -> a
+    1785:1785:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> a
+    1785:1785:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4413 -> a
+    1786:1786:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3501:3501 -> a
+    1786:1786:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4415 -> a
+    1787:1787:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4416:4416 -> a
+    1788:1788:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):4235:4235 -> a
+    1788:1788:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4418 -> a
+    1789:1792:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4421:4424 -> a
+    1793:1793:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    1793:1793:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1803:1803:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    1803:1803:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4424 -> a
-    1804:1804:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425:4425 -> a
-    1805:1805:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    1805:1805:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425 -> a
+    1794:1794:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    1794:1794:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4424 -> a
+    1795:1795:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425:4425 -> a
+    1796:1796:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    1796:1796:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1806:1806:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    1806:1806:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425 -> a
-    1807:1807:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4359:4359 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
-    1808:1808:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    1808:1808:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360 -> a
-    1809:1809:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360:4360 -> a
-    1810:1810:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
-    1810:1810:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360 -> a
-    1811:1811:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362:4362 -> a
-    1812:1812:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
-    1812:1812:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
-    1813:1813:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> a
-    1813:1813:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
-    1814:1814:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> a
-    1814:1814:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
-    1815:1818:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362:4365 -> a
-    1819:1819:void lambda$desugar$126(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):4393:4393 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/internal/lY;Lcom/android/tools/r8/graph/C5;)V"}
-    1820:1820:void lambda$desugar$127(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):4401:4401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/E9;Lcom/android/tools/r8/graph/C5;)V"}
-    1821:1823:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4429:4431 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PI;Lcom/android/tools/r8/graph/C5;)V"}
-    1824:1825:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4436:4437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pg;Lcom/android/tools/r8/graph/C5;)V"}
-    1826:1826:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
-    1826:1826:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
-    1827:1827:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
-    1827:1827:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
+    1797:1797:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    1797:1797:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4425 -> a
+    1798:1798:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4359:4359 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
+    1799:1799:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    1799:1799:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360 -> a
+    1800:1800:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360:4360 -> a
+    1801:1801:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
+    1801:1801:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4360 -> a
+    1802:1802:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362:4362 -> a
+    1803:1803:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
+    1803:1803:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
+    1804:1804:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> a
+    1804:1804:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
+    1805:1805:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> a
+    1805:1805:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362 -> a
+    1806:1809:void lambda$desugar$124(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4362:4365 -> a
+    1810:1810:void lambda$desugar$126(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):4393:4393 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/internal/pY;Lcom/android/tools/r8/graph/C5;)V"}
+    1811:1811:void lambda$desugar$127(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):4401:4401 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P;Lcom/android/tools/r8/internal/G9;Lcom/android/tools/r8/graph/C5;)V"}
+    1812:1814:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4429:4431 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TI;Lcom/android/tools/r8/graph/C5;)V"}
+    1815:1816:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4436:4437 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rg;Lcom/android/tools/r8/graph/C5;)V"}
+    1817:1817:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
+    1817:1817:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
+    1818:1818:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
+    1818:1818:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1828:1828:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
-    1828:1828:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
-    1829:1829:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():350:350 -> a
-    1829:1829:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
+    1819:1819:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():349:349 -> a
+    1819:1819:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
+    1820:1820:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.getConstantDynamicProgramClass():350:350 -> a
+    1820:1820:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1830:1831:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437:4438 -> a
-    1832:1840:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4481:4489 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/c0;"}
-    1841:1841:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):94:94 -> a
-    1841:1841:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4489 -> a
-    1842:1851:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4490:4499 -> a
-    1852:1852:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
-    1852:1852:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
-    1853:1853:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
-    1853:1853:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
+    1821:1822:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4437:4438 -> a
+    1823:1831:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4481:4489 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/c0;"}
+    1832:1832:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):94:94 -> a
+    1832:1832:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4489 -> a
+    1833:1842:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4490:4499 -> a
+    1843:1843:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
+    1843:1843:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
+    1844:1844:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
+    1844:1844:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1854:1854:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
-    1854:1854:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
-    1855:1864:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499:4508 -> a
-    1865:1865:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1965:1965 -> a
-    1865:1865:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
-    1866:1866:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    1866:1866:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1966 -> a
-    1866:1866:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
-    1867:1871:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1966:1970 -> a
-    1867:1871:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
-    1872:1872:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509:4509 -> a
-    1873:1873:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    1873:1873:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
+    1845:1845:boolean com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.verifyMappingIsOneToOne():104:104 -> a
+    1845:1845:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499 -> a
+    1846:1855:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4499:4508 -> a
+    1856:1856:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1970:1970 -> a
+    1856:1856:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
+    1857:1857:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    1857:1857:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1971 -> a
+    1857:1857:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
+    1858:1862:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1971:1975 -> a
+    1858:1862:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4508 -> a
+    1863:1863:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509:4509 -> a
+    1864:1864:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    1864:1864:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1874:1874:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
-    1874:1874:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
-    1875:1875:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509:4509 -> a
-    1876:1876:boolean com.android.tools.r8.graph.AppView.hasMainDexRootSet():779:779 -> a
-    1876:1876:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
+    1865:1865:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isTreeShaking():227:227 -> a
+    1865:1865:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
+    1866:1866:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509:4509 -> a
+    1867:1867:boolean com.android.tools.r8.graph.AppView.hasMainDexRootSet():779:779 -> a
+    1867:1867:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4509 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1877:1878:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4510:4511 -> a
-    1879:1879:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1965:1965 -> a
-    1879:1879:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
-    1880:1880:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    1880:1880:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1966 -> a
-    1880:1880:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
-    1881:1885:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1966:1970 -> a
-    1881:1885:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
-    1886:1891:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4513:4518 -> a
-    1892:1892:void com.android.tools.r8.graph.DexItemFactory.forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):3082:3082 -> a
-    1892:1892:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4519 -> a
+    1868:1869:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4510:4511 -> a
+    1870:1870:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1970:1970 -> a
+    1870:1870:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
+    1871:1871:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    1871:1871:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1971 -> a
+    1871:1871:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
+    1872:1876:void com.android.tools.r8.shaking.RootSetUtils$RootSet.pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Timing):1971:1975 -> a
+    1872:1876:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4511 -> a
+    1877:1882:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4513:4518 -> a
+    1883:1883:void com.android.tools.r8.graph.DexItemFactory.forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):3082:3082 -> a
+    1883:1883:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4519 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1893:1893:void com.android.tools.r8.graph.DexItemFactory.forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):3082:3082 -> a
-    1893:1893:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4519 -> a
-    1894:1906:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4520:4532 -> a
-    1907:1907:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    1907:1907:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4532 -> a
-    1908:1922:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4533:4547 -> a
-    1923:1925:com.android.tools.r8.graph.DirectMappedDexApplication$Builder com.android.tools.r8.graph.DirectMappedDexApplication$Builder.replaceClasspathClasses(java.util.Collection):279:281 -> a
-    1923:1925:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4547 -> a
-    1926:1940:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4548:4562 -> a
-    1941:1941:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319:319 -> a
-    1941:1941:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
-    1942:1942:com.android.tools.r8.shaking.rules.MaterializedRules com.android.tools.r8.shaking.rules.MaterializedRules.empty():30:30 -> a
-    1942:1942:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319 -> a
-    1942:1942:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
-    1943:1945:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319:321 -> a
-    1943:1945:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
-    1946:1949:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4564:4567 -> a
-    1950:1950:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.graph.AppInfoWithClassHierarchy.getClassToFeatureSplitMap():148:148 -> a
-    1950:1950:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4568 -> a
-    1951:1953:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4569:4571 -> a
-    1954:1954:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):137:137 -> a
+    1884:1884:void com.android.tools.r8.graph.DexItemFactory.forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):3082:3082 -> a
+    1884:1884:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4519 -> a
+    1885:1897:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4520:4532 -> a
+    1898:1898:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    1898:1898:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4532 -> a
+    1899:1913:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4533:4547 -> a
+    1914:1916:com.android.tools.r8.graph.DirectMappedDexApplication$Builder com.android.tools.r8.graph.DirectMappedDexApplication$Builder.replaceClasspathClasses(java.util.Collection):279:281 -> a
+    1914:1916:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4547 -> a
+    1917:1931:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4548:4562 -> a
+    1932:1932:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319:319 -> a
+    1932:1932:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
+    1933:1933:com.android.tools.r8.shaking.rules.MaterializedRules com.android.tools.r8.shaking.rules.MaterializedRules.empty():30:30 -> a
+    1933:1933:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319 -> a
+    1933:1933:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
+    1934:1936:void com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.setMaterializedRules(com.android.tools.r8.shaking.rules.MaterializedRules):319:321 -> a
+    1934:1936:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4562 -> a
+    1937:1940:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4564:4567 -> a
+    1941:1941:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.graph.AppInfoWithClassHierarchy.getClassToFeatureSplitMap():148:148 -> a
+    1941:1941:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4568 -> a
+    1942:1944:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4569:4571 -> a
+    1945:1945:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):137:137 -> a
+    1945:1945:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1946:1948:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):138:140 -> a
+    1946:1948:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1949:1949:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    1949:1949:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141 -> a
+    1949:1949:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1950:1950:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141:141 -> a
+    1950:1950:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1951:1951:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    1951:1951:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):143 -> a
+    1951:1951:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1952:1952:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):143:143 -> a
+    1952:1952:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1953:1953:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
+    1953:1953:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):146 -> a
+    1953:1953:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
+    1954:1954:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):146:146 -> a
     1954:1954:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1955:1957:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):138:140 -> a
+    1955:1957:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():345:347 -> a
+    1955:1957:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147 -> a
     1955:1957:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1958:1958:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    1958:1958:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141 -> a
+    1958:1958:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():346:346 -> a
+    1958:1958:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147 -> a
     1958:1958:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1959:1959:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141:141 -> a
-    1959:1959:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1960:1960:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    1960:1960:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):143 -> a
-    1960:1960:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1961:1961:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):143:143 -> a
-    1961:1961:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1962:1962:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
-    1962:1962:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):146 -> a
-    1962:1962:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1963:1963:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):146:146 -> a
-    1963:1963:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1964:1966:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():345:347 -> a
-    1964:1966:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147 -> a
-    1964:1966:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1967:1967:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():346:346 -> a
-    1967:1967:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):147 -> a
-    1967:1967:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4571 -> a
-    1968:1968:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4573:4573 -> a
-    1969:1969:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1969:1969:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575 -> a
+    1959:1959:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4573:4573 -> a
+    1960:1960:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1960:1960:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1970:1970:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
-    1970:1970:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575 -> a
-    1971:1971:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575:4575 -> a
-    1972:1972:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
-    1972:1972:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
+    1961:1961:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> a
+    1961:1961:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575 -> a
+    1962:1962:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4575:4575 -> a
+    1963:1963:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
+    1963:1963:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1973:1973:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
-    1973:1973:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
-    1974:1976:java.util.Set toDescriptorSet(java.util.Set):4712:4714 -> a
-    1974:1976:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
-    1977:1977:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576:4576 -> a
-    1978:1978:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
-    1978:1978:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
+    1964:1964:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
+    1964:1964:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
+    1965:1967:java.util.Set toDescriptorSet(java.util.Set):4712:4714 -> a
+    1965:1967:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576 -> a
+    1968:1968:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4576:4576 -> a
+    1969:1969:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
+    1969:1969:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1979:1979:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
-    1979:1979:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
-    1980:1982:java.util.Set toDescriptorSet(java.util.Set):4712:4714 -> a
-    1980:1982:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
-    1983:1983:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582:4582 -> a
-    1984:1984:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
-    1984:1984:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
-    1985:1985:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
-    1985:1985:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
+    1970:1970:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> a
+    1970:1970:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
+    1971:1973:java.util.Set toDescriptorSet(java.util.Set):4712:4714 -> a
+    1971:1973:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582 -> a
+    1974:1974:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4582:4582 -> a
+    1975:1975:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
+    1975:1975:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
+    1976:1976:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
+    1976:1976:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1986:1986:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
-    1986:1986:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
-    1987:1987:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):328:328 -> a
-    1987:1987:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
+    1977:1977:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):327:327 -> a
+    1977:1977:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
+    1978:1978:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):328:328 -> a
+    1978:1978:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1988:1991:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):329:332 -> a
-    1988:1991:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
-    1992:1998:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585:4591 -> a
-    1999:2004:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):4721:4726 -> a
-    1999:2004:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4593 -> a
-    2005:2010:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4594:4599 -> a
-    2011:2011:void com.android.tools.r8.graph.AppInfo.markObsolete():106:106 -> a
-    2011:2011:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4600 -> a
-    2012:2015:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4601:4604 -> a
-    2016:2016:void lambda$createEnqueuerResult$128(java.util.Set,com.android.tools.r8.graph.DexProgramClass):4490:4490 -> a
+    1979:1982:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder.build(com.android.tools.r8.graph.DexDefinitionSupplier):329:332 -> a
+    1979:1982:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585 -> a
+    1983:1989:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4585:4591 -> a
+    1990:1995:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):4721:4726 -> a
+    1990:1995:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4593 -> a
+    1996:2001:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4594:4599 -> a
+    2002:2002:void com.android.tools.r8.graph.AppInfo.markObsolete():106:106 -> a
+    2002:2002:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4600 -> a
+    2003:2006:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.Timing):4601:4604 -> a
+    2007:2007:void lambda$createEnqueuerResult$128(java.util.Set,com.android.tools.r8.graph.DexProgramClass):4490:4490 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)V"}
-    2017:2017:void amendKeepInfoWithCompanionMethods():4614:4614 -> a
-    2018:2019:void forEachCompanionMethod(java.util.function.BiConsumer):4608:4609 -> a
-    2018:2019:void amendKeepInfoWithCompanionMethods():4614 -> a
-    2020:2022:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4616:4618 -> a
+    2008:2008:void amendKeepInfoWithCompanionMethods():4614:4614 -> a
+    2009:2010:void forEachCompanionMethod(java.util.function.BiConsumer):4608:4609 -> a
+    2009:2010:void amendKeepInfoWithCompanionMethods():4614 -> a
+    2011:2013:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4616:4618 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-    2023:2024:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):143:144 -> a
-    2023:2024:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
-    2025:2025:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2025:2025:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():69 -> a
-    2025:2025:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> a
-    2025:2025:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
-    2026:2026:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):148:148 -> a
-    2026:2026:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
-    2027:2027:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2027:2027:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
-    2027:2027:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
-    2028:2028:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):149:149 -> a
-    2028:2028:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
-    2029:2030:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618:4619 -> a
-    2031:2031:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
-    2031:2031:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4621 -> a
-    2032:2032:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4621:4621 -> a
-    2033:2033:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2033:2033:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2033:2033:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622 -> a
-    2034:2034:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2034:2034:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622 -> a
-    2035:2038:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622:4625 -> a
-    2039:2039:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4624:4624 -> a
-    2040:2050:java.util.Set amendWithCompanionMethods(java.util.Set):4630:4640 -> a
-    2051:2052:void lambda$amendWithCompanionMethods$133(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4636:4637 -> a
+    2014:2015:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):143:144 -> a
+    2014:2015:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
+    2016:2016:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2016:2016:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():69 -> a
+    2016:2016:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):146 -> a
+    2016:2016:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
+    2017:2017:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):148:148 -> a
+    2017:2017:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
+    2018:2018:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2018:2018:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
+    2018:2018:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
+    2019:2019:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfoWithDefinitionLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):149:149 -> a
+    2019:2019:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618 -> a
+    2020:2021:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4618:4619 -> a
+    2022:2022:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
+    2022:2022:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4621 -> a
+    2023:2023:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4621:4621 -> a
+    2024:2024:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2024:2024:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2024:2024:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622 -> a
+    2025:2025:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2025:2025:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622 -> a
+    2026:2029:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4622:4625 -> a
+    2030:2030:void lambda$amendKeepInfoWithCompanionMethods$132(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4624:4624 -> a
+    2031:2041:java.util.Set amendWithCompanionMethods(java.util.Set):4630:4640 -> a
+    2042:2043:void lambda$amendWithCompanionMethods$133(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4636:4637 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
-    2053:2068:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4658:4673 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/x0;)Z"}
-    2069:2072:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4672:4675 -> a
-    2073:2084:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4682:4693 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/x0;)V"}
-    2085:2085:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505:3505 -> a
-    2085:2085:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
-    2086:2086:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    2086:2086:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
+    2044:2059:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4658:4673 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/x0;)Z"}
+    2060:2063:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4672:4675 -> a
+    2064:2075:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4682:4693 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/x0;)V"}
+    2076:2076:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505:3505 -> a
+    2076:2076:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
+    2077:2077:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    2077:2077:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2086:2086:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
-    2087:2087:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
-    2087:2087:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
-    2087:2087:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
-    2088:2088:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4695:4695 -> a
-    2089:2090:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4704:4705 -> a
-    2089:2090:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4695 -> a
-    2091:2095:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4732:4736 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
-    2096:2096:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2096:2096:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4736 -> a
+    2077:2077:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
+    2078:2078:boolean com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.contains(com.android.tools.r8.graph.DexEncodedMethod):5747:5747 -> a
+    2078:2078:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3505 -> a
+    2078:2078:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4694 -> a
+    2079:2079:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4695:4695 -> a
+    2080:2081:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4704:4705 -> a
+    2080:2081:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4695 -> a
+    2082:2086:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4732:4736 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
+    2087:2087:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2087:2087:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4736 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2097:2097:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2097:2097:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4736 -> a
-    2098:2098:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737:4737 -> a
-    2099:2099:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():548:548 -> a
-    2099:2099:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737 -> a
+    2088:2088:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2088:2088:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4736 -> a
+    2089:2089:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737:4737 -> a
+    2090:2090:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():548:548 -> a
+    2090:2090:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2100:2100:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():548:548 -> a
-    2100:2100:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737 -> a
-    2101:2114:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4738:4751 -> a
-    2115:2115:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
-    2115:2115:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4752 -> a
-    2116:2119:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4753:4756 -> a
-    2120:2120:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2270:2270 -> a
-    2120:2120:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4757 -> a
-    2121:2131:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4758:4768 -> a
-    2132:2132:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2132:2132:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4768 -> a
+    2091:2091:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():548:548 -> a
+    2091:2091:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4737 -> a
+    2092:2105:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4738:4751 -> a
+    2106:2106:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
+    2106:2106:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4752 -> a
+    2107:2110:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4753:4756 -> a
+    2111:2111:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2275:2275 -> a
+    2111:2111:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4757 -> a
+    2112:2122:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4758:4768 -> a
+    2123:2123:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2123:2123:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4768 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2133:2133:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2133:2133:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4768 -> a
-    2134:2140:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4774:4780 -> a
-    2141:2141:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    2141:2141:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4780 -> a
+    2124:2124:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2124:2124:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4768 -> a
+    2125:2131:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4774:4780 -> a
+    2132:2132:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    2132:2132:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4780 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2142:2142:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
-    2142:2142:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4780 -> a
-    2143:2144:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4781:4782 -> a
-    2145:2145:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    2145:2145:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4782 -> a
+    2133:2133:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
+    2133:2133:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4780 -> a
+    2134:2135:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4781:4782 -> a
+    2136:2136:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    2136:2136:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4782 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2146:2146:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
-    2146:2146:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4782 -> a
-    2147:2147:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784:4784 -> a
-    2148:2148:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2148:2148:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784 -> a
+    2137:2137:void com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.clear():93:93 -> a
+    2137:2137:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4782 -> a
+    2138:2138:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784:4784 -> a
+    2139:2139:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2139:2139:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2149:2149:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2149:2149:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784 -> a
-    2150:2151:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4789:4790 -> a
-    2152:2152:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2152:2152:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790 -> a
+    2140:2140:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2140:2140:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4784 -> a
+    2141:2142:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4789:4790 -> a
+    2143:2143:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2143:2143:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2144:2144:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2144:2144:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790 -> a
+    2145:2152:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790:4797 -> a
     2153:2153:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2153:2153:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790 -> a
-    2154:2161:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4790:4797 -> a
-    2162:2162:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2162:2162:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4797 -> a
+    2153:2153:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4797 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2163:2163:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2163:2163:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4797 -> a
-    2164:2175:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4802:4813 -> a
-    2176:2176:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    2176:2176:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4814 -> a
+    2154:2154:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2154:2154:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4797 -> a
+    2155:2166:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4802:4813 -> a
+    2167:2167:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    2167:2167:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4814 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2177:2177:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    2177:2177:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4815 -> a
-    2178:2181:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4815:4818 -> a
-    2182:2182:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2182:2182:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4818 -> a
+    2168:2168:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    2168:2168:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4815 -> a
+    2169:2172:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4815:4818 -> a
+    2173:2173:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2173:2173:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4818 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2183:2183:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    2183:2183:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4818 -> a
-    2184:2189:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4826:4831 -> a
-    2190:2190:java.util.Set lambda$trace$135(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4753:4753 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Ljava/util/Set;"}
-    2191:2191:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$trace$136(com.android.tools.r8.graph.ProgramDefinition):4776:4776 -> a
+    2174:2174:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    2174:2174:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4818 -> a
+    2175:2180:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4826:4831 -> a
+    2181:2181:java.util.Set lambda$trace$135(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4753:4753 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Ljava/util/Set;"}
+    2182:2182:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$trace$136(com.android.tools.r8.graph.ProgramDefinition):4776:4776 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/graph/p0;"}
-    2192:2192:void lambda$trace$137(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4796:4796 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/mn;)V"}
-    2193:2193:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4850:4850 -> a
+    2183:2183:void lambda$trace$137(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4796:4796 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/on;)V"}
+    2184:2184:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4850:4850 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;)V"}
-    2194:2194:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    2194:2194:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4854 -> a
+    2185:2185:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
+    2185:2185:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4854 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2195:2198:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4854:4857 -> a
-    2199:2199:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):95:95 -> a
-    2199:2199:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4850 -> a
+    2186:2189:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4854:4857 -> a
+    2190:2190:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):95:95 -> a
+    2190:2190:void lambda$postProcessingDesugaring$138(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4850 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2200:2206:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4896:4902 -> a
+    2191:2197:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4896:4902 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/h4;)V"}
-    2207:2207:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4904:4904 -> a
+    2198:2198:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4904:4904 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
-    2208:2208:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
-    2208:2208:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4906 -> a
-    2209:2210:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4906:4906 -> a
-    2211:2215:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1127:1131 -> a
-    2211:2215:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4907 -> a
-    2216:2218:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5074:5076 -> a
+    2199:2199:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> a
+    2199:2199:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4906 -> a
+    2200:2201:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4906:4906 -> a
+    2202:2206:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):1127:1131 -> a
+    2202:2206:void lambda$addConsequentRootSet$140(com.android.tools.r8.graph.DexType,java.util.Set):4907 -> a
+    2207:2209:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5074:5076 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/graph/C5;)V"}
-    2219:2219:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
-    2219:2219:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077 -> a
+    2210:2210:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1324:1324 -> a
+    2210:2210:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2220:2220:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> a
-    2220:2220:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077 -> a
-    2221:2224:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077:5080 -> a
-    2225:2225:com.android.tools.r8.shaking.Enqueuer$Mode getMode():571:571 -> a
-    2225:2225:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5135 -> a
-    2225:2225:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2226:2226:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5135:5135 -> a
-    2226:2226:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2227:2227:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4314:4314 -> a
-    2227:2227:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2227:2227:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2228:2230:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):4308:4310 -> a
-    2228:2230:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4315 -> a
-    2228:2230:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2228:2230:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2231:2236:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4317:4322 -> a
-    2231:2236:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2231:2236:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2237:2237:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
-    2237:2237:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322 -> a
+    2211:2211:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo com.android.tools.r8.graph.DexEncodedMethod.getOptimizationInfo():1325:1325 -> a
+    2211:2211:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077 -> a
+    2212:2215:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5077:5080 -> a
+    2216:2216:com.android.tools.r8.shaking.Enqueuer$Mode getMode():571:571 -> a
+    2216:2216:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5135 -> a
+    2216:2216:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2217:2217:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5135:5135 -> a
+    2217:2217:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2218:2218:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4314:4314 -> a
+    2218:2218:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2218:2218:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2219:2221:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):4308:4310 -> a
+    2219:2221:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4315 -> a
+    2219:2221:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2219:2221:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2222:2227:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4317:4322 -> a
+    2222:2227:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2222:2227:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2228:2228:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
+    2228:2228:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2237:2237:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2237:2237:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2238:2238:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
-    2238:2238:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322 -> a
-    2238:2238:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2238:2238:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2239:2249:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322:4332 -> a
-    2239:2249:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
-    2239:2249:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2250:2250:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5141:5141 -> a
-    2250:2250:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
-    2251:2251:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5085:5085 -> a
-    2252:2252:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
-    2252:2252:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5087 -> a
-    2253:2253:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5087:5087 -> a
-    2254:2254:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-    2254:2254:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5088 -> a
-    2255:2255:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5088:5088 -> a
-    2256:2256:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-    2256:2256:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5089 -> a
-    2257:2262:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5089:5094 -> a
-    2263:2263:void lambda$markMethodAsLive$141(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5094:5094 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/mn;)V"}
-    2264:2264:void lambda$markMethodAsTargeted$142(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5114:5114 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/mn;)V"}
-    2265:2265:void lambda$traceMethodDefinitionExcludingCode$143(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):5124:5124 -> a
+    2228:2228:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2228:2228:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2229:2229:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
+    2229:2229:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322 -> a
+    2229:2229:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2229:2229:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2230:2240:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):4322:4332 -> a
+    2230:2240:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5136 -> a
+    2230:2240:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2241:2241:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):5141:5141 -> a
+    2241:2241:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5083 -> a
+    2242:2242:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5085:5085 -> a
+    2243:2243:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
+    2243:2243:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5087 -> a
+    2244:2244:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5087:5087 -> a
+    2245:2245:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
+    2245:2245:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5088 -> a
+    2246:2246:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5088:5088 -> a
+    2247:2247:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):43:43 -> a
+    2247:2247:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5089 -> a
+    2248:2253:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):5089:5094 -> a
+    2254:2254:void lambda$markMethodAsLive$141(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5094:5094 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/on;)V"}
+    2255:2255:void lambda$markMethodAsTargeted$142(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5114:5114 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/on;)V"}
+    2256:2256:void lambda$traceMethodDefinitionExcludingCode$143(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):5124:5124 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/r0;)V"}
-    2266:2266:void lambda$traceCode$144(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5149:5149 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/internal/mn;)V"}
-    2267:2267:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5175:5175 -> a
+    2257:2257:void lambda$traceCode$144(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):5149:5149 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/internal/on;)V"}
+    2258:2258:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5175:5175 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Supplier;)V"}
-    2268:2273:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5201:5206 -> a
-    2268:2273:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2274:2274:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):65:65 -> a
-    2274:2274:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5206 -> a
-    2274:2274:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2275:2275:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexType):69:69 -> a
-    2275:2275:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):65 -> a
-    2275:2275:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5206 -> a
-    2275:2275:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2276:2281:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5210:5215 -> a
-    2276:2281:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2282:2282:boolean com.android.tools.r8.graph.AppView.hasProguardCompatibilityActions():835:835 -> a
-    2282:2282:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5215 -> a
-    2282:2282:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2259:2264:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5201:5206 -> a
+    2259:2264:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2265:2265:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):65:65 -> a
+    2265:2265:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5206 -> a
+    2265:2265:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2266:2266:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexType):69:69 -> a
+    2266:2266:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexProgramClass):65 -> a
+    2266:2266:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5206 -> a
+    2266:2266:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2267:2272:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5210:5215 -> a
+    2267:2272:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2273:2273:boolean com.android.tools.r8.graph.AppView.hasProguardCompatibilityActions():835:835 -> a
+    2273:2273:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5215 -> a
+    2273:2273:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    2283:2283:boolean com.android.tools.r8.shaking.ProguardCompatibilityActions.isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    2283:2283:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5216 -> a
+    2274:2274:boolean com.android.tools.r8.shaking.ProguardCompatibilityActions.isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    2274:2274:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2283:2283:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2284:2284:boolean com.android.tools.r8.shaking.ProguardCompatibilityActions.isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    2284:2284:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5216 -> a
-    2284:2284:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
-    2285:2285:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5181:5181 -> a
-    2286:2286:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    2286:2286:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5182 -> a
+    2274:2274:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2275:2275:boolean com.android.tools.r8.shaking.ProguardCompatibilityActions.isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    2275:2275:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):5216 -> a
+    2275:2275:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5177 -> a
+    2276:2276:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5181:5181 -> a
+    2277:2277:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    2277:2277:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5182 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2287:2287:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    2287:2287:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5182 -> a
-    2288:2298:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5183:5193 -> a
-    2299:2299:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5190:5190 -> a
-    2300:2300:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2300:2300:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2300:2300:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195 -> a
-    2301:2301:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2301:2301:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195 -> a
-    2302:2302:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195:5195 -> a
-    2303:2303:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2303:2303:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5194 -> a
-    2304:2310:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5235:5241 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Iw;)V"}
-    2311:2318:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5352:5359 -> a
-    2311:2318:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2319:2321:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5358:5360 -> a
-    2319:2321:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2322:2322:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2322:2322:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5366 -> a
+    2278:2278:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    2278:2278:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5182 -> a
+    2279:2289:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5183:5193 -> a
+    2290:2290:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5190:5190 -> a
+    2291:2291:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2291:2291:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2291:2291:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195 -> a
+    2292:2292:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2292:2292:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195 -> a
+    2293:2293:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5195:5195 -> a
+    2294:2294:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2294:2294:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):5194 -> a
+    2295:2301:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5235:5241 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Kw;)V"}
+    2302:2309:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5352:5359 -> a
+    2302:2309:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2310:2312:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5358:5360 -> a
+    2310:2312:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2313:2313:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2313:2313:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5366 -> a
+    2313:2313:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2314:2314:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5370:5370 -> a
+    2314:2314:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2315:2315:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2315:2315:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5372 -> a
+    2315:2315:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2316:2318:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5373:5375 -> a
+    2316:2318:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2319:2319:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2319:2319:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2319:2319:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377 -> a
+    2319:2319:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2320:2320:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2320:2320:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377 -> a
+    2320:2320:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2321:2321:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377:5377 -> a
+    2321:2321:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
+    2322:2322:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2322:2322:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5376 -> a
     2322:2322:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2323:2323:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5370:5370 -> a
-    2323:2323:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2324:2324:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2324:2324:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5372 -> a
-    2324:2324:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2325:2327:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5373:5375 -> a
-    2325:2327:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2328:2328:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2328:2328:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2328:2328:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377 -> a
-    2328:2328:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2329:2329:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2329:2329:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377 -> a
-    2329:2329:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2330:2330:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5377:5377 -> a
-    2330:2330:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2331:2331:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2331:2331:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5376 -> a
-    2331:2331:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5242 -> a
-    2332:2332:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5245:5245 -> a
-    2333:2354:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5385:5406 -> a
-    2333:2354:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2355:2357:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5405:5407 -> a
-    2355:2357:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2358:2358:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2358:2358:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5413 -> a
-    2358:2358:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2359:2359:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2359:2359:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5417 -> a
-    2359:2359:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2360:2369:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5417:5426 -> a
-    2360:2369:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2370:2370:int com.android.tools.r8.ir.code.NewArrayFilled.size():241:241 -> a
-    2370:2370:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5428 -> a
-    2370:2370:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2371:2381:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5429:5439 -> a
-    2371:2381:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2382:2382:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2382:2382:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5446 -> a
+    2323:2323:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5245:5245 -> a
+    2324:2345:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5385:5406 -> a
+    2324:2345:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2346:2348:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5405:5407 -> a
+    2346:2348:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2349:2349:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2349:2349:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5413 -> a
+    2349:2349:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2350:2350:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2350:2350:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5417 -> a
+    2350:2350:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2351:2360:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5417:5426 -> a
+    2351:2360:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2361:2361:int com.android.tools.r8.ir.code.NewArrayFilled.size():241:241 -> a
+    2361:2361:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5428 -> a
+    2361:2361:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2362:2372:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5429:5439 -> a
+    2362:2372:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2373:2373:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2373:2373:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5446 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2382:2382:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2383:2405:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5449:5471 -> a
-    2383:2405:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2406:2418:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5470:5482 -> a
-    2406:2418:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2419:2419:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramInitializer(com.android.tools.r8.graph.DexType[]):362:362 -> a
-    2419:2419:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5488 -> a
-    2419:2419:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2420:2420:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2420:2420:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5493 -> a
-    2420:2420:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2421:2423:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5494:5496 -> a
-    2421:2423:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2424:2424:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2424:2424:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2424:2424:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498 -> a
-    2424:2424:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2425:2425:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2425:2425:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498 -> a
-    2425:2425:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2426:2426:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498:5498 -> a
-    2426:2426:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2427:2427:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2427:2427:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5497 -> a
-    2427:2427:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
-    2428:2428:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5249:5249 -> a
-    2429:2429:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2429:2429:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5587 -> a
+    2373:2373:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2374:2396:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5449:5471 -> a
+    2374:2396:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2397:2409:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5470:5482 -> a
+    2397:2409:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2410:2410:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexProgramClass.getProgramInitializer(com.android.tools.r8.graph.DexType[]):362:362 -> a
+    2410:2410:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5488 -> a
+    2410:2410:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2411:2411:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2411:2411:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5493 -> a
+    2411:2411:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2412:2414:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5494:5496 -> a
+    2412:2414:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2415:2415:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2415:2415:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2415:2415:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498 -> a
+    2415:2415:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2416:2416:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2416:2416:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498 -> a
+    2416:2416:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2417:2417:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5498:5498 -> a
+    2417:2417:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2418:2418:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2418:2418:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5497 -> a
+    2418:2418:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5246 -> a
+    2419:2419:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5249:5249 -> a
+    2420:2420:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2420:2420:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5587 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2429:2429:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2430:2430:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5587:5587 -> a
-    2430:2430:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2431:2431:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2431:2431:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588 -> a
-    2431:2431:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2432:2432:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588:5588 -> a
-    2432:2432:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2433:2433:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
-    2433:2433:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588 -> a
+    2420:2420:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2421:2421:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5587:5587 -> a
+    2421:2421:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2422:2422:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2422:2422:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588 -> a
+    2422:2422:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2423:2423:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588:5588 -> a
+    2423:2423:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2424:2424:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
+    2424:2424:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5588 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2433:2433:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2434:2436:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5589:5591 -> a
-    2434:2436:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
-    2437:2441:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5253:5257 -> a
-    2442:2442:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2442:2442:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5597 -> a
+    2424:2424:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2425:2427:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5589:5591 -> a
+    2425:2427:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5250 -> a
+    2428:2432:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5253:5257 -> a
+    2433:2433:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2433:2433:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5597 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2433:2433:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2434:2434:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5597:5597 -> a
+    2434:2434:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2435:2435:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2435:2435:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5602 -> a
+    2435:2435:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2436:2437:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5602:5603 -> a
+    2436:2437:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2438:2438:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    2438:2438:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5603 -> a
+    2438:2438:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2439:2439:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5604:5604 -> a
+    2439:2439:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2440:2440:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
+    2440:2440:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5604 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2440:2440:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2441:2441:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605:5605 -> a
+    2441:2441:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2442:2442:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
+    2442:2442:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2442:2442:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2443:2443:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5597:5597 -> a
+    2443:2443:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605:5605 -> a
     2443:2443:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2444:2444:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2444:2444:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5602 -> a
+    2444:2444:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2444:2444:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5610 -> a
     2444:2444:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2445:2446:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5602:5603 -> a
-    2445:2446:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2447:2447:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    2447:2447:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5603 -> a
+    2445:2445:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5610:5610 -> a
+    2445:2445:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2446:2446:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2446:2446:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5612 -> a
+    2446:2446:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2447:2447:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613:5613 -> a
     2447:2447:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2448:2448:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5604:5604 -> a
+    2448:2448:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
+    2448:2448:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2448:2448:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2449:2449:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():79:79 -> a
-    2449:2449:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5604 -> a
+    2449:2450:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613:5614 -> a
+    2449:2450:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
+    2451:2455:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5261:5265 -> a
+    2456:2456:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult.getReference():56:56 -> a
+    2456:2456:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5269 -> a
+    2457:2457:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5270:5270 -> a
+    2458:2458:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    2458:2458:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5270 -> a
+    2459:2466:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5271:5278 -> a
+    2467:2467:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2467:2467:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5279 -> a
+    2468:2468:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2468:2468:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5283 -> a
+    2469:2469:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5283:5283 -> a
+    2470:2470:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600:600 -> a
+    2470:2470:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
+    2471:2471:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
+    2471:2471:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600 -> a
+    2471:2471:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
+    2472:2472:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600:600 -> a
+    2472:2472:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
+    2473:2486:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284:5297 -> a
+    2487:2487:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2487:2487:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5297 -> a
+    2488:2498:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5301:5311 -> a
+    2499:2499:boolean com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.isFieldUpdater(com.android.tools.r8.graph.DexMethod):2236:2236 -> a
+    2499:2499:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5312 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2449:2449:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2450:2450:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605:5605 -> a
-    2450:2450:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2451:2451:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
-    2451:2451:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605 -> a
+    2500:2500:boolean com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.isFieldUpdater(com.android.tools.r8.graph.DexMethod):2236:2236 -> a
+    2500:2500:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5312 -> a
+    2501:2501:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5314:5314 -> a
+    2502:2502:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2502:2502:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5315 -> a
+    2503:2507:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5314:5318 -> a
+    2508:2508:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> a
+    2508:2508:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24 -> a
+    2508:2508:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5321 -> a
+    2509:2509:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24:24 -> a
+    2509:2509:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5321 -> a
+    2510:2511:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5322:5323 -> a
+    2512:2512:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2512:2512:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5324 -> a
+    2513:2513:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):565:565 -> a
+    2513:2513:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2451:2451:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2452:2452:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5605:5605 -> a
-    2452:2452:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2453:2453:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2453:2453:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5610 -> a
-    2453:2453:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2454:2454:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5610:5610 -> a
-    2454:2454:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2455:2455:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2455:2455:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5612 -> a
-    2455:2455:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2456:2456:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613:5613 -> a
-    2456:2456:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2457:2457:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
-    2457:2457:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2457:2457:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2458:2459:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5613:5614 -> a
-    2458:2459:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5258 -> a
-    2460:2464:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5261:5265 -> a
-    2465:2465:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult.getReference():56:56 -> a
-    2465:2465:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5269 -> a
-    2466:2466:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5270:5270 -> a
-    2467:2467:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    2467:2467:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5270 -> a
-    2468:2475:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5271:5278 -> a
-    2476:2476:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2476:2476:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5279 -> a
-    2477:2477:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2477:2477:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5283 -> a
-    2478:2478:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5283:5283 -> a
-    2479:2479:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600:600 -> a
-    2479:2479:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
-    2480:2480:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
-    2480:2480:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600 -> a
-    2480:2480:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
-    2481:2481:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():600:600 -> a
-    2481:2481:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284 -> a
-    2482:2495:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5284:5297 -> a
-    2496:2496:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2496:2496:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5297 -> a
-    2497:2507:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5301:5311 -> a
-    2508:2508:boolean com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.isFieldUpdater(com.android.tools.r8.graph.DexMethod):2236:2236 -> a
-    2508:2508:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5312 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2509:2509:boolean com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.isFieldUpdater(com.android.tools.r8.graph.DexMethod):2236:2236 -> a
-    2509:2509:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5312 -> a
-    2510:2510:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5314:5314 -> a
-    2511:2511:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2511:2511:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5315 -> a
-    2512:2516:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5314:5318 -> a
-    2517:2517:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> a
-    2517:2517:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24 -> a
-    2517:2517:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5321 -> a
-    2518:2518:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24:24 -> a
-    2518:2518:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5321 -> a
-    2519:2519:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> a
-    2519:2519:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5322 -> a
-    2520:2520:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> a
-    2520:2520:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5323 -> a
+    2514:2514:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):565:565 -> a
+    2514:2514:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5324 -> a
+    2515:2515:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4060:4060 -> a
+    2515:2515:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5319 -> a
+    2516:2518:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5327:5329 -> a
+    2519:2519:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2519:2519:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5330 -> a
+    2520:2520:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5334:5334 -> a
     2521:2521:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2521:2521:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5324 -> a
-    2522:2522:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):646:646 -> a
-    2522:2522:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5324 -> a
-    2523:2523:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4060:4060 -> a
-    2523:2523:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5319 -> a
-    2524:2526:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5327:5329 -> a
-    2527:2527:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2527:2527:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5330 -> a
-    2528:2528:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5334:5334 -> a
-    2529:2529:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2529:2529:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5338 -> a
-    2530:2530:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339:5339 -> a
-    2531:2531:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
-    2531:2531:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339 -> a
+    2521:2521:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5338 -> a
+    2522:2522:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339:5339 -> a
+    2523:2523:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
+    2523:2523:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2532:2532:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
-    2532:2532:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339 -> a
-    2533:2536:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5340:5343 -> a
-    2537:2537:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2537:2537:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2537:2537:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346 -> a
-    2538:2538:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2538:2538:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346 -> a
-    2539:2539:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346:5346 -> a
-    2540:2540:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2540:2540:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5345 -> a
-    2541:2542:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5508:5509 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/LB;)V"}
-    2543:2543:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
-    2543:2543:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5513 -> a
-    2544:2551:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5513:5520 -> a
-    2552:2552:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
-    2552:2552:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5523 -> a
-    2553:2557:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5525:5529 -> a
-    2558:2558:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
-    2558:2558:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5536 -> a
-    2559:2561:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5537:5539 -> a
-    2562:2562:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
-    2562:2562:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5543 -> a
-    2563:2563:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5544:5544 -> a
-    2564:2564:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2564:2564:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5545 -> a
-    2565:2580:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5546:5561 -> a
-    2581:2581:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    2581:2581:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5562 -> a
-    2582:2582:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5563:5563 -> a
-    2583:2583:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> a
-    2583:2583:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5563 -> a
-    2584:2588:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5572:5576 -> a
-    2589:2591:void lambda$handleJavaLangReflectProxyNewProxyInstance$149(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):5565:5567 -> a
+    2524:2524:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToDirectPool():609:609 -> a
+    2524:2524:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5339 -> a
+    2525:2528:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5340:5343 -> a
+    2529:2529:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2529:2529:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2529:2529:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346 -> a
+    2530:2530:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2530:2530:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346 -> a
+    2531:2531:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5346:5346 -> a
+    2532:2532:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2532:2532:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):5345 -> a
+    2533:2534:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5508:5509 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/NB;)V"}
+    2535:2535:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
+    2535:2535:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5513 -> a
+    2536:2543:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5513:5520 -> a
+    2544:2544:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
+    2544:2544:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5523 -> a
+    2545:2549:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5525:5529 -> a
+    2550:2550:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> a
+    2550:2550:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5536 -> a
+    2551:2553:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5537:5539 -> a
+    2554:2554:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):974:974 -> a
+    2554:2554:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5543 -> a
+    2555:2555:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5544:5544 -> a
+    2556:2556:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2556:2556:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5545 -> a
+    2557:2572:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5546:5561 -> a
+    2573:2573:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    2573:2573:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5562 -> a
+    2574:2574:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5563:5563 -> a
+    2575:2575:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):338:338 -> a
+    2575:2575:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5563 -> a
+    2576:2580:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5572:5576 -> a
+    2581:2581:void lambda$handleJavaLangReflectProxyNewProxyInstance$147(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5557:5557 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
+    2582:2584:void lambda$handleJavaLangReflectProxyNewProxyInstance$149(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):5565:5567 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/C5;)V"}
-    2592:2592:void lambda$handleJavaLangReflectProxyNewProxyInstance$148(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):5566:5566 -> a
+    2585:2585:void lambda$handleJavaLangReflectProxyNewProxyInstance$148(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):5566:5566 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;)V"}
-    2593:2593:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5621:5621 -> a
+    2586:2586:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5621:5621 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/G1;)V"}
-    2594:2594:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
-    2594:2594:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5622 -> a
+    2587:2587:com.android.tools.r8.graph.AppServices com.android.tools.r8.graph.AppView.appServices():455:455 -> a
+    2587:2587:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5622 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2595:2611:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5622:5638 -> a
-    2612:2612:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2612:2612:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2612:2612:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641 -> a
-    2613:2613:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2613:2613:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641 -> a
-    2614:2614:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641:5641 -> a
-    2615:2615:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2615:2615:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5640 -> a
-    2616:2616:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():135:135 -> a
-    2616:2616:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5644 -> a
-    2617:2620:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5644:5647 -> a
-    2621:2621:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexMethodSignature):199:199 -> a
-    2621:2621:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5647 -> a
-    2622:2622:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):195:195 -> a
-    2622:2622:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexMethodSignature):199 -> a
-    2622:2622:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5647 -> a
-    2623:2623:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5646:5646 -> a
-    2624:2624:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):416:416 -> a
-    2624:2624:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5646 -> a
-    2625:2625:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    2625:2625:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
-    2625:2625:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651 -> a
-    2626:2626:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
-    2626:2626:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651 -> a
-    2627:2627:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651:5651 -> a
-    2628:2628:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
-    2628:2628:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5650 -> a
+    2588:2604:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5622:5638 -> a
+    2605:2605:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2605:2605:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2605:2605:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641 -> a
+    2606:2606:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2606:2606:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641 -> a
+    2607:2607:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5641:5641 -> a
+    2608:2608:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2608:2608:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5640 -> a
+    2609:2609:java.util.Iterator com.android.tools.r8.utils.collections.DexMethodSignatureSet.iterator():135:135 -> a
+    2609:2609:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5644 -> a
+    2610:2613:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5644:5647 -> a
+    2614:2614:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexMethodSignature):199:199 -> a
+    2614:2614:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5647 -> a
+    2615:2615:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):195:195 -> a
+    2615:2615:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(com.android.tools.r8.graph.DexMethodSignature):199 -> a
+    2615:2615:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5647 -> a
+    2616:2616:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5646:5646 -> a
+    2617:2617:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):416:416 -> a
+    2617:2617:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5646 -> a
+    2618:2618:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    2618:2618:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> a
+    2618:2618:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651 -> a
+    2619:2619:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> a
+    2619:2619:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651 -> a
+    2620:2620:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5651:5651 -> a
+    2621:2621:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
+    2621:2621:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5650 -> a
     1:1:com.android.tools.r8.graph.DexApplication lambda$synthesize$123(com.android.tools.r8.graph.DexApplication):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;)Lcom/android/tools/r8/graph/x0;"}
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):80:80 -> b
@@ -273102,339 +272743,327 @@
     50:50:com.android.tools.r8.graph.ClassResolutionResult internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):817 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/z5;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/graph/b0;"}
     51:56:com.android.tools.r8.graph.ClassResolutionResult internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):817:822 -> b
-    57:57:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> b
-    57:57:void lambda$handleReflectiveBehavior$146(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5293 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
-    58:58:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> b
-    58:58:void lambda$handleReflectiveBehavior$146(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5293 -> b
-    59:59:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> b
-    59:59:void lambda$handleReflectiveBehavior$146(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5293 -> b
-    60:60:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):706:706 -> b
+    57:57:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):706:706 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/z5;)V"}
-    61:62:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):957:958 -> b
+    58:59:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):957:958 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/graph/D2;"}
-    63:63:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):968:968 -> b
+    60:60:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):968:968 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/E0;"}
-    64:64:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1082:1082 -> b
+    61:61:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1082:1082 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
-    65:65:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
-    65:65:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1083 -> b
-    66:67:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1083:1084 -> b
-    68:68:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():613:613 -> b
-    68:68:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1088 -> b
+    62:62:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
+    62:62:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1083 -> b
+    63:64:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1083:1084 -> b
+    65:65:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():532:532 -> b
+    65:65:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1088 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> b
-    69:69:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1089 -> b
-    70:70:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1090:1090 -> b
-    71:71:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> b
+    66:66:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> b
+    66:66:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1089 -> b
+    67:67:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1090:1090 -> b
+    68:68:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> b
+    68:68:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
+    69:69:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086:1086 -> b
+    70:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> b
+    70:70:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
+    71:71:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):171:171 -> b
     71:71:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
-    72:72:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086:1086 -> b
-    73:73:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> b
-    73:73:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
-    74:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):171:171 -> b
-    74:74:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    75:78:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):172:175 -> b
-    75:78:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
-    79:82:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):157:160 -> b
-    79:82:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):176 -> b
-    79:82:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
-    83:83:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1084:1084 -> b
-    84:84:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1097:1097 -> b
+    72:75:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):172:175 -> b
+    72:75:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
+    76:79:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):157:160 -> b
+    76:79:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):176 -> b
+    76:79:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1086 -> b
+    80:80:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1084:1084 -> b
+    81:81:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1097:1097 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    85:85:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
-    85:85:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1098 -> b
-    86:87:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1098:1099 -> b
-    88:88:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> b
-    88:88:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1102 -> b
+    82:82:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
+    82:82:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1098 -> b
+    83:84:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1098:1099 -> b
+    85:85:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> b
+    85:85:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1102 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:89:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1102:1102 -> b
-    90:90:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> b
+    86:86:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1102:1102 -> b
+    87:87:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> b
+    87:87:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
+    88:88:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101:1101 -> b
+    89:89:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> b
+    89:89:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
+    90:90:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> b
     90:90:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
-    91:91:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101:1101 -> b
-    92:92:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> b
-    92:92:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
-    93:93:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> b
-    93:93:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:94:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):148:148 -> b
-    94:94:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
-    95:98:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):136:139 -> b
-    95:98:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):149 -> b
-    95:98:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
-    99:99:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101:1101 -> b
-    100:100:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1099:1099 -> b
-    101:102:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1321:1322 -> b
+    91:91:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):148:148 -> b
+    91:91:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
+    92:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):136:139 -> b
+    92:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):149 -> b
+    92:95:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101 -> b
+    96:96:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1101:1101 -> b
+    97:97:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1099:1099 -> b
+    98:99:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1321:1322 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;Z)V"}
-    103:103:void lambda$traceSafeCheckCast$14(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1327:1327 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/nn;)V"}
-    104:110:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1512:1518 -> b
+    100:100:void lambda$traceSafeCheckCast$14(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1327:1327 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
+    101:107:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1512:1518 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;)V"}
-    111:111:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):660:660 -> b
-    111:111:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1518 -> b
-    112:112:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):667:667 -> b
-    112:112:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):662 -> b
-    112:112:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1518 -> b
-    113:113:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1522:1522 -> b
-    114:114:void lambda$traceInvokeDirect$23(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1557:1557 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
-    115:121:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1576:1582 -> b
+    108:108:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):660:660 -> b
+    108:108:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1518 -> b
+    109:109:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):667:667 -> b
+    109:109:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):662 -> b
+    109:109:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1518 -> b
+    110:110:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry):1522:1522 -> b
+    111:111:void lambda$traceInvokeDirect$23(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1557:1557 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tn;)V"}
+    112:118:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1576:1582 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/shaking/x1;)V"}
-    122:122:void lambda$traceNewInstance$28(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerNewInstanceAnalysis):1729:1729 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/sn;)V"}
-    123:123:void com.android.tools.r8.features.IsolatedFeatureSplitsChecker.traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):195:195 -> b
-    123:123:void lambda$traceNewInstance$28(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerNewInstanceAnalysis):1729 -> b
-    124:124:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1929:1929 -> b
+    119:119:void lambda$traceNewInstance$28(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerNewInstanceAnalysis):1729:1729 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/un;)V"}
+    120:120:void com.android.tools.r8.features.IsolatedFeatureSplitsChecker.traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):195:195 -> b
+    120:120:void lambda$traceNewInstance$28(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerNewInstanceAnalysis):1729 -> b
+    121:121:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1929:1929 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;)V"}
-    125:125:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1148:1148 -> b
-    125:125:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1929 -> b
-    126:137:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1933:1944 -> b
-    138:138:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> b
-    138:138:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1944 -> b
-    139:162:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1946:1969 -> b
+    122:122:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1148:1148 -> b
+    122:122:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1929 -> b
+    123:134:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1933:1944 -> b
+    135:135:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> b
+    135:135:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1944 -> b
+    136:159:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1946:1969 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;Lcom/android/tools/r8/graph/y3$a;)V"}
-    163:165:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> b
-    163:165:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1969 -> b
-    166:167:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1972:1973 -> b
-    168:168:void lambda$traceInstanceFieldWrite$32(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1948:1948 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
+    160:162:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> b
+    160:162:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1969 -> b
+    163:164:void lambda$traceInstanceFieldWrite$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1972:1973 -> b
+    165:165:void lambda$traceInstanceFieldWrite$32(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1948:1948 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
+    166:166:java.lang.Boolean lambda$traceStaticFieldWrite$42(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2098:2098 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3;Lcom/android/tools/r8/internal/yr;)Ljava/lang/Boolean;"}
+    167:168:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):253:254 -> b
+    167:168:java.lang.Boolean lambda$traceStaticFieldWrite$42(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2098 -> b
     169:169:java.lang.Boolean lambda$traceStaticFieldWrite$42(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2098:2098 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y3;Lcom/android/tools/r8/internal/wr;)Ljava/lang/Boolean;"}
-    170:171:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):253:254 -> b
-    170:171:java.lang.Boolean lambda$traceStaticFieldWrite$42(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2098 -> b
-    172:172:java.lang.Boolean lambda$traceStaticFieldWrite$42(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):2098:2098 -> b
-    173:173:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$46(com.android.tools.r8.graph.DexType):2221:2221 -> b
+    170:170:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$46(com.android.tools.r8.graph.DexType):2221:2221 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/shaking/s4;"}
-    174:174:void com.android.tools.r8.shaking.ScopedDexMethodSet.<init>():28:28 -> b
-    174:174:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$46(com.android.tools.r8.graph.DexType):2221 -> b
-    175:175:void lambda$ensureMethodsContinueToWidenAccess$54(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):2399:2399 -> b
+    171:171:void com.android.tools.r8.shaking.ScopedDexMethodSet.<init>():28:28 -> b
+    171:171:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$46(com.android.tools.r8.graph.DexType):2221 -> b
+    172:172:void lambda$ensureMethodsContinueToWidenAccess$54(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):2399:2399 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/C5;)V"}
-    176:181:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2404:2409 -> b
+    173:178:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2404:2409 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;)V"}
-    182:182:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):841:841 -> b
-    182:182:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    183:183:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> b
-    183:183:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):843 -> b
-    183:183:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    184:187:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):842:845 -> b
-    184:187:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    188:188:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> b
-    188:188:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
+    179:179:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):841:841 -> b
+    179:179:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    180:180:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> b
+    180:180:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):843 -> b
+    180:180:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    181:184:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):842:845 -> b
+    181:184:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    185:185:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> b
+    185:185:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    185:185:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    186:186:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> b
+    186:186:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
+    186:186:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    187:187:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.asClassJoinerOrNull(com.android.tools.r8.shaking.KeepInfo$Joiner):512:512 -> b
+    187:187:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
+    187:187:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
+    188:188:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):846:846 -> b
     188:188:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    189:189:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.MinimumKeepInfoCollection.getOrDefault(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):104:104 -> b
-    189:189:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
-    189:189:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    190:190:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.asClassJoinerOrNull(com.android.tools.r8.shaking.KeepInfo$Joiner):593:593 -> b
-    190:190:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):845 -> b
-    190:190:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    191:191:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):846:846 -> b
-    191:191:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410 -> b
-    192:238:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410:2456 -> b
-    239:239:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> b
-    239:239:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2459 -> b
-    240:240:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2457:2457 -> b
-    241:241:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> b
-    241:241:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2412 -> b
-    242:242:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2476:2476 -> b
+    189:235:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2410:2456 -> b
+    236:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> b
+    236:236:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2459 -> b
+    237:237:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2457:2457 -> b
+    238:238:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> b
+    238:238:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2412 -> b
+    239:239:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2476:2476 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)V"}
-    243:243:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):47:47 -> b
-    243:243:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2477 -> b
-    244:244:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2482:2482 -> b
-    244:244:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2474 -> b
-    245:246:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2487:2488 -> b
-    245:246:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2482 -> b
-    245:246:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2474 -> b
-    247:249:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2572:2574 -> b
+    240:240:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):47:47 -> b
+    240:240:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2477 -> b
+    241:241:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2482:2482 -> b
+    241:241:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2474 -> b
+    242:243:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2487:2488 -> b
+    242:243:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2482 -> b
+    242:243:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2474 -> b
+    244:246:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2572:2574 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/K1;)Lcom/android/tools/r8/graph/U4;"}
-    250:250:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):258:258 -> b
-    250:250:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2574 -> b
+    247:247:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):258:258 -> b
+    247:247:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2574 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    251:253:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2867:2869 -> b
+    248:250:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2867:2869 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/z5;)V"}
-    254:254:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2868:2868 -> b
-    255:257:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3369:3371 -> b
+    251:251:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2868:2868 -> b
+    252:254:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3369:3371 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;)V"}
-    258:263:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3370:3375 -> b
-    264:264:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> b
-    264:264:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375 -> b
-    265:265:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> b
-    265:265:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> b
-    265:265:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375 -> b
-    266:269:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375:3378 -> b
-    270:273:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3314:3317 -> b
-    270:273:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
-    274:274:boolean com.android.tools.r8.graph.DexEncodedField.hasOriginalFieldWitness():379:379 -> b
-    274:274:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3317 -> b
+    255:260:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3370:3375 -> b
+    261:261:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725:5725 -> b
+    261:261:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375 -> b
+    262:262:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.DexEncodedField):5721:5721 -> b
+    262:262:boolean com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet.contains(com.android.tools.r8.graph.ProgramField):5725 -> b
+    262:262:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375 -> b
+    263:266:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3375:3378 -> b
+    267:270:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3314:3317 -> b
+    267:270:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
+    271:271:boolean com.android.tools.r8.graph.DexEncodedField.hasOriginalFieldWitness():379:379 -> b
+    271:271:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3317 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    274:274:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
-    275:275:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3318 -> b
-    275:275:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
-    276:276:com.android.tools.r8.graph.OriginalFieldWitness com.android.tools.r8.graph.DexEncodedField.getOriginalFieldWitness():375:375 -> b
-    276:276:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318 -> b
+    271:271:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
+    272:272:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3318 -> b
+    272:272:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
+    273:273:com.android.tools.r8.graph.OriginalFieldWitness com.android.tools.r8.graph.DexEncodedField.getOriginalFieldWitness():375:375 -> b
+    273:273:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    276:276:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
-    277:279:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3320 -> b
-    277:279:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
-    280:280:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> b
-    280:280:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
-    281:281:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> b
-    281:281:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> b
-    281:281:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
-    282:283:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> b
-    282:283:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
-    284:284:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3386:3386 -> b
-    285:285:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3380:3380 -> b
-    286:287:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> b
-    286:287:void lambda$traceInstanceFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1977 -> b
+    273:273:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
+    274:276:void addEffectivelyLiveOriginalField(com.android.tools.r8.graph.ProgramField):3318:3320 -> b
+    274:276:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3383 -> b
+    277:277:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3390:3390 -> b
+    277:277:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
+    278:278:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> b
+    278:278:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391 -> b
+    278:278:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
+    279:280:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3391:3392 -> b
+    279:280:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3384 -> b
+    281:281:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3386:3386 -> b
+    282:282:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3380:3380 -> b
+    283:284:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> b
+    283:284:void lambda$traceInstanceFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1977 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/s3;)V"}
-    288:288:void lambda$traceInstanceFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1978:1978 -> b
-    289:289:boolean lambda$markVirtualMethodAsReachable$90(com.android.tools.r8.graph.DexDefinition):3659:3659 -> b
+    285:285:void lambda$traceInstanceFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1978:1978 -> b
+    286:286:boolean lambda$markVirtualMethodAsReachable$90(com.android.tools.r8.graph.DexDefinition):3659:3659 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)Z"}
-    290:305:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3729:3744 -> b
+    287:302:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3729:3744 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/K1;Lcom/android/tools/r8/graph/U4$a;)V"}
-    306:306:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> b
-    306:306:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
-    307:307:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> b
-    307:307:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
-    308:308:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> b
-    308:308:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
-    309:311:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744:3746 -> b
-    312:312:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> b
-    312:312:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> b
-    312:312:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3750 -> b
-    313:313:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> b
-    313:313:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3750 -> b
-    314:314:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> b
-    314:314:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3751 -> b
-    315:315:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> b
-    315:315:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3752 -> b
-    316:316:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3753:3753 -> b
-    317:317:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4004:4004 -> b
-    317:317:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3748 -> b
-    318:322:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3760:3764 -> b
+    303:303:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> b
+    303:303:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
+    304:304:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> b
+    304:304:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
+    305:305:java.lang.Object com.android.tools.r8.com.google.common.collect.TransformedIterator.next():52:52 -> b
+    305:305:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744 -> b
+    306:308:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3744:3746 -> b
+    309:309:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> b
+    309:309:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> b
+    309:309:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3750 -> b
+    310:310:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> b
+    310:310:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3750 -> b
+    311:313:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3751:3753 -> b
+    314:314:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4004:4004 -> b
+    314:314:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3748 -> b
+    315:319:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3760:3764 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/w2;"}
-    323:328:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3763:3768 -> b
-    329:329:void lambda$markEnumValuesAsReachable$99(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3779:3779 -> b
+    320:325:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3763:3768 -> b
+    326:326:void lambda$markEnumValuesAsReachable$99(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3779:3779 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;)V"}
-    330:330:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$101(com.android.tools.r8.graph.DexEncodedMethod):3823:3823 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/yY;"}
-    331:333:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3846:3848 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/Y1;"}
-    334:334:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet com.android.tools.r8.graph.AppView.getMainDexRootSet():783:783 -> b
-    334:334:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3848 -> b
+    327:327:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$101(com.android.tools.r8.graph.DexEncodedMethod):3823:3823 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/internal/CY;"}
+    328:330:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3846:3848 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/Y1;"}
+    331:331:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet com.android.tools.r8.graph.AppView.getMainDexRootSet():783:783 -> b
+    331:331:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3848 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    335:341:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3848:3854 -> b
-    342:342:com.android.tools.r8.shaking.MainDexInfo$Builder com.android.tools.r8.shaking.MainDexInfo.builder():307:307 -> b
-    342:342:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3854 -> b
-    343:343:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855:3855 -> b
-    344:344:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> b
-    344:344:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855 -> b
+    332:338:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3848:3854 -> b
+    339:339:com.android.tools.r8.shaking.MainDexInfo$Builder com.android.tools.r8.shaking.MainDexInfo.builder():307:307 -> b
+    339:339:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3854 -> b
+    340:340:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855:3855 -> b
+    341:341:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> b
+    341:341:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    345:345:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> b
-    345:345:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855 -> b
-    346:347:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855:3856 -> b
-    348:348:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():239:239 -> b
-    348:348:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3856 -> b
-    349:349:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857:3857 -> b
-    350:350:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> b
-    350:350:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857 -> b
+    342:342:java.util.Set com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason.getItems():5699:5699 -> b
+    342:342:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855 -> b
+    343:344:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3855:3856 -> b
+    345:345:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():239:239 -> b
+    345:345:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3856 -> b
+    346:346:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857:3857 -> b
+    347:347:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> b
+    347:347:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    351:351:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> b
-    351:351:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857 -> b
-    352:354:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857:3859 -> b
-    355:355:boolean com.android.tools.r8.shaking.MainDexInfo.isTracedMethodRootsCleared():131:131 -> b
-    355:355:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859 -> b
+    348:348:java.util.Set com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet.getItems():5755:5755 -> b
+    348:348:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857 -> b
+    349:351:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3857:3859 -> b
+    352:352:boolean com.android.tools.r8.shaking.MainDexInfo.isTracedMethodRootsCleared():131:131 -> b
+    352:352:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    356:357:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859:3860 -> b
-    358:358:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():247:247 -> b
-    358:358:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3860 -> b
-    359:362:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859:3862 -> b
-    363:363:java.util.Set com.android.tools.r8.shaking.MainDexInfo$Builder.getRoots():391:391 -> b
-    363:363:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862 -> b
-    364:364:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862:3862 -> b
-    365:366:void com.android.tools.r8.shaking.MainDexListBuilder.run():68:69 -> b
-    365:366:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862 -> b
-    367:367:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3863:3863 -> b
-    368:368:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):409:409 -> b
-    368:368:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3864 -> b
-    369:369:void lambda$includeMinimumKeepInfo$113(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3988:3988 -> b
+    353:354:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859:3860 -> b
+    355:355:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():247:247 -> b
+    355:355:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3860 -> b
+    356:359:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3859:3862 -> b
+    360:360:java.util.Set com.android.tools.r8.shaking.MainDexInfo$Builder.getRoots():391:391 -> b
+    360:360:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862 -> b
+    361:361:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862:3862 -> b
+    362:363:void com.android.tools.r8.shaking.MainDexListBuilder.run():68:69 -> b
+    362:363:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3862 -> b
+    364:364:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3863:3863 -> b
+    365:365:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):409:409 -> b
+    365:365:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3864 -> b
+    366:366:void lambda$includeMinimumKeepInfo$113(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3988:3988 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    370:370:void lambda$applyMinimumKeepInfoWhenLive$115(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4012:4012 -> b
+    367:367:void lambda$applyMinimumKeepInfoWhenLive$115(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4012:4012 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;Lcom/android/tools/r8/shaking/e1;)V"}
-    371:371:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4025:4025 -> b
+    368:368:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4025:4025 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
-    372:372:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> b
-    372:372:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4026 -> b
+    369:369:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> b
+    369:369:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4026 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    373:373:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> b
-    373:373:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> b
+    370:370:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> b
+    370:370:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4026 -> b
+    371:371:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4027:4027 -> b
+    372:372:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1040:1040 -> b
+    372:372:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
+    373:373:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
+    373:373:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041 -> b
+    373:373:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
+    374:374:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041:1041 -> b
+    374:374:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
+    375:375:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> b
+    375:375:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    373:373:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4026 -> b
-    374:374:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4027:4027 -> b
-    375:375:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1040:1040 -> b
     375:375:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
-    376:376:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> b
-    376:376:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041 -> b
+    376:376:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042:1042 -> b
     376:376:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
-    377:377:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041:1041 -> b
-    377:377:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
-    378:378:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> b
-    378:378:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    378:378:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
-    379:379:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042:1042 -> b
-    379:379:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4028 -> b
-    380:380:void lambda$applyMinimumKeepInfoWhenLive$117(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4066:4066 -> b
+    377:377:void lambda$applyMinimumKeepInfoWhenLive$117(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4066:4066 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;Lcom/android/tools/r8/shaking/j1;)V"}
-    381:386:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):4099:4104 -> b
+    378:383:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):4099:4104 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
-    387:387:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$119(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4118:4118 -> b
+    384:384:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$119(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4118:4118 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;Lcom/android/tools/r8/shaking/u1;)V"}
-    388:390:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4443:4445 -> b
+    385:387:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4443:4445 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)V"}
-    391:391:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4445:4445 -> b
-    392:392:void lambda$createEnqueuerResult$130(com.android.tools.r8.graph.ClasspathOrLibraryClass):4528:4528 -> b
+    388:388:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4445:4445 -> b
+    389:389:void lambda$createEnqueuerResult$130(com.android.tools.r8.graph.ClasspathOrLibraryClass):4528:4528 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/f0;)V"}
-    393:393:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913:4913 -> b
+    390:390:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913:4913 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/h4;"}
-    394:394:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2208:2208 -> b
+    391:391:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2213:2213 -> b
+    391:391:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
+    392:392:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions getProfileCollectionAdditions():567:567 -> b
+    392:392:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):195 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    392:392:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2213 -> b
+    392:392:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
+    393:393:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):195:195 -> b
+    393:393:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2213 -> b
+    393:393:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
+    394:394:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):193:193 -> b
+    394:394:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2213 -> b
     394:394:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
-    395:395:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions getProfileCollectionAdditions():567:567 -> b
-    395:395:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):195 -> b
+    395:396:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4914:4915 -> b
+    397:397:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getMethodToKeep():34:34 -> b
+    397:397:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4943 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    395:395:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2208 -> b
-    395:395:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
-    396:396:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):195:195 -> b
-    396:396:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2208 -> b
-    396:396:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
-    397:397:void com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):193:193 -> b
-    397:397:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder com.android.tools.r8.shaking.RootSetUtils$RootSet.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2208 -> b
-    397:397:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4913 -> b
-    398:399:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4914:4915 -> b
-    400:400:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getMethodToKeep():34:34 -> b
-    400:400:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4943 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    400:400:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
-    401:401:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getSingleTarget():38:38 -> b
-    401:401:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4944 -> b
-    401:401:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
-    402:407:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4945:4950 -> b
-    402:407:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
-    408:408:java.util.function.Consumer com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getAction():42:42 -> b
-    408:408:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4952 -> b
-    408:408:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
-    409:409:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4952:4952 -> b
-    409:409:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
-    410:413:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.buildConsequentRootSet():487:490 -> b
-    410:413:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4920 -> b
-    414:418:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):5165:5169 -> b
+    397:397:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
+    398:398:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getSingleTarget():38:38 -> b
+    398:398:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4944 -> b
+    398:398:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
+    399:404:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4945:4950 -> b
+    399:404:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
+    405:405:java.util.function.Consumer com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction.getAction():42:42 -> b
+    405:405:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4952 -> b
+    405:405:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
+    406:406:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4952:4952 -> b
+    406:406:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4916 -> b
+    407:410:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.buildConsequentRootSet():487:490 -> b
+    407:410:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4920 -> b
+    411:415:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):5165:5169 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/K1;)V"}
-    419:419:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):5168:5168 -> b
+    416:416:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):5168:5168 -> b
+    417:417:void lambda$handleReflectiveBehavior$146(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5293:5293 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.utils.collections.DexMethodSignatureSet.create():33:33 -> c
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):5658 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Sl;"}
     2:3:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList(java.lang.Object):43:44 -> c
     2:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):5659 -> c
     4:11:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):5660:5667 -> c
@@ -273465,7 +273094,7 @@
     38:38:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):836:836 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/shaking/f1;"}
     39:39:void lambda$traceInvokeInterface$24(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1583:1583 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tn;)V"}
     40:44:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1603:1607 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/shaking/x1;)V"}
     45:45:boolean com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods.isFieldUpdater(com.android.tools.r8.graph.DexMethod):2236:2236 -> c
@@ -273496,7 +273125,7 @@
     135:135:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3325:3325 -> c
     135:135:void lambda$traceStaticFieldRead$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2062 -> c
     136:136:void lambda$traceStaticFieldRead$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):2027:2027 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
     137:145:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):2174:2182 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y5;)V"}
     146:146:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2213:2213 -> c
@@ -273533,7 +273162,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/K1;)V"}
     214:214:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832:2832 -> c
     214:214:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3780 -> c
-    215:215:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> c
+    215:215:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> c
     215:215:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2832 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     215:215:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3780 -> c
@@ -273541,25 +273170,21 @@
     216:216:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3780 -> c
     217:217:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4077:4077 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
-    218:218:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> c
+    218:218:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
     218:218:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4078 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    219:219:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> c
-    219:219:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    219:219:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
     219:219:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4078 -> c
     220:221:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4079:4080 -> c
     222:222:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4131:4131 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    223:223:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> c
+    223:223:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
     223:223:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4132 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    224:224:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> c
-    224:224:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    224:224:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
     224:224:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4132 -> c
     225:228:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4133:4136 -> c
-    229:229:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> c
+    229:229:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> c
     229:229:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4137 -> c
     230:231:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2469:2470 -> c
     230:231:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4137 -> c
@@ -273585,151 +273210,141 @@
     16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):5220:5220 -> d
     16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5111 -> d
     17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5114:5114 -> d
-    18:18:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> d
-    18:18:void lambda$traceStaticFieldRead$37(com.android.tools.r8.shaking.KeepClassInfo$Joiner):2049 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
-    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> d
-    19:19:void lambda$traceStaticFieldRead$37(com.android.tools.r8.shaking.KeepClassInfo$Joiner):2049 -> d
-    20:20:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowOptimization():686:686 -> d
-    20:20:void lambda$traceStaticFieldRead$37(com.android.tools.r8.shaking.KeepClassInfo$Joiner):2049 -> d
-    21:21:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> d
-    21:21:void lambda$traceStaticFieldRead$37(com.android.tools.r8.shaking.KeepClassInfo$Joiner):2049 -> d
-    22:22:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):702:702 -> d
+    18:18:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):702:702 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/y5;)V"}
-    23:28:boolean hasAlternativeLibraryDefinition(com.android.tools.r8.graph.DexProgramClass):792:797 -> d
+    19:24:boolean hasAlternativeLibraryDefinition(com.android.tools.r8.graph.DexProgramClass):792:797 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
-    29:29:void enqueueAllIfNotShrinking():1014:1014 -> d
-    30:30:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> d
-    30:30:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> d
-    30:30:void enqueueAllIfNotShrinking():1018 -> d
-    31:31:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> d
-    31:31:void enqueueAllIfNotShrinking():1018 -> d
-    32:32:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> d
-    32:32:void enqueueAllIfNotShrinking():1018 -> d
-    33:33:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> d
-    33:33:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24 -> d
-    33:33:void enqueueAllIfNotShrinking():1019 -> d
-    34:34:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24:24 -> d
-    34:34:void enqueueAllIfNotShrinking():1019 -> d
-    35:35:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowShrinking():691:691 -> d
-    35:35:void enqueueAllIfNotShrinking():1019 -> d
-    36:36:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> d
-    36:36:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> d
-    36:36:void enqueueAllIfNotShrinking():1020 -> d
-    37:37:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> d
-    37:37:void enqueueAllIfNotShrinking():1020 -> d
-    38:41:void enqueueAllIfNotShrinking():1020:1023 -> d
-    42:42:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    25:25:void enqueueAllIfNotShrinking():1014:1014 -> d
+    26:26:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> d
+    26:26:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49 -> d
+    26:26:void enqueueAllIfNotShrinking():1018 -> d
+    27:27:com.android.tools.r8.shaking.KeepClassInfo$Joiner com.android.tools.r8.shaking.KeepClassInfo.newEmptyJoiner():49:49 -> d
+    27:27:void enqueueAllIfNotShrinking():1018 -> d
+    28:28:void enqueueAllIfNotShrinking():1018:1018 -> d
+    29:29:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> d
+    29:29:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24 -> d
+    29:29:void enqueueAllIfNotShrinking():1019 -> d
+    30:30:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24:24 -> d
+    30:30:void enqueueAllIfNotShrinking():1019 -> d
+    31:31:void enqueueAllIfNotShrinking():1019:1019 -> d
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> d
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28 -> d
+    32:32:void enqueueAllIfNotShrinking():1020 -> d
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo.newEmptyJoiner():28:28 -> d
+    33:33:void enqueueAllIfNotShrinking():1020 -> d
+    34:37:void enqueueAllIfNotShrinking():1020:1023 -> d
+    38:38:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    38:38:void enqueueAllIfNotShrinking():1023 -> d
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    39:39:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    39:39:void enqueueAllIfNotShrinking():1023 -> d
+    40:40:void enqueueAllIfNotShrinking():1023:1023 -> d
+    41:41:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473:473 -> d
+    41:41:void enqueueAllIfNotShrinking():1023 -> d
+    42:42:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):469:469 -> d
+    42:42:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473 -> d
     42:42:void enqueueAllIfNotShrinking():1023 -> d
+    43:43:void enqueueAllIfNotShrinking():1023:1023 -> d
+    44:44:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    44:44:void enqueueAllIfNotShrinking():1024 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:43:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
-    43:43:void enqueueAllIfNotShrinking():1023 -> d
-    44:44:void enqueueAllIfNotShrinking():1023:1023 -> d
-    45:45:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473:473 -> d
-    45:45:void enqueueAllIfNotShrinking():1023 -> d
-    46:46:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):469:469 -> d
-    46:46:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473 -> d
-    46:46:void enqueueAllIfNotShrinking():1023 -> d
-    47:47:void enqueueAllIfNotShrinking():1023:1023 -> d
-    48:48:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    45:45:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    45:45:void enqueueAllIfNotShrinking():1024 -> d
+    46:46:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464:464 -> d
+    46:46:void enqueueAllIfNotShrinking():1024 -> d
+    47:47:void enqueueAllIfNotShrinking():1024:1024 -> d
+    48:48:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473:473 -> d
+    48:48:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464 -> d
     48:48:void enqueueAllIfNotShrinking():1024 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> d
+    49:49:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):469:469 -> d
+    49:49:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473 -> d
+    49:49:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464 -> d
     49:49:void enqueueAllIfNotShrinking():1024 -> d
     50:50:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464:464 -> d
     50:50:void enqueueAllIfNotShrinking():1024 -> d
-    51:51:void enqueueAllIfNotShrinking():1024:1024 -> d
-    52:52:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473:473 -> d
-    52:52:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464 -> d
-    52:52:void enqueueAllIfNotShrinking():1024 -> d
-    53:53:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):469:469 -> d
-    53:53:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473 -> d
-    53:53:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464 -> d
-    53:53:void enqueueAllIfNotShrinking():1024 -> d
-    54:54:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):464:464 -> d
-    54:54:void enqueueAllIfNotShrinking():1024 -> d
-    55:55:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547:547 -> d
-    55:55:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
-    55:55:void enqueueAllIfNotShrinking():1024 -> d
+    51:51:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547:547 -> d
+    51:51:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
+    51:51:void enqueueAllIfNotShrinking():1024 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    56:56:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547:547 -> d
-    56:56:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
-    56:56:void enqueueAllIfNotShrinking():1024 -> d
-    57:57:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):244:244 -> d
-    57:57:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547 -> d
+    52:52:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547:547 -> d
+    52:52:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
+    52:52:void enqueueAllIfNotShrinking():1024 -> d
+    53:53:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):244:244 -> d
+    53:53:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:57:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
-    57:57:void enqueueAllIfNotShrinking():1024 -> d
-    58:58:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):244:244 -> d
-    58:58:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547 -> d
-    58:58:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
-    58:58:void enqueueAllIfNotShrinking():1024 -> d
-    59:59:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1040:1040 -> d
-    59:59:void enqueueAllIfNotShrinking():1028 -> d
-    60:60:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> d
-    60:60:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041 -> d
-    60:60:void enqueueAllIfNotShrinking():1028 -> d
-    61:61:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():617:617 -> d
-    61:61:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042 -> d
+    53:53:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
+    53:53:void enqueueAllIfNotShrinking():1024 -> d
+    54:54:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):244:244 -> d
+    54:54:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):547 -> d
+    54:54:boolean com.android.tools.r8.synthesis.SyntheticItems.isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):465 -> d
+    54:54:void enqueueAllIfNotShrinking():1024 -> d
+    55:55:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1040:1040 -> d
+    55:55:void enqueueAllIfNotShrinking():1028 -> d
+    56:56:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> d
+    56:56:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1041 -> d
+    56:56:void enqueueAllIfNotShrinking():1028 -> d
+    57:57:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():536:536 -> d
+    57:57:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:61:void enqueueAllIfNotShrinking():1028 -> d
-    62:62:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042:1042 -> d
-    62:62:void enqueueAllIfNotShrinking():1028 -> d
-    63:63:void enqueueAllIfNotShrinking():1029:1029 -> d
-    64:64:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> d
-    64:64:void enqueueAllIfNotShrinking():1029 -> d
-    65:65:void enqueueAllIfNotShrinking():1031:1031 -> d
-    66:66:void lambda$traceInvokeStatic$25(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1629:1629 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
-    67:73:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1660:1666 -> d
+    57:57:void enqueueAllIfNotShrinking():1028 -> d
+    58:58:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):1042:1042 -> d
+    58:58:void enqueueAllIfNotShrinking():1028 -> d
+    59:59:void enqueueAllIfNotShrinking():1029:1029 -> d
+    60:60:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):252:252 -> d
+    60:60:void enqueueAllIfNotShrinking():1029 -> d
+    61:61:void enqueueAllIfNotShrinking():1031:1031 -> d
+    62:62:void lambda$traceInvokeStatic$25(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1629:1629 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tn;)V"}
+    63:69:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1660:1666 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/x;Lcom/android/tools/r8/shaking/x1;)V"}
-    74:74:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1974:1974 -> d
-    74:74:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1666 -> d
+    70:70:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1974:1974 -> d
+    70:70:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1666 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    75:75:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1974:1974 -> d
-    75:75:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1666 -> d
-    76:78:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1668:1670 -> d
-    79:89:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1665:1675 -> d
-    90:90:void lambda$traceNewInstance$27(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1717:1717 -> d
+    71:71:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1974:1974 -> d
+    71:71:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1666 -> d
+    72:74:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1668:1670 -> d
+    75:85:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.KeepReason):1665:1675 -> d
+    86:86:void lambda$traceNewInstance$27(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1717:1717 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)V"}
-    91:91:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2087:2087 -> d
+    87:87:void lambda$traceStaticFieldRead$37(com.android.tools.r8.shaking.KeepClassInfo$Joiner):2049:2049 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/e1;)V"}
+    88:88:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2087:2087 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;)V"}
-    92:92:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1148:1148 -> d
-    92:92:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2087 -> d
-    93:102:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2091:2100 -> d
-    103:109:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2096:2102 -> d
-    110:110:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):667:667 -> d
-    110:110:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2102 -> d
-    111:117:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2107:2113 -> d
-    118:118:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> d
-    118:118:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2113 -> d
-    119:144:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2115:2140 -> d
+    89:89:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1148:1148 -> d
+    89:89:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2087 -> d
+    90:99:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2091:2100 -> d
+    100:106:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2096:2102 -> d
+    107:107:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):667:667 -> d
+    107:107:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2102 -> d
+    108:114:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2107:2113 -> d
+    115:115:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):128:128 -> d
+    115:115:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):2113 -> d
+    116:141:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2115:2140 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/J;Lcom/android/tools/r8/graph/y3$a;)V"}
-    145:147:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> d
-    145:147:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2140 -> d
-    148:148:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):63:63 -> d
-    148:148:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3325 -> d
-    148:148:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2143 -> d
-    149:149:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3325:3325 -> d
-    149:149:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2143 -> d
-    150:150:void lambda$traceStaticFieldWrite$43(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):2117:2117 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/pn;)V"}
-    151:155:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2217:2221 -> d
+    142:144:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2206:2208 -> d
+    142:144:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2140 -> d
+    145:145:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):63:63 -> d
+    145:145:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3325 -> d
+    145:145:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2143 -> d
+    146:146:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3325:3325 -> d
+    146:146:void lambda$traceStaticFieldWrite$44(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2143 -> d
+    147:147:void lambda$traceStaticFieldWrite$43(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):2117:2117 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3$a;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
+    148:152:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2217:2221 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/K1;)V"}
-    156:158:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2220:2222 -> d
-    159:159:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2218:2218 -> d
-    160:160:java.util.Map lambda$processAnnotation$57(com.android.tools.r8.graph.DexType):2503:2503 -> d
+    153:155:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2220:2222 -> d
+    156:156:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2218:2218 -> d
+    157:157:java.util.Map lambda$processAnnotation$57(com.android.tools.r8.graph.DexType):2503:2503 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Map;"}
-    161:162:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> d
-    161:162:void lambda$traceStaticFieldWrite$45(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2147 -> d
+    158:159:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):3398:3399 -> d
+    158:159:void lambda$traceStaticFieldWrite$45(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2147 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/s3;)V"}
-    163:163:void lambda$traceStaticFieldWrite$45(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2148:2148 -> d
-    164:164:void lambda$traceApplication$106(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3919:3919 -> d
+    160:160:void lambda$traceStaticFieldWrite$45(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2148:2148 -> d
+    161:161:void lambda$traceApplication$106(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3919:3919 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/e1;)V"}
-    165:165:void lambda$applyMinimumKeepInfoDependentOn$121(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4168:4168 -> d
+    162:162:void lambda$applyMinimumKeepInfoDependentOn$121(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4168:4168 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/shaking/j1;)V"}
-    166:166:void lambda$applyMinimumKeepInfoDependentOn$122(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4170:4170 -> d
+    163:163:void lambda$applyMinimumKeepInfoDependentOn$122(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4170:4170 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():563:563 -> e
     1:1:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):692 -> e
@@ -273749,7 +273364,7 @@
     10:10:com.android.tools.r8.shaking.Enqueuer$Mode getMode():571:571 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/M$a;"}
     11:11:void lambda$traceInvokeVirtual$26(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1676:1676 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/rn;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/tn;)V"}
     12:16:com.android.tools.r8.graph.DexClass resolveBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):2540:2544 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/graph/E0;"}
     17:17:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():143:143 -> e
@@ -273792,7 +273407,7 @@
     48:48:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> e
     48:48:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4041 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> e
+    49:49:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> e
     49:49:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     49:49:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):4041 -> e
@@ -273805,7 +273420,7 @@
     59:59:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> e
     59:59:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4151 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    60:60:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> e
+    60:60:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> e
     60:60:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     60:60:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4151 -> e
@@ -273843,7 +273458,7 @@
     18:18:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> f
     18:18:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4091 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> f
+    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> f
     19:19:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4091 -> f
@@ -273944,7 +273559,7 @@
     26:26:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):5130:5130 -> h
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.create():32:32 -> i
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$85(com.android.tools.r8.graph.DexProgramClass):3377 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/rY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/vY;"}
     2:3:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1715:1716 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/C5;)V"}
     4:4:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):660:660 -> i
@@ -274171,10 +273786,10 @@
     31:31:void com.android.tools.r8.graph.FieldAccessInfoImpl.setReadFromAnnotation():260:260 -> a
     31:31:boolean addField(com.android.tools.r8.graph.DexField):5796 -> a
     32:39:boolean addField(com.android.tools.r8.graph.DexField):5797:5804 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     40:40:boolean addField(com.android.tools.r8.graph.DexField):5804 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     41:41:boolean addField(com.android.tools.r8.graph.DexField):5804 -> a
     42:44:boolean addField(com.android.tools.r8.graph.DexField):5804:5806 -> a
     45:45:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> a
@@ -274182,8 +273797,7 @@
     45:45:boolean addField(com.android.tools.r8.graph.DexField):5807 -> a
     46:46:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepFieldInfo.newEmptyJoiner():24:24 -> a
     46:46:boolean addField(com.android.tools.r8.graph.DexField):5807 -> a
-    47:47:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowMinification():681:681 -> a
-    47:47:boolean addField(com.android.tools.r8.graph.DexField):5807 -> a
+    47:47:boolean addField(com.android.tools.r8.graph.DexField):5807:5807 -> a
     48:48:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4060:4060 -> a
     48:48:boolean addField(com.android.tools.r8.graph.DexField):5806 -> a
     49:49:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4060:4060 -> a
@@ -274224,7 +273838,7 @@
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):5877:5877 -> a
     7:7:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):5878:5878 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/z5;)V"}
-com.android.tools.r8.shaking.Enqueuer$FieldAccessKind -> R8$$REMOVED$$CLASS$$230:
+com.android.tools.r8.shaking.Enqueuer$FieldAccessKind -> R8$$REMOVED$$CLASS$$219:
 # {"id":"sourceFile","fileName":"Enqueuer.java"}
 com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata -> com.android.tools.r8.shaking.J:
 # {"id":"sourceFile","fileName":"Enqueuer.java"}
@@ -274321,7 +273935,7 @@
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.P:
 # {"id":"sourceFile","fileName":"Enqueuer.java"}
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/He;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Je;"}
     java.util.Map methodProcessingContexts -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.List desugaredMethods -> c
@@ -274329,7 +273943,7 @@
     java.util.Map liveMethods -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap minimumSyntheticKeepInfo -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     java.util.Map syntheticClasspathClasses -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentHashMap;"}
     java.util.Map injectedInterfaces -> g
@@ -274339,7 +273953,7 @@
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():4175:4175 -> <clinit>
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):4200:4200 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/He;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Je;)V"}
     2:25:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):4178:4201 -> <init>
     1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection com.android.tools.r8.shaking.Enqueuer.getKeepInfo():832:832 -> a
     1:1:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4277 -> a
@@ -274349,7 +273963,7 @@
     3:3:void com.android.tools.r8.shaking.Enqueuer.applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4110:4110 -> a
     3:3:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4278 -> a
     4:4:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):4206:4206 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/Ge;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/Ie;"}
     5:10:boolean isEmpty():4210:4215 -> a
     11:12:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):4220:4221 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I0;)V"}
@@ -274377,7 +273991,7 @@
     41:41:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):4264 -> a
     42:53:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):4264:4275 -> a
     54:54:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):4262:4262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/IV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/MV;)V"}
     55:55:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):4271:4271 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/D2;Ljava/util/Set;)V"}
     56:56:com.android.tools.r8.graph.AppInfoWithClassHierarchy com.android.tools.r8.shaking.Enqueuer.appInfo():563:563 -> a
@@ -274388,7 +274002,7 @@
     1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):4235:4235 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     1:2:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):4205:4206 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ge;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Ie;"}
     3:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):4205:4205 -> c
 com.android.tools.r8.shaking.EnqueuerDeferredTracing -> com.android.tools.r8.shaking.Q:
 # {"id":"sourceFile","fileName":"EnqueuerDeferredTracing.java"}
@@ -274409,13 +274023,13 @@
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M$a;"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter rewriter -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/T;"}
     com.android.tools.r8.utils.collections.ProgramFieldMap deferredEnqueuerActions -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uY;"}
     com.android.tools.r8.utils.collections.ProgramFieldSet ineligibleForPruning -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):70:70 -> <init>
@@ -274424,344 +274038,330 @@
     3:3:com.android.tools.r8.utils.collections.ProgramFieldSet com.android.tools.r8.utils.collections.ProgramFieldSet.create():32:32 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):67 -> <init>
     4:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):67:75 -> <init>
-    1:21:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):85:105 -> a
+    1:29:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):85:113 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/graph/y3;Lcom/android/tools/r8/graph/C5;ILcom/android/tools/r8/shaking/J;)Z"}
-    22:22:com.android.tools.r8.utils.ReachabilitySensitiveValue com.android.tools.r8.graph.DexProgramClass.getReachabilitySensitiveValue():217:217 -> a
-    22:22:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213 -> a
-    22:22:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):105 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    23:23:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213:213 -> a
-    23:23:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):105 -> a
-    24:24:boolean com.android.tools.r8.utils.ReachabilitySensitiveValue.isEnabled():16:16 -> a
-    24:24:boolean com.android.tools.r8.graph.DexProgramClass.isReachabilitySensitive():213 -> a
-    24:24:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):105 -> a
-    25:32:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):106:113 -> a
-    33:33:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
-    33:33:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113 -> a
+    30:30:com.android.tools.r8.shaking.AssumeInfoCollection com.android.tools.r8.graph.AppView.getAssumeInfoCollection():479:479 -> a
+    30:30:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113:113 -> a
-    35:35:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):46:46 -> a
-    35:35:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113 -> a
-    36:36:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.getAssumeValue():52:52 -> a
-    36:36:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):114 -> a
+    31:31:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113:113 -> a
+    32:32:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):46:46 -> a
+    32:32:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):113 -> a
+    33:33:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.getAssumeValue():52:52 -> a
+    33:33:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):114 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    37:46:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):114:123 -> a
-    47:47:com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata.toDeferred():1842:1842 -> a
-    47:47:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
+    34:43:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):114:123 -> a
+    44:44:com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata.toDeferred():1842:1842 -> a
+    44:44:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:58:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1787:1797 -> a
-    48:58:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
-    59:59:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1795:1795 -> a
+    45:55:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1787:1797 -> a
+    45:55:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
+    56:56:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1795:1795 -> a
+    56:56:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
+    57:57:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1793:1793 -> a
+    57:57:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
+    58:58:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1791:1791 -> a
+    58:58:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
+    59:59:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1789:1789 -> a
     59:59:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
-    60:60:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1793:1793 -> a
-    60:60:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
-    61:61:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1791:1791 -> a
-    61:61:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
-    62:62:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1789:1789 -> a
-    62:62:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):129 -> a
-    63:64:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):130:131 -> a
-    65:65:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
-    65:65:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131 -> a
+    60:61:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):130:131 -> a
+    62:62:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
+    62:62:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
-    66:66:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131 -> a
-    67:74:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131:138 -> a
-    75:75:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
-    75:75:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):138 -> a
+    63:63:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.computeIfAbsent(com.android.tools.r8.graph.DexClassAndMember,java.util.function.Function):50:50 -> a
+    63:63:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131 -> a
+    64:71:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):131:138 -> a
+    72:72:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
+    72:72:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    76:81:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):138:143 -> a
-    82:82:com.android.tools.r8.shaking.GraphReporter com.android.tools.r8.shaking.Enqueuer.getGraphReporter():575:575 -> a
-    82:82:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
+    73:78:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):138:143 -> a
+    79:79:com.android.tools.r8.shaking.GraphReporter com.android.tools.r8.shaking.Enqueuer.getGraphReporter():575:575 -> a
+    79:79:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    83:83:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144:144 -> a
-    84:84:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
-    84:84:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
-    85:87:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):238:240 -> a
-    85:87:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
-    88:88:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145:145 -> a
+    80:80:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144:144 -> a
+    81:81:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):237:237 -> a
+    81:81:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
+    82:84:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):238:240 -> a
+    82:84:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):144 -> a
+    85:85:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145:145 -> a
+    86:86:com.android.tools.r8.shaking.EnqueuerWorklist com.android.tools.r8.shaking.Enqueuer.getWorklist():868:868 -> a
+    86:86:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    87:88:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145:146 -> a
     89:89:com.android.tools.r8.shaking.EnqueuerWorklist com.android.tools.r8.shaking.Enqueuer.getWorklist():868:868 -> a
-    89:89:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145 -> a
+    89:89:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:91:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):145:146 -> a
-    92:92:com.android.tools.r8.shaking.EnqueuerWorklist com.android.tools.r8.shaking.Enqueuer.getWorklist():868:868 -> a
-    92:92:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):146 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:93:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):146:146 -> a
-    94:94:void notifyReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):154:154 -> a
+    90:90:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):146:146 -> a
+    91:91:void notifyReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):154:154 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
-    95:95:boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist):233:233 -> a
+    92:92:boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist):233:233 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/G0;)Z"}
-    96:99:boolean lambda$enqueueWorklistActions$1(com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.ProgramField,java.util.Set):235:238 -> a
+    93:96:boolean lambda$enqueueWorklistActions$1(com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.ProgramField,java.util.Set):235:238 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/G0;Lcom/android/tools/r8/graph/A5;Ljava/util/Set;)Z"}
-    100:100:void rewriteApplication(java.util.concurrent.ExecutorService):245:245 -> a
-    101:101:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl com.android.tools.r8.shaking.Enqueuer.getFieldAccessInfoCollection():828:828 -> a
-    101:101:void rewriteApplication(java.util.concurrent.ExecutorService):246 -> a
+    97:97:void rewriteApplication(java.util.concurrent.ExecutorService):245:245 -> a
+    98:98:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl com.android.tools.r8.shaking.Enqueuer.getFieldAccessInfoCollection():828:828 -> a
+    98:98:void rewriteApplication(java.util.concurrent.ExecutorService):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:111:void rewriteApplication(java.util.concurrent.ExecutorService):247:256 -> a
-    112:112:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
-    112:112:void rewriteApplication(java.util.concurrent.ExecutorService):256 -> a
+    99:108:void rewriteApplication(java.util.concurrent.ExecutorService):247:256 -> a
+    109:109:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
+    109:109:void rewriteApplication(java.util.concurrent.ExecutorService):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:113:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
-    113:113:void rewriteApplication(java.util.concurrent.ExecutorService):256 -> a
-    114:119:void rewriteApplication(java.util.concurrent.ExecutorService):259:264 -> a
-    120:131:void rewriteApplication(java.util.concurrent.ExecutorService):261:272 -> a
-    132:132:com.android.tools.r8.shaking.EnqueuerWorklist com.android.tools.r8.shaking.Enqueuer.getWorklist():868:868 -> a
-    132:132:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
+    110:110:void com.android.tools.r8.utils.collections.DexClassAndMemberMap.clear():42:42 -> a
+    110:110:void rewriteApplication(java.util.concurrent.ExecutorService):256 -> a
+    111:116:void rewriteApplication(java.util.concurrent.ExecutorService):259:264 -> a
+    117:128:void rewriteApplication(java.util.concurrent.ExecutorService):261:272 -> a
+    129:129:com.android.tools.r8.shaking.EnqueuerWorklist com.android.tools.r8.shaking.Enqueuer.getWorklist():868:868 -> a
+    129:129:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    133:133:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
+    130:130:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    130:130:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    134:134:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
-    134:134:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
-    135:138:void rewriteApplication(java.util.concurrent.ExecutorService):272:275 -> a
-    139:139:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j3;Ljava/util/Map;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/A5;Ljava/util/Set;)V"}
-    140:140:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    140:140:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251 -> a
+    131:131:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():544:544 -> a
+    131:131:void rewriteApplication(java.util.concurrent.ExecutorService):272 -> a
+    132:135:void rewriteApplication(java.util.concurrent.ExecutorService):272:275 -> a
+    136:136:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251:251 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j3;Ljava/util/Map;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/A5;Ljava/util/Set;)V"}
+    137:137:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    137:137:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    141:141:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
-    141:141:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251 -> a
-    142:143:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):252:253 -> a
-    144:144:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachReadContext(java.util.function.Consumer):206:206 -> a
-    144:144:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):200 -> a
-    144:144:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
+    138:138:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):54:54 -> a
+    138:138:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):251 -> a
+    139:140:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):252:253 -> a
+    141:141:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachReadContext(java.util.function.Consumer):206:206 -> a
+    141:141:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):200 -> a
+    141:141:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    145:145:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachReadContext(java.util.function.Consumer):206:206 -> a
-    145:145:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):200 -> a
-    145:145:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
-    146:146:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachWriteContext(java.util.function.Consumer):211:211 -> a
-    146:146:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):201 -> a
-    146:146:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
-    147:147:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):254:254 -> a
-    148:150:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachIndirectAccess(java.util.function.Consumer):138:140 -> a
-    148:150:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):254 -> a
-    151:151:void lambda$rewriteApplication$2(java.util.Map,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexField):254:254 -> a
+    142:142:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachReadContext(java.util.function.Consumer):206:206 -> a
+    142:142:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):200 -> a
+    142:142:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
+    143:143:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachWriteContext(java.util.function.Consumer):211:211 -> a
+    143:143:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachAccessContext(java.util.function.Consumer):201 -> a
+    143:143:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):253 -> a
+    144:144:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):254:254 -> a
+    145:147:void com.android.tools.r8.graph.FieldAccessInfoImpl.forEachIndirectAccess(java.util.function.Consumer):138:140 -> a
+    145:147:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):254 -> a
+    148:148:void lambda$rewriteApplication$2(java.util.Map,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexField):254:254 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/A5;Lcom/android/tools/r8/graph/l1;)V"}
-    152:152:void lambda$rewriteApplication$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):271:271 -> a
+    149:149:void lambda$rewriteApplication$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):271:271 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)V"}
-    153:153:void lambda$rewriteApplication$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):271:271 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/yY;)V"}
-    154:154:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275:275 -> a
+    150:150:void lambda$rewriteApplication$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):271:271 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/CY;)V"}
+    151:151:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275:275 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j3;Lcom/android/tools/r8/graph/A5;)V"}
-    155:155:void com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.remove(com.android.tools.r8.graph.DexField):71:71 -> a
-    155:155:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275 -> a
+    152:152:void com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.remove(com.android.tools.r8.graph.DexField):71:71 -> a
+    152:152:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    156:156:void com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.remove(com.android.tools.r8.graph.DexField):71:71 -> a
-    156:156:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275 -> a
-    157:158:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):284:285 -> a
-    157:158:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    153:153:void com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.remove(com.android.tools.r8.graph.DexField):71:71 -> a
+    153:153:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):275 -> a
+    154:155:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):284:285 -> a
+    154:155:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/graph/C5;I)V"}
-    159:163:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions com.android.tools.r8.ir.conversion.MethodConversionOptions.forPreLirPhase(com.android.tools.r8.graph.AppView):14:18 -> a
-    159:163:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):285 -> a
-    159:163:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    164:171:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):286:293 -> a
-    164:171:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    172:176:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):66:70 -> a
-    172:176:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    172:176:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    177:177:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    177:177:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):72 -> a
+    156:160:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions com.android.tools.r8.ir.conversion.MethodConversionOptions.forPreLirPhase(com.android.tools.r8.graph.AppView):14:18 -> a
+    156:160:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):285 -> a
+    156:160:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    161:168:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):286:293 -> a
+    161:168:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    169:173:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):66:70 -> a
+    169:173:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    169:173:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    174:174:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    174:174:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):72 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    177:177:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    177:177:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    178:178:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
-    178:178:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):72 -> a
-    178:178:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    178:178:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    179:179:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
-    179:179:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):73 -> a
-    179:179:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    179:179:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    180:213:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):74:107 -> a
-    180:213:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    180:213:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    214:219:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):180:185 -> a
-    214:219:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):104 -> a
-    214:219:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    214:219:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    220:220:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):96:96 -> a
-    220:220:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    220:220:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    221:221:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):161:161 -> a
+    174:174:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    174:174:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    175:175:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():37:37 -> a
+    175:175:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):72 -> a
+    175:175:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    175:175:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    176:176:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():42:42 -> a
+    176:176:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):73 -> a
+    176:176:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    176:176:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    177:210:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):74:107 -> a
+    177:210:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    177:210:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    211:216:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):180:185 -> a
+    211:216:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):104 -> a
+    211:216:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    211:216:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    217:217:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):96:96 -> a
+    217:217:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    217:217:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    218:218:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):161:161 -> a
+    218:218:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    218:218:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    218:218:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    219:220:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):196:197 -> a
+    219:220:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
+    219:220:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    219:220:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    219:220:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    221:221:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    221:221:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
     221:221:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
     221:221:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     221:221:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    222:223:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):196:197 -> a
-    222:223:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
-    222:223:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
-    222:223:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    222:223:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    224:224:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    224:224:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
-    224:224:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
-    224:224:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    224:224:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    225:225:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    225:225:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    222:222:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
+    222:222:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
+    222:222:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    222:222:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    222:222:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    223:224:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199:200 -> a
+    223:224:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
+    223:224:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    223:224:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    223:224:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstructionListIterator.insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
+    225:225:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):200 -> a
     225:225:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
     225:225:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
     225:225:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     225:225:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    226:227:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199:200 -> a
+    226:227:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:202 -> a
     226:227:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
     226:227:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
     226:227:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     226:227:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    228:228:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstructionListIterator.insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
-    228:228:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):200 -> a
-    228:228:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
-    228:228:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
-    228:228:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    228:228:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    229:230:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:202 -> a
-    229:230:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
-    229:230:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
-    229:230:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    229:230:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    231:234:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:204 -> a
-    231:234:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
-    231:234:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
-    231:234:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    231:234:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    235:235:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):168:168 -> a
-    235:235:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    228:231:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:204 -> a
+    228:231:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):166 -> a
+    228:231:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    228:231:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    228:231:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    232:232:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,java.util.Set,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):168:168 -> a
+    232:232:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):93 -> a
+    232:232:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    232:232:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    233:233:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89:89 -> a
+    233:233:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    233:233:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    234:234:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):144:144 -> a
+    234:234:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
+    234:234:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    234:234:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    235:235:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210:210 -> a
+    235:235:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
+    235:235:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
     235:235:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     235:235:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    236:236:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89:89 -> a
+    236:236:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():504:504 -> a
+    236:236:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    236:236:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
+    236:236:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
     236:236:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     236:236:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    237:237:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):144:144 -> a
-    237:237:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
-    237:237:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    237:237:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    238:238:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210:210 -> a
-    238:238:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
-    238:238:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
-    238:238:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    238:238:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    239:239:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():504:504 -> a
-    239:239:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210 -> a
+    237:238:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:212 -> a
+    237:238:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
+    237:238:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
+    237:238:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    237:238:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    239:242:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:214 -> a
+    239:242:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
+    239:242:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
+    239:242:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    239:242:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    243:243:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):83:83 -> a
+    243:243:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    243:243:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    244:244:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):129:129 -> a
+    244:244:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    244:244:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    244:244:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    245:246:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):196:197 -> a
+    245:246:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
+    245:246:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    245:246:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    245:246:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    247:247:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    239:239:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
-    239:239:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
-    239:239:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    239:239:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    240:241:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:212 -> a
-    240:241:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
-    240:241:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
-    240:241:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    240:241:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    242:245:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:214 -> a
-    242:245:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):149 -> a
-    242:245:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):89 -> a
-    242:245:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    242:245:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    246:246:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):83:83 -> a
-    246:246:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    246:246:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    247:247:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):129:129 -> a
+    247:247:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
     247:247:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
     247:247:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     247:247:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    248:249:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):196:197 -> a
-    248:249:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
-    248:249:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    248:249:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    248:249:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    250:250:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    250:250:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    250:250:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
-    250:250:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    250:250:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    250:250:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    251:251:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
+    248:248:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    248:248:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199 -> a
+    248:248:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
+    248:248:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    248:248:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    248:248:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    249:250:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199:200 -> a
+    249:250:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
+    249:250:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    249:250:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    249:250:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    251:251:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstructionListIterator.insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
+    251:251:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):200 -> a
     251:251:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
     251:251:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
     251:251:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     251:251:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    252:253:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):199:200 -> a
+    252:253:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:202 -> a
     252:253:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
     252:253:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
     252:253:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
     252:253:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    254:254:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InstructionListIterator.insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):151:151 -> a
-    254:254:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):200 -> a
-    254:254:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
-    254:254:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    254:254:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    254:254:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    255:256:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:202 -> a
-    255:256:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
-    255:256:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    255:256:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    255:256:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    257:260:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:204 -> a
-    257:260:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
-    257:260:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    257:260:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    257:260:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    261:261:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210:210 -> a
-    261:261:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
-    261:261:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    261:261:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    261:261:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    262:262:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():504:504 -> a
-    262:262:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210 -> a
+    254:257:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.insertDefaultValueForFieldGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldGet,java.util.Set,com.android.tools.r8.graph.ProgramField):201:204 -> a
+    254:257:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):134 -> a
+    254:257:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    254:257:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    254:257:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    258:258:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210:210 -> a
+    258:258:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
+    258:258:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    258:258:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    258:258:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    259:259:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():504:504 -> a
+    259:259:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):210 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    262:262:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
-    262:262:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    262:262:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    262:262:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    263:264:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:212 -> a
-    263:264:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
-    263:264:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    263:264:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    263:264:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    265:268:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:214 -> a
-    265:268:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
-    265:268:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
-    265:268:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    265:268:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    269:269:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):117:117 -> a
-    269:269:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    269:269:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    270:270:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
-    270:270:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):117 -> a
-    270:270:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
-    270:270:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    271:271:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):119:119 -> a
-    271:271:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    259:259:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
+    259:259:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    259:259:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    259:259:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    260:261:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:212 -> a
+    260:261:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
+    260:261:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    260:261:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    260:261:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    262:265:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):211:214 -> a
+    262:265:boolean com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):136 -> a
+    262:265:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):80 -> a
+    262:265:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    262:265:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    266:266:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):117:117 -> a
+    266:266:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    266:266:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    267:267:void com.android.tools.r8.ir.optimize.AffectedValues.narrowingWithAssumeRemoval(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:41 -> a
+    267:267:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):117 -> a
+    267:267:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    267:267:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    268:268:void com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):119:119 -> a
+    268:268:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):293 -> a
+    268:268:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    269:270:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):296:297 -> a
+    269:270:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    271:271:com.android.tools.r8.ir.optimize.DeadCodeRemover com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.getDeadCodeRemover():57:57 -> a
+    271:271:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):297 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     271:271:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    272:273:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):296:297 -> a
-    272:273:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    274:274:com.android.tools.r8.ir.optimize.DeadCodeRemover com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.getDeadCodeRemover():57:57 -> a
-    274:274:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):297 -> a
+    272:276:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):297:301 -> a
+    272:276:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    277:277:com.android.tools.r8.ir.optimize.DeadCodeRemover com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.getDeadCodeRemover():57:57 -> a
+    277:277:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):302 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    274:274:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    275:279:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):297:301 -> a
-    275:279:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    280:280:com.android.tools.r8.ir.optimize.DeadCodeRemover com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter.getDeadCodeRemover():57:57 -> a
-    280:280:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):302 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    280:280:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    281:283:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):302:304 -> a
-    281:283:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
-    284:284:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():629:629 -> a
-    284:284:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):173 -> a
+    277:277:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    278:280:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):302:304 -> a
+    278:280:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod,int):263 -> a
+    281:281:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():548:548 -> a
+    281:281:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;)Z"}
-    285:285:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isOptimizationAllowed():407:407 -> a
-    285:285:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():629 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    285:285:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):173 -> a
-    286:286:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> a
-    286:286:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    286:286:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):174 -> a
+    282:282:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():548:548 -> a
+    282:282:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):173 -> a
+    283:283:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> a
+    283:283:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):174 -> a
     1:1:boolean enqueueDeferredEnqueuerActions(com.android.tools.r8.graph.ProgramField):223:223 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
     2:2:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.remove(com.android.tools.r8.graph.DexClassAndMember):157:157 -> b
@@ -274885,7 +274485,7 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView):46:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:3:void removeOrReplaceStaticFieldInstructionByInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.graph.ProgramField):224:226 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/J5;Lcom/android/tools/r8/graph/C5;Ljava/util/Map;Lcom/android/tools/r8/graph/A5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/L5;Lcom/android/tools/r8/graph/C5;Ljava/util/Map;Lcom/android/tools/r8/graph/A5;)V"}
     4:4:com.android.tools.r8.ir.code.InitClass$Builder com.android.tools.r8.ir.code.InitClass.builder():41:41 -> a
     4:4:void removeOrReplaceStaticFieldInstructionByInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.graph.ProgramField):226 -> a
     5:5:void removeOrReplaceStaticFieldInstructionByInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.graph.ProgramField):227:227 -> a
@@ -274911,7 +274511,7 @@
     1:1:com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/U;"}
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Z;"}
     2:2:com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier):20:20 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;)Lcom/android/tools/r8/graph/b1;"}
     boolean isClassEvent() -> b
@@ -274938,7 +274538,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent.getType():92:92 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Z;"}
     2:2:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):181:181 -> a
     3:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     3:4:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):181 -> a
@@ -274964,7 +274564,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent.getType():92:92 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Z;"}
     2:2:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):129:129 -> a
     3:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     3:4:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):129 -> a
@@ -274987,7 +274587,7 @@
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Z;"}
 com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.shaking.Y:
 # {"id":"sourceFile","fileName":"EnqueuerEvent.java"}
     com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent INSTANCE -> a
@@ -274995,11 +274595,11 @@
     1:1:void <clinit>():212:212 -> <clinit>
     1:1:void <init>():214:214 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Z;"}
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.a0:
 # {"id":"sourceFile","fileName":"EnqueuerFactory.java"}
     1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):24:24 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/T5;)Lcom/android/tools/r8/shaking/M;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/T5;)Lcom/android/tools/r8/shaking/M;"}
     2:11:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set):40:49 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/graph/T5;Lcom/android/tools/r8/experimental/graphinfo/GraphConsumer;Ljava/util/Set;)Lcom/android/tools/r8/shaking/M;"}
     12:13:void com.android.tools.r8.graph.AppView.withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):592:593 -> a
@@ -275009,7 +274609,7 @@
     16:16:java.util.Set com.android.tools.r8.ir.analysis.proto.ProtoShrinker.getDeadProtoTypes():78:78 -> a
     16:16:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):50 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/c10;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/internal/g10;)V"}
     17:17:void com.android.tools.r8.shaking.Enqueuer.setInitialDeadProtoTypes(java.util.Set):650:650 -> a
     17:17:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):50 -> a
     18:18:void com.android.tools.r8.shaking.Enqueuer.setInitialDeadProtoTypes(java.util.Set):650:650 -> a
@@ -275700,7 +275300,7 @@
 # {"id":"sourceFile","fileName":"FilteredClassPath.java"}
     java.nio.file.Path path -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList pattern -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     1:5:void <init>(java.nio.file.Path,java.util.List,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):27:31 -> <init>
@@ -275723,7 +275323,7 @@
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> c
     com.android.tools.r8.shaking.CollectingGraphConsumer verificationGraphConsumer -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/t;"}
@@ -275748,7 +275348,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Z"}
     22:22:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):99:99 -> a
     23:29:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):104:110 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/KeepRuleGraphNode;)Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/KeepRuleGraphNode;)Lcom/android/tools/r8/internal/js$a;"}
     30:30:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):184:184 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     31:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():762:762 -> a
@@ -275768,7 +275368,7 @@
     60:69:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):257:266 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/M0;"}
     70:71:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):319:320 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/hs$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/js$a;)V"}
     72:73:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):353:354 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K1;)Z"}
     74:74:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):426:426 -> a
@@ -275799,7 +275399,7 @@
     101:101:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):430 -> a
     102:110:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):431:439 -> a
     111:111:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):447:447 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hs$a;)Lcom/android/tools/r8/internal/hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/js$a;)Lcom/android/tools/r8/internal/js;"}
     112:112:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):457:457 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/experimental/graphinfo/AnnotationGraphNode;"}
     113:117:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$0(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):462:466 -> a
@@ -275844,7 +275444,7 @@
     1:1:void <clinit>():331:331 -> <clinit>
     1:1:void <init>():333:333 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():339:339 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):344:344 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
 com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.O0:
@@ -275904,7 +275504,7 @@
     com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder rootSetBuilder -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/i4;"}
     com.android.tools.r8.threading.TaskCollection tasks -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ag0;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():35:35 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,java.util.concurrent.ExecutorService,java.util.Map,com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder):50:56 -> <init>
@@ -276153,7 +275753,7 @@
     10:10:com.android.tools.r8.graph.DexProgramClass asClass():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/D2;"}
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():43:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VI;"}
 com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.T0:
 # {"id":"sourceFile","fileName":"InstantiatedObject.java"}
     com.android.tools.r8.graph.DexProgramClass clazz -> b
@@ -276170,11 +275770,11 @@
 com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.U0:
 # {"id":"sourceFile","fileName":"InstantiatedObject.java"}
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VI;"}
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):68:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)V"}
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():79:79 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/RI;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/VI;"}
 com.android.tools.r8.shaking.KeepAnnotationCollectionInfo -> com.android.tools.r8.shaking.c1:
 # {"id":"sourceFile","fileName":"KeepAnnotationCollectionInfo.java"}
     1:1:void <init>():17:17 -> <init>
@@ -276602,13 +276202,13 @@
     14:14:void <init>(com.android.tools.r8.shaking.KeepClassInfo$Builder):68 -> <init>
     15:15:void <init>(com.android.tools.r8.shaking.KeepClassInfo$Builder):68:68 -> <init>
     1:1:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Z)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():853:853 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Z)Z"}
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():859:859 -> a
     2:2:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):110 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():853:853 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isKeepRuntimeVisibleAnnotationsEnabled():859:859 -> a
     3:3:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):110 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
     4:4:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):111 -> a
     5:5:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalAnnotationsInfo():134:134 -> a
     5:5:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):112 -> a
@@ -276616,7 +276216,7 @@
     7:7:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo.isBottom():0:0 -> a
     7:7:boolean isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):112 -> a
     8:12:boolean isKotlinMetadataClassKept(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions,java.util.function.Function,java.util.function.Function):120:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/gB;Ljava/util/function/Function;Ljava/util/function/Function;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/iB;Ljava/util/function/Function;Ljava/util/function/Function;)Z"}
     1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():165:165 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/e1;"}
     2:2:com.android.tools.r8.shaking.KeepClassInfo top():41:41 -> b
@@ -276698,77 +276298,43 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
     2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepClassInfo):354:354 -> b
     2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):179 -> b
-    1:1:com.android.tools.r8.shaking.KeepClassInfo doBuild():372:372 -> e
-    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():179 -> e
+    3:3:com.android.tools.r8.shaking.KeepClassInfo doBuild():372:372 -> b
+    3:3:com.android.tools.r8.shaking.KeepInfo doBuild():179 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepClassInfo getBottomInfo():344:344 -> f
-    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():179 -> f
+    1:1:com.android.tools.r8.shaking.KeepClassInfo getBottomInfo():344:344 -> c
+    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():179 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():339:339 -> g
-    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():179 -> g
+    1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():339:339 -> d
+    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():179 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
     1:1:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():179:179 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):471:471 -> k
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> k
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():337 -> k
-    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377:377 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/d1;"}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):484:484 -> k
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModificationForTesting():493 -> k
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():338 -> k
-    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    3:3:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> k
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval():506 -> k
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():339 -> k
-    3:3:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval():506:506 -> k
-    4:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():339 -> k
-    4:4:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    5:5:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> k
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval():530 -> k
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():340 -> k
-    5:5:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    6:6:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval():530:530 -> k
-    6:6:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():340 -> k
-    6:6:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    7:9:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():341:343 -> k
-    7:9:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    10:10:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):540:540 -> k
-    10:10:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> k
-    10:10:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():344 -> k
-    10:10:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    11:11:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):458:458 -> k
-    11:11:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.unsetCheckDiscarded():467 -> k
-    11:11:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():345 -> k
-    11:11:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    12:12:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():346:346 -> k
-    12:12:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377 -> k
-    13:13:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():377:377 -> k
-    14:14:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowClassInlining(boolean):234:234 -> k
-    14:14:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowClassInlining():239 -> k
-    14:14:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():378 -> k
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowClassInlining(boolean):234:234 -> k
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowClassInlining():239 -> k
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():378 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    15:15:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowHorizontalClassMerging(boolean):253:253 -> k
-    15:15:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowHorizontalClassMerging():258 -> k
-    15:15:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():379 -> k
-    16:16:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowPermittedSubclassesRemoval(boolean):272:272 -> k
-    16:16:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowPermittedSubclassesRemoval():277 -> k
-    16:16:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():380 -> k
-    17:17:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowRepackaging(boolean):287:287 -> k
-    17:17:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowRepackaging():296 -> k
-    17:17:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():381 -> k
-    18:18:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowUnusedInterfaceRemoval(boolean):310:310 -> k
-    18:18:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowUnusedInterfaceRemoval():315 -> k
-    18:18:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():382 -> k
-    19:19:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowVerticalClassMerging(boolean):329:329 -> k
-    19:19:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowVerticalClassMerging():334 -> k
-    19:19:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():383 -> k
-    20:20:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed(boolean):211:211 -> k
-    20:20:com.android.tools.r8.shaking.KeepClassInfo$Builder unsetCheckEnumUnboxed():220 -> k
-    20:20:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():384 -> k
+    3:3:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowHorizontalClassMerging(boolean):253:253 -> k
+    3:3:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowHorizontalClassMerging():258 -> k
+    3:3:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():379 -> k
+    4:4:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowPermittedSubclassesRemoval(boolean):272:272 -> k
+    4:4:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowPermittedSubclassesRemoval():277 -> k
+    4:4:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():380 -> k
+    5:5:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowRepackaging(boolean):287:287 -> k
+    5:5:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowRepackaging():296 -> k
+    5:5:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():381 -> k
+    6:6:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowUnusedInterfaceRemoval(boolean):310:310 -> k
+    6:6:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowUnusedInterfaceRemoval():315 -> k
+    6:6:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():382 -> k
+    7:7:com.android.tools.r8.shaking.KeepClassInfo$Builder setAllowVerticalClassMerging(boolean):329:329 -> k
+    7:7:com.android.tools.r8.shaking.KeepClassInfo$Builder disallowVerticalClassMerging():334 -> k
+    7:7:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():383 -> k
+    8:8:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed(boolean):211:211 -> k
+    8:8:com.android.tools.r8.shaking.KeepClassInfo$Builder unsetCheckEnumUnboxed():220 -> k
+    8:8:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():384 -> k
 com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.e1:
 # {"id":"sourceFile","fileName":"KeepClassInfo.java"}
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo):403:403 -> <init>
@@ -276863,7 +276429,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.KeepConstantArgumentRule$Builder -> com.android.tools.r8.shaking.g1:
 # {"id":"sourceFile","fileName":"KeepConstantArgumentRule.java"}
@@ -276895,48 +276461,42 @@
     1:4:void <clinit>():7:10 -> <clinit>
     5:5:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeTop():92:92 -> <clinit>
     5:5:void <clinit>():10 -> <clinit>
-    6:6:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):107:107 -> <clinit>
-    6:6:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.disallowFieldTypeStrengthening():116 -> <clinit>
+    6:6:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):109:109 -> <clinit>
     6:6:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeTop():93 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void <clinit>():10 -> <clinit>
-    7:7:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):125:125 -> <clinit>
-    7:7:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.disallowRedundantFieldLoadElimination():134 -> <clinit>
+    7:7:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):119:119 -> <clinit>
     7:7:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeTop():94 -> <clinit>
     7:7:void <clinit>():10 -> <clinit>
     8:11:void <clinit>():10:13 -> <clinit>
-    12:12:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98:98 -> <clinit>
+    12:12:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90:90 -> <clinit>
     12:12:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99 -> <clinit>
     12:12:void <clinit>():13 -> <clinit>
     13:13:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):73:73 -> <clinit>
-    13:13:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.allowValuePropagation():78 -> <clinit>
-    13:13:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    13:13:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90 -> <clinit>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99 -> <clinit>
     13:13:void <clinit>():13 -> <clinit>
     14:14:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):74:74 -> <clinit>
-    14:14:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.allowValuePropagation():78 -> <clinit>
-    14:14:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98 -> <clinit>
+    14:14:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90 -> <clinit>
     14:14:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99 -> <clinit>
     14:14:void <clinit>():13 -> <clinit>
     15:15:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99:99 -> <clinit>
     15:15:void <clinit>():13 -> <clinit>
-    16:16:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):107:107 -> <clinit>
-    16:16:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.allowFieldTypeStrengthening():112 -> <clinit>
-    16:16:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    16:16:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):109:109 -> <clinit>
+    16:16:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():100 -> <clinit>
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:void <clinit>():13 -> <clinit>
-    17:17:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):125:125 -> <clinit>
-    17:17:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.allowRedundantFieldLoadElimination():130 -> <clinit>
-    17:17:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():99 -> <clinit>
+    17:17:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):119:119 -> <clinit>
+    17:17:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.makeBottom():101 -> <clinit>
     17:17:void <clinit>():13 -> <clinit>
     18:18:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$Builder):31:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i1;)V"}
-    2:2:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isFieldTypeStrengtheningAllowed():103:103 -> <init>
+    2:2:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isFieldTypeStrengtheningAllowed():105:105 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$Builder):32 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$Builder):32:32 -> <init>
-    4:4:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isRedundantFieldLoadEliminationAllowed():120:120 -> <init>
+    4:4:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isRedundantFieldLoadEliminationAllowed():114:114 -> <init>
     4:4:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$Builder):33 -> <init>
     5:5:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$Builder):33:33 -> <init>
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner joiner():60:60 -> b
@@ -276966,101 +276526,97 @@
     6:6:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):87:87 -> <init>
     1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74:74 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
-    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):159:159 -> a
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):145:145 -> a
     2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> a
-    3:3:boolean isFieldTypeStrengtheningAllowed():103:103 -> a
-    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):160 -> a
+    3:3:boolean isFieldTypeStrengtheningAllowed():105:105 -> a
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):146 -> a
     3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> a
     4:4:boolean com.android.tools.r8.shaking.KeepFieldInfo.internalIsFieldTypeStrengtheningAllowed():48:48 -> a
-    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):160 -> a
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):146 -> a
     4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> a
-    5:5:boolean isRedundantFieldLoadEliminationAllowed():120:120 -> a
-    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):161 -> a
+    5:5:boolean isRedundantFieldLoadEliminationAllowed():114:114 -> a
+    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):147 -> a
     5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> a
     6:6:boolean com.android.tools.r8.shaking.KeepFieldInfo.internalIsRedundantFieldLoadEliminationAllowed():56:56 -> a
-    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):162 -> a
+    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):148 -> a
     6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> a
     1:1:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74:74 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
-    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):159:159 -> b
-    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):154 -> b
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):145:145 -> b
+    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):140 -> b
     2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> b
-    3:3:boolean isFieldTypeStrengtheningAllowed():103:103 -> b
-    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):160 -> b
-    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):154 -> b
+    3:3:boolean isFieldTypeStrengtheningAllowed():105:105 -> b
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):146 -> b
+    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):140 -> b
     3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> b
     4:4:boolean com.android.tools.r8.shaking.KeepFieldInfo.internalIsFieldTypeStrengtheningAllowed():48:48 -> b
-    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):160 -> b
-    4:4:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):154 -> b
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):146 -> b
+    4:4:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):140 -> b
     4:4:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> b
-    5:5:boolean isRedundantFieldLoadEliminationAllowed():120:120 -> b
-    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):161 -> b
-    5:5:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):154 -> b
+    5:5:boolean isRedundantFieldLoadEliminationAllowed():114:114 -> b
+    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):147 -> b
+    5:5:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):140 -> b
     5:5:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> b
     6:6:boolean com.android.tools.r8.shaking.KeepFieldInfo.internalIsRedundantFieldLoadEliminationAllowed():56:56 -> b
-    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):162 -> b
-    6:6:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):154 -> b
+    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):148 -> b
+    6:6:boolean isEqualTo(com.android.tools.r8.shaking.KeepFieldInfo):140 -> b
     6:6:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):74 -> b
-    1:1:com.android.tools.r8.shaking.KeepFieldInfo doBuild():167:167 -> e
-    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():74 -> e
+    7:7:com.android.tools.r8.shaking.KeepFieldInfo doBuild():153:153 -> b
+    7:7:com.android.tools.r8.shaking.KeepInfo doBuild():74 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepFieldInfo getBottomInfo():144:144 -> f
-    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():74 -> f
+    1:1:com.android.tools.r8.shaking.KeepFieldInfo getBottomInfo():130:130 -> c
+    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():74 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepFieldInfo getTopInfo():139:139 -> g
-    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():74 -> g
+    1:1:com.android.tools.r8.shaking.KeepFieldInfo getTopInfo():125:125 -> d
+    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():74 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeTop():92:92 -> i
     1:1:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():74 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowFieldTypeStrengthening(boolean):107:107 -> i
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder disallowFieldTypeStrengthening():116 -> i
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowFieldTypeStrengthening(boolean):109:109 -> i
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeTop():93 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():74 -> i
-    3:3:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowRedundantFieldLoadElimination(boolean):125:125 -> i
-    3:3:com.android.tools.r8.shaking.KeepFieldInfo$Builder disallowRedundantFieldLoadElimination():134 -> i
+    3:3:com.android.tools.r8.shaking.KeepFieldInfo$Builder setAllowRedundantFieldLoadElimination(boolean):119:119 -> i
     3:3:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeTop():94 -> i
     3:3:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():74 -> i
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
 com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.j1:
 # {"id":"sourceFile","fileName":"KeepFieldInfo.java"}
-    1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):174:174 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):160:160 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/k1;)V"}
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo.builder():40:40 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):174 -> <init>
-    3:3:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):174:174 -> <init>
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):171:171 -> a
+    2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):160 -> <init>
+    3:3:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):160:160 -> <init>
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):157:157 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;)Lcom/android/tools/r8/shaking/m1;"}
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):195:195 -> a
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):181:181 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/j1;)Lcom/android/tools/r8/shaking/j1;"}
-    3:3:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isFieldTypeStrengtheningAllowed():103:103 -> a
-    3:3:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):197 -> a
+    3:3:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isFieldTypeStrengtheningAllowed():105:105 -> a
+    3:3:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):183 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):197:197 -> a
-    5:5:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):196:196 -> a
-    6:6:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isRedundantFieldLoadEliminationAllowed():120:120 -> a
-    6:6:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):200 -> a
+    4:4:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):183:183 -> a
+    5:5:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):182:182 -> a
+    6:6:boolean com.android.tools.r8.shaking.KeepFieldInfo$Builder.isRedundantFieldLoadEliminationAllowed():114:114 -> a
+    6:6:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):200:200 -> a
-    8:8:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):199:199 -> a
+    7:7:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):186:186 -> a
+    8:8:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):185:185 -> a
     com.android.tools.r8.shaking.KeepFieldInfo$Joiner asFieldJoiner() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/j1;"}
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():178:178 -> r
+    1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():164:164 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/j1;"}
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):107:107 -> r
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.disallowFieldTypeStrengthening():116 -> r
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():178 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowRedundantFieldLoadElimination():183:183 -> s
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowFieldTypeStrengthening(boolean):109:109 -> r
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():164 -> r
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowRedundantFieldLoadElimination():169:169 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/j1;"}
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):125:125 -> s
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.disallowRedundantFieldLoadElimination():134 -> s
-    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowRedundantFieldLoadElimination():183 -> s
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder com.android.tools.r8.shaking.KeepFieldInfo$Builder.setAllowRedundantFieldLoadElimination(boolean):119:119 -> s
+    2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowRedundantFieldLoadElimination():169 -> s
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
 com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.n1:
 # {"id":"sourceFile","fileName":"KeepInfo.java"}
     boolean allowAccessModification -> a
@@ -277074,26 +276630,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/c1;"}
     com.android.tools.r8.shaking.KeepAnnotationCollectionInfo typeAnnotationsInfo -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/c1;"}
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowed():391:391 -> <init>
+    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowed():427:427 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):56 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l1;)V"}
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowedForTesting():395:395 -> <init>
+    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowedForTesting():436:436 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):57 -> <init>
-    3:3:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isMinificationAllowed():403:403 -> <init>
-    3:3:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):58 -> <init>
-    4:4:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isOptimizationAllowed():407:407 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):59 -> <init>
-    5:5:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):60 -> <init>
-    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isSignatureRemovalAllowed():415:415 -> <init>
+    3:5:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):58:60 -> <init>
+    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isSignatureRemovalAllowed():463:463 -> <init>
     6:6:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):61 -> <init>
-    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():399:399 -> <init>
+    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():391:391 -> <init>
     7:7:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):62 -> <init>
-    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():497:497 -> <init>
+    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> <init>
     8:8:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):63 -> <init>
     9:9:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):63:63 -> <init>
-    10:10:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():521:521 -> <init>
+    10:10:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():454:454 -> <init>
     10:10:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):64 -> <init>
     11:11:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):64:64 -> <init>
     12:21:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.shaking.KeepAnnotationCollectionInfo,com.android.tools.r8.shaking.KeepAnnotationCollectionInfo):42:51 -> <init>
@@ -277121,31 +276672,31 @@
     8:8:com.android.tools.r8.shaking.KeepInfo$Joiner newEmptyJoinerFor(com.android.tools.r8.graph.DexReference):68:68 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;)Lcom/android/tools/r8/shaking/m1;"}
     9:9:boolean internalIsAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.shaking.KeepAnnotationCollectionInfo,boolean,boolean):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/r0;ZLcom/android/tools/r8/shaking/c1;ZZ)Z"}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/r0;ZLcom/android/tools/r8/shaking/c1;ZZ)Z"}
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
     10:10:boolean internalIsAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.shaking.KeepAnnotationCollectionInfo,boolean,boolean):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:14:boolean internalIsAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.shaking.KeepAnnotationCollectionInfo,boolean,boolean):97:100 -> a
     15:15:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):256:256 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():838:838 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():844:844 -> a
     16:16:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():838:838 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isKeepInnerClassesAttributeEnabled():844:844 -> a
     17:17:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):256 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
     18:18:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):259 -> a
     19:19:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):259:259 -> a
     1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):166:166 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> b
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):166 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean internalIsMinificationAllowed():170:170 -> b
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):166 -> b
     1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):180:180 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():797:797 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():796:796 -> c
     2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):180 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean internalIsOptimizationAllowed():184:184 -> c
@@ -277154,20 +276705,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
     1:1:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194:194 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():787:787 -> e
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():786:786 -> e
     2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean internalIsShrinkingAllowed():198:198 -> e
     3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194 -> e
     1:1:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):208:208 -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():819:819 -> f
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():818:818 -> f
     2:2:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):208 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> f
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():820 -> f
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> f
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():819 -> f
     3:3:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):208 -> f
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():821:821 -> f
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceKeepSignatureAttributeEnabled():820:820 -> f
     4:4:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):208 -> f
     5:5:boolean internalIsSignatureRemovalAllowed():213:213 -> f
     5:5:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):209 -> f
@@ -277219,33 +276770,30 @@
     21:21:void <init>(com.android.tools.r8.shaking.KeepInfo):333:333 -> <init>
     1:12:com.android.tools.r8.shaking.KeepInfo build():363:374 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    13:13:boolean isAccessModificationAllowed():391:391 -> a
+    13:13:boolean isAccessModificationAllowed():427:427 -> a
     13:13:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):378 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
     14:14:boolean com.android.tools.r8.shaking.KeepInfo.internalIsAccessModificationAllowed():230:230 -> a
     14:14:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):378 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:boolean isAccessModificationAllowedForTesting():395:395 -> a
+    15:15:boolean isAccessModificationAllowedForTesting():436:436 -> a
     15:15:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):379 -> a
     16:16:boolean com.android.tools.r8.shaking.KeepInfo.internalIsAccessModificationAllowedForTesting():239:239 -> a
     16:16:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):380 -> a
-    17:17:boolean isMinificationAllowed():403:403 -> a
-    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):381 -> a
+    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):381:381 -> a
     18:18:boolean com.android.tools.r8.shaking.KeepInfo.internalIsMinificationAllowed():170:170 -> a
     18:18:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):381 -> a
-    19:19:boolean isOptimizationAllowed():407:407 -> a
-    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):382 -> a
+    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):382:382 -> a
     20:20:boolean com.android.tools.r8.shaking.KeepInfo.internalIsOptimizationAllowed():184:184 -> a
     20:20:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):382 -> a
-    21:21:boolean isShrinkingAllowed():411:411 -> a
-    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):383 -> a
+    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):383:383 -> a
     22:22:boolean com.android.tools.r8.shaking.KeepInfo.internalIsShrinkingAllowed():198:198 -> a
     22:22:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):383 -> a
-    23:23:boolean isSignatureRemovalAllowed():415:415 -> a
+    23:23:boolean isSignatureRemovalAllowed():463:463 -> a
     23:23:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):384 -> a
     24:24:boolean com.android.tools.r8.shaking.KeepInfo.internalIsSignatureRemovalAllowed():213:213 -> a
     24:24:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):384 -> a
-    25:25:boolean isCheckDiscardedEnabled():399:399 -> a
+    25:25:boolean isCheckDiscardedEnabled():391:391 -> a
     25:25:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):385 -> a
     26:26:boolean com.android.tools.r8.shaking.KeepInfo.internalIsCheckDiscardedEnabled():146:146 -> a
     26:26:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):385 -> a
@@ -277256,58 +276804,65 @@
     30:30:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalTypeAnnotationsInfo():138:138 -> a
     30:30:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):387 -> a
     31:31:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):387:387 -> a
+    com.android.tools.r8.shaking.KeepInfo doBuild() -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
     boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):419:420 -> b
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():428 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):432:433 -> c
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():441 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):445:446 -> d
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():454 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    com.android.tools.r8.shaking.KeepInfo doBuild() -> e
+    com.android.tools.r8.shaking.KeepInfo getBottomInfo() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    com.android.tools.r8.shaking.KeepInfo getBottomInfo() -> f
+    com.android.tools.r8.shaking.KeepInfo getTopInfo() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    com.android.tools.r8.shaking.KeepInfo getTopInfo() -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):471:472 -> h
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder allowAccessModification():476 -> h
+    1:1:boolean isMinificationAllowed():400:400 -> e
+    1:1:boolean isOptimizationAllowed():409:409 -> f
+    1:1:boolean isShrinkingAllowed():418:418 -> g
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):431:432 -> h
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():350 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModificationForTesting(boolean):484:485 -> h
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder allowAccessModificationForTesting():489 -> h
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModificationForTesting(boolean):440:441 -> h
     3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():351 -> h
     5:5:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createBottom():354:354 -> h
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder allowAnnotationRemoval():501 -> h
     5:5:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():352 -> h
-    6:7:com.android.tools.r8.shaking.KeepInfo$Builder allowAnnotationRemoval():501:502 -> h
+    6:7:com.android.tools.r8.shaking.KeepInfo$Builder setAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):449:450 -> h
     6:7:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():352 -> h
     8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createBottom():354:354 -> h
-    8:8:com.android.tools.r8.shaking.KeepInfo$Builder allowTypeAnnotationRemoval():525 -> h
     8:8:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():353 -> h
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder allowTypeAnnotationRemoval():525:526 -> h
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setTypeAnnotationsInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):458:459 -> h
     9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():353 -> h
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):419:420 -> h
-    11:12:com.android.tools.r8.shaking.KeepInfo$Builder allowMinification():424 -> h
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):404:405 -> h
     11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():354 -> h
-    13:14:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):432:433 -> h
-    13:14:com.android.tools.r8.shaking.KeepInfo$Builder allowOptimization():437 -> h
+    13:14:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):413:414 -> h
     13:14:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():355 -> h
-    15:16:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):445:446 -> h
-    15:16:com.android.tools.r8.shaking.KeepInfo$Builder allowShrinking():450 -> h
+    15:16:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):422:423 -> h
     15:16:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():356 -> h
-    17:18:com.android.tools.r8.shaking.KeepInfo$Builder setAllowSignatureRemoval(boolean):540:541 -> h
-    17:18:com.android.tools.r8.shaking.KeepInfo$Builder allowSignatureRemoval():545 -> h
+    17:18:com.android.tools.r8.shaking.KeepInfo$Builder setAllowSignatureRemoval(boolean):467:468 -> h
     17:18:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():357 -> h
-    19:20:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded(boolean):458:459 -> h
-    19:20:com.android.tools.r8.shaking.KeepInfo$Builder unsetCheckDiscarded():467 -> h
+    19:20:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded(boolean):395:396 -> h
     19:20:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():358 -> h
     21:21:com.android.tools.r8.shaking.KeepInfo$Builder makeBottom():359:359 -> h
-    com.android.tools.r8.shaking.KeepInfo$Builder makeTop() -> i
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModification(boolean):431:432 -> i
+    1:2:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():337 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder setAllowAccessModificationForTesting(boolean):440:441 -> i
+    3:4:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():338 -> i
+    5:5:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> i
+    5:5:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():339 -> i
+    6:7:com.android.tools.r8.shaking.KeepInfo$Builder setAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):449:450 -> i
+    6:7:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():339 -> i
+    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> i
+    8:8:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():340 -> i
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder setTypeAnnotationsInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):458:459 -> i
+    9:10:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():340 -> i
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder setAllowMinification(boolean):404:405 -> i
+    11:12:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():341 -> i
+    13:14:com.android.tools.r8.shaking.KeepInfo$Builder setAllowOptimization(boolean):413:414 -> i
+    13:14:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():342 -> i
+    15:16:com.android.tools.r8.shaking.KeepInfo$Builder setAllowShrinking(boolean):422:423 -> i
+    15:16:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():343 -> i
+    17:18:com.android.tools.r8.shaking.KeepInfo$Builder setAllowSignatureRemoval(boolean):467:468 -> i
+    17:18:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():344 -> i
+    19:20:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded(boolean):395:396 -> i
+    19:20:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():345 -> i
+    21:21:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():346:346 -> i
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
 com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.m1:
@@ -277318,185 +276873,182 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
     java.util.Set rules -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():554:554 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):577:577 -> <init>
+    1:1:void <clinit>():473:473 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):496:496 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/l1;)V"}
-    2:7:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):573:578 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):492:497 -> <init>
     1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner asClassJoiner():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/e1;"}
-    2:4:com.android.tools.r8.shaking.KeepInfo$Joiner applyIf(boolean,java.util.function.Consumer):583:585 -> a
+    2:4:com.android.tools.r8.shaking.KeepInfo$Joiner applyIf(boolean,java.util.function.Consumer):502:504 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/util/function/Consumer;)Lcom/android/tools/r8/shaking/m1;"}
-    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):706:706 -> a
+    5:5:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):625:625 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;)Lcom/android/tools/r8/shaking/m1;"}
-    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowed():391:391 -> a
-    6:6:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):707 -> a
+    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowed():427:427 -> a
+    6:6:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):626 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):707:707 -> a
-    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowedForTesting():395:395 -> a
-    8:8:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):709 -> a
-    9:9:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):709:709 -> a
-    10:10:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):708:708 -> a
-    11:11:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isMinificationAllowed():403:403 -> a
-    11:11:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):711 -> a
-    12:12:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):711:711 -> a
-    13:13:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isOptimizationAllowed():407:407 -> a
-    13:13:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):712 -> a
-    14:14:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):712:712 -> a
-    15:15:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> a
-    15:15:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):713 -> a
-    16:16:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):713:713 -> a
-    17:17:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isSignatureRemovalAllowed():415:415 -> a
-    17:17:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):714 -> a
-    18:18:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):714:714 -> a
-    19:19:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():399:399 -> a
-    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):715 -> a
-    20:21:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):715:716 -> a
-    22:22:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():497:497 -> a
-    22:22:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):716 -> a
+    7:7:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):626:626 -> a
+    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isAccessModificationAllowedForTesting():436:436 -> a
+    8:8:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):628 -> a
+    9:9:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):628:628 -> a
+    10:15:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):627:632 -> a
+    16:16:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isSignatureRemovalAllowed():463:463 -> a
+    16:16:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):633 -> a
+    17:17:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):633:633 -> a
+    18:18:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():391:391 -> a
+    18:18:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):634 -> a
+    19:20:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):634:635 -> a
+    21:21:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> a
+    21:21:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):635 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():497:497 -> a
-    23:23:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):716 -> a
-    24:25:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):716:717 -> a
-    26:26:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():521:521 -> a
-    26:26:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):717 -> a
+    22:22:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> a
+    22:22:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):635 -> a
+    23:24:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):635:636 -> a
+    25:25:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():454:454 -> a
+    25:25:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):636 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():521:521 -> a
-    27:27:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):717 -> a
-    28:31:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):717:720 -> a
-    32:32:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):736:736 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-    33:33:boolean isShrinkingAllowed():633:633 -> a
-    33:33:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):736 -> a
-    34:34:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> a
-    34:34:boolean isShrinkingAllowed():633 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):736 -> a
-    35:35:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):736:736 -> a
-    36:36:java.util.Set getReasons():613:613 -> a
-    36:36:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):737 -> a
-    37:37:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):737:737 -> a
-    38:38:java.util.Set getRules():617:617 -> a
-    38:38:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):737 -> a
-    39:39:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):737:737 -> a
+    26:26:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():454:454 -> a
+    26:26:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):636 -> a
+    27:30:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):636:639 -> a
+    31:31:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):655:655 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+    32:32:boolean isShrinkingAllowed():552:552 -> a
+    32:32:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):655 -> a
+    33:33:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):655:655 -> a
+    34:34:java.util.Set getReasons():532:532 -> a
+    34:34:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):656 -> a
+    35:35:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):656:656 -> a
+    36:36:java.util.Set getRules():536:536 -> a
+    36:36:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):656 -> a
+    37:37:boolean verifyShrinkingDisallowedWithRule(com.android.tools.r8.utils.InternalOptions):656:656 -> a
     com.android.tools.r8.shaking.KeepFieldInfo$Joiner asFieldJoiner() -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/j1;"}
     com.android.tools.r8.shaking.KeepMemberInfo$Joiner asMemberJoiner() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/r1;"}
     com.android.tools.r8.shaking.KeepMethodInfo$Joiner asMethodJoiner() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():656:656 -> e
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():575:575 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):471:471 -> e
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> e
-    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():656 -> e
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):472:472 -> e
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> e
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():656 -> e
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():657:657 -> e
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():661:661 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):484:484 -> f
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModificationForTesting():493 -> f
-    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():661 -> f
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):485:485 -> f
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModificationForTesting():493 -> f
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():661 -> f
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():662:662 -> f
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():681:682 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():686:687 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():691:692 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():696:696 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):540:540 -> j
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> j
-    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():696 -> j
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):541:541 -> j
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> j
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():696 -> j
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():697:697 -> j
-    1:1:boolean isBottom():621:621 -> k
-    1:1:boolean isCheckDiscardedEnabled():625:625 -> l
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():399:399 -> l
-    2:2:boolean isCheckDiscardedEnabled():625 -> l
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):431:431 -> e
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():575 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:3:com.android.tools.r8.shaking.KeepInfo join():729:731 -> m
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):432:432 -> e
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():575 -> e
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModification():576:576 -> e
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():580:580 -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):440:440 -> f
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():580 -> f
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):441:441 -> f
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():580 -> f
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowAccessModificationForTesting():581:581 -> f
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():600:600 -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowMinification(boolean):404:404 -> g
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():600 -> g
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowMinification(boolean):405:405 -> g
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():600 -> g
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification():601:601 -> g
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():605:605 -> h
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowOptimization(boolean):413:413 -> h
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():605 -> h
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowOptimization(boolean):414:414 -> h
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():605 -> h
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowOptimization():606:606 -> h
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():610:610 -> i
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowShrinking(boolean):422:422 -> i
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():610 -> i
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowShrinking(boolean):423:423 -> i
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():610 -> i
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowShrinking():611:611 -> i
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():615:615 -> j
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):467:467 -> j
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():615 -> j
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):468:468 -> j
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():615 -> j
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner disallowSignatureRemoval():616:616 -> j
+    1:1:boolean isBottom():540:540 -> k
+    1:1:boolean isCheckDiscardedEnabled():544:544 -> l
+    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isCheckDiscardedEnabled():391:391 -> l
+    2:2:boolean isCheckDiscardedEnabled():544 -> l
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:3:com.android.tools.r8.shaking.KeepInfo join():648:650 -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
     4:4:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):283:283 -> m
-    4:4:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    4:4:com.android.tools.r8.shaking.KeepInfo join():650 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:boolean com.android.tools.r8.shaking.KeepInfo.internalIsAccessModificationAllowed():230:230 -> m
     5:5:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):283 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    5:5:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     6:6:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):283:283 -> m
-    6:6:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    6:6:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     7:7:boolean com.android.tools.r8.shaking.KeepInfo.internalIsAccessModificationAllowedForTesting():239:239 -> m
     7:7:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):285 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    7:7:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     8:8:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):285:285 -> m
-    8:8:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    8:8:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     9:9:boolean com.android.tools.r8.shaking.KeepInfo.internalIsMinificationAllowed():170:170 -> m
     9:9:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):286 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    9:9:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     10:10:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):286:286 -> m
-    10:10:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    10:10:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     11:11:boolean com.android.tools.r8.shaking.KeepInfo.internalIsOptimizationAllowed():184:184 -> m
     11:11:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):287 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    11:11:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     12:12:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):287:287 -> m
-    12:12:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    12:12:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     13:13:boolean com.android.tools.r8.shaking.KeepInfo.internalIsShrinkingAllowed():198:198 -> m
     13:13:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):288 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    13:13:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     14:14:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):288:288 -> m
-    14:14:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    14:14:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     15:15:boolean com.android.tools.r8.shaking.KeepInfo.internalIsSignatureRemovalAllowed():213:213 -> m
     15:15:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):289 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    15:15:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     16:16:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):289:289 -> m
-    16:16:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    16:16:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     17:17:boolean com.android.tools.r8.shaking.KeepInfo.internalIsCheckDiscardedEnabled():146:146 -> m
     17:17:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):290 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    17:17:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     18:18:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):290:290 -> m
-    18:18:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    18:18:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     19:19:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalAnnotationsInfo():134:134 -> m
     19:19:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):291 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    19:19:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     20:20:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):291:291 -> m
-    20:20:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    20:20:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     21:21:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepInfo.internalTypeAnnotationsInfo():138:138 -> m
     21:21:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):292 -> m
-    21:21:com.android.tools.r8.shaking.KeepInfo join():731 -> m
+    21:21:com.android.tools.r8.shaking.KeepInfo join():650 -> m
     22:22:boolean com.android.tools.r8.shaking.KeepInfo.isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):292:292 -> m
-    22:22:com.android.tools.r8.shaking.KeepInfo join():731 -> m
-    23:23:com.android.tools.r8.shaking.KeepInfo join():731:731 -> m
+    22:22:com.android.tools.r8.shaking.KeepInfo join():650 -> m
+    23:23:com.android.tools.r8.shaking.KeepInfo join():650:650 -> m
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():701:701 -> o
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():620:620 -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):458:458 -> o
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded():463 -> o
-    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():701 -> o
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):459:459 -> o
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded():463 -> o
-    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():701 -> o
-    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():702:702 -> o
-    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():641:642 -> p
+    2:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):395:395 -> o
+    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():620 -> o
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):396:396 -> o
+    3:3:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():620 -> o
+    4:4:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():621:621 -> o
+    1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():560:561 -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
 com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.p1:
 # {"id":"sourceFile","fileName":"KeepInfoCollection.java"}
@@ -277504,7 +277056,7 @@
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>():54:54 -> <init>
     void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     void forEachRuleInstance(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;)V"}
     com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -277518,9 +277070,9 @@
     void registerCompilerSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/o1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/o1;"}
     boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Set;)V"}
     1:1:com.android.tools.r8.shaking.KeepMemberInfo getMemberInfo(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.graph.DexProgramClass):104:104 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h1;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/shaking/s1;"}
     2:2:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
@@ -277626,15 +277178,15 @@
     56:56:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.ProgramField):153:153 -> a
     56:56:com.android.tools.r8.shaking.KeepInfo getInfo(com.android.tools.r8.graph.ProgramDefinition):217 -> a
     57:57:com.android.tools.r8.shaking.KeepInfo getInfo(com.android.tools.r8.graph.ProgramDefinition):219:219 -> a
-    58:58:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
     58:58:boolean isMinificationAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):243 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/gB;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/iB;)Z"}
     59:59:boolean isMinificationAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):244:244 -> a
     void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
 com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.o1:
 # {"id":"sourceFile","fileName":"KeepInfoCollection.java"}
     java.util.Map keepClassInfo -> b
@@ -277647,18 +277199,18 @@
     java.util.Map fieldRuleInstances -> f
     java.util.Map methodRuleInstances -> g
     com.android.tools.r8.shaking.rules.MaterializedRules materializedRules -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XM;"}
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():274:274 -> <clinit>
     1:8:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.shaking.rules.MaterializedRules):308:315 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/TM;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/internal/XM;)V"}
     1:1:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):126:126 -> a
     1:1:void joinMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):588 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/C5;)V"}
     2:2:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.top():20:20 -> a
-    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo.isTop():252 -> a
+    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo.isTop():263 -> a
     2:2:void joinMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):589 -> a
-    3:3:boolean com.android.tools.r8.shaking.KeepMethodInfo.isTop():252:252 -> a
+    3:3:boolean com.android.tools.r8.shaking.KeepMethodInfo.isTop():263:263 -> a
     3:3:void joinMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:11:void joinMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):590:597 -> a
@@ -277694,16 +277246,16 @@
     34:34:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):337 -> a
     35:35:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):337:337 -> a
     36:58:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):360:382 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/o1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/o1;"}
     59:65:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):380:386 -> a
     66:71:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):384:389 -> a
     72:72:com.android.tools.r8.graph.DexType lambda$rewrite$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexType):372:372 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     73:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     73:74:com.android.tools.r8.graph.DexType lambda$rewrite$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexType):372 -> a
     75:78:com.android.tools.r8.graph.DexType lambda$rewrite$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.DexType):373:376 -> a
     79:79:void lambda$rewriteClassInfo$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):399:399 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
     80:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     80:81:void lambda$rewriteClassInfo$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):399 -> a
     82:88:void lambda$rewriteClassInfo$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):400:406 -> a
@@ -277714,13 +277266,13 @@
     90:90:void lambda$rewriteClassInfo$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):407 -> a
     91:96:void lambda$rewriteClassInfo$1(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):404:409 -> a
     97:97:void lambda$rewriteFieldInfo$2(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):421:421 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/shaking/k1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Ljava/util/Map;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/shaking/k1;)V"}
     98:99:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.lens.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):161:162 -> a
     98:99:void lambda$rewriteFieldInfo$2(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):421 -> a
     100:102:void lambda$rewriteFieldInfo$2(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):422:424 -> a
     103:107:void lambda$rewriteFieldInfo$2(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):422:426 -> a
     108:108:void lambda$rewriteMethodInfo$4(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):439:439 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
     109:110:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     109:110:void lambda$rewriteMethodInfo$4(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):439 -> a
     111:113:void lambda$rewriteMethodInfo$4(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):440:442 -> a
@@ -277755,57 +277307,57 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/p1;)V"}
     183:183:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):625:625 -> a
     183:183:void registerCompilerSynthesizedMethods(com.android.tools.r8.shaking.KeepInfoCollection):538 -> a
-    184:184:void lambda$registerCompilerSynthesizedMethods$13(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):540:540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/o1;)V"}
-    185:187:void lambda$registerCompilerSynthesizedMethods$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):542:544 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
-    188:188:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552:552 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/shaking/f1;"}
-    189:189:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> a
-    189:189:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552 -> a
-    190:190:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552:552 -> a
-    191:192:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):558:559 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/shaking/v1;"}
-    193:193:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
-    193:193:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):559 -> a
-    194:194:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):559:559 -> a
-    195:196:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):565:566 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/shaking/k1;"}
-    197:197:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> a
-    197:197:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):566 -> a
-    198:198:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):566:566 -> a
-    199:199:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):570:570 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)V"}
-    200:200:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.top():41:41 -> a
-    200:200:boolean com.android.tools.r8.shaking.KeepClassInfo.isTop():171 -> a
-    200:200:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):571 -> a
-    201:201:boolean com.android.tools.r8.shaking.KeepClassInfo.isTop():171:171 -> a
-    201:201:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):571 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    202:209:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):572:579 -> a
-    210:210:void keepField(com.android.tools.r8.graph.ProgramField):620:620 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
-    211:211:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
-    211:211:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):523 -> a
+    184:184:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
+    184:184:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):523 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/u1;)V"}
-    212:212:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
-    212:212:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):523 -> a
-    213:216:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):524:527 -> a
+    185:185:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
+    185:185:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):523 -> a
+    186:189:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):524:527 -> a
+    190:190:void lambda$registerCompilerSynthesizedMethods$13(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):540:540 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/o1;)V"}
+    191:193:void lambda$registerCompilerSynthesizedMethods$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):542:544 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
+    194:194:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552:552 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/shaking/f1;"}
+    195:195:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.bottom():45:45 -> a
+    195:195:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552 -> a
+    196:196:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):552:552 -> a
+    197:198:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):558:559 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)Lcom/android/tools/r8/shaking/v1;"}
+    199:199:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepMethodInfo.bottom():24:24 -> a
+    199:199:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):559 -> a
+    200:200:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):559:559 -> a
+    201:202:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):565:566 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/g1;)Lcom/android/tools/r8/shaking/k1;"}
+    203:203:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepFieldInfo.bottom():20:20 -> a
+    203:203:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):566 -> a
+    204:204:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):566:566 -> a
+    205:205:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):570:570 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)V"}
+    206:206:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepClassInfo.top():41:41 -> a
+    206:206:boolean com.android.tools.r8.shaking.KeepClassInfo.isTop():171 -> a
+    206:206:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):571 -> a
+    207:207:boolean com.android.tools.r8.shaking.KeepClassInfo.isTop():171:171 -> a
+    207:207:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):571 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    208:215:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):572:579 -> a
+    216:216:void keepField(com.android.tools.r8.graph.ProgramField):620:620 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)V"}
     217:217:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):625:625 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)Lcom/android/tools/r8/shaking/o1;"}
     218:218:boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions):631:631 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Set;)V"}
     219:219:void lambda$verifyPinnedTypesAreLive$14(com.android.tools.r8.utils.InternalOptions,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):633:633 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
     220:221:void lambda$forEachPinnedType$15(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):642:643 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/f1;)V"}
     222:223:void lambda$forEachPinnedMethod$16(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):652:653 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/shaking/v1;)V"}
     224:224:void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):660:660 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     225:226:void lambda$forEachPinnedField$17(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):662:663 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/shaking/k1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/l1;Lcom/android/tools/r8/shaking/k1;)V"}
     1:2:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):342:343 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)V"}
     3:3:java.util.Set com.android.tools.r8.graph.PrunedItems.getRemovedClasses():129:129 -> b
@@ -277822,19 +277374,19 @@
     12:12:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):348 -> b
     13:15:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):349:351 -> b
     16:32:java.util.Map rewriteClassInfo(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):395:411 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Ljava/util/IdentityHashMap;"}
     33:33:void keepClass(com.android.tools.r8.graph.DexProgramClass):584:584 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     34:34:void keepMethod(com.android.tools.r8.graph.ProgramMethod):602:602 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     35:35:void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):650:650 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     1:12:java.util.Map rewriteFieldInfo(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):417:428 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Ljava/util/IdentityHashMap;"}
     13:13:void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):640:640 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/iB;)V"}
     1:22:java.util.Map rewriteMethodInfo(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):435:456 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)Ljava/util/IdentityHashMap;"}
 com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.s1:
 # {"id":"sourceFile","fileName":"KeepMemberInfo.java"}
     boolean allowValuePropagation -> j
@@ -277865,82 +277417,46 @@
     3:3:boolean com.android.tools.r8.shaking.KeepMemberInfo.internalIsValuePropagationAllowed():49:49 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.KeepMemberInfo):63 -> <init>
     4:4:void <init>(com.android.tools.r8.shaking.KeepMemberInfo):63:63 -> <init>
-    1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):87:87 -> a
+    1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):79:79 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/s1;)Z"}
     2:2:boolean isValuePropagationAllowed():69:69 -> a
-    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):88 -> a
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):80 -> a
     3:3:boolean com.android.tools.r8.shaking.KeepMemberInfo.internalIsValuePropagationAllowed():49:49 -> a
-    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):88 -> a
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):471:472 -> k
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> k
-    1:2:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():337 -> k
-    1:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMemberInfo):80 -> a
+    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():85:85 -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/q1;"}
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModificationForTesting(boolean):484:485 -> k
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModificationForTesting():493 -> k
-    3:4:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():338 -> k
-    3:4:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    5:5:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> k
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval():506 -> k
-    5:5:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():339 -> k
-    5:5:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    6:7:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval():506:507 -> k
-    6:7:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():339 -> k
-    6:7:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> k
-    8:8:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval():530 -> k
-    8:8:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():340 -> k
-    8:8:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval():530:531 -> k
-    9:10:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():340 -> k
-    9:10:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    11:13:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():341:343 -> k
-    11:13:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    14:15:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):540:541 -> k
-    14:15:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> k
-    14:15:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():344 -> k
-    14:15:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    16:17:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setCheckDiscarded(boolean):458:459 -> k
-    16:17:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.unsetCheckDiscarded():467 -> k
-    16:17:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():345 -> k
-    16:17:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    18:18:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.makeTop():346:346 -> k
-    18:18:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-    19:19:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93:93 -> k
-    20:20:com.android.tools.r8.shaking.KeepMemberInfo$Builder setAllowValuePropagation(boolean):73:73 -> k
-    20:20:com.android.tools.r8.shaking.KeepMemberInfo$Builder disallowValuePropagation():82 -> k
-    20:20:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    21:21:com.android.tools.r8.shaking.KeepMemberInfo$Builder setAllowValuePropagation(boolean):74:74 -> k
-    21:21:com.android.tools.r8.shaking.KeepMemberInfo$Builder disallowValuePropagation():82 -> k
-    21:21:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():93 -> k
+    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder setAllowValuePropagation(boolean):73:73 -> k
+    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():85 -> k
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder setAllowValuePropagation(boolean):74:74 -> k
+    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder makeTop():85 -> k
 com.android.tools.r8.shaking.KeepMemberInfo$Joiner -> com.android.tools.r8.shaking.r1:
 # {"id":"sourceFile","fileName":"KeepMemberInfo.java"}
-    1:1:void <init>(com.android.tools.r8.shaking.KeepMemberInfo$Builder):107:107 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepMemberInfo$Builder):99:99 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/q1;)V"}
-    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):123:123 -> a
+    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):115:115 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/r1;)Lcom/android/tools/r8/shaking/r1;"}
     2:2:boolean com.android.tools.r8.shaking.KeepMemberInfo$Builder.isValuePropagationAllowed():69:69 -> a
-    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):124 -> a
+    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):116 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):124:124 -> a
+    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Joiner merge(com.android.tools.r8.shaking.KeepMemberInfo$Joiner):116:116 -> a
     com.android.tools.r8.shaking.KeepMemberInfo$Joiner asMemberJoiner() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/r1;"}
-    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():111:111 -> q
+    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():103:103 -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/r1;"}
     2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):73:73 -> q
-    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.disallowValuePropagation():82 -> q
-    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():111 -> q
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():103 -> q
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):74:74 -> q
-    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.disallowValuePropagation():82 -> q
-    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():111 -> q
-    4:4:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():112:112 -> q
+    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():103 -> q
+    4:4:com.android.tools.r8.shaking.KeepMemberInfo$Joiner disallowValuePropagation():104:104 -> q
 com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.v1:
 # {"id":"sourceFile","fileName":"KeepMethodInfo.java"}
-    com.android.tools.r8.shaking.KeepMethodInfo BOTTOM -> A
+    com.android.tools.r8.shaking.KeepMethodInfo TOP -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/v1;"}
-    boolean $assertionsDisabled -> B
+    com.android.tools.r8.shaking.KeepMethodInfo BOTTOM -> B
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/v1;"}
+    boolean $assertionsDisabled -> C
     boolean allowThrowsRemoval -> k
     boolean allowClassInlining -> l
     boolean allowClosedWorldReasoning -> m
@@ -277955,168 +277471,101 @@
     boolean allowSingleCallerInlining -> v
     boolean allowUnusedArgumentOptimization -> w
     boolean allowUnusedReturnValueOptimization -> x
-    com.android.tools.r8.shaking.KeepAnnotationCollectionInfo parameterAnnotationsInfo -> y
+    boolean allowParameterNamesRemoval -> y
+    com.android.tools.r8.shaking.KeepAnnotationCollectionInfo parameterAnnotationsInfo -> z
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/c1;"}
-    com.android.tools.r8.shaking.KeepMethodInfo TOP -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/v1;"}
-    1:4:void <clinit>():11:14 -> <clinit>
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():639:639 -> <clinit>
-    5:5:void <clinit>():14 -> <clinit>
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowThrowsRemoval(boolean):307:307 -> <clinit>
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowThrowsRemoval():316 -> <clinit>
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():640 -> <clinit>
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:6:void <clinit>():14 -> <clinit>
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowThrowsRemoval(boolean):308:308 -> <clinit>
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowThrowsRemoval():316 -> <clinit>
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():640 -> <clinit>
-    7:7:void <clinit>():14 -> <clinit>
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClassInlining(boolean):326:327 -> <clinit>
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowClassInlining():335 -> <clinit>
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():641 -> <clinit>
-    8:9:void <clinit>():14 -> <clinit>
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClosedWorldReasoning(boolean):345:346 -> <clinit>
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowClosedWorldReasoning():354 -> <clinit>
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():642 -> <clinit>
-    10:11:void <clinit>():14 -> <clinit>
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowConstantArgumentOptimization(boolean):364:365 -> <clinit>
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowConstantArgumentOptimization():373 -> <clinit>
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():643 -> <clinit>
-    12:13:void <clinit>():14 -> <clinit>
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowInlining(boolean):383:384 -> <clinit>
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowInlining():392 -> <clinit>
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():644 -> <clinit>
-    14:15:void <clinit>():14 -> <clinit>
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowMethodStaticizing(boolean):402:403 -> <clinit>
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowMethodStaticizing():411 -> <clinit>
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():645 -> <clinit>
-    16:17:void <clinit>():14 -> <clinit>
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterRemoval(boolean):421:422 -> <clinit>
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterRemoval():430 -> <clinit>
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():646 -> <clinit>
-    18:19:void <clinit>():14 -> <clinit>
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterReordering(boolean):440:441 -> <clinit>
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterReordering():449 -> <clinit>
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():647 -> <clinit>
-    20:21:void <clinit>():14 -> <clinit>
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterTypeStrengthening(boolean):459:460 -> <clinit>
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterTypeStrengthening():468 -> <clinit>
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():648 -> <clinit>
-    22:23:void <clinit>():14 -> <clinit>
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReprocessing(boolean):478:479 -> <clinit>
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowReprocessing():487 -> <clinit>
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():649 -> <clinit>
-    24:25:void <clinit>():14 -> <clinit>
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReturnTypeStrengthening(boolean):497:498 -> <clinit>
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowReturnTypeStrengthening():506 -> <clinit>
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():650 -> <clinit>
-    26:27:void <clinit>():14 -> <clinit>
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowSingleCallerInlining(boolean):516:517 -> <clinit>
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowSingleCallerInlining():525 -> <clinit>
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():651 -> <clinit>
-    28:29:void <clinit>():14 -> <clinit>
-    30:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedArgumentOptimization(boolean):535:536 -> <clinit>
-    30:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedArgumentOptimization():544 -> <clinit>
-    30:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():652 -> <clinit>
-    30:31:void <clinit>():14 -> <clinit>
-    32:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedReturnValueOptimization(boolean):555:556 -> <clinit>
-    32:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedReturnValueOptimization():564 -> <clinit>
-    32:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():653 -> <clinit>
-    32:33:void <clinit>():14 -> <clinit>
-    34:34:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> <clinit>
-    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterAnnotationsRemoval():579 -> <clinit>
-    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():654 -> <clinit>
-    34:34:void <clinit>():14 -> <clinit>
-    35:36:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterAnnotationsRemoval():579:580 -> <clinit>
-    35:36:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.makeTop():654 -> <clinit>
-    35:36:void <clinit>():14 -> <clinit>
-    37:40:void <clinit>():14:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):48:48 -> <init>
+    1:7:void <clinit>():11:17 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):49:49 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/t1;)V"}
-    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isThrowsRemovalAllowed():303:303 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):49 -> <init>
-    3:3:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):49:49 -> <init>
-    4:4:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClassInliningAllowed():322:322 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):50 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):50:50 -> <init>
-    6:6:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClosedWorldReasoningAllowed():341:341 -> <init>
-    6:6:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):51 -> <init>
-    7:7:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):51:51 -> <init>
-    8:8:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isConstantArgumentOptimizationAllowed():360:360 -> <init>
-    8:8:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):52 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):52:52 -> <init>
-    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isInliningAllowed():379:379 -> <init>
-    10:10:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):53 -> <init>
-    11:11:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):53:53 -> <init>
-    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isMethodStaticizingAllowed():398:398 -> <init>
-    12:12:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):54 -> <init>
-    13:13:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):54:54 -> <init>
-    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterRemovalAllowed():417:417 -> <init>
-    14:14:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):55 -> <init>
-    15:15:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):55:55 -> <init>
-    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterReorderingAllowed():436:436 -> <init>
-    16:16:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):56 -> <init>
-    17:17:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):56:56 -> <init>
-    18:18:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterTypeStrengtheningAllowed():455:455 -> <init>
-    18:18:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):57 -> <init>
-    19:19:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):57:57 -> <init>
-    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReprocessingAllowed():474:474 -> <init>
-    20:20:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):58 -> <init>
-    21:21:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):58:58 -> <init>
-    22:22:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReturnTypeStrengtheningAllowed():493:493 -> <init>
-    22:22:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):59 -> <init>
-    23:23:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):59:59 -> <init>
-    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isSingleCallerInliningAllowed():512:512 -> <init>
-    24:24:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):60 -> <init>
-    25:25:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):60:60 -> <init>
-    26:26:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedArgumentOptimizationAllowed():531:531 -> <init>
-    26:26:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):61 -> <init>
-    27:27:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):61:61 -> <init>
-    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedReturnValueOptimizationAllowed():550:550 -> <init>
-    28:28:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):62 -> <init>
-    29:29:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):62:62 -> <init>
-    30:30:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():570:570 -> <init>
-    30:30:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):63 -> <init>
-    31:31:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):63:63 -> <init>
+    2:2:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isThrowsRemovalAllowed():316:316 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):50 -> <init>
+    3:3:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):50:50 -> <init>
+    4:4:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClassInliningAllowed():325:325 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):51 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):51:51 -> <init>
+    6:6:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClosedWorldReasoningAllowed():334:334 -> <init>
+    6:6:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):52 -> <init>
+    7:7:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):52:52 -> <init>
+    8:8:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isConstantArgumentOptimizationAllowed():343:343 -> <init>
+    8:8:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):53 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):53:53 -> <init>
+    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isInliningAllowed():352:352 -> <init>
+    10:10:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):54 -> <init>
+    11:11:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):54:54 -> <init>
+    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isMethodStaticizingAllowed():361:361 -> <init>
+    12:12:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):55 -> <init>
+    13:13:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):55:55 -> <init>
+    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterRemovalAllowed():370:370 -> <init>
+    14:14:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):56 -> <init>
+    15:15:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):56:56 -> <init>
+    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterReorderingAllowed():379:379 -> <init>
+    16:16:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):57 -> <init>
+    17:17:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):57:57 -> <init>
+    18:18:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterTypeStrengtheningAllowed():388:388 -> <init>
+    18:18:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):58 -> <init>
+    19:19:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):58:58 -> <init>
+    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReprocessingAllowed():397:397 -> <init>
+    20:20:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):59 -> <init>
+    21:21:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):59:59 -> <init>
+    22:22:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReturnTypeStrengtheningAllowed():406:406 -> <init>
+    22:22:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):60 -> <init>
+    23:23:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):60:60 -> <init>
+    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isSingleCallerInliningAllowed():415:415 -> <init>
+    24:24:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):61 -> <init>
+    25:25:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):61:61 -> <init>
+    26:26:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedArgumentOptimizationAllowed():424:424 -> <init>
+    26:26:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):62 -> <init>
+    27:27:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):62:62 -> <init>
+    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedReturnValueOptimizationAllowed():433:433 -> <init>
+    28:28:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):63 -> <init>
+    29:29:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):63:63 -> <init>
+    30:30:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterNamesRemovalAllowed():443:443 -> <init>
+    30:30:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):64 -> <init>
+    31:31:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):64:64 -> <init>
+    32:32:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():452:452 -> <init>
+    32:32:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):65 -> <init>
+    33:33:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):65:65 -> <init>
     1:1:com.android.tools.r8.shaking.KeepMethodInfo asMethodInfo():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/v1;"}
-    2:2:boolean isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Z"}
-    3:3:boolean isReprocessingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.ProgramMethod):194:194 -> a
+    2:2:boolean isArgumentPropagationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):113:113 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Z"}
+    3:3:boolean isReprocessingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.ProgramMethod):196:196 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Z"}
-    4:4:boolean internalIsReprocessingAllowed():199:199 -> a
-    4:4:boolean isReprocessingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.ProgramMethod):195 -> a
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder builder():70:70 -> b
+    4:4:boolean internalIsReprocessingAllowed():201:201 -> a
+    4:4:boolean isReprocessingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.ProgramMethod):197 -> a
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder builder():72:72 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():246:246 -> c
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():257:257 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
     2:2:com.android.tools.r8.shaking.KeepMethodInfo top():20:20 -> c
-    2:2:boolean isTop():252 -> c
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():246 -> c
-    3:3:boolean isTop():252:252 -> c
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():246 -> c
-    4:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():246:247 -> c
+    2:2:boolean isTop():263 -> c
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():257 -> c
+    3:3:boolean isTop():263:263 -> c
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():257 -> c
+    4:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner joiner():257:258 -> c
     1:1:com.android.tools.r8.shaking.KeepMethodInfo bottom():24:24 -> d
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():28 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():28:28 -> d
-    1:1:boolean isClosedWorldReasoningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):123:123 -> g
+    1:1:boolean isClosedWorldReasoningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):125:125 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean internalIsClosedWorldReasoningAllowed():127:127 -> g
-    2:2:boolean isClosedWorldReasoningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):123 -> g
-    1:1:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):139:139 -> h
+    2:2:boolean internalIsClosedWorldReasoningAllowed():129:129 -> g
+    2:2:boolean isClosedWorldReasoningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):125 -> g
+    1:1:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):141:141 -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
-    2:2:boolean internalIsInliningAllowed():143:143 -> h
-    2:2:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):139 -> h
-    1:3:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:161 -> i
+    2:2:boolean internalIsInliningAllowed():145:145 -> h
+    2:2:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):141 -> h
+    1:3:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):161:163 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/L0;)Z"}
     4:4:boolean com.android.tools.r8.shaking.KeepInfo.internalIsCheckDiscardedEnabled():146:146 -> i
     4:4:boolean com.android.tools.r8.shaking.KeepInfo.isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):142 -> i
-    4:4:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):162 -> i
-    5:5:boolean internalIsParameterRemovalAllowed():167:167 -> i
-    5:5:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):163 -> i
+    4:4:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):164 -> i
+    5:5:boolean internalIsParameterRemovalAllowed():169:169 -> i
+    5:5:boolean isParameterRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> i
 com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.t1:
 # {"id":"sourceFile","fileName":"KeepMethodInfo.java"}
+    com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder parameterAnnotationsInfo -> A
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/X0;"}
     boolean allowThrowsRemoval -> l
     boolean allowClassInlining -> m
     boolean allowClosedWorldReasoning -> n
@@ -278131,513 +277580,508 @@
     boolean allowSingleCallerInlining -> w
     boolean allowUnusedArgumentOptimization -> x
     boolean allowUnusedReturnValueOptimization -> y
-    com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder parameterAnnotationsInfo -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/X0;"}
-    1:1:void <init>():279:279 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):283:283 -> <init>
+    boolean allowParameterNamesRemoval -> z
+    1:1:void <init>():291:291 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):295:295 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/v1;)V"}
-    3:3:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():103:103 -> <init>
-    3:3:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):284 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):284:284 -> <init>
-    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():119:119 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):285 -> <init>
-    6:6:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):285:285 -> <init>
-    7:7:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClosedWorldReasoningAllowed():127:127 -> <init>
-    7:7:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):286 -> <init>
-    8:8:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):286:286 -> <init>
-    9:9:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():135:135 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):287 -> <init>
-    10:10:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):287:287 -> <init>
-    11:11:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsInliningAllowed():143:143 -> <init>
-    11:11:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):288 -> <init>
-    12:12:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):288:288 -> <init>
-    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():155:155 -> <init>
-    13:13:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):289 -> <init>
-    14:14:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):289:289 -> <init>
-    15:15:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterRemovalAllowed():167:167 -> <init>
-    15:15:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):290 -> <init>
-    16:16:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):290:290 -> <init>
-    17:17:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():178:178 -> <init>
-    17:17:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):291 -> <init>
-    18:18:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):291:291 -> <init>
-    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():189:189 -> <init>
-    19:19:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):292 -> <init>
-    20:20:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):292:292 -> <init>
-    21:21:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReprocessingAllowed():199:199 -> <init>
-    21:21:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):293 -> <init>
-    22:22:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):293:293 -> <init>
-    23:23:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():210:210 -> <init>
-    23:23:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):294 -> <init>
-    24:24:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):294:294 -> <init>
-    25:25:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():220:220 -> <init>
-    25:25:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):295 -> <init>
-    26:26:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):295:295 -> <init>
-    27:27:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():231:231 -> <init>
-    27:27:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):296 -> <init>
-    28:28:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):296:296 -> <init>
-    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():242:242 -> <init>
-    29:29:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):298 -> <init>
-    30:30:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> <init>
-    31:31:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepMethodInfo.internalParameterAnnotationsInfo():107:107 -> <init>
-    31:31:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):299 -> <init>
-    32:32:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):299:299 -> <init>
-    1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):260:260 -> a
+    3:3:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():105:105 -> <init>
+    3:3:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):296 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):296:296 -> <init>
+    5:5:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():121:121 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):297 -> <init>
+    6:6:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):297:297 -> <init>
+    7:7:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClosedWorldReasoningAllowed():129:129 -> <init>
+    7:7:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):298 -> <init>
+    8:8:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):298:298 -> <init>
+    9:9:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():137:137 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):299 -> <init>
+    10:10:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):299:299 -> <init>
+    11:11:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsInliningAllowed():145:145 -> <init>
+    11:11:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):300 -> <init>
+    12:12:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):300:300 -> <init>
+    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():157:157 -> <init>
+    13:13:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):301 -> <init>
+    14:14:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):301:301 -> <init>
+    15:15:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterRemovalAllowed():169:169 -> <init>
+    15:15:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):302 -> <init>
+    16:16:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):302:302 -> <init>
+    17:17:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():180:180 -> <init>
+    17:17:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):303 -> <init>
+    18:18:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):303:303 -> <init>
+    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():191:191 -> <init>
+    19:19:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):304 -> <init>
+    20:20:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):304:304 -> <init>
+    21:21:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReprocessingAllowed():201:201 -> <init>
+    21:21:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):305 -> <init>
+    22:22:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):305:305 -> <init>
+    23:23:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():212:212 -> <init>
+    23:23:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):306 -> <init>
+    24:24:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):306:306 -> <init>
+    25:25:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():222:222 -> <init>
+    25:25:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):307 -> <init>
+    26:26:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):307:307 -> <init>
+    27:27:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():233:233 -> <init>
+    27:27:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):308 -> <init>
+    28:28:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):308:308 -> <init>
+    29:29:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():244:244 -> <init>
+    29:29:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):310 -> <init>
+    30:30:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):310:310 -> <init>
+    31:31:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterNamesRemovalAllowed():253:253 -> <init>
+    31:31:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):311 -> <init>
+    32:32:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):311:311 -> <init>
+    33:33:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo com.android.tools.r8.shaking.KeepMethodInfo.internalParameterAnnotationsInfo():109:109 -> <init>
+    33:33:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):312 -> <init>
+    34:34:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):312:312 -> <init>
+    1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):271:271 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
-    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):610:610 -> a
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):482:482 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/v1;)Z"}
-    3:3:boolean isThrowsRemovalAllowed():303:303 -> a
-    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):611 -> a
-    4:4:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():103:103 -> a
-    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):611 -> a
-    5:5:boolean isClassInliningAllowed():322:322 -> a
-    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):612 -> a
-    6:6:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():119:119 -> a
-    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):612 -> a
-    7:7:boolean isClosedWorldReasoningAllowed():341:341 -> a
-    7:7:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):613 -> a
-    8:8:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClosedWorldReasoningAllowed():127:127 -> a
-    8:8:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):613 -> a
-    9:9:boolean isConstantArgumentOptimizationAllowed():360:360 -> a
-    9:9:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):614 -> a
-    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():135:135 -> a
-    10:10:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):615 -> a
-    11:11:boolean isInliningAllowed():379:379 -> a
-    11:11:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):616 -> a
-    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsInliningAllowed():143:143 -> a
-    12:12:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):616 -> a
-    13:13:boolean isMethodStaticizingAllowed():398:398 -> a
-    13:13:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):617 -> a
-    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():155:155 -> a
-    14:14:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):617 -> a
-    15:15:boolean isParameterRemovalAllowed():417:417 -> a
-    15:15:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):618 -> a
-    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterRemovalAllowed():167:167 -> a
-    16:16:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):618 -> a
-    17:17:boolean isParameterReorderingAllowed():436:436 -> a
-    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):619 -> a
-    18:18:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():178:178 -> a
-    18:18:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):619 -> a
-    19:19:boolean isParameterTypeStrengtheningAllowed():455:455 -> a
-    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):620 -> a
-    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():189:189 -> a
-    20:20:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):621 -> a
-    21:21:boolean isReprocessingAllowed():474:474 -> a
-    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):622 -> a
-    22:22:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReprocessingAllowed():199:199 -> a
-    22:22:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):622 -> a
-    23:23:boolean isReturnTypeStrengtheningAllowed():493:493 -> a
-    23:23:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):623 -> a
-    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():210:210 -> a
-    24:24:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):623 -> a
-    25:25:boolean isSingleCallerInliningAllowed():512:512 -> a
-    25:25:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):624 -> a
-    26:26:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():220:220 -> a
-    26:26:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):624 -> a
-    27:27:boolean isUnusedArgumentOptimizationAllowed():531:531 -> a
-    27:27:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):625 -> a
-    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():231:231 -> a
-    28:28:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):626 -> a
-    29:29:boolean isUnusedReturnValueOptimizationAllowed():550:550 -> a
-    29:29:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):627 -> a
-    30:30:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():242:242 -> a
-    30:30:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):628 -> a
-    31:32:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):628:629 -> a
-    1:1:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):260:260 -> b
+    3:3:boolean isThrowsRemovalAllowed():316:316 -> a
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):483 -> a
+    4:4:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsThrowsRemovalAllowed():105:105 -> a
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):483 -> a
+    5:5:boolean isClassInliningAllowed():325:325 -> a
+    5:5:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):484 -> a
+    6:6:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClassInliningAllowed():121:121 -> a
+    6:6:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):484 -> a
+    7:7:boolean isClosedWorldReasoningAllowed():334:334 -> a
+    7:7:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):485 -> a
+    8:8:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsClosedWorldReasoningAllowed():129:129 -> a
+    8:8:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):485 -> a
+    9:9:boolean isConstantArgumentOptimizationAllowed():343:343 -> a
+    9:9:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):486 -> a
+    10:10:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsConstantArgumentOptimizationAllowed():137:137 -> a
+    10:10:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):487 -> a
+    11:11:boolean isInliningAllowed():352:352 -> a
+    11:11:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):488 -> a
+    12:12:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsInliningAllowed():145:145 -> a
+    12:12:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):488 -> a
+    13:13:boolean isMethodStaticizingAllowed():361:361 -> a
+    13:13:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):489 -> a
+    14:14:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsMethodStaticizingAllowed():157:157 -> a
+    14:14:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):489 -> a
+    15:15:boolean isParameterRemovalAllowed():370:370 -> a
+    15:15:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):490 -> a
+    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterRemovalAllowed():169:169 -> a
+    16:16:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):490 -> a
+    17:17:boolean isParameterReorderingAllowed():379:379 -> a
+    17:17:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):491 -> a
+    18:18:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterReorderingAllowed():180:180 -> a
+    18:18:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):491 -> a
+    19:19:boolean isParameterTypeStrengtheningAllowed():388:388 -> a
+    19:19:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):492 -> a
+    20:20:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterTypeStrengtheningAllowed():191:191 -> a
+    20:20:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):493 -> a
+    21:21:boolean isReprocessingAllowed():397:397 -> a
+    21:21:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):494 -> a
+    22:22:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReprocessingAllowed():201:201 -> a
+    22:22:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):494 -> a
+    23:23:boolean isReturnTypeStrengtheningAllowed():406:406 -> a
+    23:23:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):495 -> a
+    24:24:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsReturnTypeStrengtheningAllowed():212:212 -> a
+    24:24:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):495 -> a
+    25:25:boolean isSingleCallerInliningAllowed():415:415 -> a
+    25:25:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):496 -> a
+    26:26:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsSingleCallerInliningAllowed():222:222 -> a
+    26:26:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):496 -> a
+    27:27:boolean isUnusedArgumentOptimizationAllowed():424:424 -> a
+    27:27:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):497 -> a
+    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedArgumentOptimizationAllowed():233:233 -> a
+    28:28:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):498 -> a
+    29:29:boolean isUnusedReturnValueOptimizationAllowed():433:433 -> a
+    29:29:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):499 -> a
+    30:30:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsUnusedReturnValueOptimizationAllowed():244:244 -> a
+    30:30:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):500 -> a
+    31:31:boolean isParameterNamesRemovalAllowed():443:443 -> a
+    31:31:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):501 -> a
+    32:32:boolean com.android.tools.r8.shaking.KeepMethodInfo.internalIsParameterNamesRemovalAllowed():253:253 -> a
+    32:32:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):501 -> a
+    33:34:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):501:502 -> a
+    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():271:271 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
+    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):271:271 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/n1;)Z"}
-    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):605:605 -> b
-    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):260 -> b
-    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():260:260 -> e
+    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepMethodInfo):477:477 -> b
+    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):271 -> b
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo getBottomInfo():472:472 -> c
+    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():271 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo getBottomInfo():600:600 -> f
-    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():260 -> f
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo getTopInfo():467:467 -> d
+    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():271 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo getTopInfo():595:595 -> g
-    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():260 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():639:639 -> i
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
+    1:1:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():271:271 -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):307:307 -> i
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowThrowsRemoval():316 -> i
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():640 -> i
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    2:2:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):308:308 -> i
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowThrowsRemoval():316 -> i
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():640 -> i
-    3:3:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    4:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):326:327 -> i
-    4:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowClassInlining():335 -> i
-    4:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():641 -> i
-    4:5:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    6:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):345:346 -> i
-    6:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowClosedWorldReasoning():354 -> i
-    6:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():642 -> i
-    6:7:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):364:365 -> i
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowConstantArgumentOptimization():373 -> i
-    8:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():643 -> i
-    8:9:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):383:384 -> i
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowInlining():392 -> i
-    10:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():644 -> i
-    10:11:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):402:403 -> i
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowMethodStaticizing():411 -> i
-    12:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():645 -> i
-    12:13:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):421:422 -> i
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterRemoval():430 -> i
-    14:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():646 -> i
-    14:15:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):440:441 -> i
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterReordering():449 -> i
-    16:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():647 -> i
-    16:17:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):459:460 -> i
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterTypeStrengthening():468 -> i
-    18:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():648 -> i
-    18:19:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):478:479 -> i
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowReprocessing():487 -> i
-    20:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():649 -> i
-    20:21:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):497:498 -> i
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowReturnTypeStrengthening():506 -> i
-    22:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():650 -> i
-    22:23:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):516:517 -> i
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowSingleCallerInlining():525 -> i
-    24:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():651 -> i
-    24:25:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):535:536 -> i
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowUnusedArgumentOptimization():544 -> i
-    26:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():652 -> i
-    26:27:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):555:556 -> i
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowUnusedReturnValueOptimization():564 -> i
-    28:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():653 -> i
-    28:29:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    30:30:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> i
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterAnnotationsRemoval():579 -> i
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():654 -> i
-    30:30:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    31:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowParameterAnnotationsRemoval():579:580 -> i
-    31:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():654 -> i
-    31:32:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():260 -> i
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder self():260:260 -> j
+    1:1:com.android.tools.r8.shaking.KeepInfo$Builder self():271:271 -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo doBuild():634:634 -> l
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo doBuild():507:507 -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/v1;"}
-    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98:98 -> m
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():659 -> m
+    1:1:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90:90 -> m
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():533 -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
     2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):73:73 -> m
-    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.allowValuePropagation():78 -> m
-    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():659 -> m
+    2:2:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():533 -> m
     3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.setAllowValuePropagation(boolean):74:74 -> m
-    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.allowValuePropagation():78 -> m
-    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():98 -> m
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():659 -> m
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():659:659 -> m
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):307:307 -> m
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowThrowsRemoval():312 -> m
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():660 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):308:308 -> m
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowThrowsRemoval():312 -> m
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():660 -> m
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):326:326 -> m
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClassInlining():331 -> m
-    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():661 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):327:327 -> m
-    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClassInlining():331 -> m
-    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():661 -> m
-    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):345:345 -> m
-    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClosedWorldReasoning():350 -> m
-    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():662 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):346:346 -> m
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowClosedWorldReasoning():350 -> m
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():662 -> m
-    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):364:364 -> m
-    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowConstantArgumentOptimization():369 -> m
-    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():663 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):365:365 -> m
-    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowConstantArgumentOptimization():369 -> m
-    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():663 -> m
-    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):383:383 -> m
-    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowInlining():388 -> m
-    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():664 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):384:384 -> m
-    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowInlining():388 -> m
-    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():664 -> m
-    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):402:402 -> m
-    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowMethodStaticizing():407 -> m
-    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():665 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):403:403 -> m
-    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowMethodStaticizing():407 -> m
-    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():665 -> m
-    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):421:421 -> m
-    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterRemoval():426 -> m
-    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():666 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):422:422 -> m
-    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterRemoval():426 -> m
-    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():666 -> m
-    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):440:440 -> m
-    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterReordering():445 -> m
-    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():667 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):441:441 -> m
-    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterReordering():445 -> m
-    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():667 -> m
-    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):459:459 -> m
-    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterTypeStrengthening():464 -> m
-    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():668 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):460:460 -> m
-    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterTypeStrengthening():464 -> m
-    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():668 -> m
-    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):478:478 -> m
-    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReprocessing():483 -> m
-    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():669 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):479:479 -> m
-    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReprocessing():483 -> m
-    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():669 -> m
-    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):497:497 -> m
-    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReturnTypeStrengthening():502 -> m
-    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():670 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):498:498 -> m
-    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowReturnTypeStrengthening():502 -> m
-    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():670 -> m
-    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):516:516 -> m
-    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowSingleCallerInlining():521 -> m
-    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():671 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):517:517 -> m
-    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowSingleCallerInlining():521 -> m
-    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():671 -> m
-    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):535:535 -> m
-    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowUnusedArgumentOptimization():540 -> m
-    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():672 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):536:536 -> m
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowUnusedArgumentOptimization():540 -> m
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():672 -> m
-    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):555:555 -> m
-    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowUnusedReturnValueOptimization():560 -> m
-    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():673 -> m
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):556:556 -> m
-    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowUnusedReturnValueOptimization():560 -> m
-    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():673 -> m
-    33:33:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createBottom():354:354 -> m
-    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterAnnotationsRemoval():574 -> m
-    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():674 -> m
-    34:35:com.android.tools.r8.shaking.KeepMethodInfo$Builder allowParameterAnnotationsRemoval():574:575 -> m
-    34:35:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():674 -> m
-    com.android.tools.r8.shaking.KeepMethodInfo$Builder self() -> n
+    3:3:com.android.tools.r8.shaking.KeepMemberInfo$Builder com.android.tools.r8.shaking.KeepMemberInfo$Builder.makeBottom():90 -> m
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():533 -> m
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():533:533 -> m
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):320:320 -> m
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():534 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):321:321 -> m
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():534 -> m
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):329:329 -> m
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():535 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):330:330 -> m
+    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():535 -> m
+    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):338:338 -> m
+    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():536 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):339:339 -> m
+    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():536 -> m
+    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):347:347 -> m
+    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():537 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):348:348 -> m
+    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():537 -> m
+    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):356:356 -> m
+    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():538 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):357:357 -> m
+    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():538 -> m
+    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):365:365 -> m
+    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():539 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):366:366 -> m
+    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():539 -> m
+    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):374:374 -> m
+    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():540 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):375:375 -> m
+    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():540 -> m
+    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):383:383 -> m
+    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():541 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):384:384 -> m
+    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():541 -> m
+    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):392:392 -> m
+    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():542 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):393:393 -> m
+    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():542 -> m
+    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):401:401 -> m
+    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():543 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):402:402 -> m
+    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():543 -> m
+    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):410:410 -> m
+    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():544 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):411:411 -> m
+    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():544 -> m
+    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):419:419 -> m
+    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():545 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):420:420 -> m
+    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():545 -> m
+    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):428:428 -> m
+    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():546 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):429:429 -> m
+    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():546 -> m
+    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):438:438 -> m
+    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():547 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):439:439 -> m
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():547 -> m
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterNamesRemoval(boolean):447:447 -> m
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():548 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterNamesRemoval(boolean):448:448 -> m
+    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():548 -> m
+    35:35:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createBottom():354:354 -> m
+    35:35:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():549 -> m
+    36:36:com.android.tools.r8.shaking.KeepMethodInfo$Builder setParameterAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):456:456 -> m
+    36:36:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():549 -> m
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    37:37:com.android.tools.r8.shaking.KeepMethodInfo$Builder setParameterAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):457:457 -> m
+    37:37:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom():549 -> m
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():512:512 -> n
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):320:320 -> n
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():513 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowThrowsRemoval(boolean):321:321 -> n
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():513 -> n
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):329:329 -> n
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():514 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClassInlining(boolean):330:330 -> n
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():514 -> n
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):338:338 -> n
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():515 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowClosedWorldReasoning(boolean):339:339 -> n
+    7:7:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():515 -> n
+    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):347:347 -> n
+    8:8:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():516 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):348:348 -> n
+    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():516 -> n
+    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):356:356 -> n
+    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():517 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowInlining(boolean):357:357 -> n
+    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():517 -> n
+    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):365:365 -> n
+    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():518 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowMethodStaticizing(boolean):366:366 -> n
+    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():518 -> n
+    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):374:374 -> n
+    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():519 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterRemoval(boolean):375:375 -> n
+    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():519 -> n
+    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):383:383 -> n
+    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():520 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterReordering(boolean):384:384 -> n
+    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():520 -> n
+    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):392:392 -> n
+    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():521 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterTypeStrengthening(boolean):393:393 -> n
+    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():521 -> n
+    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):401:401 -> n
+    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():522 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReprocessing(boolean):402:402 -> n
+    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():522 -> n
+    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):410:410 -> n
+    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():523 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowReturnTypeStrengthening(boolean):411:411 -> n
+    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():523 -> n
+    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):419:419 -> n
+    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():524 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowSingleCallerInlining(boolean):420:420 -> n
+    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():524 -> n
+    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):428:428 -> n
+    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():525 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedArgumentOptimization(boolean):429:429 -> n
+    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():525 -> n
+    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):438:438 -> n
+    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():526 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowUnusedReturnValueOptimization(boolean):439:439 -> n
+    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():526 -> n
+    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterNamesRemoval(boolean):447:447 -> n
+    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():527 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowParameterNamesRemoval(boolean):448:448 -> n
+    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():527 -> n
+    32:32:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder.createTop():350:350 -> n
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():528 -> n
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder setParameterAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):456:456 -> n
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():528 -> n
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder setParameterAnnotationInfo(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder):457:457 -> n
+    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Builder makeTop():528 -> n
+    com.android.tools.r8.shaking.KeepMethodInfo$Builder self() -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
 com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.u1:
 # {"id":"sourceFile","fileName":"KeepMethodInfo.java"}
-    1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):681:681 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):556:556 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/v1;)V"}
-    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):685:685 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.KeepMethodInfo$Builder):560:560 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u4;)V"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():739:739 -> A
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():609:609 -> A
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReturnTypeStrengthening(boolean):497:497 -> A
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowReturnTypeStrengthening():506 -> A
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():739 -> A
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():740:740 -> A
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():744:744 -> B
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReprocessing(boolean):401:401 -> A
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():609 -> A
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():610:610 -> A
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():614:614 -> B
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowSingleCallerInlining(boolean):516:516 -> B
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowSingleCallerInlining():525 -> B
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():744 -> B
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():745:745 -> B
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():689:689 -> C
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReturnTypeStrengthening(boolean):410:410 -> B
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():614 -> B
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():615:615 -> B
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():619:619 -> C
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowThrowsRemoval(boolean):307:307 -> C
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowThrowsRemoval():316 -> C
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():689 -> C
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():690:690 -> C
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():749:749 -> D
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowSingleCallerInlining(boolean):419:419 -> C
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():619 -> C
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowSingleCallerInlining():620:620 -> C
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():564:564 -> D
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedArgumentOptimization(boolean):535:535 -> D
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedArgumentOptimization():544 -> D
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():749 -> D
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():750:750 -> D
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():754:754 -> E
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowThrowsRemoval(boolean):320:320 -> D
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():564 -> D
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowThrowsRemoval():565:565 -> D
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():624:624 -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedReturnValueOptimization(boolean):555:555 -> E
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowUnusedReturnValueOptimization():564 -> E
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():754 -> E
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():755:755 -> E
-    com.android.tools.r8.shaking.KeepMethodInfo$Joiner self() -> F
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedArgumentOptimization(boolean):428:428 -> E
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():624 -> E
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():625:625 -> E
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():629:629 -> F
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):678:678 -> a
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowUnusedReturnValueOptimization(boolean):438:438 -> F
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():629 -> F
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():630:630 -> F
+    com.android.tools.r8.shaking.KeepMethodInfo$Joiner self() -> G
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):553:553 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;)Lcom/android/tools/r8/shaking/m1;"}
-    2:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):776:777 -> a
+    2:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):657:658 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/u1;)Lcom/android/tools/r8/shaking/u1;"}
-    4:4:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():570:570 -> a
-    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):778 -> a
+    4:4:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():452:452 -> a
+    4:4:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):659 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):778:778 -> a
-    6:6:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():570:570 -> a
-    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):779 -> a
+    5:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):659:659 -> a
+    6:6:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():452:452 -> a
+    6:6:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):660 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:8:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):779:780 -> a
-    9:9:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isThrowsRemovalAllowed():303:303 -> a
-    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):780 -> a
+    7:8:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):660:661 -> a
+    9:9:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isThrowsRemovalAllowed():316:316 -> a
+    9:9:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):661 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):780:780 -> a
-    11:11:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClassInliningAllowed():322:322 -> a
-    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):781 -> a
+    10:10:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):661:661 -> a
+    11:11:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClassInliningAllowed():325:325 -> a
+    11:11:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):662 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):781:781 -> a
-    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClosedWorldReasoningAllowed():341:341 -> a
-    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):783 -> a
+    12:12:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):662:662 -> a
+    13:13:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isClosedWorldReasoningAllowed():334:334 -> a
+    13:13:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):664 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):783:783 -> a
-    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):782:782 -> a
-    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isConstantArgumentOptimizationAllowed():360:360 -> a
-    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):785 -> a
+    14:14:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):664:664 -> a
+    15:15:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):663:663 -> a
+    16:16:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isConstantArgumentOptimizationAllowed():343:343 -> a
+    16:16:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):666 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):785:785 -> a
-    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):784:784 -> a
-    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isInliningAllowed():379:379 -> a
-    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):787 -> a
+    17:17:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):666:666 -> a
+    18:18:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):665:665 -> a
+    19:19:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isInliningAllowed():352:352 -> a
+    19:19:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):668 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):787:787 -> a
-    21:21:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isMethodStaticizingAllowed():398:398 -> a
-    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):788 -> a
+    20:20:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):668:668 -> a
+    21:21:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isMethodStaticizingAllowed():361:361 -> a
+    21:21:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):669 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):788:788 -> a
-    23:23:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterRemovalAllowed():417:417 -> a
-    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):789 -> a
+    22:22:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):669:669 -> a
+    23:23:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterRemovalAllowed():370:370 -> a
+    23:23:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):670 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):789:789 -> a
-    25:25:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterReorderingAllowed():436:436 -> a
-    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):791 -> a
+    24:24:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):670:670 -> a
+    25:25:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterReorderingAllowed():379:379 -> a
+    25:25:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):672 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):791:791 -> a
-    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):790:790 -> a
-    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterTypeStrengtheningAllowed():455:455 -> a
-    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):793 -> a
+    26:26:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):672:672 -> a
+    27:27:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):671:671 -> a
+    28:28:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterTypeStrengtheningAllowed():388:388 -> a
+    28:28:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):674 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):793:793 -> a
-    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):792:792 -> a
-    31:31:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReprocessingAllowed():474:474 -> a
-    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):795 -> a
+    29:29:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):674:674 -> a
+    30:30:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):673:673 -> a
+    31:31:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReprocessingAllowed():397:397 -> a
+    31:31:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):676 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):795:795 -> a
-    33:33:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReturnTypeStrengtheningAllowed():493:493 -> a
-    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):797 -> a
+    32:32:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):676:676 -> a
+    33:33:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isReturnTypeStrengtheningAllowed():406:406 -> a
+    33:33:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):678 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):797:797 -> a
-    35:35:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):796:796 -> a
-    36:36:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isSingleCallerInliningAllowed():512:512 -> a
-    36:36:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):800 -> a
+    34:34:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):678:678 -> a
+    35:35:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):677:677 -> a
+    36:36:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isSingleCallerInliningAllowed():415:415 -> a
+    36:36:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):681 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    37:37:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):800:800 -> a
-    38:38:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):799:799 -> a
-    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedArgumentOptimizationAllowed():531:531 -> a
-    39:39:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):802 -> a
+    37:37:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):681:681 -> a
+    38:38:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):680:680 -> a
+    39:39:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedArgumentOptimizationAllowed():424:424 -> a
+    39:39:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):683 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):802:802 -> a
-    41:41:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):801:801 -> a
-    42:42:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedReturnValueOptimizationAllowed():550:550 -> a
-    42:42:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):805 -> a
+    40:40:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):683:683 -> a
+    41:41:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):682:682 -> a
+    42:42:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isUnusedReturnValueOptimizationAllowed():433:433 -> a
+    42:42:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):686 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:43:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):805:805 -> a
-    44:44:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):804:804 -> a
+    43:43:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):686:686 -> a
+    44:44:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):685:685 -> a
+    45:45:boolean com.android.tools.r8.shaking.KeepMethodInfo$Builder.isParameterNamesRemovalAllowed():443:443 -> a
+    45:45:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):689 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    46:46:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):689:689 -> a
+    47:47:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):688:688 -> a
     com.android.tools.r8.shaking.KeepMethodInfo$Joiner asMethodJoiner() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner self():678:678 -> n
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner self():553:553 -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():694:694 -> r
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():569:569 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClassInlining(boolean):326:326 -> r
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowClassInlining():335 -> r
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():694 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():695:695 -> r
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():699:699 -> s
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClassInlining(boolean):329:329 -> r
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():569 -> r
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClassInlining():570:570 -> r
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():574:574 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClosedWorldReasoning(boolean):345:345 -> s
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowClosedWorldReasoning():354 -> s
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():699 -> s
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():700:700 -> s
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():704:704 -> t
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowClosedWorldReasoning(boolean):338:338 -> s
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():574 -> s
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowClosedWorldReasoning():575:575 -> s
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():579:579 -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowConstantArgumentOptimization(boolean):364:364 -> t
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowConstantArgumentOptimization():373 -> t
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():704 -> t
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():705:705 -> t
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():709:709 -> u
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowConstantArgumentOptimization(boolean):347:347 -> t
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():579 -> t
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowConstantArgumentOptimization():580:580 -> t
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():584:584 -> u
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowInlining(boolean):383:383 -> u
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowInlining():392 -> u
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():709 -> u
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():710:710 -> u
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():714:714 -> v
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowInlining(boolean):356:356 -> u
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():584 -> u
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowInlining():585:585 -> u
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():589:589 -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowMethodStaticizing(boolean):402:402 -> v
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowMethodStaticizing():411 -> v
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():714 -> v
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():715:715 -> v
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():719:719 -> w
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowMethodStaticizing(boolean):365:365 -> v
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():589 -> v
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowMethodStaticizing():590:590 -> v
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterNamesRemoval():634:634 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterRemoval(boolean):421:421 -> w
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterRemoval():430 -> w
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():719 -> w
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():720:720 -> w
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():724:724 -> x
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterNamesRemoval(boolean):447:447 -> w
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterNamesRemoval():634 -> w
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterNamesRemoval():635:635 -> w
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():594:594 -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterReordering(boolean):440:440 -> x
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterReordering():449 -> x
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():724 -> x
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():725:725 -> x
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():729:729 -> y
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterRemoval(boolean):374:374 -> x
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():594 -> x
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterRemoval():595:595 -> x
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():599:599 -> y
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterTypeStrengthening(boolean):459:459 -> y
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterTypeStrengthening():468 -> y
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():729 -> y
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():730:730 -> y
-    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():734:734 -> z
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterReordering(boolean):383:383 -> y
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():599 -> y
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterReordering():600:600 -> y
+    1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():604:604 -> z
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowReprocessing(boolean):478:478 -> z
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowReprocessing():487 -> z
-    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():734 -> z
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReprocessing():735:735 -> z
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowParameterTypeStrengthening(boolean):392:392 -> z
+    2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():604 -> z
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowParameterTypeStrengthening():605:605 -> z
 com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.K1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
     1:1:com.android.tools.r8.shaking.KeepReason reachableFromLiveType(com.android.tools.r8.graph.DexType):47:47 -> a
@@ -278660,7 +278104,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexDefinition):263:264 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/b1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():269:269 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     2:4:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):274:276 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
     5:5:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
@@ -278679,7 +278123,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():123:123 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.z1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     boolean $assertionsDisabled -> b
@@ -278687,25 +278131,25 @@
     1:2:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.A1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.B1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():140:140 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.C1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):365:365 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():370:370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.D1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     com.android.tools.r8.graph.DexType type -> a
@@ -278713,7 +278157,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):223:224 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():229:229 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):234:234 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
 com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.E1:
@@ -278721,7 +278165,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):205:205 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.F1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     com.android.tools.r8.graph.DexAnnotation annotation -> a
@@ -278731,7 +278175,7 @@
     1:3:void <init>(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):243:245 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r0;Lcom/android/tools/r8/graph/y5;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():250:250 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):255:255 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
 com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.G1:
@@ -278739,13 +278183,13 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():298:298 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepReason$ReflectiveUseFromXml -> com.android.tools.r8.shaking.I1:
 # {"id":"sourceFile","fileName":"KeepReason.java"}
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin):311:312 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():322:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):327:327 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/N0;)Lcom/android/tools/r8/experimental/graphinfo/GraphNode;"}
     boolean isDueToReflectiveUse() -> b
@@ -278761,13 +278205,13 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):152:152 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():157:157 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hs$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/js$a;"}
 com.android.tools.r8.shaking.KeepUnusedArgumentRule -> com.android.tools.r8.shaking.M1:
 # {"id":"sourceFile","fileName":"KeepUnusedArgumentRule.java"}
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.KeepUnusedArgumentRule$Builder -> com.android.tools.r8.shaking.L1:
 # {"id":"sourceFile","fileName":"KeepUnusedArgumentRule.java"}
@@ -278792,7 +278236,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.KeepUnusedReturnValueRule$Builder -> com.android.tools.r8.shaking.N1:
 # {"id":"sourceFile","fileName":"KeepUnusedReturnValueRule.java"}
@@ -278815,14 +278259,14 @@
 com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.shaking.P1:
 # {"id":"sourceFile","fileName":"L8TreePruner.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.List pruned -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):26:26 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:5:void <init>(com.android.tools.r8.utils.InternalOptions):24:27 -> <init>
     1:2:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):31:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/gj0;)Lcom/android/tools/r8/graph/x0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r4;Lcom/android/tools/r8/internal/kj0;)Lcom/android/tools/r8/graph/x0;"}
     3:3:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getEmulatedInterfaces():163:163 -> a
     3:3:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):33 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -278885,7 +278329,7 @@
     1:1:void <clinit>():146:146 -> <clinit>
     1:1:void <init>():149:149 -> <init>
     1:3:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):161:163 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/po;Lcom/android/tools/r8/internal/Iw;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/so;Lcom/android/tools/r8/internal/Kw;Lcom/android/tools/r8/graph/C5;)Z"}
     4:9:boolean isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):173:178 -> a
     4:9:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):162 -> a
     10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
@@ -278968,7 +278412,7 @@
     30:30:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):101 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):102:102 -> a
     32:36:void lambda$getFirstReferenceOutsideFromCode$2(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):93:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/I2;)V"}
 com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.shaking.T1:
 # {"id":"sourceFile","fileName":"MainDexDirectReferenceTracer.java"}
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
@@ -279127,15 +278571,15 @@
     77:78:void ifNotRemoved(com.android.tools.r8.graph.DexType,java.util.Set,java.util.function.Consumer):273:274 -> a
     77:78:void lambda$withoutPrunedItems$5(java.util.Set,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexMethod):265 -> a
     79:79:com.android.tools.r8.shaking.MainDexInfo lambda$rewrittenWithLens$7(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.lens.GraphLens):280:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Y1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Y1;"}
     80:80:com.android.tools.r8.shaking.MainDexInfo rewrittenWithLens(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):280:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/Y1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/Y1;"}
     81:81:void lambda$rewrittenWithLens$8(com.android.tools.r8.graph.lens.GraphLens,java.util.Set,com.android.tools.r8.graph.DexType):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;)V"}
     82:82:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexType):288:288 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/graph/I2;)V"}
     83:83:void lambda$rewrittenWithLens$10(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):289:289 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)V"}
     84:85:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     84:85:void lambda$rewrittenWithLens$10(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):289 -> a
     86:86:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
@@ -279144,7 +278588,7 @@
     87:87:void com.android.tools.r8.shaking.MainDexInfo$Builder.addRoot(com.android.tools.r8.graph.DexMethod):340:340 -> a
     87:87:void lambda$rewrittenWithLens$10(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexMethod):289 -> a
     88:88:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):292:292 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/shaking/W1;Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/graph/I2;)V"}
     89:89:boolean com.android.tools.r8.graph.lens.GraphLens.isSyntheticFinalizationGraphLens():0:0 -> a
     89:89:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):292 -> a
     90:93:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexType):295:298 -> a
@@ -279170,7 +278614,7 @@
     4:5:void ifNotRemoved(com.android.tools.r8.graph.DexType,java.util.Set,java.util.function.Consumer):273:274 -> b
     4:5:void lambda$withoutPrunedItems$6(java.util.Set,com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexType):267 -> b
     6:7:com.android.tools.r8.shaking.MainDexInfo rewrittenWithLens(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.lens.GraphLens):284:285 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/Y1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/Y1;"}
     8:8:com.android.tools.r8.shaking.MainDexInfo$Builder builder():307:307 -> b
     8:8:com.android.tools.r8.shaking.MainDexInfo rewrittenWithLens(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.lens.GraphLens):287 -> b
     9:24:com.android.tools.r8.shaking.MainDexInfo rewrittenWithLens(com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.lens.GraphLens):288:303 -> b
@@ -279332,7 +278776,7 @@
     int $r8$clinit -> s
       # {"id":"com.android.tools.r8.synthesized"}
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,int):81:95 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
     1:1:java.lang.String typeString():130:130 -> D
     1:1:java.lang.String typeSuffix():135:135 -> E
     1:1:int getMaxRemovedAndroidLogLevel():115:115 -> F
@@ -279397,17 +278841,17 @@
     24:24:void merge(com.android.tools.r8.shaking.MinimumKeepInfoCollection):123 -> a
     25:25:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128:128 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
-    26:26:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> a
+    26:26:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> a
     26:26:void mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):132:132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/shaking/M;)V"}
     28:28:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):135:135 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)Z"}
-    29:29:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
+    29:29:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
     29:29:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
+    30:30:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
     30:30:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):135 -> a
     31:41:boolean lambda$pruneDeadItems$9(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):135:145 -> a
     42:42:com.android.tools.r8.graph.ProgramDefinition lambda$pruneDeadItems$6(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):138:138 -> a
@@ -279421,19 +278865,19 @@
     47:47:void pruneItems(com.android.tools.r8.graph.PrunedItems):150:150 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)V"}
     48:61:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):169:182 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
     62:77:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):170:185 -> a
-    78:78:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):725:725 -> a
+    78:78:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):644:644 -> a
     78:78:void lambda$rewrittenWithLens$11(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     79:79:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/F2;"}
     80:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     80:81:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):172 -> a
     82:85:com.android.tools.r8.graph.DexReference lambda$rewrittenWithLens$10(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):173:176 -> a
     86:86:int size():193:193 -> a
     86:86:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):166 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/c2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/c2;"}
     87:87:com.android.tools.r8.shaking.MinimumKeepInfoCollection create(int):47:47 -> a
     87:87:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):166 -> a
     88:88:com.android.tools.r8.shaking.MinimumKeepInfoCollection rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):167:167 -> a
@@ -279461,7 +278905,7 @@
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor.getFrom():27:27 -> a
     1:1:void lambda$getAllowedMissingClasses$7(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):302 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wu;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/jh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yu;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lh;)V"}
     2:2:void lambda$getAllowedMissingClasses$7(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):302:302 -> a
     3:6:void addWithRewrittenType(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):314:317 -> a
     3:6:void lambda$getAllowedMissingClasses$7(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):301 -> a
@@ -279522,9 +278966,9 @@
     111:125:void lambda$getMissingClassesToBeReported$5(java.util.function.Predicate,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):252:266 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
     126:128:boolean lambda$getIsAllowedMissingClassesPredicate$6(java.util.Set,java.util.function.Predicate,com.android.tools.r8.errors.dontwarn.DontWarnConfiguration,com.android.tools.r8.graph.DexType):278:280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/mm;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/om;Lcom/android/tools/r8/graph/I2;)Z"}
     129:129:void lambda$getAllowedMissingClasses$8(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexMethod):308:308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wu;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yu;Lcom/android/tools/r8/graph/w2;)V"}
     130:131:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):326:327 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/graph/I2;)Z"}
     132:132:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):534:534 -> a
@@ -279537,7 +278981,7 @@
     1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):112:112 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     2:4:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.AppView):284:286 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/gv;"}
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> b
     5:5:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.AppView):286 -> b
     6:6:java.util.Set getAllowedMissingClasses(com.android.tools.r8.graph.AppView):286:286 -> b
@@ -279565,7 +279009,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoAccessModificationRule$Builder -> com.android.tools.r8.shaking.f2:
 # {"id":"sourceFile","fileName":"NoAccessModificationRule.java"}
@@ -279590,7 +279034,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.h2:
 # {"id":"sourceFile","fileName":"NoFieldTypeStrengtheningRule.java"}
@@ -279615,7 +279059,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.j2:
 # {"id":"sourceFile","fileName":"NoHorizontalClassMergingRule.java"}
@@ -279640,7 +279084,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder -> com.android.tools.r8.shaking.l2:
 # {"id":"sourceFile","fileName":"NoMethodStaticizingRule.java"}
@@ -279665,7 +279109,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoParameterReorderingRule$Builder -> com.android.tools.r8.shaking.n2:
 # {"id":"sourceFile","fileName":"NoParameterReorderingRule.java"}
@@ -279690,7 +279134,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.p2:
 # {"id":"sourceFile","fileName":"NoParameterTypeStrengtheningRule.java"}
@@ -279715,7 +279159,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoRedundantFieldLoadEliminationRule$Builder -> com.android.tools.r8.shaking.r2:
 # {"id":"sourceFile","fileName":"NoRedundantFieldLoadEliminationRule.java"}
@@ -279740,7 +279184,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.t2:
 # {"id":"sourceFile","fileName":"NoReturnTypeStrengtheningRule.java"}
@@ -279765,7 +279209,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.v2:
 # {"id":"sourceFile","fileName":"NoUnusedInterfaceRemovalRule.java"}
@@ -279790,7 +279234,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.NoValuePropagationRule$Builder -> com.android.tools.r8.shaking.x2:
 # {"id":"sourceFile","fileName":"NoValuePropagationRule.java"}
@@ -279815,7 +279259,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.z2:
 # {"id":"sourceFile","fileName":"NoVerticalClassMergingRule.java"}
@@ -279838,7 +279282,7 @@
 com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils -> com.android.tools.r8.shaking.B2:
 # {"id":"sourceFile","fileName":"ObjectAllocationInfoCollectionUtils.java"}
     1:2:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ObjectAllocationInfoCollection):29:30 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/pd;Lcom/android/tools/r8/graph/o5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/rd;Lcom/android/tools/r8/graph/o5;)Z"}
     3:3:boolean com.android.tools.r8.ir.analysis.type.InterfaceCollection.isEmpty():103:103 -> a
     3:3:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ObjectAllocationInfoCollection):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -279853,7 +279297,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/l5;Lcom/android/tools/r8/graph/I2;)Z"}
     45:72:boolean mayHaveFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.DexType):58:85 -> a
     73:80:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):61:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/internal/Oh0;"}
     81:86:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):67:72 -> a
     87:87:boolean com.android.tools.r8.graph.DexType.isNotIdenticalTo(com.android.tools.r8.graph.DexType):44:44 -> a
     87:87:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):72 -> a
@@ -279863,13 +279307,13 @@
     89:89:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):73 -> a
     90:94:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):74:78 -> a
     95:95:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)Lcom/android/tools/r8/internal/Oh0;"}
 com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.shaking.C2:
 # {"id":"sourceFile","fileName":"ProguardAccessFlags.java"}
     int flags -> a
     int PPP_MASK -> b
     java.util.List NAMES -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <clinit>():15:15 -> <clinit>
     2:2:void set(int):213:213 -> <clinit>
     2:2:com.android.tools.r8.shaking.ProguardAccessFlags setPrivate():92 -> <clinit>
@@ -279877,7 +279321,7 @@
     3:9:void <clinit>():16:22 -> <clinit>
     1:6:void <init>():13:18 -> <init>
     1:1:java.util.List getPredicates():40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     2:2:int com.android.tools.r8.graph.AccessFlags.getOriginalAccessFlags():90:90 -> a
     2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -279913,7 +279357,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():86:86 -> D
     boolean applyToNonProgramClasses() -> l
 com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.D2:
@@ -279939,7 +279383,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():88:88 -> D
     boolean applyToNonProgramClasses() -> l
 com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.F2:
@@ -279962,7 +279406,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():83:83 -> D
 com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.H2:
 # {"id":"sourceFile","fileName":"ProguardAssumeValuesRule.java"}
@@ -279987,7 +279431,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():90:90 -> D
     com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule() -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/K2;"}
@@ -280012,12 +279456,12 @@
 com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.L2:
 # {"id":"sourceFile","fileName":"ProguardClassFilter.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <clinit>():12:12 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <clinit>
     2:2:void <clinit>():12 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):36:37 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():17:17 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/L2$a;"}
     2:3:boolean matches(com.android.tools.r8.graph.DexType):53:54 -> a
@@ -280026,7 +279470,7 @@
 com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.L2$a:
 # {"id":"sourceFile","fileName":"ProguardClassFilter.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:1:void <init>():23:23 -> <init>
     2:2:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):27:27 -> a
@@ -280059,7 +279503,7 @@
 com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.M2$a:
 # {"id":"sourceFile","fileName":"ProguardClassNameList.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     1:1:void <init>():47:47 -> <init>
     2:2:void <init>():45:45 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):51:51 -> a
@@ -280082,9 +279526,9 @@
 com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.N2:
 # {"id":"sourceFile","fileName":"ProguardClassNameList.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):337:338 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GS;)V"}
     1:1:java.util.List asSpecificDexTypes():0:0 -> a
     2:2:void writeTo(java.lang.StringBuilder):349:349 -> a
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():185:185 -> a
@@ -280140,7 +279584,7 @@
 com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.O2:
 # {"id":"sourceFile","fileName":"ProguardClassNameList.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.Collection):250:251 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):246:246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/shaking/M2;"}
@@ -280248,7 +279692,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/position/TextPosition;"}
     java.lang.String source -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classAnnotations -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     com.android.tools.r8.shaking.ProguardAccessFlags classAccessFlags -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/C2;"}
     com.android.tools.r8.shaking.ProguardAccessFlags negatedClassAccessFlags -> g
@@ -280259,7 +279703,7 @@
     com.android.tools.r8.shaking.ProguardClassNameList classNames -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M2;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder inheritanceAnnotations -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/R3;"}
     boolean inheritanceIsExtends -> m
@@ -280342,12 +279786,12 @@
     java.util.Set compatInstantiatedTypes -> a
     1:2:void <init>(java.util.Set):19:20 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/X2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/X2;"}
     2:2:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.<init>():62:62 -> a
     2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder builder():24 -> a
     2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):53 -> a
     2:2:com.android.tools.r8.shaking.ProguardCompatibilityActions lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/X2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/X2;"}
     3:4:com.android.tools.r8.shaking.ProguardCompatibilityActions rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):54:55 -> a
     3:4:com.android.tools.r8.shaking.ProguardCompatibilityActions lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens):49 -> a
     5:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
@@ -280366,11 +279810,11 @@
 com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.Y2:
 # {"id":"sourceFile","fileName":"ProguardConfiguration.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList obfuscationDictionary -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList classObfuscationDictionary -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList packageObfuscationDictionary -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean keepParameterNames -> D
     com.android.tools.r8.shaking.ProguardClassFilter adaptClassStrings -> E
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/L2;"}
@@ -280388,9 +279832,9 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryJars -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
     java.lang.String packagePrefix -> e
     boolean allowAccessModification -> f
     boolean ignoreWarnings -> g
@@ -280415,16 +279859,16 @@
     com.android.tools.r8.shaking.ProguardClassFilter dontNotePatterns -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/L2;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList rules -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean printSeeds -> y
     java.nio.file.Path seedFile -> z
     1:40:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode,java.lang.String,boolean,boolean,boolean,boolean,boolean,boolean,java.nio.file.Path,boolean,java.nio.file.Path,boolean,java.nio.file.Path,java.nio.file.Path,boolean,java.lang.String,com.android.tools.r8.shaking.ProguardKeepAttributes,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardClassFilter,java.util.Set,boolean,java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,boolean,com.android.tools.r8.shaking.ProguardClassFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,com.android.tools.r8.shaking.ProguardPathFilter,boolean,boolean,boolean,int):458:497 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/util/ArrayList;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/gB$n;Ljava/lang/String;ZZZZZZLjava/nio/file/Path;ZLjava/nio/file/Path;ZLjava/nio/file/Path;Ljava/nio/file/Path;ZLjava/lang/String;Lcom/android/tools/r8/shaking/r3;Lcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L2;Ljava/util/LinkedHashSet;ZLjava/nio/file/Path;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;ZLcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L3;Lcom/android/tools/r8/shaking/L3;Lcom/android/tools/r8/shaking/L3;ZZZI)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/graph/B1;Ljava/util/ArrayList;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/iB$n;Ljava/lang/String;ZZZZZZLjava/nio/file/Path;ZLjava/nio/file/Path;ZLjava/nio/file/Path;Ljava/nio/file/Path;ZLjava/lang/String;Lcom/android/tools/r8/shaking/r3;Lcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L2;Ljava/util/LinkedHashSet;ZLjava/nio/file/Path;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;ZLcom/android/tools/r8/shaking/L2;Lcom/android/tools/r8/shaking/L3;Lcom/android/tools/r8/shaking/L3;Lcom/android/tools/r8/shaking/L3;ZZZI)V"}
     1:1:boolean isPrintUsage():577:577 -> A
     1:1:boolean isShrinking():565:565 -> B
     1:1:boolean isVerbose():585:585 -> C
     1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):505:505 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/shaking/Y2$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/shaking/Y2$a;"}
     2:2:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():634:634 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/L2;"}
     1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():642:642 -> b
@@ -280443,7 +279887,7 @@
     1:1:java.util.List getLibraryjars():521:521 -> i
     1:1:int getMaxRemovedAndroidLogLevel():670:670 -> j
     1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():525:525 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$n;"}
     1:1:java.lang.String getPackagePrefix():529:529 -> l
     1:1:java.nio.file.Path getPrintConfigurationFile():573:573 -> m
     1:1:java.nio.file.Path getPrintMappingFile():541:541 -> n
@@ -280454,10 +279898,10 @@
     1:1:boolean hasApplyMappingFile():545:545 -> s
     1:1:boolean hasMaximumRemovedAndroidLogLevelRules():674:674 -> t
     1:2:java.lang.String toString():679:680 -> toString
-    3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():221:221 -> toString
+    3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():208:208 -> toString
     3:3:java.lang.String toString():680 -> toString
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():221:221 -> toString
+    4:4:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():208:208 -> toString
     4:4:java.lang.String toString():680 -> toString
     5:12:java.lang.String toString():681:688 -> toString
     1:1:boolean isConfigurationDebugging():658:658 -> u
@@ -280497,9 +279941,9 @@
     java.util.List libraryJars -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode packageObfuscationMode -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
     java.lang.String packagePrefix -> f
     boolean allowAccessModification -> g
     boolean ignoreWarnings -> h
@@ -280529,7 +279973,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):78:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)V"}
     2:28:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):26:52 -> <init>
     29:29:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():311:311 -> <init>
     29:29:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):53 -> <init>
@@ -280654,26 +280098,26 @@
     com.android.tools.r8.shaking.ProguardConfigurationParserOptions options -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/d3;"}
     com.android.tools.r8.utils.Reporter reporter -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.InputDependencyGraphConsumer inputDependencyConsumer -> e
     java.util.List IGNORED_SINGLE_ARG_OPTIONS -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List IGNORED_OPTIONAL_SINGLE_ARG_OPTIONS -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List IGNORED_FLAG_OPTIONS -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List IGNORED_CLASS_DESCRIPTOR_OPTIONS -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List WARNED_SINGLE_ARG_OPTIONS -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
     java.util.List WARNED_OPTIONAL_SINGLE_ARG_OPTIONS -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
     java.util.List WARNED_FLAG_OPTIONS -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
     java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List UNSUPPORTED_FLAG_OPTIONS -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
     1:29:void <clinit>():62:90 -> <clinit>
     30:30:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <clinit>
     30:30:void <clinit>():90 -> <clinit>
@@ -280688,12 +280132,12 @@
     56:56:void <clinit>():112 -> <clinit>
     57:57:void <clinit>():112:112 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):129:134 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)V"}
     7:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):126:126 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions):141:141 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/shaking/d3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/shaking/d3;)V"}
     9:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions,com.android.tools.r8.InputDependencyGraphConsumer):148:152 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/shaking/d3;Lcom/android/tools/r8/InputDependencyGraphConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/shaking/d3;Lcom/android/tools/r8/InputDependencyGraphConsumer;)V"}
     14:14:com.android.tools.r8.InputDependencyGraphConsumer emptyInputDependencyGraphConsumer():160:160 -> <init>
     14:14:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions,com.android.tools.r8.InputDependencyGraphConsumer):156 -> <init>
     15:15:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions,com.android.tools.r8.InputDependencyGraphConsumer):156:156 -> <init>
@@ -280736,7 +280180,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/a3$a;"}
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2327:2329 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Z)V"}
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.c3:
 # {"id":"sourceFile","fileName":"ProguardConfigurationParser.java"}
     java.lang.String name -> a
@@ -280777,7 +280221,7 @@
     14:14:void lambda$parseMaximumRemovedAndroidLogLevelRule$1(com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule$Builder):933:933 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/a2;)V"}
     15:27:void verifyAndLinkBackReferences(java.lang.Iterable):951:963 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fq;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hq;)V"}
     28:31:void verifyAndLinkBackReferences(java.lang.Iterable):958:961 -> a
     32:41:void verifyAndLinkBackReferences(java.lang.Iterable):958:967 -> a
     42:42:void lambda$parseClassSpecFromClassTypeInclusive$3(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):999:999 -> a
@@ -280825,7 +280269,7 @@
     71:71:boolean parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1143 -> a
     72:72:boolean parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1147:1147 -> a
     73:75:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,com.android.tools.r8.utils.ThrowingAction,java.util.function.Consumer):1165:1167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P2$a;Lcom/android/tools/r8/internal/Qg0;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/P2$a;Lcom/android/tools/r8/internal/Ug0;Ljava/util/function/Consumer;)V"}
     76:76:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):152:152 -> a
     76:76:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,com.android.tools.r8.utils.ThrowingAction,java.util.function.Consumer):1168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -281925,7 +281369,7 @@
     4:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2127:2127 -> l
     4:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2117 -> l
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1614:1616 -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     4:4:void com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.<init>():787:787 -> m
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1616 -> m
     5:9:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1617:1621 -> m
@@ -282909,7 +282353,7 @@
     java.lang.String typeString() -> D
     java.lang.String typeSuffix() -> E
     1:1:void lambda$isTrivalAllClassMatch$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.shaking.ProguardTypeMatcher):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/shaking/R3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/shaking/R3;)V"}
     2:2:boolean lambda$isTrivalAllClassMatch$1(com.android.tools.r8.shaking.ProguardTypeMatcher):69:69 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/R3;)Z"}
     3:28:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):153:178 -> a
@@ -283195,7 +282639,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():79:79 -> D
 com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.m3:
 # {"id":"sourceFile","fileName":"ProguardIdentifierNameStringRule.java"}
@@ -283304,39 +282748,37 @@
     boolean enclosingMethod -> d
     boolean signature -> e
     boolean exceptions -> f
-    boolean lineNumberTable -> g
-    boolean localVariableTable -> h
-    boolean localVariableTypeTable -> i
-    boolean methodParameters -> j
-    boolean sourceDebugExtension -> k
-    boolean runtimeVisibleAnnotations -> l
-    boolean runtimeInvisibleAnnotations -> m
-    boolean runtimeVisibleParameterAnnotations -> n
-    boolean runtimeInvisibleParameterAnnotations -> o
-    boolean runtimeVisibleTypeAnnotations -> p
-    boolean runtimeInvisibleTypeAnnotations -> q
-    boolean annotationDefault -> r
-    boolean stackMapTable -> s
-    boolean permittedSubclasses -> t
-    java.util.List KEEP_ALL -> u
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fc0;"}
+    boolean localVariableTypeTable -> g
+    boolean methodParameters -> h
+    boolean sourceDebugExtension -> i
+    boolean runtimeVisibleAnnotations -> j
+    boolean runtimeInvisibleAnnotations -> k
+    boolean runtimeVisibleParameterAnnotations -> l
+    boolean runtimeInvisibleParameterAnnotations -> m
+    boolean runtimeVisibleTypeAnnotations -> n
+    boolean runtimeInvisibleTypeAnnotations -> o
+    boolean annotationDefault -> p
+    boolean stackMapTable -> q
+    boolean permittedSubclasses -> r
+    java.util.List KEEP_ALL -> s
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jc0;"}
     1:1:void <clinit>():37:37 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <clinit>
     2:2:void <clinit>():37 -> <clinit>
     3:3:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>():60:60 -> <init>
-    2:21:void <init>():39:58 -> <init>
-    1:10:boolean update(boolean,java.lang.String,java.util.List):76:85 -> a
-    11:27:boolean matches(java.lang.String,int,java.lang.String,int):92:108 -> a
+    1:1:void <init>():59:59 -> <init>
+    2:20:void <init>():39:57 -> <init>
+    1:10:boolean update(boolean,java.lang.String,java.util.List):75:84 -> a
+    11:27:boolean matches(java.lang.String,int,java.lang.String,int):91:107 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;Ljava/lang/String;)Z"}
-    28:28:com.android.tools.r8.shaking.ProguardKeepAttributes fromPatterns(java.util.List):112:112 -> a
+    28:28:com.android.tools.r8.shaking.ProguardKeepAttributes fromPatterns(java.util.List):111:111 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)Lcom/android/tools/r8/shaking/r3;"}
-    29:54:void applyPatterns(java.util.List):118:143 -> a
-    29:54:com.android.tools.r8.shaking.ProguardKeepAttributes fromPatterns(java.util.List):113 -> a
-    55:110:java.lang.StringBuilder append(java.lang.StringBuilder):241:296 -> a
-    1:5:boolean equals(java.lang.Object):176:180 -> equals
-    1:17:int hashCode():201:217 -> hashCode
-    1:1:java.lang.String toString():304:304 -> toString
+    29:52:void applyPatterns(java.util.List):117:140 -> a
+    29:52:com.android.tools.r8.shaking.ProguardKeepAttributes fromPatterns(java.util.List):112 -> a
+    53:108:java.lang.StringBuilder append(java.lang.StringBuilder):228:283 -> a
+    1:5:boolean equals(java.lang.Object):163:167 -> equals
+    1:17:int hashCode():188:204 -> hashCode
+    1:1:java.lang.String toString():291:291 -> toString
 com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.t3:
 # {"id":"sourceFile","fileName":"ProguardKeepRule.java"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):63:63 -> <init>
@@ -283626,22 +283068,22 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/B3;"}
     boolean booleanValue -> b
     com.android.tools.r8.utils.LongInterval longInterval -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/JL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NL;"}
     com.android.tools.r8.graph.DexType fieldHolder -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.graph.DexString fieldName -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/H2;"}
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XR;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():22:22 -> <clinit>
     1:7:void <init>(boolean):38:44 -> <init>
     8:15:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.Nullability):48:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/TR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/XR;)V"}
     16:23:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):58:65 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/XR;)V"}
     24:29:void <init>(com.android.tools.r8.utils.LongInterval):68:73 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NL;)V"}
     30:30:boolean com.android.tools.r8.utils.LongInterval.isSingleValue(int):40:40 -> <init>
     30:30:com.android.tools.r8.ir.analysis.type.Nullability getNullabilityForValueRange(com.android.tools.r8.utils.LongInterval):78 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -283669,12 +283111,12 @@
     1:2:com.android.tools.r8.graph.DexString getFieldName():114:115 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/H2;"}
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():123:123 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XR;"}
     2:2:boolean hasNullability():119:119 -> d
     2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():123 -> d
     3:4:com.android.tools.r8.ir.analysis.type.Nullability getNullability():123:124 -> d
     1:2:com.android.tools.r8.utils.LongInterval getValueRange():128:129 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/JL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NL;"}
     1:1:boolean isBoolean():88:88 -> f
     1:1:boolean isField():92:92 -> g
     1:1:boolean isNullability():96:96 -> h
@@ -283801,9 +283243,9 @@
 com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.J3:
 # {"id":"sourceFile","fileName":"ProguardPackageNameList.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):40:41 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CS;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GS;)V"}
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder builder():16:16 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/J3$a;"}
     2:2:boolean matches(com.android.tools.r8.graph.DexType):60:60 -> a
@@ -283876,7 +283318,7 @@
 com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.J3$a:
 # {"id":"sourceFile","fileName":"ProguardPackageNameList.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GS;"}
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):29:29 -> a
@@ -283887,11 +283329,11 @@
 # {"id":"sourceFile","fileName":"ProguardPathFilter.java"}
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,boolean):44:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Z)V"}
     4:4:com.android.tools.r8.shaking.ProguardPathList com.android.tools.r8.shaking.ProguardPathList.emptyList():17:17 -> <init>
     4:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,boolean):47 -> <init>
     5:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,boolean):47:47 -> <init>
@@ -283903,14 +283345,14 @@
 # {"id":"sourceFile","fileName":"ProguardPathFilter.java"}
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:1:void <init>():21:21 -> <init>
     2:3:void <init>():18:19 -> <init>
 com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.P3:
 # {"id":"sourceFile","fileName":"ProguardPathList.java"}
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$Builder -> R8$$REMOVED$$CLASS$$231:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> R8$$REMOVED$$CLASS$$220:
 # {"id":"sourceFile","fileName":"ProguardPathList.java"}
 com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.M3:
 # {"id":"sourceFile","fileName":"ProguardPathList.java"}
@@ -283932,9 +283374,9 @@
 com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.O3:
 # {"id":"sourceFile","fileName":"ProguardPathList.java"}
     java.util.List matchers -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:2:void <init>(java.util.List):106:107 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;)V"}
     1:1:boolean matches(java.lang.String):112:112 -> a
     2:2:boolean com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher.match(java.lang.String):58:58 -> a
     2:2:boolean matches(java.lang.String):113 -> a
@@ -284153,7 +283595,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):58:58 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():80:80 -> D
 com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.X3:
 # {"id":"sourceFile","fileName":"ProguardWhyAreYouKeepingRule.java"}
@@ -284238,7 +283680,7 @@
     int $r8$clinit -> s
       # {"id":"com.android.tools.r8.synthesized"}
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type):75:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
     1:7:java.lang.String typeString():112:118 -> D
     8:8:java.lang.String typeString():114:114 -> D
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type getType():97:97 -> F
@@ -284265,7 +283707,7 @@
     7:7:com.android.tools.r8.shaking.ProguardClassSpecification build():18 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/P2$a;"}
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type -> R8$$REMOVED$$CLASS$$232:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type -> R8$$REMOVED$$CLASS$$221:
 # {"id":"sourceFile","fileName":"ReprocessClassInitializerRule.java"}
 com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.d4:
 # {"id":"sourceFile","fileName":"ReprocessMethodRule.java"}
@@ -284274,7 +283716,7 @@
     int $r8$clinit -> s
       # {"id":"com.android.tools.r8.synthesized"}
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessMethodRule$Type):75:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;I)V"}
     1:7:java.lang.String typeString():112:118 -> D
     8:8:java.lang.String typeString():114:114 -> D
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type getType():97:97 -> F
@@ -284301,12 +283743,12 @@
     7:7:com.android.tools.r8.shaking.ProguardClassSpecification build():18 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/P2$a;"}
-com.android.tools.r8.shaking.ReprocessMethodRule$Type -> R8$$REMOVED$$CLASS$$233:
+com.android.tools.r8.shaking.ReprocessMethodRule$Type -> R8$$REMOVED$$CLASS$$222:
 # {"id":"sourceFile","fileName":"ReprocessMethodRule.java"}
 com.android.tools.r8.shaking.RootSetBuilderEventConsumer -> com.android.tools.r8.shaking.f4:
 # {"id":"sourceFile","fileName":"RootSetBuilderEventConsumer.java"}
     1:1:com.android.tools.r8.shaking.RootSetBuilderEventConsumer create(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions):15:15 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YX;)Lcom/android/tools/r8/shaking/f4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cY;)Lcom/android/tools/r8/shaking/f4;"}
     2:2:com.android.tools.r8.shaking.RootSetBuilderEventConsumer com.android.tools.r8.profile.rewriting.ProfileRewritingRootSetBuilderEventConsumer.attach(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.shaking.RootSetBuilderEventConsumer):23:23 -> a
     2:2:com.android.tools.r8.shaking.RootSetBuilderEventConsumer create(com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions):15 -> a
     3:3:boolean com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions.isNop():0:0 -> a
@@ -284354,279 +283796,269 @@
     10:10:void <clinit>():250:250 -> <clinit>
 com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.h4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
-    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2259:2259 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/tY;)V"}
+    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2264:2264 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A;Ljava/util/IdentityHashMap;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/xY;)V"}
 com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.i4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
     com.android.tools.r8.shaking.Enqueuer enqueuer -> F
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/M;"}
     1:1:com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions com.android.tools.r8.shaking.Enqueuer.getProfileCollectionAdditions():567:567 -> <init>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2234 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2239 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/T5;)V"}
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2234:2234 -> <init>
-    3:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2232:2237 -> <init>
-    1:1:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2242:2242 -> a
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2239:2239 -> <init>
+    3:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.SubtypingInfo):2237:2242 -> <init>
+    1:1:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2247:2247 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f;)V"}
     2:2:com.android.tools.r8.shaking.Enqueuer$Mode com.android.tools.r8.shaking.Enqueuer.getMode():571:571 -> a
-    2:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2242 -> a
+    2:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2247 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2242:2243 -> a
+    3:4:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2247:2248 -> a
     5:5:boolean com.android.tools.r8.shaking.AnnotationMatchResult.isConcreteAnnotationMatchResult():0:0 -> a
-    5:5:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2243 -> a
-    6:7:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244:2245 -> a
+    5:5:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2248 -> a
+    6:7:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249:2250 -> a
     8:8:java.util.List com.android.tools.r8.shaking.AnnotationMatchResult$ConcreteAnnotationMatchResult.getMatchedAnnotations():44:44 -> a
-    8:8:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2245 -> a
+    8:8:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4956:4956 -> a
-    9:9:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    9:9:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     10:10:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4956:4956 -> a
-    10:10:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    10:10:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4956:4956 -> a
-    11:11:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    11:11:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     12:12:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4957:4957 -> a
-    12:12:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    12:12:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:14:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4958:4959 -> a
-    13:14:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    13:14:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     15:15:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.shaking.AnnotationMatchResult$MatchedAnnotation.getAnnotation():76:76 -> a
     15:15:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4959 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
-    16:16:void com.android.tools.r8.shaking.AnnotationRemover$Builder.retainAnnotation(com.android.tools.r8.graph.DexAnnotation):442:442 -> a
+    15:15:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
+    16:16:void com.android.tools.r8.shaking.AnnotationRemover$Builder.retainAnnotation(com.android.tools.r8.graph.DexAnnotation):441:441 -> a
     16:16:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4959 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
-    17:17:void com.android.tools.r8.shaking.AnnotationRemover$Builder.retainAnnotation(com.android.tools.r8.graph.DexAnnotation):442:442 -> a
+    16:16:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
+    17:17:void com.android.tools.r8.shaking.AnnotationRemover$Builder.retainAnnotation(com.android.tools.r8.graph.DexAnnotation):441:441 -> a
     17:17:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4959 -> a
-    17:17:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    17:17:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     18:18:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4960:4960 -> a
-    18:18:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    18:18:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     19:19:com.android.tools.r8.graph.ProgramDefinition com.android.tools.r8.shaking.AnnotationMatchResult$MatchedAnnotation.getAnnotatedItem():72:72 -> a
     19:19:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4961 -> a
-    19:19:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    19:19:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     20:20:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.shaking.AnnotationMatchResult$MatchedAnnotation.getAnnotation():76:76 -> a
     20:20:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4962 -> a
-    20:20:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    20:20:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     21:21:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.shaking.AnnotationMatchResult$MatchedAnnotation.getAnnotatedKind():80:80 -> a
     21:21:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4963 -> a
-    21:21:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    21:21:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
     22:22:void com.android.tools.r8.shaking.Enqueuer.retainAnnotationForFinalTreeShaking(java.util.List):4960:4960 -> a
-    22:22:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2244 -> a
+    22:22:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2249 -> a
 com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet -> com.android.tools.r8.shaking.j4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
     boolean $assertionsDisabled -> o
-    1:1:void <clinit>():2305:2305 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2315:2318 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/internal/vu;Ljava/util/Set;Ljava/util/ArrayList;)V"}
+    1:1:void <clinit>():2310:2310 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2320:2323 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/internal/xu;Ljava/util/Set;Ljava/util/ArrayList;)V"}
     5:5:com.android.tools.r8.utils.PredicateSet com.android.tools.r8.utils.PredicateSet.empty():28:28 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2319 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2320:2322 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2324 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2325:2327 -> <init>
     9:9:com.android.tools.r8.utils.collections.ProgramMethodMap com.android.tools.r8.utils.collections.ProgramMethodMap.empty():42:42 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2325 -> <init>
-    10:10:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2312:2312 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2330 -> <init>
+    10:10:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2317:2317 -> <init>
     1:1:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)V"}
-    2:2:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2305:2305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/l4;"}
-    3:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2333:2333 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)Lcom/android/tools/r8/shaking/k4;"}
-    4:4:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2351:2351 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/graph/F2;)V"}
-    1:15:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2343:2357 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/j4;"}
-    16:16:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> b
-    16:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2359 -> b
-    17:22:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2359:2364 -> b
-    23:32:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2369:2378 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/j4;"}
-    33:33:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> b
-    33:33:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2380 -> b
-    34:35:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2380:2381 -> b
+    2:2:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2310:2310 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/l4;"}
+    3:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2338:2338 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)Lcom/android/tools/r8/shaking/k4;"}
+    4:4:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2356:2356 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/graph/F2;)V"}
+    1:15:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2348:2362 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/j4;"}
+    16:16:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> b
+    16:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2364 -> b
+    17:22:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2364:2369 -> b
+    23:32:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2374:2383 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/j4;"}
+    33:33:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> b
+    33:33:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2385 -> b
+    34:35:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):2385:2386 -> b
 com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder -> com.android.tools.r8.shaking.k4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2283:2283 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)V"}
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2281:2281 -> <init>
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2274:2274 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2288:2288 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/graph/T5;Ljava/util/List;)V"}
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2286:2286 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2279:2279 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/shaking/l4;"}
-    1:2:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2296:2297 -> b
+    1:2:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2301:2302 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/shaking/j4;"}
-    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> b
-    3:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2298 -> b
+    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> b
+    3:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2303 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2298:2298 -> b
+    4:4:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2303:2303 -> b
 com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.l4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.Set alwaysInline -> f
     java.util.Set bypassClinitForInlining -> g
     java.util.Set whyAreYouNotInlining -> h
     java.util.Set reprocess -> i
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nX;"}
     java.util.Map mayHaveSideEffects -> k
     java.util.Set identifierNameStrings -> l
     java.util.Set ifRules -> m
     boolean $assertionsDisabled -> n
-    1:1:void <clinit>():1874:1874 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1900:1913 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/internal/vu;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/jX;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/tY;)V"}
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> a
-    1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1960 -> a
+    1:1:void <clinit>():1879:1879 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1905:1918 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Lcom/android/tools/r8/internal/xu;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/nX;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/xY;)V"}
+    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> a
+    1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1965 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;)Z"}
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> a
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1960 -> a
-    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    3:3:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2032 -> a
+    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> a
+    2:2:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1965 -> a
+    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    3:3:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2037 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)V"}
-    4:7:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2033:2036 -> a
-    8:8:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2035:2035 -> a
-    9:9:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    9:9:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2040 -> a
+    4:7:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2038:2041 -> a
+    8:8:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2040:2040 -> a
+    9:9:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    9:9:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2045 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     10:10:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
-    10:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2041 -> a
-    11:12:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2041:2042 -> a
-    13:21:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1917:1925 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+    10:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2046 -> a
+    11:12:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):2046:2047 -> a
+    13:21:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1922:1930 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     22:22:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    22:22:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1925 -> a
-    23:23:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1926:1926 -> a
+    22:22:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1930 -> a
+    23:23:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1931:1931 -> a
     24:24:java.util.Set com.android.tools.r8.shaking.ProguardIfRule.getAndClearInlinableFieldsMatchingPrecondition():50:50 -> a
-    24:24:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1927 -> a
+    24:24:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1932 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:26:java.util.Set com.android.tools.r8.shaking.ProguardIfRule.getAndClearInlinableFieldsMatchingPrecondition():50:51 -> a
-    25:26:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1927 -> a
-    27:30:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1928:1931 -> a
+    25:26:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1932 -> a
+    27:30:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1933:1936 -> a
     31:31:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isUsed():82:82 -> a
-    31:31:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1936 -> a
-    32:32:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1937:1937 -> a
+    31:31:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1941 -> a
+    32:32:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1942:1942 -> a
     33:33:void com.android.tools.r8.utils.Reporter.info(com.android.tools.r8.Diagnostic):93:93 -> a
-    33:33:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1937 -> a
-    34:34:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1937:1937 -> a
-    35:40:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1943:1948 -> a
+    33:33:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1942 -> a
+    34:34:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1942:1942 -> a
+    35:40:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1948:1953 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/h4;)V"}
-    41:42:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1946:1947 -> a
+    41:42:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1951:1952 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/Set;)V"}
-    43:43:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1953:1953 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/gB;)Z"}
-    44:44:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    44:44:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1956 -> a
+    43:43:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1958:1958 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/iB;)Z"}
+    44:44:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    44:44:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1961 -> a
     45:45:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
-    45:45:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1957 -> a
-    46:48:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1957:1959 -> a
-    49:49:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1958:1958 -> a
-    50:50:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1977:1977 -> a
+    45:45:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1962 -> a
+    46:48:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1962:1964 -> a
+    49:49:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1963:1963 -> a
+    50:50:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1982:1982 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/shaking/M;)V"}
-    51:51:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1981:1981 -> a
+    51:51:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1986:1986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/shaking/M;Lcom/android/tools/r8/graph/F2;)Z"}
-    52:59:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1980:1987 -> a
-    60:60:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1983:1983 -> a
+    52:59:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1985:1992 -> a
+    60:60:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1988:1988 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/l1;)Lcom/android/tools/r8/graph/o0;"}
     61:61:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):456:456 -> a
     61:61:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):108 -> a
-    61:61:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1983 -> a
+    61:61:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1988 -> a
     62:62:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):499:499 -> a
     62:62:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):456 -> a
     62:62:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):108 -> a
-    62:62:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1983 -> a
-    63:63:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1986:1986 -> a
+    62:62:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1988 -> a
+    63:63:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1991:1991 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/o0;"}
-    64:64:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1985:1985 -> a
-    65:65:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1992:1992 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/lh0;)V"}
-    66:66:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    66:66:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1993 -> a
-    67:73:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1993:1999 -> a
-    74:74:boolean lambda$pruneItems$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MinimumKeepInfoCollection):1996:1996 -> a
+    64:64:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1990:1990 -> a
+    65:65:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1997:1997 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/ph0;)V"}
+    66:66:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    66:66:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1998 -> a
+    67:73:void pruneItems(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.utils.Timing):1998:2004 -> a
+    74:74:boolean lambda$pruneItems$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MinimumKeepInfoCollection):2001:2001 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/shaking/c2;)Z"}
     75:75:boolean com.android.tools.r8.shaking.MinimumKeepInfoCollection.isEmpty():119:119 -> a
-    75:75:boolean lambda$pruneItems$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MinimumKeepInfoCollection):1997 -> a
-    76:84:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2003:2011 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/shaking/l4;"}
-    85:85:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> a
-    85:85:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2013 -> a
-    86:100:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2013:2027 -> a
-    101:101:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2044:2044 -> a
+    75:75:boolean lambda$pruneItems$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.MinimumKeepInfoCollection):2002 -> a
+    76:84:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2008:2016 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/shaking/l4;"}
+    85:85:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> a
+    85:85:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2018 -> a
+    86:100:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.utils.Timing):2018:2032 -> a
+    101:101:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2049:2049 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)Z"}
-    102:102:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> a
-    102:102:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2044 -> a
+    102:102:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> a
+    102:102:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2049 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> a
-    103:103:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2044 -> a
-    104:115:void lambda$verifyKeptFieldsAreAccessedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2046:2057 -> a
+    103:103:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> a
+    103:103:boolean lambda$verifyKeptFieldsAreAccessedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2049 -> a
+    104:115:void lambda$verifyKeptFieldsAreAccessedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2051:2062 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
-    116:124:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2102:2110 -> a
+    116:124:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2107:2115 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;)Z"}
-    125:128:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2124:2127 -> a
+    125:128:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2129:2132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Ljava/util/Map;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
-    129:136:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2126:2133 -> a
-    137:142:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2132:2137 -> a
-    143:145:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2216:2218 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YX;Lcom/android/tools/r8/graph/T5;Ljava/lang/Iterable;)Lcom/android/tools/r8/shaking/o4;"}
-    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> b
-    1:1:boolean lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2122 -> b
+    129:136:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2131:2138 -> a
+    137:142:void lambda$verifyKeptItemsAreKept$17(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2137:2142 -> a
+    143:145:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2221:2223 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cY;Lcom/android/tools/r8/graph/T5;Ljava/lang/Iterable;)Lcom/android/tools/r8/shaking/o4;"}
+    1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> b
+    1:1:boolean lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2127 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)Z"}
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> b
-    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2122 -> b
-    3:3:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1946:1946 -> b
+    2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> b
+    2:2:boolean lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2127 -> b
+    3:3:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1951:1951 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-    4:4:void lambda$shouldNotBeMinified$7(com.android.tools.r8.shaking.KeepInfo$Joiner):2036:2036 -> b
+    4:4:void lambda$shouldNotBeMinified$7(com.android.tools.r8.shaking.KeepInfo$Joiner):2041:2041 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;)V"}
-    5:14:void lambda$verifyKeptMethodsAreTargetedAndLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2071:2080 -> b
+    5:14:void lambda$verifyKeptMethodsAreTargetedAndLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2076:2085 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
-    15:87:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2116:2188 -> b
+    15:87:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2121:2193 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> c
-    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2065 -> c
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> c
+    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2070 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:2:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> c
-    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2066 -> c
-    3:4:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2066:2067 -> c
-    5:5:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069:2069 -> c
+    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2071 -> c
+    3:4:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2071:2072 -> c
+    5:5:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2074:2074 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)Z"}
-    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> c
-    6:6:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069 -> c
+    6:6:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
+    6:6:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2074 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> c
-    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069 -> c
-    8:10:void lambda$verifyKeptTypesAreLive$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2094:2096 -> c
+    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> c
+    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2074 -> c
+    8:10:void lambda$verifyKeptTypesAreLive$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2099:2101 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)V"}
-    11:11:java.util.Set lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.DexType):2129:2129 -> c
+    11:11:java.util.Set lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.DexType):2134:2134 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1870:1870 -> d
-    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2088 -> d
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentMinimumKeepInfo():1875:1875 -> d
+    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2093 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:2:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> d
-    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2089 -> d
-    3:4:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2089:2090 -> d
-    5:5:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2092:2092 -> d
+    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2094 -> d
+    3:4:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2094:2095 -> d
+    5:5:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2097:2097 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Lcom/android/tools/r8/shaking/m1;)Z"}
     6:6:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> d
-    6:6:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2092 -> d
-    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633:633 -> d
-    7:7:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2092 -> d
+    6:6:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2097 -> d
+    7:7:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> d
+    7:7:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2097 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Builder.isShrinkingAllowed():411:411 -> d
-    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():633 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2092 -> d
-    9:9:java.util.Set lambda$verifyKeptItemsAreKept$16(com.android.tools.r8.graph.DexType):2136:2136 -> d
+    8:8:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():552:552 -> d
+    8:8:boolean lambda$verifyKeptTypesAreLive$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2097 -> d
+    9:9:java.util.Set lambda$verifyKeptItemsAreKept$16(com.android.tools.r8.graph.DexType):2141:2141 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-    1:6:java.lang.String toString():2196:2201 -> toString
+    1:6:java.lang.String toString():2201:2206 -> toString
 com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.m4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
     com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> a
@@ -284635,12 +284067,12 @@
     java.util.List delayedRootSetActionItems -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
-    1:5:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1858:1862 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Ljava/util/Map;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/tY;)V"}
-    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1866:1866 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
+    1:5:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1863:1867 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/C;Ljava/util/Map;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/xY;)V"}
+    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1871:1871 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-    2:2:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1870:1870 -> a
+    2:2:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1875:1875 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/C;"}
 com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.o4:
 # {"id":"sourceFile","fileName":"RootSetUtils.java"}
@@ -284672,7 +284104,7 @@
     java.util.Set whyAreYouNotInlining -> k
     java.util.Set reprocess -> l
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jX;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nX;"}
     java.util.Map dependentKeepClassCompatRule -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map mayHaveSideEffects -> o
@@ -284683,7 +284115,7 @@
     java.util.Queue delayedRootSetActionItems -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/concurrent/ConcurrentLinkedQueue;"}
     com.android.tools.r8.utils.InternalOptions options -> s
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     com.android.tools.r8.shaking.DexStringCache dexStringCache -> t
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/D;"}
     java.util.Set ifRules -> u
@@ -284693,22 +284125,22 @@
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> x
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/C;"}
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper interfaceDesugaringSyntheticHelper -> y
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/BA;"}
     com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> z
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     1:1:void <clinit>():111:111 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):160:160 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/f4;Lcom/android/tools/r8/graph/T5;Ljava/lang/Iterable;)V"}
     2:2:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.createConcurrent():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):120 -> <init>
     3:58:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):120:175 -> <init>
-    59:67:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1721:1729 -> <init>
+    59:67:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1726:1734 -> <init>
     59:67:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):176 -> <init>
     68:71:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):176:179 -> <init>
-    72:80:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1721:1729 -> <init>
+    72:80:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1726:1734 -> <init>
     72:80:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):180 -> <init>
     81:84:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):180:183 -> <init>
-    85:93:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1721:1729 -> <init>
+    85:93:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo getRetentionFromAttributeConfig(boolean,boolean):1726:1734 -> <init>
     85:93:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):184 -> <init>
     94:94:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.RootSetBuilderEventConsumer,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):184:184 -> <init>
     1:1:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):0:0 -> a
@@ -284741,7 +284173,7 @@
     31:31:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder setAssumeInfoCollectionBuilder(com.android.tools.r8.shaking.AssumeInfoCollection$Builder):214:214 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/k;)Lcom/android/tools/r8/shaking/o4;"}
     32:46:void runPerRule(com.android.tools.r8.threading.TaskCollection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):349:363 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wg0;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ag0;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
     47:52:void lambda$runPerRule$2(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):366:371 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
     53:63:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):378:388 -> a
@@ -284805,749 +284237,697 @@
     102:114:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):415:427 -> a
     115:116:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):394:395 -> a
     117:117:void lambda$build$3(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):403:403 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jr;)V"}
     118:118:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gr;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ir;)V"}
     119:119:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):357:357 -> a
     119:119:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    120:123:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):357:360 -> a
-    120:123:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
-    124:124:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowInlining():709:709 -> a
-    124:124:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):361 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    124:124:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
-    125:125:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowInlining():709:709 -> a
-    125:125:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):361 -> a
-    125:125:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
-    126:126:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowInlining(boolean):383:383 -> a
-    126:126:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowInlining():392 -> a
-    126:126:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowInlining():709 -> a
-    126:126:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):361 -> a
-    126:126:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    127:137:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):432:442 -> a
+    120:124:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker.extendRootSet(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection):357:361 -> a
+    120:124:void lambda$build$4(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):405 -> a
+    125:135:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):432:442 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)V"}
-    138:154:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):448:464 -> a
-    138:154:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    155:155:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):117:117 -> a
-    155:155:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
+    136:152:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):448:464 -> a
+    136:152:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    153:153:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):117:117 -> a
+    153:153:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    153:153:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    154:154:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):117:117 -> a
+    154:154:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
+    154:154:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    155:155:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.build():192:192 -> a
+    155:155:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):118 -> a
+    155:155:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
     155:155:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    156:156:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):117:117 -> a
+    156:156:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.empty():44:44 -> a
+    156:156:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):118 -> a
     156:156:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
     156:156:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    157:157:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.build():192:192 -> a
-    157:157:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):118 -> a
-    157:157:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
-    157:157:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    158:158:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.empty():44:44 -> a
-    158:158:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection$Builder.buildInfo(com.android.tools.r8.graph.DexClassAndMember):118 -> a
-    158:158:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):464 -> a
-    158:158:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    159:166:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):475:482 -> a
-    159:166:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    167:167:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134:134 -> a
-    167:167:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
+    157:164:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):475:482 -> a
+    157:164:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    165:165:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134:134 -> a
+    165:165:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    165:165:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    166:166:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134:134 -> a
+    166:166:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
+    166:166:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    167:167:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):166:166 -> a
+    167:167:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
+    167:167:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
     167:167:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    168:168:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134:134 -> a
+    168:168:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
+    168:168:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):166 -> a
+    168:168:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
     168:168:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
     168:168:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
     169:169:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):166:166 -> a
     169:169:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
     169:169:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
     169:169:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    170:170:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
-    170:170:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):166 -> a
+    170:170:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    170:170:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
     170:170:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
     170:170:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
     170:170:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    171:171:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):166:166 -> a
-    171:171:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
-    171:171:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
-    171:171:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    172:172:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    172:172:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
-    172:172:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
-    172:172:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
-    172:172:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    173:182:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
-    173:182:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
-    173:182:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
-    173:182:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
-    173:182:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
-    173:182:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    183:183:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    183:183:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    171:180:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
+    171:180:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
+    171:180:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    171:180:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
+    171:180:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
+    171:180:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    181:181:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    181:181:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167 -> a
+    181:181:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
+    181:181:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
+    181:181:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    182:182:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167:167 -> a
+    182:182:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
+    182:182:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
+    182:182:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
+    183:183:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetIsSideEffectFree(boolean):182:182 -> a
+    183:183:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):168 -> a
     183:183:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
     183:183:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
     183:183:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    184:184:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):167:167 -> a
-    184:184:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
-    184:184:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
-    184:184:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    185:185:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetIsSideEffectFree(boolean):182:182 -> a
-    185:185:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):168 -> a
-    185:185:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):134 -> a
-    185:185:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):482 -> a
-    185:185:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):442 -> a
-    186:195:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):503:512 -> a
+    184:193:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):503:512 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/h1;Ljava/util/Map;)Lcom/android/tools/r8/graph/D2;"}
-    196:198:boolean lambda$markMatchingVisibleMethods$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):535:537 -> a
+    194:196:boolean lambda$markMatchingVisibleMethods$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):535:537 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/j1;)Z"}
-    199:200:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):541:542 -> a
+    197:198:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):541:542 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Collection;Ljava/util/Set;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;Lcom/android/tools/r8/graph/H0;)V"}
-    201:202:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):733:734 -> a
+    199:200:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):733:734 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Collection;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;Lcom/android/tools/r8/graph/H0;)V"}
-    203:212:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):746:755 -> a
+    201:210:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):746:755 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/List;Lcom/android/tools/r8/shaking/f3;Ljava/util/Map;ZLcom/android/tools/r8/shaking/q3;)V"}
-    213:213:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):765:765 -> a
+    211:211:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):765:765 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/List;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
-    214:215:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):768:769 -> a
+    212:213:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):768:769 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/Collection;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;Lcom/android/tools/r8/graph/F0;)V"}
-    216:216:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):776:776 -> a
+    214:214:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):776:776 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Ljava/io/PrintStream;Ljava/util/function/Predicate;)V"}
-    217:217:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
-    217:217:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):778 -> a
-    218:219:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):778:779 -> a
-    220:220:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
-    220:220:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):787 -> a
-    221:222:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):787:788 -> a
-    223:223:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
-    223:223:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):801 -> a
-    224:261:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):801:838 -> a
-    262:263:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):781:782 -> a
+    215:215:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
+    215:215:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):778 -> a
+    216:217:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):778:779 -> a
+    218:218:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
+    218:218:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):787 -> a
+    219:220:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):787:788 -> a
+    221:221:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.AppInfoWithLiveness.getKeepInfo():903:903 -> a
+    221:221:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):801 -> a
+    222:259:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):801:838 -> a
+    260:261:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):781:782 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/io/PrintStream;Lcom/android/tools/r8/graph/I2;)V"}
-    264:270:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):790:796 -> a
+    262:268:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):790:796 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Ljava/io/PrintStream;Lcom/android/tools/r8/graph/l1;)V"}
-    271:271:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):791:791 -> a
-    272:292:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):804:824 -> a
+    269:269:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):791:791 -> a
+    270:290:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):804:824 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/shaking/i;Ljava/io/PrintStream;Lcom/android/tools/r8/graph/w2;)V"}
-    293:307:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):821:835 -> a
-    308:308:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):842:842 -> a
-    308:308:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):220 -> a
+    291:305:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):821:835 -> a
+    306:306:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):842:842 -> a
+    306:306:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):220 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
-    309:309:boolean com.android.tools.r8.shaking.ProguardClassSpecification.getClassTypeNegated():288:288 -> a
-    309:309:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):842 -> a
-    309:309:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):220 -> a
-    310:311:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):846:847 -> a
-    310:311:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):223 -> a
-    312:312:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851:851 -> a
+    307:307:boolean com.android.tools.r8.shaking.ProguardClassSpecification.getClassTypeNegated():288:288 -> a
+    307:307:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):842 -> a
+    307:307:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):220 -> a
+    308:309:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):846:847 -> a
+    308:309:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):223 -> a
+    310:310:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851:851 -> a
+    310:310:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
+    311:311:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1001:1001 -> a
+    311:311:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851 -> a
+    311:311:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
+    312:312:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1000:1000 -> a
+    312:312:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851 -> a
     312:312:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    313:313:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1001:1001 -> a
-    313:313:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851 -> a
-    313:313:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    314:314:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1000:1000 -> a
-    314:314:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):851 -> a
-    314:314:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    315:369:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230:284 -> a
-    370:370:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):955:955 -> a
-    370:370:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260 -> a
-    371:372:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):968:969 -> a
-    371:372:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):956 -> a
-    371:372:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260 -> a
-    373:373:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
-    373:373:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
-    374:380:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):266:272 -> a
-    381:390:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):271:280 -> a
-    391:391:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253:253 -> a
-    392:392:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):83:83 -> a
-    392:392:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):130 -> a
-    392:392:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253 -> a
-    393:429:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254:290 -> a
-    430:430:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    430:430:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):292 -> a
-    431:481:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):293:343 -> a
-    482:482:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):955:955 -> a
-    482:482:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):332 -> a
-    483:484:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):968:969 -> a
-    483:484:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):956 -> a
-    483:484:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):332 -> a
-    485:485:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
-    485:485:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):333 -> a
-    486:486:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):326:326 -> a
-    487:487:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):314:314 -> a
-    488:491:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):307:310 -> a
-    492:492:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
-    492:492:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):298 -> a
-    493:494:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):299:300 -> a
-    495:495:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):291:291 -> a
-    496:505:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):909:918 -> a
+    313:367:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230:284 -> a
+    368:368:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):955:955 -> a
+    368:368:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260 -> a
+    369:370:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):968:969 -> a
+    369:370:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):956 -> a
+    369:370:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260 -> a
+    371:371:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
+    371:371:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    372:378:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):266:272 -> a
+    379:388:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):271:280 -> a
+    389:389:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253:253 -> a
+    390:390:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):83:83 -> a
+    390:390:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of(java.lang.Object,java.lang.Object):130 -> a
+    390:390:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253 -> a
+    391:427:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254:290 -> a
+    428:428:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    428:428:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):292 -> a
+    429:479:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):293:343 -> a
+    480:480:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):955:955 -> a
+    480:480:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):332 -> a
+    481:482:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):968:969 -> a
+    481:482:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):956 -> a
+    481:482:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):332 -> a
+    483:483:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
+    483:483:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):333 -> a
+    484:484:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):326:326 -> a
+    485:485:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):314:314 -> a
+    486:489:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):307:310 -> a
+    490:490:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1107:1107 -> a
+    490:490:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):298 -> a
+    491:492:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):299:300 -> a
+    493:493:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):291:291 -> a
+    494:503:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):909:918 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/shaking/f3;)Z"}
-    506:506:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification.getInheritanceAnnotations():276:276 -> a
+    504:504:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification.getInheritanceAnnotations():276:276 -> a
+    504:504:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):920 -> a
+    505:505:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1001:1001 -> a
+    505:505:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):920 -> a
+    506:506:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1000:1000 -> a
     506:506:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):920 -> a
-    507:507:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1001:1001 -> a
-    507:507:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):920 -> a
-    508:508:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):1000:1000 -> a
-    508:508:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):920 -> a
-    509:525:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):922:938 -> a
-    526:526:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):945:945 -> a
+    507:523:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):922:938 -> a
+    524:524:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):945:945 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/shaking/f3;Z)Z"}
-    527:527:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses com.android.tools.r8.graph.AppView.getVerticallyMergedClasses():886:886 -> a
-    527:527:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):945 -> a
+    525:525:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses com.android.tools.r8.graph.AppView.getVerticallyMergedClasses():886:886 -> a
+    525:525:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):945 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    528:528:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946:946 -> a
-    529:529:java.util.Collection com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):71:71 -> a
-    529:529:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946 -> a
+    526:526:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946:946 -> a
+    527:527:java.util.Collection com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):71:71 -> a
+    527:527:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    530:530:java.util.Collection com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):71:71 -> a
-    530:530:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946 -> a
-    531:535:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946:950 -> a
-    536:536:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):949:949 -> a
+    528:528:java.util.Collection com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):71:71 -> a
+    528:528:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946 -> a
+    529:533:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):946:950 -> a
+    534:534:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):949:949 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/graph/I2;)Z"}
-    537:539:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):984:986 -> a
+    535:537:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):984:986 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A3;Ljava/lang/Iterable;)Z"}
-    540:540:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):995:995 -> a
+    538:538:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):995:995 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A3;Lcom/android/tools/r8/graph/F0;)Z"}
-    541:545:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1042:1046 -> a
+    539:543:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1042:1046 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/graph/p0;)Lcom/android/tools/r8/shaking/f;"}
-    546:547:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1063:1064 -> a
-    546:547:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1048 -> a
-    548:551:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1052:1055 -> a
-    552:557:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1053:1058 -> a
-    558:558:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079:1079 -> a
+    544:545:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1063:1064 -> a
+    544:545:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1048 -> a
+    546:549:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1052:1055 -> a
+    550:555:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1053:1058 -> a
+    556:556:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079:1079 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Ljava/util/Collection;Ljava/util/Set;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/q3;)V"}
-    559:559:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
-    559:559:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079 -> a
-    560:567:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079:1086 -> a
-    568:568:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
-    568:568:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1086 -> a
-    569:571:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1086:1088 -> a
-    572:574:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1099:1101 -> a
+    557:557:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
+    557:557:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079 -> a
+    558:565:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1079:1086 -> a
+    566:566:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
+    566:566:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1086 -> a
+    567:569:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1086:1088 -> a
+    570:572:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1099:1101 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;Ljava/util/Collection;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/q3;)V"}
-    575:593:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112:1130 -> a
+    573:591:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112:1130 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/shaking/u3;Lcom/android/tools/r8/shaking/Z;)V"}
-    594:594:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
-    594:594:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1130 -> a
+    592:592:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
+    592:592:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    595:595:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
-    595:595:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1130 -> a
-    596:596:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:651 -> a
-    596:596:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1131 -> a
+    593:593:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
+    593:593:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1130 -> a
+    594:594:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:570 -> a
+    594:594:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    597:598:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:652 -> a
-    597:598:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1131 -> a
-    599:603:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1132:1136 -> a
-    604:604:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
-    604:604:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1136 -> a
+    595:596:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:571 -> a
+    595:596:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1131 -> a
+    597:601:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1132:1136 -> a
+    602:602:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
+    602:602:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    605:607:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1136:1138 -> a
-    608:608:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
-    608:608:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1138 -> a
+    603:605:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1136:1138 -> a
+    606:606:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
+    606:606:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    609:609:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
-    609:609:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1138 -> a
-    610:612:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1139:1141 -> a
-    613:619:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1167:1173 -> a
+    607:607:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
+    607:607:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1138 -> a
+    608:610:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1139:1141 -> a
+    611:617:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1167:1173 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/A3;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/q3;)V"}
-    620:635:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1172:1187 -> a
-    636:636:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1435:1435 -> a
-    636:636:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186 -> a
-    637:637:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    637:637:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1436 -> a
+    618:633:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1172:1187 -> a
+    634:634:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1435:1435 -> a
+    634:634:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186 -> a
+    635:635:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    635:635:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1436 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    637:637:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186 -> a
-    638:664:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1188:1214 -> a
-    665:668:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1208:1211 -> a
-    669:672:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1202:1205 -> a
-    673:676:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1196:1199 -> a
-    677:707:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1193:1223 -> a
-    708:734:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1246 -> a
-    735:746:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1237:1248 -> a
-    747:857:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1228:1338 -> a
-    858:864:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1337:1343 -> a
-    865:893:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1333:1361 -> a
-    894:941:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1352:1399 -> a
-    942:944:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1772:1774 -> a
-    942:944:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    945:945:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1773:1773 -> a
-    945:945:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    946:947:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):80:81 -> a
-    946:947:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1773 -> a
-    946:947:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    948:948:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.joinMaxRemovedAndroidLogLevel(int):405:405 -> a
-    948:948:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):82 -> a
+    635:635:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186 -> a
+    636:662:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1188:1214 -> a
+    663:666:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1208:1211 -> a
+    667:670:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1202:1205 -> a
+    671:674:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1196:1199 -> a
+    675:705:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1193:1223 -> a
+    706:732:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1246 -> a
+    733:744:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1237:1248 -> a
+    745:855:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1228:1338 -> a
+    856:862:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1337:1343 -> a
+    863:891:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1333:1361 -> a
+    892:939:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1352:1399 -> a
+    940:942:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1777:1779 -> a
+    940:942:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
+    943:943:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1778:1778 -> a
+    943:943:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
+    944:945:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):80:81 -> a
+    944:945:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1778 -> a
+    944:945:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
+    946:946:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.joinMaxRemovedAndroidLogLevel(int):405:405 -> a
+    946:946:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):82 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    948:948:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1773 -> a
+    946:946:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1778 -> a
+    946:946:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
+    947:947:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.joinMaxRemovedAndroidLogLevel(int):406:406 -> a
+    947:947:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):82 -> a
+    947:947:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1778 -> a
+    947:947:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
+    948:948:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    948:948:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1780 -> a
     948:948:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    949:949:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.joinMaxRemovedAndroidLogLevel(int):406:406 -> a
-    949:949:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.joinMaxRemovedAndroidLogLevel(com.android.tools.r8.graph.ProgramMethod,int):82 -> a
-    949:949:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1773 -> a
-    949:949:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    950:950:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    950:950:void evaluateMaximumRemovedAndroidLogLevelRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.MaximumRemovedAndroidLogLevelRule):1775 -> a
-    950:950:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1398 -> a
-    951:951:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1401:1401 -> a
-    952:953:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1406:1407 -> a
+    949:949:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1401:1401 -> a
+    950:951:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1406:1407 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/shaking/K2;)V"}
-    954:959:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1417:1422 -> a
-    954:959:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1407 -> a
-    960:964:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1407:1411 -> a
-    965:966:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1428:1429 -> a
+    952:957:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1417:1422 -> a
+    952:957:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1407 -> a
+    958:962:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1407:1411 -> a
+    963:964:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1428:1429 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/K2;)V"}
-    967:967:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    967:967:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1430 -> a
+    965:965:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    965:965:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    968:968:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1440:1440 -> a
+    966:966:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1440:1440 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;)V"}
-    969:969:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    969:969:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1441 -> a
-    970:970:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
-    970:970:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1441 -> a
+    967:967:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    967:967:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1441 -> a
+    968:968:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():99:99 -> a
+    968:968:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1441 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    971:972:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1442:1443 -> a
-    973:973:void finalizeCheckDiscardedInformation():1447:1447 -> a
-    974:974:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
-    974:974:void finalizeCheckDiscardedInformation():1449 -> a
-    975:978:void finalizeCheckDiscardedInformation():1448:1451 -> a
-    979:979:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):400:400 -> a
-    979:979:void finalizeCheckDiscardedInformation():1452 -> a
+    969:970:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1442:1443 -> a
+    971:971:void finalizeCheckDiscardedInformation():1447:1447 -> a
+    972:972:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> a
+    972:972:void finalizeCheckDiscardedInformation():1449 -> a
+    973:976:void finalizeCheckDiscardedInformation():1448:1451 -> a
+    977:977:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):400:400 -> a
+    977:977:void finalizeCheckDiscardedInformation():1452 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    980:980:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
-    980:980:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):401 -> a
+    978:978:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
+    978:978:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):401 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    980:980:void finalizeCheckDiscardedInformation():1452 -> a
-    981:983:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):402:404 -> a
-    981:983:void finalizeCheckDiscardedInformation():1452 -> a
-    984:984:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
-    984:984:void finalizeCheckDiscardedInformation():1457 -> a
+    978:978:void finalizeCheckDiscardedInformation():1452 -> a
+    979:981:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):402:404 -> a
+    979:981:void finalizeCheckDiscardedInformation():1452 -> a
+    982:982:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():160:160 -> a
+    982:982:void finalizeCheckDiscardedInformation():1457 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    985:985:void finalizeCheckDiscardedInformation():1458:1458 -> a
+    983:983:void finalizeCheckDiscardedInformation():1458:1458 -> a
+    984:984:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1456:1456 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/B5;)Lcom/android/tools/r8/internal/Oh0;"}
+    985:985:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
+    985:985:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1456 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     986:986:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1456:1456 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/B5;)Lcom/android/tools/r8/internal/Kh0;"}
-    987:987:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
-    987:987:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1456 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    988:988:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1456:1456 -> a
-    989:989:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1455:1455 -> a
-    990:990:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1454:1454 -> a
-    991:1004:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1466:1479 -> a
+    987:987:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1455:1455 -> a
+    988:988:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$17(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1454:1454 -> a
+    989:1002:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1466:1479 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/shaking/G2;Lcom/android/tools/r8/shaking/A3;)V"}
-    1005:1005:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1478:1478 -> a
-    1006:1006:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158:158 -> a
+    1003:1003:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1478:1478 -> a
+    1004:1004:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158:158 -> a
+    1004:1004:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1487 -> a
+    1005:1005:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexMember):153:153 -> a
+    1005:1005:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158 -> a
+    1005:1005:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1487 -> a
+    1006:1006:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.setIsSideEffectFree():187:187 -> a
+    1006:1006:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexMember):153 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1006:1006:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158 -> a
     1006:1006:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1487 -> a
-    1007:1007:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexMember):153:153 -> a
-    1007:1007:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158 -> a
-    1007:1007:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1487 -> a
-    1008:1008:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.setIsSideEffectFree():187:187 -> a
-    1008:1008:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexMember):153 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1008:1008:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):158 -> a
-    1008:1008:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1487 -> a
-    1009:1012:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1488:1491 -> a
-    1013:1013:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> a
-    1013:1013:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
-    1014:1014:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int):262:262 -> a
-    1014:1014:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markClassInitializerMayBePostponed():289 -> a
-    1014:1014:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218 -> a
-    1014:1014:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
+    1007:1010:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1488:1491 -> a
+    1011:1011:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> a
+    1011:1011:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
+    1012:1012:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int):262:262 -> a
+    1012:1012:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markClassInitializerMayBePostponed():289 -> a
+    1012:1012:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218 -> a
+    1012:1012:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    1015:1015:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int):262:262 -> a
-    1015:1015:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markClassInitializerMayBePostponed():289 -> a
-    1015:1015:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218 -> a
-    1015:1015:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
-    1016:1016:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1016:1016:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1495 -> a
+    1013:1013:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.setFlag(int):262:262 -> a
+    1013:1013:void com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.markClassInitializerMayBePostponed():289 -> a
+    1013:1013:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):218 -> a
+    1013:1013:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1491 -> a
+    1014:1014:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1014:1014:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1495 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1017:1017:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481:1481 -> a
+    1015:1015:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481:1481 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A3;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/shaking/G2;Lcom/android/tools/r8/shaking/k;)V"}
-    1018:1018:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:172 -> a
-    1018:1018:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
-    1019:1019:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.hasNullability():119:119 -> a
-    1019:1019:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172 -> a
-    1019:1019:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
-    1020:1022:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:174 -> a
-    1020:1022:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
-    1023:1024:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1483:1484 -> a
-    1025:1025:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.getOrCreateAssumeInfo(com.android.tools.r8.graph.DexClassAndMember):126:126 -> a
+    1016:1016:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:172 -> a
+    1016:1016:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
+    1017:1017:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.hasNullability():119:119 -> a
+    1017:1017:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172 -> a
+    1017:1017:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
+    1018:1020:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:174 -> a
+    1018:1020:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1481 -> a
+    1021:1022:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1483:1484 -> a
+    1023:1023:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.getOrCreateAssumeInfo(com.android.tools.r8.graph.DexClassAndMember):126:126 -> a
+    1023:1023:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+    1023:1023:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
+    1024:1024:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
+    1024:1024:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1024:1024:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
+    1025:1025:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
     1025:1025:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
     1025:1025:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1026:1026:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
-    1026:1026:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1026:1026:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149:149 -> a
     1026:1026:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1027:1027:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
-    1027:1027:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+    1027:1027:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144:144 -> a
+    1027:1027:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
     1027:1027:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1028:1028:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149:149 -> a
-    1028:1028:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1029:1029:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144:144 -> a
-    1029:1029:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1029:1029:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1030:1030:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    1030:1030:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1028:1028:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    1028:1028:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1030:1030:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1030:1030:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1031:1040:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
-    1031:1040:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
-    1031:1040:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
-    1031:1040:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1031:1040:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1041:1041:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    1041:1041:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
-    1041:1041:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1041:1041:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
-    1042:1042:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1485:1485 -> a
-    1043:1049:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1500:1506 -> a
+    1028:1028:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1028:1028:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
+    1029:1038:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
+    1029:1038:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
+    1029:1038:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1029:1038:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1029:1038:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
+    1039:1039:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    1039:1039:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1039:1039:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1039:1039:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1484 -> a
+    1040:1040:void lambda$evaluateAssumeNoSideEffectsRule$18(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1485:1485 -> a
+    1041:1047:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1500:1506 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/shaking/I2;Lcom/android/tools/r8/shaking/A3;)V"}
-    1050:1050:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:172 -> a
-    1050:1050:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
-    1051:1051:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.hasNullability():119:119 -> a
-    1051:1051:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172 -> a
-    1051:1051:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
-    1052:1054:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:174 -> a
-    1052:1054:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
-    1055:1057:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1507:1509 -> a
-    1058:1058:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.getOrCreateAssumeInfo(com.android.tools.r8.graph.DexClassAndMember):126:126 -> a
+    1048:1048:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:172 -> a
+    1048:1048:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
+    1049:1049:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.hasNullability():119:119 -> a
+    1049:1049:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172 -> a
+    1049:1049:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
+    1050:1052:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:174 -> a
+    1050:1052:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1506 -> a
+    1053:1055:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1507:1509 -> a
+    1056:1056:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.getOrCreateAssumeInfo(com.android.tools.r8.graph.DexClassAndMember):126:126 -> a
+    1056:1056:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+    1056:1056:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1509 -> a
+    1057:1057:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
+    1057:1057:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1057:1057:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1509 -> a
+    1058:1058:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
     1058:1058:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
     1058:1058:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1509 -> a
-    1059:1059:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
-    1059:1059:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
+    1059:1059:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149:149 -> a
+    1059:1059:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
+    1060:1060:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144:144 -> a
+    1060:1060:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1060:1060:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
+    1061:1061:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    1061:1061:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1059:1059:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1509 -> a
-    1060:1060:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):172:172 -> a
-    1060:1060:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):139 -> a
-    1060:1060:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1509 -> a
-    1061:1061:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149:149 -> a
+    1061:1061:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
     1061:1061:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
-    1062:1062:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144:144 -> a
-    1062:1062:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1062:1062:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
-    1063:1063:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    1063:1063:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1062:1071:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
+    1062:1071:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
+    1062:1071:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1062:1071:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1062:1071:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
+    1072:1072:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
+    1072:1072:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
+    1072:1072:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
+    1072:1072:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
+    1073:1073:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1511:1511 -> a
+    1074:1074:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1074:1074:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1512 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1063:1063:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1063:1063:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
-    1064:1073:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):90:99 -> a
-    1064:1073:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177 -> a
-    1064:1073:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
-    1064:1073:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1064:1073:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
-    1074:1074:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):177:177 -> a
-    1074:1074:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):144 -> a
-    1074:1074:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):149 -> a
-    1074:1074:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1510 -> a
-    1075:1075:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1511:1511 -> a
-    1076:1076:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1076:1076:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1512 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1077:1102:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1516:1541 -> a
+    1075:1100:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1516:1541 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/shaking/n;)V"}
-    1103:1122:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1551:1570 -> a
+    1101:1120:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1551:1570 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/shaking/t3;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/shaking/q3;)V"}
-    1123:1124:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):330:331 -> a
-    1123:1124:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1570 -> a
-    1125:1125:boolean com.android.tools.r8.graph.DexProto.isIdenticalTo(com.android.tools.r8.graph.DexProto):26:26 -> a
-    1125:1125:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):331 -> a
-    1125:1125:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1570 -> a
-    1126:1126:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1580:1580 -> a
-    1127:1127:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():123:123 -> a
-    1127:1127:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1581 -> a
+    1121:1122:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):330:331 -> a
+    1121:1122:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1570 -> a
+    1123:1123:boolean com.android.tools.r8.graph.DexProto.isIdenticalTo(com.android.tools.r8.graph.DexProto):26:26 -> a
+    1123:1123:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):331 -> a
+    1123:1123:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1570 -> a
+    1124:1124:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1580:1580 -> a
+    1125:1125:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():123:123 -> a
+    1125:1125:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1581 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1128:1128:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():123:123 -> a
-    1128:1128:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1581 -> a
-    1129:1136:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1587:1594 -> a
-    1137:1137:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1137:1137:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1595 -> a
-    1138:1141:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1602:1605 -> a
-    1142:1145:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1604:1607 -> a
-    1146:1146:boolean isMainDexRootSetBuilder():0:0 -> a
-    1146:1146:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1779 -> a
-    1146:1146:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1610 -> a
-    1147:1152:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1779:1784 -> a
-    1147:1152:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1610 -> a
-    1153:1158:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1611:1616 -> a
-    1159:1159:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
-    1159:1159:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
+    1126:1126:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():123:123 -> a
+    1126:1126:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1581 -> a
+    1127:1134:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1587:1594 -> a
+    1135:1135:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1135:1135:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1595 -> a
+    1136:1139:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1602:1605 -> a
+    1140:1143:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1604:1607 -> a
+    1144:1144:boolean isMainDexRootSetBuilder():0:0 -> a
+    1144:1144:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1784 -> a
+    1144:1144:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1610 -> a
+    1145:1150:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1784:1789 -> a
+    1145:1150:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1610 -> a
+    1151:1156:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1611:1616 -> a
+    1157:1157:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
+    1157:1157:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1160:1160:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
-    1160:1160:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
-    1161:1168:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1618:1625 -> a
-    1169:1169:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():797:797 -> a
-    1169:1169:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1625 -> a
+    1158:1158:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
+    1158:1158:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
+    1159:1166:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1618:1625 -> a
+    1167:1167:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():796:796 -> a
+    1167:1167:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1625 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1170:1170:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1625:1625 -> a
-    1171:1171:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1171:1171:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1626 -> a
-    1172:1172:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1626:1626 -> a
-    1173:1173:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1173:1173:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1627 -> a
-    1174:1174:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1629:1629 -> a
-    1175:1175:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1168:1168:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1625:1625 -> a
+    1169:1169:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1169:1169:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1626 -> a
+    1170:1170:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1626:1626 -> a
+    1171:1171:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1171:1171:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1627 -> a
+    1172:1172:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1629:1629 -> a
+    1173:1173:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1173:1173:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
+    1174:1174:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630:1630 -> a
+    1175:1175:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:570 -> a
     1175:1175:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
-    1176:1176:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630:1630 -> a
-    1177:1177:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:651 -> a
-    1177:1177:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1178:1179:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:652 -> a
-    1178:1179:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
-    1180:1180:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630:1630 -> a
-    1181:1181:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1181:1181:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1631 -> a
-    1182:1195:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1633:1646 -> a
-    1196:1196:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
-    1196:1196:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646 -> a
+    1176:1177:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:571 -> a
+    1176:1177:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
+    1178:1178:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630:1630 -> a
+    1179:1179:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1179:1179:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1631 -> a
+    1180:1193:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1633:1646 -> a
+    1194:1194:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
+    1194:1194:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1197:1197:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():890:890 -> a
-    1197:1197:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646 -> a
-    1198:1198:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646:1646 -> a
-    1199:1199:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1199:1199:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
-    1200:1200:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647:1647 -> a
-    1201:1201:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656:656 -> a
-    1201:1201:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
+    1195:1195:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():896:896 -> a
+    1195:1195:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646 -> a
+    1196:1196:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1646:1646 -> a
+    1197:1197:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1197:1197:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
+    1198:1198:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647:1647 -> a
+    1199:1199:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1199:1199:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1648 -> a
+    1200:1200:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1652:1652 -> a
+    1201:1201:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():809:809 -> a
+    1201:1201:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1652 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1202:1202:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):471:471 -> a
-    1202:1202:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> a
-    1202:1202:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656 -> a
-    1202:1202:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    1203:1203:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowAccessModification(boolean):472:472 -> a
-    1203:1203:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAccessModification():480 -> a
-    1203:1203:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():656 -> a
-    1203:1203:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
-    1204:1204:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAccessModification():657:657 -> a
-    1204:1204:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1647 -> a
-    1205:1205:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1205:1205:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1648 -> a
-    1206:1206:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1652:1652 -> a
-    1207:1207:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():810:810 -> a
-    1207:1207:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1652 -> a
+    1202:1204:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1653:1655 -> a
+    1205:1205:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
+    1205:1205:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1655 -> a
+    1206:1206:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
+    1206:1206:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1655 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1208:1210:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1653:1655 -> a
-    1211:1211:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
-    1211:1211:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1655 -> a
-    1212:1212:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
-    1212:1212:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1655 -> a
+    1207:1207:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1207:1207:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
+    1208:1208:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656:1656 -> a
+    1209:1209:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585:585 -> a
+    1209:1209:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1213:1213:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1213:1213:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
-    1214:1214:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656:1656 -> a
-    1215:1215:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666:666 -> a
-    1215:1215:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
+    1210:1210:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> a
+    1210:1210:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1216:1216:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):511:511 -> a
-    1216:1216:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666 -> a
+    1210:1210:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
+    1211:1212:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585:586 -> a
+    1211:1212:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
+    1213:1213:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1658:1658 -> a
+    1214:1214:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
+    1214:1214:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1658 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1216:1216:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
-    1217:1218:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):511:512 -> a
-    1217:1218:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666 -> a
-    1217:1218:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
-    1219:1219:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):667:667 -> a
-    1219:1219:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1656 -> a
-    1220:1220:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1658:1658 -> a
-    1221:1221:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
-    1221:1221:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1658 -> a
+    1215:1215:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1215:1215:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
+    1216:1216:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659:1659 -> a
+    1217:1217:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):595:595 -> a
+    1217:1217:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1222:1222:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1222:1222:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
-    1223:1223:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659:1659 -> a
-    1224:1224:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):676:676 -> a
-    1224:1224:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
+    1218:1218:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getTypeAnnotationsInfo():454:454 -> a
+    1218:1218:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):595 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1225:1225:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):535:535 -> a
-    1225:1225:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):676 -> a
+    1218:1218:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
+    1219:1220:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):595:596 -> a
+    1219:1220:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
+    1221:1221:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1661:1661 -> a
+    1222:1222:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
+    1222:1222:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1661 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1225:1225:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
-    1226:1227:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):535:536 -> a
-    1226:1227:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):676 -> a
-    1226:1227:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
-    1228:1228:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowTypeAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):677:677 -> a
-    1228:1228:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1659 -> a
-    1229:1229:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1661:1661 -> a
-    1230:1230:boolean com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo.isNone():78:78 -> a
-    1230:1230:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1661 -> a
+    1223:1223:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1223:1223:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1663 -> a
+    1224:1225:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1663:1664 -> a
+    1226:1226:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):644:644 -> a
+    1226:1226:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1231:1231:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1231:1231:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1663 -> a
-    1232:1233:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1663:1664 -> a
-    1234:1234:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):764:764 -> a
-    1234:1234:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
+    1227:1227:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):644:644 -> a
+    1227:1227:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
+    1228:1228:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.getParameterAnnotationsInfo():452:452 -> a
+    1228:1228:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):644 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1235:1235:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):764:764 -> a
-    1235:1235:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
-    1236:1236:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):584:584 -> a
-    1236:1236:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):764 -> a
+    1228:1228:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
+    1229:1230:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):644:645 -> a
+    1229:1230:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
+    1231:1231:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1231:1231:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1668 -> a
+    1232:1232:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1671:1671 -> a
+    1233:1233:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1233:1233:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
+    1234:1234:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672:1672 -> a
+    1235:1235:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1235:1235:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1673 -> a
+    1236:1236:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1676:1676 -> a
+    1237:1237:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1237:1237:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677 -> a
+    1238:1238:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677:1677 -> a
+    1239:1239:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1239:1239:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1678 -> a
+    1240:1240:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1681:1681 -> a
+    1241:1241:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1241:1241:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1682 -> a
+    1242:1242:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1682:1682 -> a
+    1243:1243:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1243:1243:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1683 -> a
+    1244:1244:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1686:1686 -> a
+    1245:1245:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():791:791 -> a
+    1245:1245:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1686 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1236:1236:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
-    1237:1237:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):584:584 -> a
-    1237:1237:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowParameterAnnotationsRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):764 -> a
-    1237:1237:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665 -> a
-    1238:1238:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1238:1238:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1668 -> a
-    1239:1239:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1671:1671 -> a
-    1240:1240:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1240:1240:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
-    1241:1241:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672:1672 -> a
-    1242:1242:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696:696 -> a
-    1242:1242:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
+    1246:1246:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1686:1686 -> a
+    1247:1247:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1247:1247:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1687 -> a
+    1248:1248:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1687:1687 -> a
+    1249:1249:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1249:1249:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1688 -> a
+    1250:1251:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1691:1692 -> a
+    1252:1255:boolean isRepackagingDisallowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):1739:1742 -> a
+    1252:1255:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1693 -> a
+    1256:1256:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1256:1256:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1694 -> a
+    1257:1257:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1694:1694 -> a
+    1258:1258:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1258:1258:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1695 -> a
+    1259:1259:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1698:1698 -> a
+    1260:1260:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():796:796 -> a
+    1260:1260:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1698 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1243:1243:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):540:540 -> a
-    1243:1243:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> a
-    1243:1243:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696 -> a
-    1243:1243:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    1244:1244:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.setAllowSignatureRemoval(boolean):541:541 -> a
-    1244:1244:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowSignatureRemoval():549 -> a
-    1244:1244:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():696 -> a
-    1244:1244:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
-    1245:1245:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowSignatureRemoval():697:697 -> a
-    1245:1245:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
-    1246:1246:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1246:1246:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1673 -> a
-    1247:1247:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1676:1676 -> a
-    1248:1248:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1248:1248:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677 -> a
-    1249:1249:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677:1677 -> a
-    1250:1250:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowThrowsRemoval():689:689 -> a
-    1250:1250:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1251:1251:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowThrowsRemoval():689:689 -> a
-    1251:1251:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677 -> a
-    1252:1252:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.setAllowThrowsRemoval(boolean):307:307 -> a
-    1252:1252:com.android.tools.r8.shaking.KeepMethodInfo$Builder com.android.tools.r8.shaking.KeepMethodInfo$Builder.disallowThrowsRemoval():316 -> a
-    1252:1252:com.android.tools.r8.shaking.KeepMethodInfo$Joiner com.android.tools.r8.shaking.KeepMethodInfo$Joiner.disallowThrowsRemoval():689 -> a
-    1252:1252:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1677 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    1253:1253:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1253:1253:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1678 -> a
-    1254:1254:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1681:1681 -> a
-    1255:1255:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():792:792 -> a
-    1255:1255:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1681 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1256:1256:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1681:1681 -> a
-    1257:1257:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1257:1257:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1682 -> a
-    1258:1258:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1682:1682 -> a
-    1259:1259:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1259:1259:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1683 -> a
-    1260:1261:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1686:1687 -> a
-    1262:1265:boolean isRepackagingDisallowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):1734:1737 -> a
-    1262:1265:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1688 -> a
+    1261:1261:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1698:1698 -> a
+    1262:1262:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1262:1262:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1699 -> a
+    1263:1263:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1699:1699 -> a
+    1264:1264:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1264:1264:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700 -> a
+    1265:1265:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1703:1703 -> a
     1266:1266:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1266:1266:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1689 -> a
-    1267:1267:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1689:1689 -> a
-    1268:1268:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1268:1268:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1690 -> a
-    1269:1269:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1693:1693 -> a
-    1270:1270:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():797:797 -> a
-    1270:1270:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1693 -> a
+    1266:1266:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
+    1267:1267:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705:1705 -> a
+    1268:1268:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:570 -> a
+    1268:1268:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1271:1271:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1693:1693 -> a
-    1272:1272:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1272:1272:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1694 -> a
-    1273:1273:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1694:1694 -> a
-    1274:1274:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1274:1274:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1695 -> a
-    1275:1275:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1698:1698 -> a
-    1276:1276:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1276:1276:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700 -> a
-    1277:1277:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700:1700 -> a
-    1278:1278:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:651 -> a
-    1278:1278:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700 -> a
+    1269:1270:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):570:571 -> a
+    1269:1270:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
+    1271:1271:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705:1705 -> a
+    1272:1272:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1272:1272:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1706 -> a
+    1273:1273:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1709:1709 -> a
+    1274:1281:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1147:1154 -> a
+    1274:1281:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
+    1282:1282:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    1282:1282:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1279:1280:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):651:652 -> a
-    1279:1280:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700 -> a
-    1281:1281:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1700:1700 -> a
-    1282:1282:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1282:1282:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1701 -> a
-    1283:1283:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1704:1704 -> a
-    1284:1291:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1147:1154 -> a
-    1284:1291:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
-    1292:1292:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    1292:1292:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155 -> a
+    1282:1282:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
+    1283:1283:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
+    1283:1283:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155 -> a
+    1283:1283:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
+    1284:1286:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155:1157 -> a
+    1284:1286:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
+    1287:1287:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1287:1287:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1711 -> a
+    1288:1289:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1714:1715 -> a
+    1290:1290:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():879:879 -> a
+    1290:1290:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1715 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1292:1292:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
-    1293:1293:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndField.getType():46:46 -> a
-    1293:1293:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155 -> a
-    1293:1293:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
-    1294:1296:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1155:1157 -> a
-    1294:1296:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1705 -> a
-    1297:1297:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1297:1297:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1706 -> a
-    1298:1299:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1709:1710 -> a
-    1300:1300:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():873:873 -> a
-    1300:1300:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
+    1291:1291:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():880:880 -> a
+    1291:1291:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1715 -> a
+    1292:1292:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1715:1715 -> a
+    1293:1293:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1293:1293:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1717 -> a
+    1294:1294:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1717:1717 -> a
+    1295:1295:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
+    1295:1295:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1718 -> a
+    1296:1296:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721:1721 -> a
+    1297:1297:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
+    1297:1297:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721 -> a
+    1298:1298:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721:1721 -> a
+    1299:1299:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
+    1299:1299:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1301:1301:boolean com.android.tools.r8.utils.InternalOptions.isKeepPermittedSubclassesEnabled():874:874 -> a
-    1301:1301:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710 -> a
-    1302:1302:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1710:1710 -> a
-    1303:1303:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1303:1303:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1712 -> a
-    1304:1304:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1712:1712 -> a
-    1305:1305:void com.android.tools.r8.shaking.ProguardConfigurationRule.markAsUsed():86:86 -> a
-    1305:1305:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1713 -> a
-    1306:1306:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716:1716 -> a
-    1307:1307:java.lang.Object com.android.tools.r8.utils.LazyBox.computeIfAbsent():18:18 -> a
-    1307:1307:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716 -> a
-    1308:1308:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716:1716 -> a
-    1309:1309:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
-    1309:1309:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1310:1310:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():621:621 -> a
-    1310:1310:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716 -> a
-    1311:1311:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1716:1716 -> a
-    1312:1312:java.util.Set lambda$evaluateKeepRule$19(com.android.tools.r8.graph.DexType):1593:1593 -> a
+    1300:1300:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isBottom():540:540 -> a
+    1300:1300:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721 -> a
+    1301:1301:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1721:1721 -> a
+    1302:1302:java.util.Set lambda$evaluateKeepRule$19(com.android.tools.r8.graph.DexType):1593:1593 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/Set;"}
-    1313:1314:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621:1622 -> a
+    1303:1304:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621:1622 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/shaking/m1;"}
-    1315:1315:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
-    1315:1315:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621 -> a
+    1305:1305:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
+    1305:1305:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1316:1316:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
-    1316:1316:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621 -> a
-    1317:1318:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643:1644 -> a
+    1306:1306:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
+    1306:1306:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$20(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):1621 -> a
+    1307:1308:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643:1644 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/Z;Lcom/android/tools/r8/graph/y5;)Lcom/android/tools/r8/shaking/m1;"}
-    1319:1319:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
-    1319:1319:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643 -> a
+    1309:1309:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):94:94 -> a
+    1309:1309:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1320:1320:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
-    1320:1320:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643 -> a
-    1321:1321:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1743:1743 -> a
+    1310:1310:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):95:95 -> a
+    1310:1310:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$evaluateKeepRule$21(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramDefinition):1643 -> a
+    1311:1311:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1748:1748 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/o0;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
-    1322:1322:boolean isMainDexRootSetBuilder():0:0 -> a
-    1322:1322:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1743 -> a
-    1323:1342:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1743:1762 -> a
-    1343:1354:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1756:1767 -> a
-    1355:1356:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1790:1791 -> a
+    1312:1312:boolean isMainDexRootSetBuilder():0:0 -> a
+    1312:1312:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1748 -> a
+    1313:1332:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1748:1767 -> a
+    1333:1344:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1761:1772 -> a
+    1345:1346:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1795:1796 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/shaking/G2;)V"}
-    1357:1357:com.android.tools.r8.position.Position com.android.tools.r8.shaking.ProguardClassSpecification.getPosition():248:248 -> a
-    1357:1357:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1791 -> a
-    1358:1361:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1791:1794 -> a
-    1362:1362:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$22(com.android.tools.r8.utils.OriginWithPosition):1793:1793 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aV;)Ljava/util/Set;"}
-    1363:1363:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1799:1799 -> a
+    1347:1347:com.android.tools.r8.position.Position com.android.tools.r8.shaking.ProguardClassSpecification.getPosition():248:248 -> a
+    1347:1347:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1796 -> a
+    1348:1351:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1796:1799 -> a
+    1352:1352:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$22(com.android.tools.r8.utils.OriginWithPosition):1798:1798 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eV;)Ljava/util/Set;"}
+    1353:1353:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1804:1804 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
-    1364:1371:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1814:1821 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aV;Ljava/util/Set;)V"}
-    1372:1373:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.addMatchedMethods(java.util.Set):71:72 -> a
-    1372:1373:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1823 -> a
-    1374:1374:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.OriginWithPosition.getOrigin():20:20 -> a
-    1374:1374:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1824 -> a
+    1354:1361:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1819:1826 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eV;Ljava/util/Set;)V"}
+    1362:1363:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.addMatchedMethods(java.util.Set):71:72 -> a
+    1362:1363:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1828 -> a
+    1364:1364:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.OriginWithPosition.getOrigin():20:20 -> a
+    1364:1364:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1829 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1375:1375:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.setOrigin(com.android.tools.r8.origin.Origin):78:78 -> a
-    1375:1375:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1824 -> a
-    1376:1376:com.android.tools.r8.position.Position com.android.tools.r8.utils.OriginWithPosition.getPosition():24:24 -> a
-    1376:1376:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1825 -> a
-    1377:1377:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.setPosition(com.android.tools.r8.position.Position):83:83 -> a
-    1377:1377:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1825 -> a
-    1378:1378:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1826:1826 -> a
-    1379:1379:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1821:1821 -> a
-    1380:1386:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1832:1838 -> a
+    1365:1365:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.setOrigin(com.android.tools.r8.origin.Origin):78:78 -> a
+    1365:1365:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1829 -> a
+    1366:1366:com.android.tools.r8.position.Position com.android.tools.r8.utils.OriginWithPosition.getPosition():24:24 -> a
+    1366:1366:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1830 -> a
+    1367:1367:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder.setPosition(com.android.tools.r8.position.Position):83:83 -> a
+    1367:1367:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1830 -> a
+    1368:1368:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1831:1831 -> a
+    1369:1369:void lambda$generateAssumeNoSideEffectsWarnings$23(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1826:1826 -> a
+    1370:1376:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1837:1843 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/A3;Lcom/android/tools/r8/internal/B1;)V"}
-    1387:1388:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):59:60 -> a
-    1387:1388:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1838 -> a
-    1389:1389:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1839:1839 -> a
-    1390:1390:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setOrigin(com.android.tools.r8.origin.Origin):65:65 -> a
-    1390:1390:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1839 -> a
-    1391:1391:com.android.tools.r8.position.Position com.android.tools.r8.shaking.ProguardClassSpecification.getPosition():248:248 -> a
-    1391:1391:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1840 -> a
-    1392:1392:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setPosition(com.android.tools.r8.position.Position):70:70 -> a
-    1392:1392:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1840 -> a
-    1393:1393:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1841:1841 -> a
-    1394:1394:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1836:1836 -> a
+    1377:1378:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):59:60 -> a
+    1377:1378:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1843 -> a
+    1379:1379:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1844:1844 -> a
+    1380:1380:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setOrigin(com.android.tools.r8.origin.Origin):65:65 -> a
+    1380:1380:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1844 -> a
+    1381:1381:com.android.tools.r8.position.Position com.android.tools.r8.shaking.ProguardClassSpecification.getPosition():248:248 -> a
+    1381:1381:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1845 -> a
+    1382:1382:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder.setPosition(com.android.tools.r8.position.Position):70:70 -> a
+    1382:1382:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1845 -> a
+    1383:1383:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1846:1846 -> a
+    1384:1384:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1841:1841 -> a
     1:1:void lambda$sideEffectFreeIsRuleSatisfiedByField$15(com.android.tools.r8.shaking.AnnotationMatchResult):0:0 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/f;)V"}
     2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):272:272 -> b
@@ -285595,11 +284975,11 @@
     64:69:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):859 -> b
     70:72:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):973:975 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/A3;Ljava/lang/Iterable;)Z"}
-    73:73:void generateAssumeNoSideEffectsWarnings():1805:1805 -> b
+    73:73:void generateAssumeNoSideEffectsWarnings():1810:1810 -> b
     74:74:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration com.android.tools.r8.graph.AppView.getDontWarnConfiguration():487:487 -> b
-    74:74:void generateAssumeNoSideEffectsWarnings():1805 -> b
+    74:74:void generateAssumeNoSideEffectsWarnings():1810 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    75:81:void generateAssumeNoSideEffectsWarnings():1805:1811 -> b
+    75:81:void generateAssumeNoSideEffectsWarnings():1810:1816 -> b
     1:26:void markMatchingOverriddenMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):695:720 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/List;Lcom/android/tools/r8/shaking/f3;Lcom/android/tools/r8/shaking/q3;)V"}
 com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.n4:
@@ -285677,13 +285057,13 @@
     3:3:boolean isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):45:45 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):49 -> a
     4:4:com.android.tools.r8.graph.DexType lambda$rewriteWithLens$0(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     5:9:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):54:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/r4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/r4;"}
 com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.shaking.q4:
 # {"id":"sourceFile","fileName":"RuntimeTypeCheckInfo.java"}
     com.android.tools.r8.graph.lens.GraphLens appliedGraphLens -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.DexItemFactory factory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     java.util.Set instanceOfTypes -> c
@@ -285693,7 +285073,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     2:8:void <init>(com.android.tools.r8.graph.AppView):69:75 -> <init>
     1:4:com.android.tools.r8.shaking.RuntimeTypeCheckInfo build(com.android.tools.r8.graph.lens.GraphLens):79:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/shaking/r4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/shaking/r4;"}
     5:5:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/C5;)V"}
     6:8:void add(com.android.tools.r8.graph.DexType,java.util.Set):107:109 -> a
@@ -285725,13 +285105,13 @@
     java.util.Map items -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ScopedDexMethodSet):31:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/s4;)V"}
     2:9:void <init>(com.android.tools.r8.shaking.ScopedDexMethodSet):25:32 -> <init>
     1:2:com.android.tools.r8.graph.DexEncodedMethod lookup(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):40:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mo;)Lcom/android/tools/r8/graph/j1;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/po;)Lcom/android/tools/r8/graph/j1;"}
     3:3:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)I"}
     4:4:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
@@ -285769,9 +285149,9 @@
     23:23:void lambda$removeInstantiatedType$1(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Set,com.android.tools.r8.graph.DexProgramClass):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/i;Ljava/util/Set;Lcom/android/tools/r8/graph/D2;)V"}
     24:29:com.android.tools.r8.utils.TraversalContinuation lambda$removeInstantiatedType$0(java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):61:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     30:30:void lambda$removeInstantiatedType$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;)V"}
     1:1:com.android.tools.r8.graph.DexClassAndMethod getPositiveCacheHit(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):79:79 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/H0;"}
     1:1:boolean hasNegativeCacheHit(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):83:83 -> c
@@ -285780,7 +285160,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/w2;)Z"}
 com.android.tools.r8.shaking.SyntheticKeepMethodInfo -> com.android.tools.r8.shaking.w4:
 # {"id":"sourceFile","fileName":"SyntheticKeepMethodInfo.java"}
-    com.android.tools.r8.shaking.SyntheticKeepMethodInfo BOTTOM -> C
+    com.android.tools.r8.shaking.SyntheticKeepMethodInfo BOTTOM -> D
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/w4;"}
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.SyntheticKeepMethodInfo$Builder):104:104 -> <init>
@@ -285805,15 +285185,12 @@
     1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo build():59:59 -> a
     1:1:com.android.tools.r8.shaking.KeepInfo build():24 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder disallowMinification():24:24 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder disallowOptimization():24:24 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.shaking.KeepInfo$Builder disallowShrinking():24:24 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo doBuild():54:54 -> e
-    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():24 -> e
+    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo doBuild():54:54 -> b
+    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():24 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/n1;"}
+    boolean isMinificationAllowed() -> e
+    boolean isOptimizationAllowed() -> f
+    boolean isShrinkingAllowed() -> g
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/l1;"}
     1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo doBuild():54:54 -> l
@@ -285821,11 +285198,11 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/v1;"}
     com.android.tools.r8.shaking.KeepMethodInfo$Builder makeBottom() -> m
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
-    com.android.tools.r8.shaking.KeepMethodInfo$Builder self() -> n
+    com.android.tools.r8.shaking.KeepMethodInfo$Builder self() -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/t1;"}
-    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo build():59:59 -> o
+    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo build():59:59 -> p
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/w4;"}
-    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo$Builder makeBottom():64:64 -> p
+    1:1:com.android.tools.r8.shaking.SyntheticKeepMethodInfo$Builder makeBottom():64:64 -> q
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u4;"}
 com.android.tools.r8.shaking.SyntheticKeepMethodInfo$Joiner -> com.android.tools.r8.shaking.v4:
 # {"id":"sourceFile","fileName":"SyntheticKeepMethodInfo.java"}
@@ -285834,7 +285211,7 @@
     2:2:com.android.tools.r8.shaking.SyntheticKeepMethodInfo$Builder com.android.tools.r8.shaking.SyntheticKeepMethodInfo.builder():21:21 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.SyntheticKeepMethodInfo):76 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.SyntheticKeepMethodInfo):76:76 -> <init>
-    com.android.tools.r8.shaking.KeepMethodInfo$Joiner self() -> F
+    com.android.tools.r8.shaking.KeepMethodInfo$Joiner self() -> G
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/u1;"}
     com.android.tools.r8.shaking.KeepInfo$Joiner disallowMinification() -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/m1;"}
@@ -285863,7 +285240,7 @@
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):67:67 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/shaking/y;)V"}
     3:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):58:70 -> <init>
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.hasUsageInformationConsumer():1177:1177 -> <init>
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.hasUsageInformationConsumer():1183:1183 -> <init>
     16:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):72 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):73:77 -> <init>
@@ -285873,9 +285250,9 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/K5;)Z"}
     2:2:boolean lambda$isReachableInstanceField$2(java.util.Set,com.android.tools.r8.graph.RecordComponentInfo):282:282 -> a
     3:3:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/lang/String;)V"}
     4:5:com.android.tools.r8.graph.PrunedItems run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.PrunedItems$Builder):83:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/H5;)Lcom/android/tools/r8/graph/J5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/H5;)Lcom/android/tools/r8/graph/J5;"}
     6:7:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):107:108 -> a
     6:7:com.android.tools.r8.graph.PrunedItems run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.PrunedItems$Builder):85 -> a
     8:10:com.android.tools.r8.graph.PrunedItems run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.PrunedItems$Builder):87:89 -> a
@@ -286072,12 +285449,12 @@
     267:267:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.AppView.computedMinApiLevel():1384:1384 -> a
     267:267:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodThatLogsError(com.android.tools.r8.graph.AppView):994 -> a
     267:267:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):387 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    268:268:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     268:268:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodThatLogsError(com.android.tools.r8.graph.AppView):994 -> a
     268:268:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):387 -> a
     269:269:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodThatLogsError(com.android.tools.r8.graph.AppView):995:995 -> a
     269:269:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):387 -> a
-    270:270:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    270:270:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     270:270:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodThatLogsError(com.android.tools.r8.graph.AppView):995 -> a
     270:270:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):387 -> a
     271:271:void com.android.tools.r8.graph.DexEncodedMethod.setObsolete():185:185 -> a
@@ -286156,7 +285533,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)V"}
     3:17:void finished():76:90 -> a
     18:18:int lambda$finished$0(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/IV;Lcom/android/tools/r8/internal/IV;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/MV;Lcom/android/tools/r8/internal/MV;)I"}
     19:19:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)V"}
     20:20:void append(java.lang.String):94:94 -> a
@@ -286293,12 +285670,12 @@
     44:57:java.util.List getCanonicalPath(com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath,com.android.tools.r8.experimental.graphinfo.GraphNode):161:174 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/shaking/D4;)Ljava/util/ArrayList;"}
     58:65:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getCanonicalInfo(java.util.Set):181:188 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/hs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Lcom/android/tools/r8/internal/js;"}
     66:66:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo.unknown():11:11 -> a
     66:66:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getCanonicalInfo(java.util.Set):189 -> a
     67:67:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getCanonicalInfo(java.util.Set):188:188 -> a
     68:68:void printEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/hs;Lcom/android/tools/r8/shaking/C4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/experimental/graphinfo/GraphNode;Lcom/android/tools/r8/internal/js;Lcom/android/tools/r8/shaking/C4;)V"}
     69:69:void addNodeMessage(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter):236:236 -> a
     69:69:void printEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter):194 -> a
     70:70:void com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter.addMessage(java.lang.String):276:276 -> a
@@ -286335,7 +285712,7 @@
     int $r8$clinit -> r
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/position/Position;Ljava/lang/String;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/C2;Lcom/android/tools/r8/shaking/C2;ZLcom/android/tools/r8/shaking/V2;Lcom/android/tools/r8/shaking/M2;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/shaking/R3;ZLjava/util/List;)V"}
     1:1:java.lang.String typeString():82:82 -> D
 com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.F4:
 # {"id":"sourceFile","fileName":"WhyAreYouNotInliningRule.java"}
@@ -286361,7 +285738,7 @@
     void evaluateConditionalRules(com.android.tools.r8.shaking.Enqueuer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
     com.android.tools.r8.shaking.rules.MaterializedRules getMaterializedRules() -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XM;"}
     void evaluateUnconditionalRules(com.android.tools.r8.shaking.Enqueuer) -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
 com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder -> com.android.tools.r8.internal.U2:
@@ -286376,7 +285753,7 @@
     1:1:java.util.List com.android.tools.r8.shaking.rules.PendingConditionalRuleBase.getSatisfiedPreconditions():28:28 -> a
     1:1:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.PendingInitialConditionalRule,com.android.tools.r8.shaking.Enqueuer):81 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/mW;Lcom/android/tools/r8/shaking/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/qW;Lcom/android/tools/r8/shaking/M;)V"}
     2:4:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.PendingInitialConditionalRule,com.android.tools.r8.shaking.Enqueuer):81:83 -> a
     5:5:void com.android.tools.r8.graph.ProgramField.recordOriginalFieldWitness(com.android.tools.r8.graph.AppView):104:104 -> a
     5:5:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.PendingInitialConditionalRule,com.android.tools.r8.shaking.Enqueuer):83 -> a
@@ -286425,7 +285802,7 @@
     20:20:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.PendingInitialConditionalRule,com.android.tools.r8.shaking.Enqueuer):83 -> a
     21:21:void addRootRule(java.util.function.Consumer):64:64 -> a
     22:22:void addConditionalRule(com.android.tools.r8.shaking.rules.PendingInitialConditionalRule):68:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qW;)V"}
     23:23:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator build(com.android.tools.r8.graph.AppView):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/W2;"}
     24:24:boolean com.android.tools.r8.shaking.MinimumKeepInfoCollection.isEmpty():119:119 -> a
@@ -286442,7 +285819,7 @@
     1:1:void <init>():36:36 -> <init>
     1:1:com.android.tools.r8.shaking.rules.MaterializedRules com.android.tools.r8.shaking.rules.MaterializedRules.empty():30:30 -> a
     1:1:com.android.tools.r8.shaking.rules.MaterializedRules getMaterializedRules():50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XM;"}
     2:2:void evaluateConditionalRules(com.android.tools.r8.shaking.Enqueuer):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
     1:1:void evaluateUnconditionalRules(com.android.tools.r8.shaking.Enqueuer):41:41 -> b
@@ -286470,7 +285847,7 @@
     21:21:void <init>(com.android.tools.r8.shaking.MinimumKeepInfoCollection,java.util.List,java.util.function.BiConsumer):40 -> <init>
     22:25:void <init>(com.android.tools.r8.shaking.MinimumKeepInfoCollection,java.util.List,java.util.function.BiConsumer):40:43 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.shaking.rules.PendingConditionalRuleBase,com.android.tools.r8.shaking.Enqueuer):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lW;Lcom/android/tools/r8/shaking/M;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pW;Lcom/android/tools/r8/shaking/M;)V"}
     2:8:void evaluateConditionalRules(com.android.tools.r8.shaking.Enqueuer):56:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
     9:9:boolean com.android.tools.r8.shaking.rules.PendingConditionalRuleBase.isSatisfiedAfterUpdate(com.android.tools.r8.shaking.Enqueuer):49:49 -> a
@@ -286504,7 +285881,7 @@
     69:69:void evaluateConditionalRules(com.android.tools.r8.shaking.Enqueuer):86 -> a
     70:76:void evaluateConditionalRules(com.android.tools.r8.shaking.Enqueuer):86:92 -> a
     77:77:com.android.tools.r8.shaking.rules.MaterializedRules getMaterializedRules():98:98 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/TM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/XM;"}
     1:2:void evaluateUnconditionalRules(com.android.tools.r8.shaking.Enqueuer):48:49 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M;)V"}
     3:3:boolean com.android.tools.r8.shaking.MinimumKeepInfoCollection.isEmpty():119:119 -> b
@@ -286513,700 +285890,648 @@
     4:4:boolean com.android.tools.r8.shaking.MinimumKeepInfoCollection.isEmpty():119:119 -> b
     4:4:void evaluateUnconditionalRules(com.android.tools.r8.shaking.Enqueuer):49 -> b
     5:5:void evaluateUnconditionalRules(com.android.tools.r8.shaking.Enqueuer):50:50 -> b
-com.android.tools.r8.shaking.rules.KeepAnnotationFakeProguardRule -> com.android.tools.r8.internal.ZD:
+com.android.tools.r8.shaking.rules.KeepAnnotationFakeProguardRule -> com.android.tools.r8.internal.nE:
 # {"id":"sourceFile","fileName":"KeepAnnotationFakeProguardRule.java"}
     1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):18:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     2:2:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepEdgeMetaInfo):17:17 -> <init>
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher -> com.android.tools.r8.internal.fE:
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher -> com.android.tools.r8.internal.tE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getKind():66:66 -> a
-    1:1:void createCheckDiscardInfo(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):117 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tE;Lcom/android/tools/r8/internal/dE;Lcom/android/tools/r8/shaking/c2;)V"}
-    2:3:void createCheckDiscardInfo(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):117:118 -> a
-    4:5:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):69:70 -> a
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:2:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):71:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/W2;"}
-    6:6:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator.initialRulesBuilder():29:29 -> a
-    6:6:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):71 -> a
-    7:12:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):72:77 -> a
-    13:13:void lambda$computeInitialRules$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):74:74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/aF;)V"}
-    14:15:void processDeclaration(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder):85:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aF;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/internal/U2;)V"}
-    16:16:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/internal/cF;)V"}
-    17:17:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):303:303 -> a
-    17:17:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):88 -> a
+    3:3:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator.initialRulesBuilder():29:29 -> a
+    3:3:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):73 -> a
+    4:9:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator computeInitialRules(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):74:79 -> a
+    10:10:void lambda$computeInitialRules$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):76:76 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/mF;)V"}
+    11:11:com.android.tools.r8.relocated.keepanno.ast.KeepCheck$KeepCheckKind com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getKind():84:84 -> a
+    11:11:void createCheckDiscardInfo(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:22:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):304:308 -> a
-    18:22:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):88 -> a
-    23:28:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):91:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/internal/dE;)V"}
-    29:29:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.create():43:43 -> a
-    29:29:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):100 -> a
-    30:30:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):99:99 -> a
-    31:31:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):96:96 -> a
-    32:32:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):104:104 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/tE;)V"}
-    33:33:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):303:303 -> a
-    33:33:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):104 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HE;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/shaking/c2;)V"}
+    12:13:void createCheckDiscardInfo(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):119:120 -> a
+    14:15:void processDeclaration(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder):87:88 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mF;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/internal/U2;)V"}
+    16:16:void com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration.match(java.util.function.Consumer,java.util.function.Consumer):22:22 -> a
+    16:16:void processDeclaration(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder):88 -> a
+    17:17:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):90:90 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/internal/oF;)V"}
+    18:18:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):305:305 -> a
+    18:18:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):90 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:38:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):304:308 -> a
-    34:38:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):104 -> a
-    39:40:void lambda$processDeclaration$5(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):107:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/tE;Lcom/android/tools/r8/internal/dE;)V"}
-    41:44:void applyCheckDiscardConstraints(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition):136:139 -> a
-    41:44:void lambda$createCheckDiscardInfo$7(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):127 -> a
+    19:23:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):306:310 -> a
+    19:23:void lambda$processDeclaration$3(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepEdge):90 -> a
+    24:29:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):93:98 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/internal/rE;)V"}
+    30:30:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.create():43:43 -> a
+    30:30:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):102 -> a
+    31:31:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):101:101 -> a
+    32:32:void lambda$processDeclaration$2(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):98:98 -> a
+    33:33:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):106:106 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/HE;)V"}
+    34:34:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):305:305 -> a
+    34:34:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):106 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    35:39:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher.forEachMatch(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.function.Consumer):306:310 -> a
+    35:39:void lambda$processDeclaration$6(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher,com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck):106 -> a
+    40:41:void lambda$processDeclaration$5(com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator$Builder,com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult):109:110 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/U2;Lcom/android/tools/r8/internal/HE;Lcom/android/tools/r8/internal/rE;)V"}
+    42:45:void applyCheckDiscardConstraints(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition):138:141 -> a
+    42:45:void lambda$createCheckDiscardInfo$7(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/B5;)V"}
-    45:48:void applyCheckDiscardConstraints(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition):136:139 -> a
-    45:48:void lambda$createCheckDiscardInfo$8(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition,int):121 -> a
+    46:49:void applyCheckDiscardConstraints(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition):138:141 -> a
+    46:49:void lambda$createCheckDiscardInfo$8(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition,int):123 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/graph/y5;I)V"}
-    49:51:void lambda$createCheckDiscardInfo$8(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition,int):123:125 -> a
-    52:52:com.android.tools.r8.shaking.MinimumKeepInfoCollection createKeepInfo(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):147:147 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dE;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/shaking/c2;)Lcom/android/tools/r8/shaking/c2;"}
-    53:55:void lambda$createKeepInfo$9(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.graph.ProgramDefinition,int):151:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/internal/dE;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/graph/y5;I)V"}
-    56:56:void updateWithConstraints(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):164:164 -> a
-    56:56:void lambda$createKeepInfo$9(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.graph.ProgramDefinition,int):152 -> a
-    1:1:void lambda$processDeclaration$1(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.MinimumKeepInfoCollection):94:94 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dE;Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/shaking/c2;)V"}
-    2:2:void lambda$processDeclaration$4(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):110:110 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tE;Lcom/android/tools/r8/internal/dE;Lcom/android/tools/r8/shaking/c2;)V"}
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1 -> com.android.tools.r8.internal.aE:
+    50:52:void lambda$createCheckDiscardInfo$8(boolean,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramDefinition,int):125:127 -> a
+    53:53:com.android.tools.r8.shaking.MinimumKeepInfoCollection createKeepInfo(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):149:149 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/shaking/c2;)Lcom/android/tools/r8/shaking/c2;"}
+    54:56:void lambda$createKeepInfo$9(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.graph.ProgramDefinition,int):153:155 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/graph/y5;I)V"}
+    57:57:void updateWithConstraints(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.relocated.keepanno.ast.KeepConstraints,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):166:166 -> a
+    57:57:void lambda$createKeepInfo$9(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.graph.ProgramDefinition,int):154 -> a
+    1:1:void lambda$processDeclaration$1(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.shaking.MinimumKeepInfoCollection):96:96 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/shaking/c2;)V"}
+    2:2:void lambda$processDeclaration$4(com.android.tools.r8.relocated.keepanno.ast.KeepCheck,com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult,com.android.tools.r8.shaking.MinimumKeepInfoCollection):112:112 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HE;Lcom/android/tools/r8/internal/rE;Lcom/android/tools/r8/shaking/c2;)V"}
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$1 -> com.android.tools.r8.internal.oE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     com.android.tools.r8.shaking.KeepInfo$Joiner val$joiner -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/m1;"}
     com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration val$declaration -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mF;"}
     com.android.tools.r8.graph.ProgramDefinition val$item -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y5;"}
     com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates val$predicates -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gE;"}
-    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):165:165 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;Lcom/android/tools/r8/internal/aF;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/gE;)V"}
-    1:1:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246:246 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gE;Lcom/android/tools/r8/internal/kE;Lcom/android/tools/r8/shaking/m1;Lcom/android/tools/r8/graph/r0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uE;"}
+    1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):167:167 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/m1;Lcom/android/tools/r8/internal/mF;Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/uE;)V"}
+    1:1:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248:248 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uE;Lcom/android/tools/r8/internal/yE;Lcom/android/tools/r8/shaking/m1;Lcom/android/tools/r8/graph/r0;)V"}
     2:2:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):313:313 -> a
-    2:2:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    2:2:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
     3:3:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.includesClassRetention():119:119 -> a
     3:3:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):318 -> a
-    3:3:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    3:3:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4:4:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.includesRuntimeRetention():115:115 -> a
     4:4:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):321 -> a
-    4:4:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    4:4:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     5:5:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):324:324 -> a
-    5:5:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    5:5:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
     6:6:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.getNamePattern():111:111 -> a
     6:6:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    6:6:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
     7:7:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):324:324 -> a
-    7:7:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):246 -> a
+    7:7:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
     8:8:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.includesRuntimeRetention():115:115 -> a
-    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):255 -> a
-    8:8:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
-    9:17:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):256:264 -> a
-    9:17:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248 -> a
-    18:18:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):248:248 -> a
-    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):671:671 -> a
-    19:19:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):247 -> a
+    8:8:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):257 -> a
+    8:8:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):250 -> a
+    9:17:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):258:266 -> a
+    9:17:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):250 -> a
+    18:18:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):250:250 -> a
+    19:19:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):590:590 -> a
+    19:19:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):249 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):516:516 -> a
-    20:20:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):671 -> a
+    20:20:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> a
+    20:20:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):590 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):247 -> a
-    21:22:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):516:517 -> a
-    21:22:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):671 -> a
-    21:22:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):247 -> a
-    23:23:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):672:672 -> a
-    23:23:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):247 -> a
-    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation.asAnnotationPattern():489:489 -> a
-    24:24:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):238 -> a
+    20:20:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):249 -> a
+    21:22:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo,com.android.tools.r8.graph.DexType):590:591 -> a
+    21:22:void lambda$onAnnotation$0(com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates,com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.graph.DexAnnotation):249 -> a
+    23:23:com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation.asAnnotationPattern():489:489 -> a
+    23:23:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DE;)V"}
-    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.getNamePattern():111:111 -> a
-    25:25:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):239 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PE;)V"}
+    24:24:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.getNamePattern():111:111 -> a
+    24:24:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:27:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):239:240 -> a
-    28:28:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.includesRuntimeRetention():115:115 -> a
-    28:28:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):255 -> a
-    28:28:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
-    29:37:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):256:264 -> a
-    29:37:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
-    38:38:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666:666 -> a
-    38:38:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
+    25:26:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):241:242 -> a
+    27:27:boolean com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern.includesRuntimeRetention():115:115 -> a
+    27:27:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):257 -> a
+    27:27:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242 -> a
+    28:36:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo toRetentionInfo(com.android.tools.r8.relocated.keepanno.ast.KeepAnnotationPattern):258:266 -> a
+    28:36:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242 -> a
+    37:37:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585:585 -> a
+    37:37:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):511:511 -> a
-    39:39:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666 -> a
+    38:38:com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.getAnnotationsInfo():445:445 -> a
+    38:38:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
-    40:41:com.android.tools.r8.shaking.KeepInfo$Builder com.android.tools.r8.shaking.KeepInfo$Builder.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):511:512 -> a
-    40:41:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):666 -> a
-    40:41:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
-    42:42:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):667:667 -> a
-    42:42:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):240 -> a
-    43:45:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242:244 -> a
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment -> com.android.tools.r8.internal.bE:
+    38:38:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242 -> a
+    39:40:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.disallowAnnotationRemoval(com.android.tools.r8.shaking.KeepAnnotationCollectionInfo$RetentionInfo):585:586 -> a
+    39:40:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):242 -> a
+    41:43:void onAnnotation(com.android.tools.r8.relocated.keepanno.ast.KeepConstraint$Annotation):244:246 -> a
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment -> com.android.tools.r8.internal.pE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     java.util.List classes -> a
     java.util.List members -> b
     boolean hasEmptyMembers -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():566:566 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):572:572 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eE;)V"}
-    2:6:void <init>(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):570:574 -> <init>
-    1:1:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):579:579 -> a
+    1:1:void <clinit>():552:552 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):558:558 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sE;)V"}
+    2:6:void <init>(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):556:560 -> <init>
+    1:1:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):565:565 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/graph/y5;"}
-    2:2:int com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.decodeClassKeyReference(int):505:505 -> a
-    2:2:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):579 -> a
-    3:5:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):579:581 -> a
-    6:7:int com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.decodeMemberKeyReference(int):515:516 -> a
-    6:7:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):581 -> a
-    8:8:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):581:581 -> a
-    9:10:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):608:609 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kz;Z)Ljava/util/ArrayList;"}
+    2:2:int com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.decodeClassKeyReference(int):498:498 -> a
+    2:2:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):565 -> a
+    3:5:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):565:567 -> a
+    6:7:int com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.decodeMemberKeyReference(int):508:509 -> a
+    6:7:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):567 -> a
+    8:8:com.android.tools.r8.graph.ProgramDefinition getItemForReference(int):567:567 -> a
+    9:10:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):594:595 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mz;Z)Ljava/util/ArrayList;"}
     11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
-    11:11:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):609 -> a
-    12:12:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):609:609 -> a
+    11:11:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):595 -> a
+    12:12:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):595:595 -> a
     13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
-    13:13:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):610 -> a
-    14:17:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):611:614 -> a
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher -> com.android.tools.r8.internal.cE:
+    13:13:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):596 -> a
+    14:17:java.util.List getItemList(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,boolean):597:600 -> a
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$EdgeMatcher -> com.android.tools.r8.internal.qE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j;"}
     com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates predicates -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uE;"}
     com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema schema -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sE;"}
     com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment assignment -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bE;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/pE;"}
     java.util.function.Consumer callback -> e
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():287:287 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):297:299 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/gE;)V"}
-    1:1:void findMatchingClass(int):320:320 -> a
-    2:2:void foundMatch():312:312 -> a
-    2:2:void findMatchingClass(int):322 -> a
-    3:8:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):598:603 -> a
-    3:8:void foundMatch():312 -> a
-    3:8:void findMatchingClass(int):322 -> a
-    9:15:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):621:627 -> a
-    9:15:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):604 -> a
-    9:15:void foundMatch():312 -> a
-    9:15:void findMatchingClass(int):322 -> a
+    1:1:void <clinit>():289:289 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates):299:301 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/uE;)V"}
+    1:1:void findMatchingClass(int):322:322 -> a
+    2:2:void foundMatch():314:314 -> a
+    2:2:void findMatchingClass(int):324 -> a
+    3:8:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):584:589 -> a
+    3:8:void foundMatch():314 -> a
+    3:8:void findMatchingClass(int):324 -> a
+    9:15:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):607:613 -> a
+    9:15:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):590 -> a
+    9:15:void foundMatch():314 -> a
+    9:15:void findMatchingClass(int):324 -> a
     16:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
-    16:16:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):627 -> a
+    16:16:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):613 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):604 -> a
-    16:16:void foundMatch():312 -> a
-    16:16:void findMatchingClass(int):322 -> a
-    17:22:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):628:633 -> a
-    17:22:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):604 -> a
-    17:22:void foundMatch():312 -> a
-    17:22:void findMatchingClass(int):322 -> a
-    23:23:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):604:604 -> a
-    23:23:void foundMatch():312 -> a
-    23:23:void findMatchingClass(int):322 -> a
-    24:25:void foundMatch():314:315 -> a
-    24:25:void findMatchingClass(int):322 -> a
-    26:26:void findMatchingClass(int):325:325 -> a
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    27:27:void findMatchingClass(int):326 -> a
+    16:16:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):590 -> a
+    16:16:void foundMatch():314 -> a
+    16:16:void findMatchingClass(int):324 -> a
+    17:22:java.util.List com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.getConstraints(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):614:619 -> a
+    17:22:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):590 -> a
+    17:22:void foundMatch():314 -> a
+    17:22:void findMatchingClass(int):324 -> a
+    23:23:com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.createMatch(com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema):590:590 -> a
+    23:23:void foundMatch():314 -> a
+    23:23:void findMatchingClass(int):324 -> a
+    24:25:void foundMatch():316:317 -> a
+    24:25:void findMatchingClass(int):324 -> a
+    26:26:void findMatchingClass(int):327:327 -> a
+    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    27:27:void findMatchingClass(int):328 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:31:void findMatchingClass(int):326:329 -> a
-    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    32:32:void findMatchingClass(int):330 -> a
-    33:34:void findMatchingClass(int):330:331 -> a
-    35:35:void continueWithNoClass(int):358:358 -> a
-    35:35:void findMatchingClass(int):333 -> a
-    36:36:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):488:488 -> a
-    36:36:void continueWithNoClass(int):358 -> a
+    28:31:void findMatchingClass(int):328:331 -> a
+    32:32:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    32:32:void findMatchingClass(int):332 -> a
+    33:34:void findMatchingClass(int):332:333 -> a
+    35:35:void continueWithNoClass(int):360:360 -> a
+    35:35:void findMatchingClass(int):335 -> a
+    36:36:void findMatchingClass(int):338:338 -> a
+    37:37:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:55 -> a
+    37:37:void findMatchingClass(int):338 -> a
+    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    38:38:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:void findMatchingClass(int):333 -> a
-    37:37:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):488:488 -> a
-    37:37:void continueWithNoClass(int):358 -> a
-    37:37:void findMatchingClass(int):333 -> a
-    38:38:void continueWithNoClass(int):359:359 -> a
-    38:38:void findMatchingClass(int):333 -> a
-    39:39:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    39:39:void continueWithNoClass(int):359 -> a
+    38:38:void findMatchingClass(int):338 -> a
+    39:40:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:56 -> a
+    39:40:void findMatchingClass(int):338 -> a
+    41:41:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
+    41:41:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56 -> a
+    41:41:void findMatchingClass(int):338 -> a
+    42:42:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56:56 -> a
+    42:42:void findMatchingClass(int):338 -> a
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():89:89 -> a
+    43:43:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
+    43:43:void findMatchingClass(int):338 -> a
+    44:44:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57:57 -> a
+    44:44:void findMatchingClass(int):338 -> a
+    45:45:void findMatchingClass(int):342:342 -> a
+    46:46:void continueWithNoClass(int):360:360 -> a
+    46:46:void findMatchingClass(int):339 -> a
+    47:48:void findMatchingClass(int):346:347 -> a
+    49:49:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:55 -> a
+    49:49:void findMatchingClass(int):347 -> a
+    50:50:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():85:85 -> a
+    50:50:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:void findMatchingClass(int):333 -> a
-    40:40:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    40:40:void continueWithNoClass(int):359 -> a
-    40:40:void findMatchingClass(int):333 -> a
-    41:41:void continueWithNoClass(int):360:360 -> a
-    41:41:void findMatchingClass(int):333 -> a
-    42:42:void findMatchingClass(int):336:336 -> a
-    43:43:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:55 -> a
-    43:43:void findMatchingClass(int):336 -> a
-    44:44:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    44:44:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55 -> a
+    50:50:void findMatchingClass(int):347 -> a
+    51:52:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:56 -> a
+    51:52:void findMatchingClass(int):347 -> a
+    53:53:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():93:93 -> a
+    53:53:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56 -> a
+    53:53:void findMatchingClass(int):347 -> a
+    54:54:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56:56 -> a
+    54:54:void findMatchingClass(int):347 -> a
+    55:55:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():89:89 -> a
+    55:55:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
+    55:55:void findMatchingClass(int):347 -> a
+    56:56:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57:57 -> a
+    56:56:void findMatchingClass(int):347 -> a
+    57:57:void findMatchingClass(int):348:348 -> a
+    58:58:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):354:354 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/D2;)V"}
+    59:59:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):571:571 -> a
+    59:59:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:44:void findMatchingClass(int):336 -> a
-    45:46:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:56 -> a
-    45:46:void findMatchingClass(int):336 -> a
-    47:47:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
-    47:47:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56 -> a
-    47:47:void findMatchingClass(int):336 -> a
-    48:48:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56:56 -> a
-    48:48:void findMatchingClass(int):336 -> a
-    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():98:98 -> a
-    49:49:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    49:49:void findMatchingClass(int):336 -> a
-    50:50:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57:57 -> a
-    50:50:void findMatchingClass(int):336 -> a
-    51:51:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352:352 -> a
-    51:51:void findMatchingClass(int):340 -> a
-    52:52:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    52:52:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352 -> a
+    60:60:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):571:571 -> a
+    60:60:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):354 -> a
+    61:62:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):355:356 -> a
+    63:63:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):365:365 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/cA;)V"}
+    64:64:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):485:485 -> a
+    64:64:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):365 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:void findMatchingClass(int):340 -> a
-    53:53:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    53:53:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352 -> a
-    53:53:void findMatchingClass(int):340 -> a
-    54:55:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):353:354 -> a
-    54:55:void findMatchingClass(int):340 -> a
-    56:56:void continueWithNoClass(int):358:358 -> a
-    56:56:void findMatchingClass(int):337 -> a
-    57:57:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):488:488 -> a
-    57:57:void continueWithNoClass(int):358 -> a
+    65:65:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):366:366 -> a
+    66:66:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):571:571 -> a
+    66:66:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):366 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:57:void findMatchingClass(int):337 -> a
-    58:58:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):488:488 -> a
-    58:58:void continueWithNoClass(int):358 -> a
-    58:58:void findMatchingClass(int):337 -> a
-    59:59:void continueWithNoClass(int):359:359 -> a
-    59:59:void findMatchingClass(int):337 -> a
-    60:60:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    60:60:void continueWithNoClass(int):359 -> a
+    67:67:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):571:571 -> a
+    67:67:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):366 -> a
+    68:68:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):368:368 -> a
+    69:69:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):575:575 -> a
+    69:69:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    60:60:void findMatchingClass(int):337 -> a
-    61:61:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    61:61:void continueWithNoClass(int):359 -> a
-    61:61:void findMatchingClass(int):337 -> a
-    62:62:void continueWithNoClass(int):360:360 -> a
-    62:62:void findMatchingClass(int):337 -> a
-    63:64:void findMatchingClass(int):344:345 -> a
-    65:65:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:55 -> a
-    65:65:void findMatchingClass(int):345 -> a
-    66:66:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getClassNamePattern():94:94 -> a
-    66:66:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55 -> a
+    70:70:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):575:575 -> a
+    70:70:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):368 -> a
+    71:71:void continueWithNoClassClearingMembers(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):370:370 -> a
+    72:80:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):379:387 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/cA;Lcom/android/tools/r8/graph/D2;I)V"}
+    81:81:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():73:73 -> a
+    81:81:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):394 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:void findMatchingClass(int):345 -> a
-    67:68:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):55:56 -> a
-    67:68:void findMatchingClass(int):345 -> a
-    69:69:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getAnnotatedByPattern():102:102 -> a
-    69:69:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56 -> a
-    69:69:void findMatchingClass(int):345 -> a
-    70:70:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):56:56 -> a
-    70:70:void findMatchingClass(int):345 -> a
-    71:71:com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern.getInstanceOfPattern():98:98 -> a
-    71:71:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    71:71:void findMatchingClass(int):345 -> a
-    72:72:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepClassItemPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57:57 -> a
-    72:72:void findMatchingClass(int):345 -> a
-    73:73:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352:352 -> a
-    73:73:void findMatchingClass(int):346 -> a
-    74:74:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    74:74:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352 -> a
+    82:106:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):394:418 -> a
+    107:107:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):389:389 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;IILcom/android/tools/r8/internal/cA;ILcom/android/tools/r8/graph/y5;)V"}
+    108:109:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):429:430 -> a
+    108:109:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    110:110:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):575:575 -> a
+    110:110:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    74:74:void findMatchingClass(int):346 -> a
-    75:75:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setClass(int,com.android.tools.r8.graph.DexProgramClass):585:585 -> a
-    75:75:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):352 -> a
-    75:75:void findMatchingClass(int):346 -> a
-    76:77:void continueWithClass(int,com.android.tools.r8.graph.DexProgramClass):353:354 -> a
-    76:77:void findMatchingClass(int):346 -> a
-    78:86:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):369:377 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/aA;Lcom/android/tools/r8/graph/D2;I)V"}
-    87:87:com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getMemberPattern():74:74 -> a
-    87:87:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):384 -> a
+    110:110:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    111:111:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):575:575 -> a
+    111:111:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):430 -> a
+    111:111:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    112:114:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):432:434 -> a
+    112:114:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    115:115:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setEmptyMemberMatch(int):579:579 -> a
+    115:115:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):434 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    88:110:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):384:406 -> a
-    111:111:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):439:439 -> a
-    111:111:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    112:112:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalMember(int,int):492:492 -> a
-    112:112:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):439 -> a
+    115:115:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    116:116:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setEmptyMemberMatch(int):580:580 -> a
+    116:116:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):434 -> a
+    116:116:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    117:117:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):439:439 -> a
+    117:117:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    118:118:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):436:436 -> a
+    118:118:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):390 -> a
+    119:119:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):397:397 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/BG;)V"}
+    120:120:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
+    120:120:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):397 -> a
+    121:123:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):399:401 -> a
+    124:125:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):403:404 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BG;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/B5;)V"}
+    126:126:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):403:403 -> a
+    127:128:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):110:111 -> a
+    127:128:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):403 -> a
+    129:129:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
+    129:129:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):111 -> a
+    129:129:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):403 -> a
+    130:131:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):114:115 -> a
+    130:131:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):403 -> a
+    132:132:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):405:405 -> a
+    133:133:void lambda$findMatchingMember$4(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):411:411 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/lG;)V"}
+    134:134:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412:412 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lG;Lcom/android/tools/r8/graph/g1;)Z"}
+    135:135:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():92:92 -> a
+    135:135:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    112:112:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    113:113:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalClass(int):488:488 -> a
-    113:113:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema.isOptionalMember(int,int):492 -> a
-    113:113:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):439 -> a
-    113:113:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    114:114:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):440:440 -> a
-    114:114:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    115:115:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):589:589 -> a
-    115:115:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):440 -> a
+    135:135:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    136:138:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():92:94 -> a
+    136:138:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    136:138:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    139:139:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.isAny():36:36 -> a
+    139:139:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():94 -> a
+    139:139:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    139:139:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    140:141:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():94:95 -> a
+    140:141:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    140:141:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    142:142:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isType():21:21 -> a
+    142:142:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
+    142:142:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
+    142:142:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    142:142:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    143:143:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType.asType():41:41 -> a
+    143:143:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isType():21 -> a
+    143:143:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
+    143:143:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
+    143:143:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    143:143:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    144:144:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
+    144:144:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
+    144:144:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
+    144:144:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    144:144:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    145:145:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133:133 -> a
+    145:145:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    146:146:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getNamePattern():109:109 -> a
+    146:146:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133 -> a
+    146:146:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    147:147:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.asStringPattern():32:32 -> a
+    147:147:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:115:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    116:116:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):589:589 -> a
-    116:116:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):440 -> a
-    116:116:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    117:117:void continueWithNoMember(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):441:441 -> a
-    117:117:void findMatchingMember(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,com.android.tools.r8.graph.DexProgramClass,int):408 -> a
-    118:118:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):379:379 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;IILcom/android/tools/r8/internal/aA;ILcom/android/tools/r8/graph/y5;)V"}
-    119:120:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):419:420 -> a
-    119:120:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    121:121:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):589:589 -> a
-    121:121:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):420 -> a
+    147:147:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    148:149:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133:134 -> a
+    148:149:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    150:150:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getTypePattern():113:113 -> a
+    150:150:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134 -> a
+    150:150:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    151:151:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134:134 -> a
+    151:151:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    152:152:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType.asType():41:41 -> a
+    152:152:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    121:121:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    122:122:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setMember(int,com.android.tools.r8.graph.ProgramMember):589:589 -> a
-    122:122:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):420 -> a
-    122:122:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    123:125:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):422:424 -> a
-    123:125:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    126:126:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setEmptyMemberMatch(int):593:593 -> a
-    126:126:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):424 -> a
+    152:152:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    153:154:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134:135 -> a
+    153:154:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    155:155:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getAnnotatedByPattern():100:100 -> a
+    155:155:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):135 -> a
+    155:155:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    156:157:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):135:136 -> a
+    156:157:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getAccessPattern():105:105 -> a
+    158:158:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    158:158:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    159:163:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):165:169 -> a
+    159:163:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    159:163:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    164:164:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.getVolatilePattern():60:60 -> a
+    164:164:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):169 -> a
+    164:164:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    164:164:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    165:166:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):169:170 -> a
+    165:166:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    165:166:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    167:167:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.getTransientPattern():64:64 -> a
+    167:167:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):170 -> a
+    167:167:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    167:167:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    168:168:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):170:170 -> a
+    168:168:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
+    168:168:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):412 -> a
+    169:169:void lambda$findMatchingMember$6(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):414:414 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/JG;)V"}
+    170:170:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415:415 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/JG;Lcom/android/tools/r8/graph/j1;)Z"}
+    171:171:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():114:114 -> a
+    171:171:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:126:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    127:127:void com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$Assignment.setEmptyMemberMatch(int):594:594 -> a
-    127:127:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):424 -> a
-    127:127:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    128:128:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):429:429 -> a
-    128:128:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    129:129:void continueWithMember(com.android.tools.r8.graph.ProgramDefinition,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):426:426 -> a
-    129:129:void lambda$findMatchingMember$0(com.android.tools.r8.utils.BooleanBox,int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int,com.android.tools.r8.graph.ProgramDefinition):380 -> a
-    130:130:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):387:387 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/rG;)V"}
-    131:131:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
-    131:131:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):387 -> a
-    132:134:void lambda$findMatchingMember$2(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):389:391 -> a
-    135:136:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):393:394 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/B5;)V"}
-    137:137:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):393:393 -> a
-    138:139:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):110:111 -> a
-    138:139:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):393 -> a
-    140:140:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern.isAllMembers():98:98 -> a
-    140:140:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):111 -> a
-    140:140:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):393 -> a
-    141:142:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesGeneralMember(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern):114:115 -> a
-    141:142:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):393 -> a
-    143:143:void lambda$findMatchingMember$1(com.android.tools.r8.relocated.keepanno.ast.KeepMemberPattern,java.util.function.Consumer,com.android.tools.r8.graph.ProgramMember):395:395 -> a
-    144:144:void lambda$findMatchingMember$4(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):401:401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/ZF;)V"}
-    145:145:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402:402 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZF;Lcom/android/tools/r8/graph/g1;)Z"}
-    146:146:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():92:92 -> a
-    146:146:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
+    171:171:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    172:174:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():114:116 -> a
+    172:174:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
+    172:174:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    175:175:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isAny():83:83 -> a
+    175:175:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():116 -> a
+    175:175:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
+    175:175:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    176:178:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():116:118 -> a
+    176:178:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
+    176:178:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    179:179:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.isAny():0:0 -> a
+    179:179:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():118 -> a
+    179:179:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
+    179:179:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    180:180:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122:122 -> a
+    180:180:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    181:181:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getNamePattern():132:132 -> a
+    181:181:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122 -> a
+    181:181:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    182:182:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.asStringPattern():57:57 -> a
+    182:182:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    146:146:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    147:149:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():92:94 -> a
-    147:149:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    147:149:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    150:150:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.isAny():36:36 -> a
-    150:150:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():94 -> a
-    150:150:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    150:150:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    151:152:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():94:95 -> a
-    151:152:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    151:152:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    153:153:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isType():21:21 -> a
-    153:153:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
-    153:153:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
-    153:153:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    153:153:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    154:154:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType.asType():41:41 -> a
-    154:154:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isType():21 -> a
-    154:154:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
-    154:154:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
-    154:154:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    154:154:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    155:155:boolean com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern.isAny():0:0 -> a
-    155:155:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern.isAny():17 -> a
-    155:155:boolean com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.isAnyField():95 -> a
-    155:155:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):130 -> a
-    155:155:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    156:156:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133:133 -> a
-    156:156:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    157:157:com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getNamePattern():109:109 -> a
-    157:157:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133 -> a
-    157:157:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    158:158:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldNamePattern.asStringPattern():32:32 -> a
-    158:158:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    158:158:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    159:160:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):133:134 -> a
-    159:160:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    161:161:com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getTypePattern():113:113 -> a
-    161:161:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134 -> a
-    161:161:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    162:162:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134:134 -> a
-    162:162:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    163:163:com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldTypePattern$SomeType.asType():41:41 -> a
-    163:163:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    163:163:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    164:165:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):134:135 -> a
-    164:165:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    166:166:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getAnnotatedByPattern():100:100 -> a
-    166:166:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):135 -> a
-    166:166:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    167:168:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):135:136 -> a
-    167:168:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    169:169:com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern.getAccessPattern():105:105 -> a
-    169:169:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    169:169:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    170:174:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):165:169 -> a
-    170:174:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    170:174:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    175:175:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.getVolatilePattern():60:60 -> a
-    175:175:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):169 -> a
-    175:175:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    175:175:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    176:177:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):169:170 -> a
-    176:177:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    176:177:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    178:178:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern.getTransientPattern():64:64 -> a
-    178:178:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):170 -> a
-    178:178:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    178:178:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    179:179:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesFieldAccess(com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepFieldAccessPattern):170:170 -> a
-    179:179:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern):136 -> a
-    179:179:boolean lambda$findMatchingMember$3(com.android.tools.r8.relocated.keepanno.ast.KeepFieldPattern,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    180:180:void lambda$findMatchingMember$6(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):404:404 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/zG;)V"}
-    181:181:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405:405 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zG;Lcom/android/tools/r8/graph/j1;)Z"}
-    182:182:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():114:114 -> a
-    182:182:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    182:182:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    183:185:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():114:116 -> a
-    183:185:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
-    183:185:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    186:186:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.isAny():83:83 -> a
-    186:186:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():116 -> a
-    186:186:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
-    186:186:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    187:189:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():116:118 -> a
-    187:189:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
-    187:189:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    190:190:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.isAny():0:0 -> a
-    190:190:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.isAnyMethod():118 -> a
-    190:190:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):119 -> a
-    190:190:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    191:191:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122:122 -> a
-    191:191:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    192:192:com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getNamePattern():132:132 -> a
-    192:192:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122 -> a
-    192:192:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    193:193:com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodNamePattern.asStringPattern():57:57 -> a
-    193:193:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    193:193:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    194:195:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122:123 -> a
-    194:195:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    196:196:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getReturnTypePattern():136:136 -> a
-    196:196:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
-    196:196:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    197:197:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):267:267 -> a
-    197:197:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
-    197:197:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    198:198:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
-    198:198:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):270 -> a
-    198:198:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
-    198:198:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    199:201:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):271:273 -> a
-    199:201:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
-    199:201:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    202:202:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124:124 -> a
-    202:202:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    203:203:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getParametersPattern():140:140 -> a
-    203:203:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
-    203:203:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    204:204:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):215:215 -> a
-    204:204:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
-    204:204:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    205:205:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.isAny():0:0 -> a
-    205:205:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):215 -> a
-    205:205:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
-    205:205:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    206:212:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):218:224 -> a
-    206:212:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
-    206:212:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    213:213:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125:125 -> a
-    213:213:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    214:214:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getAnnotatedByPattern():123:123 -> a
-    214:214:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125 -> a
-    214:214:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    215:216:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125:126 -> a
-    215:216:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    217:217:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getAccessPattern():128:128 -> a
-    217:217:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    217:217:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    218:222:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):153:157 -> a
-    218:222:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    218:222:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    223:223:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getSynchronizedPattern():77:77 -> a
-    223:223:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):157 -> a
-    223:223:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    223:223:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    224:225:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):157:158 -> a
-    224:225:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    224:225:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    226:226:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getBridgePattern():81:81 -> a
-    226:226:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):158 -> a
-    226:226:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    226:226:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    227:228:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):158:159 -> a
-    227:228:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    227:228:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    229:229:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getNativePattern():85:85 -> a
-    229:229:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):159 -> a
-    229:229:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    229:229:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    230:231:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):159:160 -> a
-    230:231:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    230:231:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    232:232:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getAbstractPattern():89:89 -> a
-    232:232:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):160 -> a
-    232:232:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    232:232:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    233:234:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):160:161 -> a
-    233:234:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    233:234:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    235:235:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getStrictFpPattern():93:93 -> a
-    235:235:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):161 -> a
-    235:235:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    235:235:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-    236:236:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):161:161 -> a
-    236:236:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
-    236:236:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):405 -> a
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult -> com.android.tools.r8.internal.dE:
+    182:182:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    183:184:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):122:123 -> a
+    183:184:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    185:185:com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getReturnTypePattern():136:136 -> a
+    185:185:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
+    185:185:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    186:186:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):267:267 -> a
+    186:186:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
+    186:186:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    187:187:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern.isVoid():0:0 -> a
+    187:187:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):270 -> a
+    187:187:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
+    187:187:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    188:190:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesReturnType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepMethodReturnTypePattern):271:273 -> a
+    188:190:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):123 -> a
+    188:190:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    191:191:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124:124 -> a
+    191:191:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    192:192:com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getParametersPattern():140:140 -> a
+    192:192:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
+    192:192:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    193:193:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):215:215 -> a
+    193:193:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
+    193:193:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    194:194:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern.isAny():0:0 -> a
+    194:194:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):215 -> a
+    194:194:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
+    194:194:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    195:201:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesParameters(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.relocated.keepanno.ast.KeepMethodParametersPattern):218:224 -> a
+    195:201:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):124 -> a
+    195:201:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    202:202:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125:125 -> a
+    202:202:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    203:203:com.android.tools.r8.relocated.keepanno.ast.OptionalPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getAnnotatedByPattern():123:123 -> a
+    203:203:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125 -> a
+    203:203:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    204:205:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):125:126 -> a
+    204:205:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    206:206:com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern.getAccessPattern():128:128 -> a
+    206:206:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    206:206:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    207:211:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):153:157 -> a
+    207:211:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    207:211:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    212:212:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getSynchronizedPattern():77:77 -> a
+    212:212:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):157 -> a
+    212:212:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    212:212:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    213:214:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):157:158 -> a
+    213:214:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    213:214:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    215:215:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getBridgePattern():81:81 -> a
+    215:215:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):158 -> a
+    215:215:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    215:215:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    216:217:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):158:159 -> a
+    216:217:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    216:217:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    218:218:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getNativePattern():85:85 -> a
+    218:218:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):159 -> a
+    218:218:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    218:218:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    219:220:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):159:160 -> a
+    219:220:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    219:220:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    221:221:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getAbstractPattern():89:89 -> a
+    221:221:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):160 -> a
+    221:221:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    221:221:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    222:223:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):160:161 -> a
+    222:223:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    222:223:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    224:224:com.android.tools.r8.relocated.keepanno.ast.ModifierPattern com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern.getStrictFpPattern():93:93 -> a
+    224:224:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):161 -> a
+    224:224:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    224:224:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+    225:225:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethodAccess(com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMethodAccessPattern):161:161 -> a
+    225:225:boolean com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates.matchesMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern):126 -> a
+    225:225:boolean lambda$findMatchingMember$5(com.android.tools.r8.relocated.keepanno.ast.KeepMethodPattern,com.android.tools.r8.graph.DexEncodedMethod):415 -> a
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$MatchResult -> com.android.tools.r8.internal.rE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration declaration -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mF;"}
     java.util.List preconditions -> b
     java.util.List consequences -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List constraints -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractCollection;"}
-    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.List,java.util.List,java.util.List):279:283 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aF;Ljava/util/List;Ljava/util/ArrayList;Ljava/util/List;)V"}
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema -> com.android.tools.r8.internal.eE:
+    1:5:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration,java.util.List,java.util.List,java.util.List):281:285 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mF;Ljava/util/List;Ljava/util/ArrayList;Ljava/util/List;)V"}
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcher$NormalizedSchema -> com.android.tools.r8.internal.sE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcher.java"}
     com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration declaration -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aF;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mF;"}
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap symbolToKey -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a30;"}
     java.util.List classes -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List members -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.List classMembers -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList boundClasses -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList preconditions -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList consequences -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kz;"}
-    java.util.List constraints -> i
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList preconditions -> f
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList consequences -> g
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mz;"}
+    java.util.List constraints -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
-    int preconditionClassesCount -> j
-    int preconditionMembersCount -> k
-    boolean $assertionsDisabled -> l
-    1:1:void <clinit>():452:452 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):466:466 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aF;)V"}
-    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):455:459 -> <init>
+    int preconditionClassesCount -> i
+    boolean $assertionsDisabled -> j
+    1:1:void <clinit>():450:450 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):463:463 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mF;)V"}
+    2:6:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):453:457 -> <init>
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
-    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):459 -> <init>
-    8:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):459:460 -> <init>
+    7:7:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):457 -> <init>
+    8:9:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):457:458 -> <init>
     10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
-    10:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):460 -> <init>
-    11:12:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):460:461 -> <init>
-    13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> <init>
-    13:13:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):461 -> <init>
-    14:21:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):461:468 -> <init>
-    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():213:213 -> a
-    1:1:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):470 -> a
+    10:10:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):458 -> <init>
+    11:18:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):458:465 -> <init>
+    19:19:void com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration.match(java.util.function.Consumer,java.util.function.Consumer):22:22 -> <init>
+    19:19:void <init>(com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration):465 -> <init>
+    1:1:com.android.tools.r8.relocated.keepanno.ast.KeepPreconditions com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getPreconditions():220:220 -> a
+    1:1:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):467 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cF;)V"}
-    2:4:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):470:472 -> a
-    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():217:217 -> a
-    5:5:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):473 -> a
-    6:6:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):473:473 -> a
-    7:9:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):476:478 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tE;)V"}
-    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():70:70 -> a
-    10:10:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):478 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oF;)V"}
+    2:4:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):467:469 -> a
+    5:5:com.android.tools.r8.relocated.keepanno.ast.KeepConsequences com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getConsequences():224:224 -> a
+    5:5:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):470 -> a
+    6:6:void lambda$new$0(com.android.tools.r8.relocated.keepanno.ast.KeepEdge):470:470 -> a
+    7:9:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):473:475 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/HE;)V"}
+    10:10:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():96:96 -> a
+    10:10:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):478:478 -> a
-    12:12:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):483:483 -> a
-    12:12:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qE;)Ljava/lang/Integer;"}
-    13:13:boolean com.android.tools.r8.relocated.keepanno.ast.KeepDeclaration.isKeepEdge():26:26 -> a
-    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):483 -> a
-    13:13:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    14:15:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):483:484 -> a
-    14:15:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepBindings com.android.tools.r8.relocated.keepanno.ast.KeepEdge.getBindings():209:209 -> a
-    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):484 -> a
+    11:12:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():96:97 -> a
+    11:12:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    13:13:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):484 -> a
+    13:13:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):37:37 -> a
-    18:18:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):484 -> a
-    18:18:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():113:113 -> a
-    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):484 -> a
+    14:14:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
+    14:14:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):35:35 -> a
+    15:15:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
+    15:15:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    16:16:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528 -> a
-    20:24:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):528:532 -> a
-    25:25:int defineItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):521:521 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gG;)I"}
-    26:26:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):525:525 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nE;)I"}
-    27:27:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
-    27:27:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):526 -> a
+    16:16:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    17:17:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepCheck.getItemPattern():99:99 -> a
+    17:17:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475 -> a
+    18:18:void lambda$new$1(com.android.tools.r8.relocated.keepanno.ast.KeepCheck):475:475 -> a
+    19:19:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):480:480 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)Lcom/android/tools/r8/internal/rG;"}
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    20:20:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):481 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):526:526 -> a
-    29:29:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):525:525 -> a
-    30:33:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):537:540 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fG;)I"}
-    34:34:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> a
-    34:34:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):540 -> a
-    35:35:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):540:540 -> a
-    36:36:int encodeClassKey(int):500:500 -> a
-    36:36:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):541 -> a
-    37:37:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):543:543 -> a
-    38:38:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():70:70 -> a
-    38:38:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):543 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding com.android.tools.r8.relocated.keepanno.ast.KeepBindings.get(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):39:39 -> a
+    21:21:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):481 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern com.android.tools.r8.relocated.keepanno.ast.KeepBindings$Binding.getItem():137:137 -> a
+    22:22:com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern getItemForBinding(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):481 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:42:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):543:546 -> a
-    43:43:int encodeMemberKey(int):510:510 -> a
-    43:43:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):547 -> a
-    44:44:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):552:552 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AE;)V"}
-    45:45:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():48:48 -> a
-    45:45:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):552 -> a
+    23:23:int defineItemReference(com.android.tools.r8.relocated.keepanno.ast.KeepItemReference):514:514 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sG;)I"}
+    24:24:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):518:518 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/BE;)I"}
+    25:25:com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference.getName():32:32 -> a
+    25:25:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):519 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):552:552 -> a
-    47:47:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):556:556 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YG;)V"}
-    48:48:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():54:54 -> a
-    48:48:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):556 -> a
+    26:26:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):519:519 -> a
+    27:27:int defineBindingReference(com.android.tools.r8.relocated.keepanno.ast.KeepBindingReference):518:518 -> a
+    28:31:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):523:526 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/rG;)I"}
+    32:32:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():73:73 -> a
+    32:32:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):526 -> a
+    33:33:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):526:526 -> a
+    34:34:int encodeClassKey(int):493:493 -> a
+    34:34:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):527 -> a
+    35:35:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):529:529 -> a
+    36:36:com.android.tools.r8.relocated.keepanno.ast.KeepClassItemReference com.android.tools.r8.relocated.keepanno.ast.KeepMemberItemPattern.getClassReference():69:69 -> a
+    36:36:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):529 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:50:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):556:557 -> a
-    51:51:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():58:58 -> a
-    51:51:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):557 -> a
-    52:52:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):557:557 -> a
-com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates -> com.android.tools.r8.internal.gE:
+    37:40:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):529:532 -> a
+    41:41:int encodeMemberKey(int):503:503 -> a
+    41:41:int defineItemPattern(com.android.tools.r8.relocated.keepanno.ast.KeepItemPattern):533 -> a
+    42:42:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):538:538 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ME;)V"}
+    43:43:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepCondition.getItem():49:49 -> a
+    43:43:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):538 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    44:44:void addPrecondition(com.android.tools.r8.relocated.keepanno.ast.KeepCondition):538:538 -> a
+    45:45:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):542:542 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iH;)V"}
+    46:46:com.android.tools.r8.relocated.keepanno.ast.KeepItemReference com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getItem():55:55 -> a
+    46:46:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):542 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    47:48:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):542:543 -> a
+    49:49:com.android.tools.r8.relocated.keepanno.ast.KeepConstraints com.android.tools.r8.relocated.keepanno.ast.KeepTarget.getConstraints():59:59 -> a
+    49:49:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):543 -> a
+    50:50:void addConsequence(com.android.tools.r8.relocated.keepanno.ast.KeepTarget):543:543 -> a
+    1:1:java.lang.Integer lambda$defineBindingReference$2(com.android.tools.r8.relocated.keepanno.ast.KeepBindings$KeepBindingSymbol):519:519 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/EE;)Ljava/lang/Integer;"}
+com.android.tools.r8.shaking.rules.KeepAnnotationMatcherPredicates -> com.android.tools.r8.internal.uE:
 # {"id":"sourceFile","fileName":"KeepAnnotationMatcherPredicates.java"}
     com.android.tools.r8.graph.DexItemFactory factory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -287215,7 +286540,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):49:50 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)V"}
     1:1:boolean matchesInstanceOfPattern(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/dG;Lcom/android/tools/r8/graph/j;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/pG;Lcom/android/tools/r8/graph/j;)Z"}
     2:2:boolean com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.isAny():63:63 -> a
     2:2:boolean matchesInstanceOfPattern(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):88 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -287228,13 +286553,13 @@
     6:6:boolean matchesInstanceOfPattern(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):93 -> a
     7:20:boolean matchesInstanceOfPattern(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.AppInfoWithClassHierarchy):93:106 -> a
     21:21:com.android.tools.r8.utils.TraversalContinuation lambda$matchesInstanceOfPattern$0(com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dG;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pG;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/E0;Ljava/lang/Boolean;)Lcom/android/tools/r8/internal/Oh0;"}
     22:22:com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern$Some.getClassNamePattern():73:73 -> a
     22:22:com.android.tools.r8.utils.TraversalContinuation lambda$matchesInstanceOfPattern$0(com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:26:com.android.tools.r8.utils.TraversalContinuation lambda$matchesInstanceOfPattern$0(com.android.tools.r8.relocated.keepanno.ast.KeepInstanceOfPattern,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):101:104 -> a
     27:27:boolean matchesGeneralMemberAccess(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g;Lcom/android/tools/r8/internal/jG;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g;Lcom/android/tools/r8/internal/vG;)Z"}
     28:28:boolean com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern.isAnyVisibility():63:63 -> a
     28:28:boolean matchesGeneralMemberAccess(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):144 -> a
     29:39:com.android.tools.r8.relocated.keepanno.ast.AccessVisibility getAccessVisibility(com.android.tools.r8.graph.AccessFlags):178:188 -> a
@@ -287252,15 +286577,15 @@
     48:48:boolean matchesGeneralMemberAccess(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):149 -> a
     49:49:boolean matchesGeneralMemberAccess(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.relocated.keepanno.ast.KeepMemberAccessPattern):149:149 -> a
     50:50:boolean matchesModifier(boolean,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):174:174 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/IO;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/MO;)Z"}
     51:51:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isAny():0:0 -> a
     51:51:boolean matchesModifier(boolean,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):174 -> a
     52:52:boolean com.android.tools.r8.relocated.keepanno.ast.ModifierPattern.isOnlyPositive():0:0 -> a
     52:52:boolean matchesModifier(boolean,com.android.tools.r8.relocated.keepanno.ast.ModifierPattern):174 -> a
     53:67:boolean matchesAnnotatedBy(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.relocated.keepanno.ast.OptionalPattern):193:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/internal/UU;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/u0;Lcom/android/tools/r8/internal/YU;)Z"}
     68:72:boolean matchesString(com.android.tools.r8.graph.DexString,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):232:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/WG;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;Lcom/android/tools/r8/internal/gH;)Z"}
     73:73:java.lang.String com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern.asExactString():96:96 -> a
     73:73:boolean matchesString(com.android.tools.r8.graph.DexString,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):237 -> a
     74:74:boolean matchesString(com.android.tools.r8.graph.DexString,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):237:237 -> a
@@ -287273,15 +286598,15 @@
     79:79:boolean com.android.tools.r8.graph.DexString.endsWith(java.lang.String):574:574 -> a
     79:79:boolean matchesString(com.android.tools.r8.graph.DexString,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):242 -> a
     80:80:boolean matchesType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepTypePattern):277:277 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/dH;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/nH;)Z"}
     81:81:java.lang.Boolean lambda$matchesType$1():278:278 -> a
     82:82:boolean matchesClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):285:285 -> a
     82:82:java.lang.Boolean lambda$matchesType$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):281 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/RG;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bH;)Ljava/lang/Boolean;"}
     83:83:java.lang.Boolean lambda$matchesType$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):281:281 -> a
     84:87:boolean matchesArrayType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):289:292 -> a
     84:87:java.lang.Boolean lambda$matchesType$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):280 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/lE;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/zE;)Ljava/lang/Boolean;"}
     88:88:boolean com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern.isAny():30:30 -> a
     88:88:boolean matchesArrayType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):292 -> a
     88:88:java.lang.Boolean lambda$matchesType$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):280 -> a
@@ -287301,7 +286626,7 @@
     95:95:java.lang.Boolean lambda$matchesType$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepArrayTypePattern):280:280 -> a
     96:99:boolean matchesPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):303:306 -> a
     96:99:java.lang.Boolean lambda$matchesType$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):279 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/PG;)Ljava/lang/Boolean;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/ZG;)Ljava/lang/Boolean;"}
     100:100:boolean com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern.isAny():78:78 -> a
     100:100:boolean matchesPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):306 -> a
     100:100:java.lang.Boolean lambda$matchesType$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):279 -> a
@@ -287321,7 +286646,7 @@
     105:105:java.lang.Boolean lambda$matchesType$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):279 -> a
     106:106:java.lang.Boolean lambda$matchesType$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepPrimitiveTypePattern):279:279 -> a
     1:8:boolean matchesClassName(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):61:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/RG;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/internal/bH;)Z"}
     9:9:com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern.getPackagePattern():100:100 -> b
     9:9:boolean matchesClassName(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):68 -> b
     10:16:boolean matchesPackage(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepPackagePattern):73:79 -> b
@@ -287357,7 +286682,7 @@
     29:29:boolean matchesString(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepStringPattern):259:259 -> b
     29:29:boolean matchesSimpleName(java.lang.String,com.android.tools.r8.relocated.keepanno.ast.KeepUnqualfiedClassNamePattern):83 -> b
     29:29:boolean matchesClassName(com.android.tools.r8.graph.DexType,com.android.tools.r8.relocated.keepanno.ast.KeepQualifiedClassNamePattern):69 -> b
-com.android.tools.r8.shaking.rules.MaterializedConditionalRule -> com.android.tools.r8.internal.SM:
+com.android.tools.r8.shaking.rules.MaterializedConditionalRule -> com.android.tools.r8.internal.WM:
 # {"id":"sourceFile","fileName":"MaterializedConditionalRule.java"}
     java.util.List preconditions -> a
     com.android.tools.r8.shaking.MinimumKeepInfoCollection consequences -> b
@@ -287367,14 +286692,14 @@
     1:4:void <init>(java.util.List,com.android.tools.r8.shaking.MinimumKeepInfoCollection):18:21 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Ljava/util/List;)V"}
     1:1:com.android.tools.r8.shaking.rules.PendingConditionalRule asPendingRule():25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kW;"}
-com.android.tools.r8.shaking.rules.MaterializedRules -> com.android.tools.r8.internal.TM:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oW;"}
+com.android.tools.r8.shaking.rules.MaterializedRules -> com.android.tools.r8.internal.XM:
 # {"id":"sourceFile","fileName":"MaterializedRules.java"}
     com.android.tools.r8.shaking.MinimumKeepInfoCollection rootConsequences -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/c2;"}
     java.util.List conditionalRules -> b
     com.android.tools.r8.shaking.rules.MaterializedRules EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XM;"}
     1:1:void <clinit>():16:16 -> <clinit>
     2:2:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.MinimumKeepInfoCollection.empty():55:55 -> <clinit>
     2:2:void <clinit>():17 -> <clinit>
@@ -287384,7 +286709,7 @@
     1:1:boolean com.android.tools.r8.shaking.rules.MaterializedConditionalRule.pruneItems(com.android.tools.r8.graph.PrunedItems):29:29 -> a
     1:1:boolean lambda$pruneItems$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.rules.MaterializedConditionalRule):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/SM;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/internal/WM;)Z"}
     2:3:boolean com.android.tools.r8.shaking.rules.MaterializedConditionalRule.pruneItems(com.android.tools.r8.graph.PrunedItems):29:30 -> a
     2:3:boolean lambda$pruneItems$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.rules.MaterializedConditionalRule):52 -> a
     4:4:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
@@ -287425,7 +286750,7 @@
     30:35:com.android.tools.r8.shaking.rules.ApplicableRulesEvaluator toApplicableRules():42:47 -> a
     36:37:void pruneItems(com.android.tools.r8.graph.PrunedItems):51:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)V"}
-com.android.tools.r8.shaking.rules.PendingConditionalRule -> com.android.tools.r8.internal.kW:
+com.android.tools.r8.shaking.rules.PendingConditionalRule -> com.android.tools.r8.internal.oW:
 # {"id":"sourceFile","fileName":"PendingConditionalRule.java"}
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.MinimumKeepInfoCollection):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/c2;Ljava/util/List;)V"}
@@ -287449,7 +286774,7 @@
     8:8:boolean isSatisfied(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.Enqueuer):25 -> a
     8:8:boolean isSatisfied(java.lang.Object,com.android.tools.r8.shaking.Enqueuer):12 -> a
     9:9:java.util.List getReferences(java.util.List):20:20 -> a
-com.android.tools.r8.shaking.rules.PendingConditionalRuleBase -> com.android.tools.r8.internal.lW:
+com.android.tools.r8.shaking.rules.PendingConditionalRuleBase -> com.android.tools.r8.internal.pW:
 # {"id":"sourceFile","fileName":"PendingConditionalRuleBase.java"}
     java.util.List outstandingPreconditions -> a
     java.util.List satisfiedPreconditions -> b
@@ -287463,7 +286788,7 @@
     java.util.List getReferences(java.util.List) -> a
     boolean isSatisfied(java.lang.Object,com.android.tools.r8.shaking.Enqueuer) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/shaking/M;)Z"}
-com.android.tools.r8.shaking.rules.PendingInitialConditionalRule -> com.android.tools.r8.internal.mW:
+com.android.tools.r8.shaking.rules.PendingInitialConditionalRule -> com.android.tools.r8.internal.qW:
 # {"id":"sourceFile","fileName":"PendingInitialConditionalRule.java"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():14:14 -> <clinit>
@@ -287541,7 +286866,7 @@
     3:6:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic build():117:120 -> a
     1:1:com.android.tools.r8.startup.diagnostic.MissingStartupProfileItemsDiagnostic$Builder nop():81:81 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/startup/diagnostic/MissingStartupProfileItemsDiagnostic$a;"}
-com.android.tools.r8.startup.generated.InstrumentationServerFactory -> com.android.tools.r8.internal.Ow:
+com.android.tools.r8.startup.generated.InstrumentationServerFactory -> com.android.tools.r8.internal.Qw:
 # {"id":"sourceFile","fileName":"InstrumentationServerFactory.java"}
     1:16:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):41:56 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/D2;"}
@@ -287557,16 +286882,16 @@
     21:21:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
     22:23:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):108:109 -> a
     22:23:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     24:24:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     25:25:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):110 -> a
     25:25:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
     26:26:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):110:110 -> a
     26:26:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):111 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):60 -> a
     28:30:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):114:116 -> a
@@ -287598,13 +286923,13 @@
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):76 -> b
     3:4:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):77:78 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     5:5:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):78 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     6:6:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):79 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):79:79 -> b
-    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):80 -> b
     9:11:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):83:85 -> b
     12:12:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):82:82 -> b
@@ -287612,12 +286937,12 @@
     20:20:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     20:20:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):88 -> b
     21:21:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):89:89 -> b
-    22:22:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     22:22:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):90 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     23:23:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):91 -> b
-    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     24:24:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):92 -> b
     25:27:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):95:97 -> b
     28:31:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):96:99 -> b
@@ -287637,7 +286962,7 @@
     61:61:com.android.tools.r8.graph.Code lambda$createDirectMethods$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):100 -> b
     62:62:com.android.tools.r8.graph.CfCode createCfCode1_getInstance(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):164:164 -> b
     62:62:com.android.tools.r8.graph.Code lambda$createDirectMethods$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):100 -> b
-com.android.tools.r8.startup.generated.InstrumentationServerImplFactory -> com.android.tools.r8.internal.Pw:
+com.android.tools.r8.startup.generated.InstrumentationServerImplFactory -> com.android.tools.r8.internal.Rw:
 # {"id":"sourceFile","fileName":"InstrumentationServerImplFactory.java"}
     1:16:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.graph.DexItemFactory):63:78 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/D2;"}
@@ -287761,13 +287086,13 @@
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):151 -> b
     3:4:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):152:153 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     5:5:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):153 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     6:6:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):154 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):154:154 -> b
-    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):155 -> b
     9:12:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):158:161 -> b
     13:13:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):157:157 -> b
@@ -287775,12 +287100,12 @@
     22:22:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     22:22:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):164 -> b
     23:23:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):165:165 -> b
-    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     24:24:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):166 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     25:25:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):167 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    26:26:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     26:26:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):168 -> b
     27:30:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):171:174 -> b
     31:34:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):173:176 -> b
@@ -287789,12 +287114,12 @@
     46:46:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     46:46:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):179 -> b
     47:47:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):180:180 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    48:48:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     48:48:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):181 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    49:49:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     49:49:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):182 -> b
-    50:50:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    50:50:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     50:50:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):183 -> b
     51:56:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):186:191 -> b
     57:61:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):188:192 -> b
@@ -287803,12 +287128,12 @@
     74:74:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     74:74:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):195 -> b
     75:75:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):196:196 -> b
-    76:76:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    76:76:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     76:76:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):197 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    77:77:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     77:77:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):198 -> b
-    78:78:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    78:78:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     78:78:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):199 -> b
     79:83:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):202:206 -> b
     84:87:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):204:207 -> b
@@ -287817,12 +287142,12 @@
     99:99:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     99:99:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):210 -> b
     100:100:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):211:211 -> b
-    101:101:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    101:101:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     101:101:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):212 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    102:102:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    102:102:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     102:102:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):213 -> b
-    103:103:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    103:103:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     103:103:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):214 -> b
     104:108:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):217:221 -> b
     109:112:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):219:222 -> b
@@ -287831,12 +287156,12 @@
     124:124:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     124:124:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):225 -> b
     125:125:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):226:226 -> b
-    126:126:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    126:126:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     126:126:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):227 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:127:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    127:127:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     127:127:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):228 -> b
-    128:128:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    128:128:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     128:128:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):229 -> b
     129:133:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):232:236 -> b
     134:137:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):234:237 -> b
@@ -287845,12 +287170,12 @@
     149:149:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> b
     149:149:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):240 -> b
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):241:241 -> b
-    151:151:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> b
+    151:151:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> b
     151:151:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):242 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    152:152:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> b
+    152:152:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> b
     152:152:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):243 -> b
-    153:153:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> b
+    153:153:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> b
     153:153:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):244 -> b
     154:157:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):247:250 -> b
     158:158:com.android.tools.r8.graph.DexEncodedMethod[] createDirectMethods(com.android.tools.r8.graph.DexItemFactory):246:246 -> b
@@ -287872,13 +287197,13 @@
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):258 -> c
     3:4:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):259:260 -> c
-    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> c
+    5:5:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> c
     5:5:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):260 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> c
+    6:6:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> c
     6:6:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):261 -> c
     7:7:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):261:261 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> c
     8:8:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):262 -> c
     9:12:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):265:268 -> c
     13:15:com.android.tools.r8.graph.DexEncodedMethod[] createVirtualMethods(com.android.tools.r8.graph.DexItemFactory):267:269 -> c
@@ -288099,13 +287424,13 @@
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/c;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList committedProgramTypes -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy globalSyntheticsStrategy -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/D;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():26:26 -> <clinit>
     1:7:void <init>(com.android.tools.r8.synthesis.SyntheticItems$State,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):40:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/synthesis/c;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/synthesis/D;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/synthesis/c;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/synthesis/D;)V"}
     8:8:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):342:342 -> <init>
     8:8:void <init>(com.android.tools.r8.synthesis.SyntheticItems$State,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):46 -> <init>
     9:9:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):342:342 -> <init>
@@ -288131,19 +287456,19 @@
     com.android.tools.r8.synthesis.SyntheticNaming naming -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/Q;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap methods -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap classes -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap globalContexts -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet syntheticInputs -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():35:35 -> <clinit>
     1:7:void <init>(com.android.tools.r8.synthesis.SyntheticNaming,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet):177:183 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/gv;)V"}
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableMap mergeMapOfLists(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableMap):141:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Bu;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Du;)Lcom/android/tools/r8/internal/Du;"}
     5:5:void lambda$mergeMapOfLists$1(java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):143:143 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     6:6:void lambda$mergeMapOfSets$3(java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):154:154 -> a
@@ -288162,7 +287487,7 @@
     15:16:void lambda$verifySyntheticInputsSubsetOfSynthetics$4(java.util.Set,com.android.tools.r8.graph.DexType):195:196 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;)V"}
     17:18:java.lang.Iterable getItems(com.android.tools.r8.graph.DexType):264:265 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Fq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Hq;"}
     19:19:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):1001:1001 -> a
     19:19:java.lang.Iterable getItems(com.android.tools.r8.graph.DexType):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -288177,7 +287502,7 @@
     24:25:void forEachItem(java.util.function.Consumer):273:274 -> a
     26:26:void lambda$forEachItem$5(java.util.function.Consumer,java.util.List):273:273 -> a
     27:28:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):326:327 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/Wu;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/Yu;)Lcom/android/tools/r8/internal/Du;"}
     29:29:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Iterable):172:172 -> a
     29:29:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):327 -> a
     30:41:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):327:338 -> a
@@ -288186,7 +287511,7 @@
     1:1:java.util.List lambda$mergeMapOfLists$0(com.android.tools.r8.graph.DexType):143:143 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/List;"}
     2:5:com.android.tools.r8.com.google.common.collect.ImmutableMap mergeMapOfSets(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableMap):152:155 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Bu;)Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Du;)Lcom/android/tools/r8/internal/Du;"}
     6:6:void forEachSyntheticInput(java.util.function.Consumer):269:269 -> b
     7:7:void lambda$forEachItem$6(java.util.function.Consumer,java.util.List):274:274 -> b
     1:1:java.util.Set lambda$mergeMapOfSets$2(com.android.tools.r8.graph.DexType):154:154 -> c
@@ -288202,7 +287527,7 @@
     java.util.Map methods -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder newSyntheticInputs -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yu;"}
     java.util.Map globalContexts -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> f
@@ -288290,28 +287615,28 @@
 # {"id":"sourceFile","fileName":"GlobalSyntheticsUtils.java"}
     boolean written -> a
     com.android.tools.r8.utils.OutputBuilder val$builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GV;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():49:49 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.OutputBuilder):49:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GV;)V"}
     1:9:void accept(com.android.tools.r8.ByteDataView,com.android.tools.r8.references.ClassReference,com.android.tools.r8.DiagnosticsHandler):55:63 -> accept
     10:11:void accept(com.android.tools.r8.ByteDataView,com.android.tools.r8.references.ClassReference,com.android.tools.r8.DiagnosticsHandler):58:59 -> accept
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):69:71 -> finished
 com.android.tools.r8.synthesis.GlobalSyntheticsUtils$2 -> com.android.tools.r8.synthesis.g:
 # {"id":"sourceFile","fileName":"GlobalSyntheticsUtils.java"}
     com.android.tools.r8.utils.OutputBuilder val$builder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GV;"}
     1:1:void <init>(com.android.tools.r8.utils.OutputBuilder):78:78 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GV;)V"}
     1:1:void accept(com.android.tools.r8.ByteDataView,com.android.tools.r8.references.ClassReference,com.android.tools.r8.DiagnosticsHandler):82:82 -> accept
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):87:87 -> finished
 com.android.tools.r8.synthesis.GlobalSyntheticsUtils$3 -> com.android.tools.r8.synthesis.h:
 # {"id":"sourceFile","fileName":"GlobalSyntheticsUtils.java"}
     com.android.tools.r8.utils.OutputBuilder val$builder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/GV;"}
     1:1:void <init>(com.android.tools.r8.utils.OutputBuilder):93:93 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GV;)V"}
     1:1:void accept(com.android.tools.r8.ByteDataView,com.android.tools.r8.references.ClassReference,com.android.tools.r8.DiagnosticsHandler):96:96 -> accept
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):101:101 -> finished
 com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.synthesis.j:
@@ -288319,7 +287644,7 @@
     com.android.tools.r8.graph.DexType getHolder() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.lens.NonIdentityGraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/j;"}
 com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.k:
 # {"id":"sourceFile","fileName":"SynthesizingContext.java"}
     com.android.tools.r8.graph.DexType synthesizingContextType -> b
@@ -288519,7 +287844,7 @@
     1:1:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexType):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/graph/I2;)V"}
     1:1:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/Z;"}
     2:6:com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition lookupDefinition(java.util.function.Function):28:32 -> a
     2:6:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/synthesis/s;"}
@@ -288537,7 +287862,7 @@
     12:12:com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition lookupDefinition(java.util.function.Function):33:33 -> a
     12:12:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):18 -> a
     1:4:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):40:43 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/q;"}
 com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.synthesis.r:
 # {"id":"sourceFile","fileName":"SyntheticClasspathDefinition.java"}
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.s:
@@ -288555,7 +287880,7 @@
     void internalComputeHash(com.android.tools.r8.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.RepresentativeMap) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/m;Lcom/android/tools/r8/utils/structural/t;)V"}
     1:1:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):113:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/s;ZLcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ld;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/s;ZLcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/nd;)I"}
     2:2:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getKind():55:55 -> a
     2:2:int compareTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -288658,7 +287983,7 @@
     26:26:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticMethodDefinition):434 -> a
     27:27:void lambda$buildLensAndProgram$10(java.util.Set,java.util.List,com.android.tools.r8.synthesis.SyntheticMethodDefinition):434:434 -> a
     28:30:void finalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):170:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     31:31:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> a
     31:31:void finalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):173 -> a
     32:32:com.android.tools.r8.synthesis.SyntheticFinalization$Result com.android.tools.r8.synthesis.SyntheticItems.computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):1251:1251 -> a
@@ -288704,7 +288029,7 @@
     69:69:void finalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):184 -> a
     70:70:void finalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):186:186 -> a
     71:91:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):222:242 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/synthesis/w;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/synthesis/w;"}
     92:92:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):234:234 -> a
     93:93:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> a
     93:93:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):255 -> a
@@ -288770,7 +288095,7 @@
     140:140:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):298 -> a
     141:141:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):298:298 -> a
     142:142:java.util.Map lambda$computeFinalSynthetics$0(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):240:240 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/lh0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/ph0;)Ljava/util/Map;"}
     143:143:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.synthesis.CommittedSyntheticsCollection.getMethods():256:256 -> a
     143:143:java.util.Map lambda$computeFinalSynthetics$0(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):241 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -288785,17 +288110,17 @@
     158:166:java.util.Map computeEquivalences(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):316:324 -> a
     158:166:java.util.Map lambda$computeFinalSynthetics$0(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):240 -> a
     167:167:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):249:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/X;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/X;)V"}
     168:168:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     168:168:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):249 -> a
     169:169:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticProgramClassReference):249:249 -> a
     170:170:void lambda$computeFinalSynthetics$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):251:251 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yu;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/O;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Au;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/synthesis/O;)V"}
     171:171:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> a
     171:171:void lambda$computeFinalSynthetics$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):251 -> a
     172:172:void lambda$computeFinalSynthetics$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):251:251 -> a
     173:175:void lambda$computeFinalSynthetics$4(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):262:264 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/Bu;Ljava/util/Set;Lcom/android/tools/r8/synthesis/Z;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/Du;Ljava/util/Set;Lcom/android/tools/r8/synthesis/Z;)V"}
     176:176:void lambda$computeFinalSynthetics$6(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):274:274 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/x;Ljava/util/function/Consumer;)V"}
     177:177:void lambda$computeFinalSynthetics$5(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):277:277 -> a
@@ -288818,7 +288143,7 @@
     195:196:void lambda$verifyOneSyntheticPerSyntheticClass$8(java.util.Set,com.android.tools.r8.graph.DexType,java.util.List):365:366 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
     197:241:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):394:438 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/y;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/Set;)Lcom/android/tools/r8/graph/x0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/y;Ljava/util/Map;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/Set;)Lcom/android/tools/r8/graph/x0;"}
     242:242:boolean com.android.tools.r8.synthesis.SyntheticFinalization$Builder.isEmpty():118:118 -> a
     242:242:com.android.tools.r8.graph.DexApplication buildLensAndProgram(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.Set):455 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -288864,7 +288189,7 @@
     355:360:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):496:501 -> a
     361:361:void lambda$buildLensAndProgram$14(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):497:497 -> a
     362:362:void lambda$buildLensAndProgram$16(com.android.tools.r8.graph.fixup.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):532:532 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mh0;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/graph/B5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qh0;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/graph/B5;)V"}
     363:363:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
     363:363:void lambda$buildLensAndProgram$16(com.android.tools.r8.graph.fixup.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):532 -> a
     364:365:void lambda$buildLensAndProgram$16(com.android.tools.r8.graph.fixup.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.ProgramMember):533:534 -> a
@@ -288899,11 +288224,11 @@
     378:379:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):571 -> a
     380:380:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):114:114 -> a
     380:380:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):572 -> a
-    381:381:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    381:381:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     381:381:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):114 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     381:381:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):572 -> a
-    382:382:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    382:382:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     382:382:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):114 -> a
     382:382:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):572 -> a
     383:383:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):114:114 -> a
@@ -288992,9 +288317,9 @@
     437:437:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):116 -> a
     437:437:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):572 -> a
     438:497:java.util.Map computeActualEquivalences(java.util.Collection,java.util.Map,com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):593:652 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/Map;Lcom/android/tools/r8/graph/y;ZLcom/android/tools/r8/internal/ld;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/lh0;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/Map;Lcom/android/tools/r8/graph/y;ZLcom/android/tools/r8/internal/nd;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/ph0;)Ljava/util/IdentityHashMap;"}
     498:499:void lambda$computeActualEquivalences$20(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):599:600 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;ZLcom/android/tools/r8/internal/ld;Ljava/util/Map;Ljava/util/Map;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;ZLcom/android/tools/r8/internal/nd;Ljava/util/Map;Ljava/util/Map;Ljava/util/List;)V"}
     500:500:boolean com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.isPinned(com.android.tools.r8.graph.AppView):940:940 -> a
     500:500:void lambda$computeActualEquivalences$20(com.android.tools.r8.graph.AppView,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.Map,java.util.List):602 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -289095,7 +288420,7 @@
     586:587:void com.android.tools.r8.synthesis.SyntheticFinalization$Builder.move(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128:129 -> a
     586:587:void lambda$computeActualEquivalences$23(com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticDefinition):655 -> a
     588:589:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):678:679 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;ZLcom/android/tools/r8/internal/ld;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/List;ZLcom/android/tools/r8/internal/nd;)Ljava/util/List;"}
     590:590:com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.singleton(com.android.tools.r8.synthesis.SyntheticDefinition):911:911 -> a
     590:590:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):679 -> a
     591:591:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> a
@@ -289131,7 +288456,7 @@
     662:663:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):744 -> a
     664:664:java.util.List groupEquivalent(com.android.tools.r8.graph.AppView,java.util.List,boolean,com.android.tools.r8.features.ClassToFeatureSplitMap):744:744 -> a
     665:665:int lambda$groupEquivalent$25(boolean,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticDefinition,com.android.tools.r8.synthesis.SyntheticDefinition):691:691 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ld;Lcom/android/tools/r8/synthesis/s;Lcom/android/tools/r8/synthesis/s;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/nd;Lcom/android/tools/r8/synthesis/s;Lcom/android/tools/r8/synthesis/s;)I"}
     666:675:com.android.tools.r8.synthesis.SyntheticDefinition findSmallestMember(java.util.List,java.util.function.Consumer):752:761 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/util/List;)Lcom/android/tools/r8/synthesis/s;"}
     676:682:boolean isPinned(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticDefinition):773:779 -> a
@@ -289191,7 +288516,7 @@
     726:726:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):335 -> a
     726:726:com.android.tools.r8.graph.DexType createExternalType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.util.Map,com.android.tools.r8.graph.AppView,java.util.function.Predicate):831 -> a
     727:742:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):847:862 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;ZLcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/ls;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;ZLcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ns;)Ljava/util/Collection;"}
     743:743:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):94:94 -> a
     743:743:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):862 -> a
     744:755:java.util.Collection computePotentialEquivalences(java.util.Map,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):864:875 -> a
@@ -289268,13 +288593,13 @@
     785:785:void lambda$computePotentialEquivalences$28(java.util.Collection,com.android.tools.r8.synthesis.SyntheticDefinition):852 -> a
     786:786:void lambda$computePotentialEquivalences$28(java.util.Collection,com.android.tools.r8.synthesis.SyntheticDefinition):852:852 -> a
     787:788:void lambda$computePotentialEquivalences$29(java.util.Set,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexType):867:868 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)V"}
     789:789:com.android.tools.r8.graph.DexType lambda$computePotentialEquivalences$30(java.util.Set,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType):871:871 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     790:790:java.util.List lambda$computePotentialEquivalences$31(com.android.tools.r8.com.google.common.hash.HashCode):876:876 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Is;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ks;)Ljava/util/List;"}
     791:804:java.util.Map lookupDefinitions(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.ImmutableMap):884:897 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bu;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Du;)Ljava/util/IdentityHashMap;"}
     805:805:com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.pinnedSingleton(com.android.tools.r8.synthesis.SyntheticDefinition):921:921 -> a
     805:805:void lambda$groupEquivalent$26(java.util.List,com.android.tools.r8.synthesis.SyntheticDefinition):739 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/synthesis/s;)V"}
@@ -289322,10 +288647,10 @@
     833:833:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.getRepresentative():959:959 -> a
     833:833:void lambda$buildLensAndProgram$17(com.android.tools.r8.graph.fixup.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Mh0;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/synthesis/v;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qh0;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/synthesis/v;)V"}
     834:835:void lambda$buildLensAndProgram$17(com.android.tools.r8.graph.fixup.TreeFixerBase,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):529:530 -> a
     1:2:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):192:193 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     3:3:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> b
     3:3:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):194 -> b
     4:4:com.android.tools.r8.synthesis.SyntheticFinalization$Result com.android.tools.r8.synthesis.SyntheticItems.computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):1251:1251 -> b
@@ -289345,7 +288670,7 @@
     13:13:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> b
     14:14:void finalizeWithClassHierarchy(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200:200 -> b
     15:15:java.util.Map lambda$computeFinalSynthetics$1(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):245:245 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/lh0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/Map;Lcom/android/tools/r8/synthesis/u;Lcom/android/tools/r8/internal/ph0;)Ljava/util/Map;"}
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.synthesis.CommittedSyntheticsCollection.getClasses():260:260 -> b
     16:16:java.util.Map lambda$computeFinalSynthetics$1(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.synthesis.SyntheticFinalization$Builder,com.android.tools.r8.utils.Timing):246 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -289395,7 +288720,7 @@
     61:61:void lambda$buildLensAndProgram$15(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):518:518 -> b
     62:62:void lambda$buildLensAndProgram$15(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):513:513 -> b
     63:63:com.android.tools.r8.ir.code.NumberGenerator lambda$createExternalType$27(java.lang.String):818:818 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/dS;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/hS;"}
     64:64:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.getRepresentative():959:959 -> b
     64:64:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):440 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -289411,7 +288736,7 @@
     69:69:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):443 -> b
     70:74:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexInfo,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):443:447 -> b
     1:1:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):207:207 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Ljava/util/concurrent/ExecutorService;)V"}
     2:2:com.android.tools.r8.synthesis.SyntheticItems com.android.tools.r8.graph.AppView.getSyntheticItems():564:564 -> c
     2:2:void finalizeWithLiveness(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):208 -> c
     3:3:com.android.tools.r8.synthesis.SyntheticFinalization$Result com.android.tools.r8.synthesis.SyntheticItems.computeFinalSynthetics(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):1251:1251 -> c
@@ -289465,11 +288790,11 @@
 com.android.tools.r8.synthesis.SyntheticFinalization$Builder -> com.android.tools.r8.synthesis.u:
 # {"id":"sourceFile","fileName":"SyntheticFinalization.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap fieldMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap typeMap -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():108:108 -> <clinit>
     1:8:void <init>():108:115 -> <init>
@@ -289479,11 +288804,11 @@
     com.android.tools.r8.synthesis.SyntheticDefinition representative -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/s;"}
     com.android.tools.r8.utils.OptionalBool pinned -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():903:903 -> <clinit>
     1:7:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List,com.android.tools.r8.utils.OptionalBool):930:936 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/s;Ljava/util/List;Lcom/android/tools/r8/internal/QU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/s;Ljava/util/List;Lcom/android/tools/r8/internal/UU;)V"}
     1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():59:59 -> a
     1:1:boolean lambda$isDerivedFromMainDexList$0(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.synthesis.SyntheticDefinition):965 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -289541,7 +288866,7 @@
 # {"id":"sourceFile","fileName":"SyntheticFinalization.java"}
     1:1:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84:84 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):94 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/Y5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/a6;Lcom/android/tools/r8/internal/a6;Lcom/android/tools/r8/internal/a6;)V"}
     2:2:java.util.Map com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.getForwardMap():82:82 -> <init>
     2:2:void com.android.tools.r8.graph.lens.NestedGraphLens.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap):84 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):94 -> <init>
@@ -289723,7 +289048,7 @@
     107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SynthesizingContext.getSynthesizingContextType():118:118 -> a
     107:107:void lambda$getSynthesizingContextTypes$14(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):592 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/synthesis/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/synthesis/k;)V"}
     108:108:void lambda$getSynthesizingContextTypes$14(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):592:592 -> a
     109:109:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.disableAndroidApiLevelCheck():130:130 -> a
     109:109:void lambda$internalEnsureFixedClasspathMethod$24(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1029 -> a
@@ -289806,7 +289131,7 @@
     159:162:void lambda$getFinalGlobalSyntheticContexts$6(java.util.Map,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,java.util.Set):290:293 -> a
     163:163:java.lang.String com.android.tools.r8.contexts.CompilationContext$UniqueContext.getSyntheticSuffix():292:292 -> a
     163:163:com.android.tools.r8.graph.DexType lambda$createClass$21(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):805 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/synthesis/k;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/internal/Le;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/synthesis/k;)Lcom/android/tools/r8/graph/I2;"}
     164:164:java.lang.String com.android.tools.r8.contexts.CompilationContext$UniqueContext.getSyntheticSuffix():292:292 -> a
     164:164:com.android.tools.r8.graph.DexType lambda$createClass$21(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):805 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -290049,9 +289374,9 @@
     363:363:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):599 -> a
     364:365:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):599:600 -> a
     366:376:com.android.tools.r8.graph.DexType getSynthesizingInputContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):617:627 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     377:378:void lambda$getSynthesizingInputContext$16(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SynthesizingContext):624:625 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/synthesis/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/synthesis/k;)V"}
     379:379:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SynthesizingContext.getSynthesizingInputContext(boolean):122:122 -> a
     379:379:void lambda$getSynthesizingInputContext$16(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SynthesizingContext):625 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -290061,13 +289386,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     381:381:void lambda$getSynthesizingInputContext$16(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SynthesizingContext):625:625 -> a
     382:385:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):655:658 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/iX;Lcom/android/tools/r8/internal/iX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/mX;Lcom/android/tools/r8/internal/mX;)V"}
     386:386:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable,java.lang.Iterable):196:196 -> a
     386:386:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):432 -> a
     386:386:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):658 -> a
     387:390:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.base.Predicate,com.android.tools.r8.com.google.common.base.Predicate):660:663 -> a
     391:392:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):681:682 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/ld;)Lcom/android/tools/r8/synthesis/k;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y5;Lcom/android/tools/r8/internal/nd;)Lcom/android/tools/r8/synthesis/k;"}
     393:393:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():59:59 -> a
     393:393:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):684 -> a
     394:397:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):686:689 -> a
@@ -290137,7 +289462,7 @@
     458:458:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):714:714 -> a
     458:458:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):729 -> a
     459:459:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):800:800 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/internal/Le;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/D2;"}
     460:460:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.contexts.CompilationContext$UniqueContext.getClassContext():288:288 -> a
     460:460:com.android.tools.r8.graph.DexProgramClass createClass(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):803 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -290395,7 +289720,7 @@
     645:647:com.android.tools.r8.graph.DexEncodedMethod internalEnsureMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):1056:1058 -> a
     648:651:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1089:1092 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Supplier;Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/graph/I2;Ljava/util/Collection;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/D2;"}
-    652:652:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():588:588 -> a
+    652:652:boolean com.android.tools.r8.utils.InternalOptions.hasGlobalSyntheticsConsumer():587:587 -> a
     652:652:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):1092 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     653:653:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():754:754 -> a
@@ -290471,7 +289796,7 @@
     707:707:com.android.tools.r8.synthesis.SyntheticMethodBuilder com.android.tools.r8.synthesis.SyntheticMethodBuilder.setName(java.lang.String):67:67 -> a
     707:707:void lambda$createMethod$25(com.android.tools.r8.synthesis.SyntheticMethodBuilder):1139 -> a
     708:709:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.Timing):1167:1168 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/synthesis/a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x0;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/synthesis/a;"}
     710:710:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.graph.PrunedItems.empty(com.android.tools.r8.graph.DexApplication):59:59 -> a
     710:710:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.utils.Timing):1171 -> a
     711:711:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems$Builder.setPrunedApp(com.android.tools.r8.graph.DexApplication):180:180 -> a
@@ -290501,7 +289826,7 @@
     1:1:com.android.tools.r8.origin.Origin com.android.tools.r8.synthesis.SynthesizingContext.getInputContextOrigin():126:126 -> b
     1:1:void lambda$getSynthesizingOrigin$15(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):611 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/su;Lcom/android/tools/r8/synthesis/k;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uu;Lcom/android/tools/r8/synthesis/k;)V"}
     2:2:void lambda$getSynthesizingOrigin$15(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):611:611 -> b
     3:3:void lambda$collectSyntheticsFromContext$4(com.android.tools.r8.graph.DexType,java.util.Set,com.android.tools.r8.graph.DexType,java.util.List):236:236 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/Set;Lcom/android/tools/r8/graph/I2;Ljava/util/List;)V"}
@@ -290514,7 +289839,7 @@
     11:11:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.contexts.CompilationContext$UniqueContext.getClassContext():288:288 -> b
     11:11:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1118 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/internal/Je;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/H;Lcom/android/tools/r8/internal/Le;Lcom/android/tools/r8/graph/y;Ljava/util/function/Consumer;)Lcom/android/tools/r8/graph/C5;"}
     12:12:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1118:1118 -> b
     13:13:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView,java.util.function.Consumer):1117:1117 -> b
     14:14:void lambda$collectSyntheticInputsTransitive$9(java.util.Map,com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):360:360 -> b
@@ -290532,7 +289857,7 @@
     20:20:void lambda$getSynthesizingContexts$13(com.android.tools.r8.graph.DexType,java.util.function.Consumer):586:586 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     21:24:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):590:593 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xu;"}
     25:25:com.android.tools.r8.graph.DexType lambda$internalEnsureFixedClasspathClass$23(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):933:933 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/synthesis/k;)Lcom/android/tools/r8/graph/I2;"}
     1:1:boolean isSyntheticClassEligibleForMerging(com.android.tools.r8.graph.DexProgramClass):77:77 -> c
@@ -290546,13 +289871,13 @@
     10:11:boolean isSyntheticClassEligibleForMerging(com.android.tools.r8.graph.DexProgramClass):84:85 -> c
     12:12:boolean isFinalized():436:436 -> c
     13:13:java.util.List getSynthesizingContexts(com.android.tools.r8.graph.DexType):586:586 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/xu;"}
     14:14:com.android.tools.r8.graph.DexType lambda$internalEnsureFixedProgramClass$19(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SynthesizingContext):726:726 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/synthesis/k;)Lcom/android/tools/r8/graph/I2;"}
     1:10:java.util.Collection getSynthesizingOrigin(com.android.tools.r8.graph.DexType):604:613 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/util/List;"}
     1:3:java.lang.Iterable getSyntheticKinds(com.android.tools.r8.graph.DexType):537:539 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Gq;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/Iq;"}
     4:4:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticDefinition.getKind():55:55 -> e
     4:4:java.lang.Iterable getSyntheticKinds(com.android.tools.r8.graph.DexType):541 -> e
     5:5:java.lang.Iterable getSyntheticKinds(com.android.tools.r8.graph.DexType):541:541 -> e
@@ -290644,7 +289969,7 @@
     1:1:void <clinit>():175:175 -> <clinit>
     1:4:void <init>():175:178 -> <init>
     1:1:boolean verifyNotRewritten(com.android.tools.r8.graph.lens.NonIdentityGraphLens):196:196 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;)V"}
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.<init>(int):495:495 -> a
     2:2:void com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.<init>():488 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.graph.lens.GraphLens.rewriteTypes(java.util.Set):626 -> a
@@ -290816,7 +290141,7 @@
     1:4:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming):70:73 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;Ljava/lang/String;Lcom/android/tools/r8/synthesis/Q;)V"}
     1:5:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):84:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hd;II)Lcom/android/tools/r8/internal/G4;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jd;II)Lcom/android/tools/r8/internal/G4;"}
     6:6:int com.android.tools.r8.org.objectweb.asm.ClassReader.readByte(int):3597:3597 -> a
     6:6:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):90 -> a
     7:10:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):90:93 -> a
@@ -290824,7 +290149,7 @@
     11:12:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):93 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.Attribute read(com.android.tools.r8.org.objectweb.asm.ClassReader,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):93:95 -> a
     16:16:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):101:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/W7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y7;"}
     17:17:int com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.getId():229:229 -> a
     17:17:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -290846,7 +290171,7 @@
     com.android.tools.r8.graph.DexProto proto -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/E2;"}
     com.android.tools.r8.cf.CfVersion classFileVersion -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator codeGenerator -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/synthesis/L;"}
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> h
@@ -290864,7 +290189,7 @@
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/ir/optimize/info/h;"}
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     boolean checkAndroidApiLevels -> p
     boolean $assertionsDisabled -> q
     1:1:void <clinit>():25:25 -> <clinit>
@@ -290907,7 +290232,7 @@
     14:14:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod.syntheticBuilder():1409:1409 -> a
     14:14:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):140 -> a
     15:16:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):141:142 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     17:17:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):143:143 -> a
@@ -290917,17 +290242,17 @@
     21:21:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1577:1577 -> a
     21:21:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):145 -> a
     22:22:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):146:146 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     23:23:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):147 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):147:147 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     25:25:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):148 -> a
     26:26:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):148:148 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):149 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):149:149 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):1648:1648 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):1659:1659 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):150 -> a
     30:31:com.android.tools.r8.graph.DexEncodedMethod build(com.android.tools.r8.graph.ClassKind):150:151 -> a
     32:32:boolean com.android.tools.r8.graph.MethodAccessFlags.belongsToVirtualPool():73:73 -> a
@@ -291012,7 +290337,7 @@
     12:12:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):21 -> a
     13:13:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):58:58 -> a
     13:13:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/Z;"}
     14:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
     14:15:com.android.tools.r8.synthesis.SyntheticMethodReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):58 -> a
     14:15:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):21 -> a
@@ -291355,7 +290680,7 @@
     boolean sharable -> d
     1:2:void <init>(int,java.lang.String,boolean):332:333 -> <init>
     1:1:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):363:363 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ns;)V"}
     2:2:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):61:61 -> a
     2:2:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):363 -> a
     3:3:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):364:364 -> a
@@ -291372,7 +290697,7 @@
     1:2:void <init>(int,java.lang.String,boolean):372:373 -> <init>
     1:1:boolean isGlobal():388:388 -> a
     1:1:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):398 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ns;)V"}
     2:2:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):398:398 -> a
     3:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):61:61 -> a
     3:3:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):398 -> a
@@ -291390,7 +290715,7 @@
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticMethodKind asSyntheticMethodKind():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/synthesis/U;"}
     void internalHash(com.android.tools.r8.com.google.common.hash.Hasher) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ns;)V"}
     2:2:int compareTo(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):215:215 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/Q$b;)I"}
     3:3:int getId():229:229 -> a
@@ -291416,7 +290741,7 @@
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticMethodKind asSyntheticMethodKind():0:0 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/synthesis/U;"}
     2:2:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):322:322 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ns;)V"}
     3:3:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):61:61 -> a
     3:3:void internalHash(com.android.tools.r8.com.google.common.hash.Hasher):322 -> a
     boolean isFixedSuffixSynthetic() -> d
@@ -291490,7 +290815,7 @@
     9:9:com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function):19 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):42:42 -> a
     10:10:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/Z;"}
     11:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.lens.GraphLens.lookupType(com.android.tools.r8.graph.DexType):233:234 -> a
     11:12:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):42 -> a
     11:12:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens):19 -> a
@@ -291524,13 +290849,13 @@
     com.android.tools.r8.graph.DexType getHolder() -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.lens.NonIdentityGraphLens) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/Z;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/k;Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/Z;"}
     com.android.tools.r8.synthesis.SyntheticDefinition lookupDefinition(java.util.function.Function) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/synthesis/s;"}
     1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():40:40 -> a
     1:1:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
     1:1:com.android.tools.r8.synthesis.Rewritable com.android.tools.r8.synthesis.SyntheticProgramClassReference.rewrite(com.android.tools.r8.graph.lens.NonIdentityGraphLens):19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zR;)Lcom/android/tools/r8/synthesis/j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/DR;)Lcom/android/tools/r8/synthesis/j;"}
     2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SynthesizingContext.rewrite(com.android.tools.r8.graph.lens.NonIdentityGraphLens):135:135 -> a
     2:2:com.android.tools.r8.synthesis.SyntheticReference rewrite(com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -291561,10 +290886,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/synthesis/Q$b;"}
     com.android.tools.r8.graph.DexReference getReference() -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/F2;"}
-com.android.tools.r8.threading.SynchronizedTaskCollection -> com.android.tools.r8.internal.lg0:
+com.android.tools.r8.threading.SynchronizedTaskCollection -> com.android.tools.r8.internal.pg0:
 # {"id":"sourceFile","fileName":"SynchronizedTaskCollection.java"}
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):19:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     1:1:void submit(java.util.concurrent.Callable):24:24 -> a
     2:2:void await(java.util.function.Consumer):36:36 -> a
     3:4:java.util.List com.android.tools.r8.threading.TaskCollection.internalGetAndClearFutures():91:92 -> a
@@ -291577,7 +290902,7 @@
     1:2:java.util.List com.android.tools.r8.threading.TaskCollection.internalGetAndClearFutures():91:92 -> b
     1:2:java.util.List synchronizedGetAndClearFutures():28 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
-com.android.tools.r8.threading.TaskCollection -> com.android.tools.r8.internal.wg0:
+com.android.tools.r8.threading.TaskCollection -> com.android.tools.r8.internal.Ag0:
 # {"id":"sourceFile","fileName":"TaskCollection.java"}
     com.android.tools.r8.threading.ThreadingModule threadingModule -> a
     java.util.concurrent.ExecutorService executorService -> b
@@ -291586,11 +290911,11 @@
     1:4:void <init>(com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,int):27:30 -> <init>
     5:5:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,int):43:43 -> <init>
     5:5:void <init>(com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):38 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/concurrent/ExecutorService;)V"}
     1:1:void submit(java.util.concurrent.Callable):57:57 -> a
     2:8:void await(java.util.function.Consumer):68:74 -> a
     9:9:java.lang.Object lambda$submit$0(com.android.tools.r8.utils.ThrowingAction):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qg0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;)Ljava/lang/Object;"}
     10:10:java.util.List awaitWithResults():138:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/util/ArrayList;"}
     11:11:int size():81:81 -> a
@@ -291600,7 +290925,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)Ljava/util/ArrayList;"}
     18:19:void lambda$awaitWithResults$1(java.util.function.Predicate,java.util.List,java.lang.Object):151:152 -> a
     1:1:void submit(com.android.tools.r8.utils.ThrowingAction):106:106 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;)V"}
 com.android.tools.r8.threading.ThreadingModule -> com.android.tools.r8.threading.ThreadingModule:
 # {"id":"sourceFile","fileName":"ThreadingModule.java"}
 com.android.tools.r8.threading.ThreadingModule$Loader -> com.android.tools.r8.threading.a:
@@ -291609,7 +290934,7 @@
     1:11:com.android.tools.r8.threading.ThreadingModuleProvider load():70:80 -> b
 com.android.tools.r8.threading.ThreadingModuleProvider -> com.android.tools.r8.threading.ThreadingModuleProvider:
 # {"id":"sourceFile","fileName":"ThreadingModuleProvider.java"}
-com.android.tools.r8.threading.providers.blocking.ThreadingModuleBlocking -> com.android.tools.r8.internal.Kg0:
+com.android.tools.r8.threading.providers.blocking.ThreadingModuleBlocking -> com.android.tools.r8.internal.Og0:
 # {"id":"sourceFile","fileName":"ThreadingModuleBlocking.java"}
     1:1:void <init>():16:16 -> <init>
     1:14:void awaitFutures(java.util.List):37:50 -> awaitFutures
@@ -291621,7 +290946,7 @@
 # {"id":"sourceFile","fileName":"ThreadingModuleBlockingProvider.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:com.android.tools.r8.threading.ThreadingModule create():14:14 -> create
-com.android.tools.r8.threading.providers.singlethreaded.ThreadingModuleSingleThreaded -> com.android.tools.r8.internal.Lg0:
+com.android.tools.r8.threading.providers.singlethreaded.ThreadingModuleSingleThreaded -> com.android.tools.r8.internal.Pg0:
 # {"id":"sourceFile","fileName":"ThreadingModuleSingleThreaded.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -291748,16 +291073,16 @@
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>():35:35 -> <init>
     1:1:void lambda$runForTesting$0(com.android.tools.r8.tracereferences.TraceReferencesCommand,com.android.tools.r8.utils.InternalOptions):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/iB;)V"}
     2:2:void lambda$runInternal$1(java.util.Set,com.android.tools.r8.ClassFileResourceProvider):79:79 -> a
     3:3:boolean lambda$runInternal$2(java.util.Set,com.android.tools.r8.graph.DexType):95:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/I2;)Z"}
     4:4:void lambda$main$3(java.lang.String[]):125:125 -> a
     1:1:void runForTesting(com.android.tools.r8.tracereferences.TraceReferencesCommand,com.android.tools.r8.utils.InternalOptions):67:67 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/iB;)V"}
     2:2:void runForTesting(com.android.tools.r8.tracereferences.TraceReferencesCommand,com.android.tools.r8.utils.InternalOptions):66:66 -> b
     1:10:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand,com.android.tools.r8.utils.InternalOptions):72:81 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/tracereferences/TraceReferencesCommand;Lcom/android/tools/r8/internal/iB;)V"}
     11:17:void forEachDescriptor(com.android.tools.r8.ProgramResourceProvider,java.util.function.Consumer):43:49 -> c
     11:17:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand,com.android.tools.r8.utils.InternalOptions):81 -> c
     18:18:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> c
@@ -291899,24 +291224,24 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList library -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList traceTarget -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList traceSource -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     1:8:void <init>(boolean,boolean,com.android.tools.r8.utils.Reporter,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.tracereferences.TraceReferencesConsumer):62:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/tracereferences/TraceReferencesConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZZLcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/tracereferences/TraceReferencesConsumer;)V"}
     9:16:void <init>(boolean,boolean):72:79 -> <init>
     1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():399:399 -> a
     1:2:com.android.tools.r8.utils.InternalOptions getInternalOptions():403:404 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB;"}
     3:3:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():399:399 -> b
     3:3:com.android.tools.r8.utils.InternalOptions getInternalOptions():405 -> b
     4:9:com.android.tools.r8.utils.InternalOptions getInternalOptions():406:411 -> b
-    10:10:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTraceReferencesConsumer(java.lang.String):410:410 -> b
+    10:10:com.android.tools.r8.dump.DumpOptions$Builder com.android.tools.r8.dump.DumpOptions$Builder.setTraceReferencesConsumer(java.lang.String):422:422 -> b
     10:10:com.android.tools.r8.utils.InternalOptions getInternalOptions():411 -> b
     11:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():412:415 -> b
     1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):88:88 -> builder
@@ -291924,13 +291249,13 @@
     3:3:void com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder.<init>():134:134 -> builder
     3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder():96 -> builder
     1:1:java.util.List getLibrary():387:387 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:com.android.tools.r8.utils.Reporter getReporter():383:383 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     1:1:java.util.List getSource():395:395 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:java.util.List getTarget():391:391 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xu;"}
     1:1:boolean isPrintHelp():112:112 -> isPrintHelp
     1:1:boolean isPrintVersion():116:116 -> isPrintVersion
     1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.util.Collection,com.android.tools.r8.origin.Origin):108:108 -> parse
@@ -291945,21 +291270,21 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder libraryBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder traceTargetBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder traceSourceBuilder -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):137:137 -> <init>
     2:18:void <init>(com.android.tools.r8.DiagnosticsHandler):122:138 -> <init>
     1:1:com.android.tools.r8.utils.Reporter getReporter():142:142 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/d50;"}
     2:6:java.lang.String extractClassDescriptor(byte[]):191:195 -> a
     7:10:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):242:245 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/su;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/uu;)V"}
     11:11:void error(com.android.tools.r8.Diagnostic):377:377 -> a
     11:11:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):245 -> a
     12:17:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):247:252 -> a
@@ -291976,7 +291301,7 @@
     27:27:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):261 -> a
     28:37:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():341:350 -> a
     28:37:void lambda$build$0(com.android.tools.r8.utils.Box):370 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/m7;)V"}
     38:38:void error(com.android.tools.r8.Diagnostic):377:377 -> a
     38:38:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():350 -> a
     38:38:void lambda$build$0(com.android.tools.r8.utils.Box):370 -> a
@@ -292075,7 +291400,7 @@
 com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.h:
 # {"id":"sourceFile","fileName":"TraceReferencesCommandParser.java"}
     java.util.Set OPTIONS_WITH_PARAMETER -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):118:118 -> <clinit>
     1:1:void <clinit>():34 -> <clinit>
     2:2:void <clinit>():34:34 -> <clinit>
@@ -292215,11 +291540,11 @@
 com.android.tools.r8.tracereferences.TraceReferencesKeepRules -> com.android.tools.r8.tracereferences.TraceReferencesKeepRules:
 # {"id":"sourceFile","fileName":"TraceReferencesKeepRules.java"}
     com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder traceReferencesResultBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wh0;"}
     com.android.tools.r8.StringConsumer consumer -> d
     boolean allowObfuscation -> e
     1:4:void <init>(com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder,com.android.tools.r8.StringConsumer,boolean):37:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/sh0;Lcom/android/tools/r8/StringConsumer;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wh0;Lcom/android/tools/r8/StringConsumer;Z)V"}
     1:1:boolean allowObfuscation():44:44 -> allowObfuscation
     1:1:com.android.tools.r8.tracereferences.TraceReferencesKeepRules$Builder builder():94:94 -> builder
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):99:101 -> finished
@@ -292401,7 +291726,7 @@
     1:1:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     1:1:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.lens.MethodLookupResult):343 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;)V"}
     2:4:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.lens.MethodLookupResult):343:345 -> a
     5:5:com.android.tools.r8.ir.code.InvokeType com.android.tools.r8.graph.lens.MethodLookupResult.getType():39:39 -> a
     5:5:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.lens.MethodLookupResult):345 -> a
@@ -292460,7 +291785,7 @@
     40:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaDescriptor.getMainMethod():66:66 -> a
     40:40:void lambda$registerCallSite$7(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClass):509 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/RI;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VI;Lcom/android/tools/r8/graph/E0;)V"}
     41:45:void lambda$registerCallSite$7(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClass):509:513 -> a
     46:46:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.LambdaDescriptor.getName():70:70 -> a
     46:46:void lambda$registerCallSite$7(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClass):515 -> a
@@ -292512,11 +291837,11 @@
     79:79:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):291 -> a
     80:90:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):291:301 -> a
     91:94:void lambda$registerInvokeDirect$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexClass):294:297 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/D6;Lcom/android/tools/r8/graph/E0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/F6;Lcom/android/tools/r8/graph/E0;)V"}
     95:112:void handleRewrittenMethodResolution(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,java.util.function.Function):362:379 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/U4;Ljava/util/function/Function;)V"}
     113:124:void lambda$handleRewrittenMethodResolution$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.BooleanBox,java.util.function.Function,com.android.tools.r8.graph.MethodResolutionResult):365:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/D6;Ljava/util/function/Function;Lcom/android/tools/r8/graph/U4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/F6;Ljava/util/function/Function;Lcom/android/tools/r8/graph/U4;)V"}
     125:125:void lambda$handleRewrittenMethodResolution$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):371:371 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/j1;)V"}
     126:126:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexEncodedMethod.asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):386:386 -> a
@@ -292807,23 +292132,23 @@
     1:1:boolean isProtected():29:29 -> isProtected
     1:1:boolean isPublic():24:24 -> isPublic
     1:1:boolean isStatic():19:19 -> isStatic
-com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.Tb:
 # {"id":"sourceFile","fileName":"ClassAccessFlagsImpl.java"}
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/Q;)V"}
     1:1:boolean isEnum():23:23 -> isEnum
     1:1:boolean isInterface():18:18 -> isInterface
-com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.Wo:
+com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.Zo:
 # {"id":"sourceFile","fileName":"FieldAccessFlagsImpl.java"}
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/g3;)V"}
-com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.NN:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.RN:
 # {"id":"sourceFile","fileName":"MethodAccessFlagsImpl.java"}
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):13:13 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G4;)V"}
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> R8$$REMOVED$$CLASS$$234:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> R8$$REMOVED$$CLASS$$223:
 # {"id":"sourceFile","fileName":"TraceReferencesResult.java"}
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.sh0:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.wh0:
 # {"id":"sourceFile","fileName":"TraceReferencesResult.java"}
     java.util.Set types -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
@@ -292841,7 +292166,7 @@
     1:1:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass,com.android.tools.r8.DiagnosticsHandler):66:66 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):78:78 -> b
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):87:87 -> finished
-com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.uh0:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.yh0:
 # {"id":"sourceFile","fileName":"TracedClassImpl.java"}
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/diagnostic/DefinitionContext;Lcom/android/tools/r8/graph/E0;)V"}
@@ -292851,7 +292176,7 @@
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedReferenceBase.getReference():28:28 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.vh0:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.zh0:
 # {"id":"sourceFile","fileName":"TracedFieldImpl.java"}
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$FieldAccessFlags):31:31 -> <init>
     2:2:com.android.tools.r8.references.FieldReference com.android.tools.r8.graph.DexClassAndField.getFieldReference():37:37 -> <init>
@@ -292866,7 +292191,7 @@
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedReferenceBase.getReference():28:28 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.wh0:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.Ah0:
 # {"id":"sourceFile","fileName":"TracedMethodImpl.java"}
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/diagnostic/DefinitionContext;)V"}
@@ -292876,7 +292201,7 @@
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedReferenceBase.getReference():28:28 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.xh0:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.Bh0:
 # {"id":"sourceFile","fileName":"TracedReferenceBase.java"}
     java.lang.Object reference -> a
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
@@ -293093,7 +292418,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel max(com.android.tools.r8.utils.AndroidApiLevel):83:83 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/y2;"}
     2:2:com.android.tools.r8.utils.DexVersion getDexVersion():87:87 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/cm;"}
     1:1:int compareTo(com.android.tools.r8.utils.structural.Ordered):12:12 -> compareTo
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/s;)I"}
     1:1:int getLevel():71:71 -> d
@@ -293114,7 +292439,7 @@
     1:1:void <clinit>():30:30 -> <clinit>
     1:7:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):44:50 -> a
     1:7:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;)Z"}
     8:8:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMethod.getApiLevelForCode():1329:1329 -> a
     8:8:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):50 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -293135,7 +292460,7 @@
     18:18:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):34 -> a
     19:38:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):181:200 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Z"}
-    39:39:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2075:2075 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2081:2081 -> a
     39:39:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):200 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:48:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):204:212 -> a
@@ -293143,7 +292468,7 @@
     49:49:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):212 -> a
     50:50:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):161:161 -> a
     50:50:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):214 -> a
-    51:51:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2075:2075 -> a
+    51:51:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2081:2081 -> a
     51:51:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     51:51:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):214 -> a
@@ -293160,7 +292485,7 @@
     64:66:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):172:174 -> a
     64:66:boolean isApiSafeForTypeStrengthening(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):214 -> a
     67:67:com.android.tools.r8.utils.TraversalContinuation lambda$firstLibraryClassOrProgramClassWithDefinition$0(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList):286:286 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/xm0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/r2;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/Bm0;)Lcom/android/tools/r8/internal/Oh0;"}
     68:68:com.android.tools.r8.utils.TraversalContinuation$Break com.android.tools.r8.utils.TraversalContinuation.doBreak(java.lang.Object):152:152 -> a
     68:68:com.android.tools.r8.utils.TraversalContinuation lambda$firstLibraryClassOrProgramClassWithDefinition$0(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList):287 -> a
     69:69:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):535:535 -> a
@@ -293178,7 +292503,7 @@
     85:85:java.util.Set findAllFirstLibraryInterfacesOrProgramClassWithDefinition(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):312 -> a
     86:88:java.util.Set findAllFirstLibraryInterfacesOrProgramClassWithDefinition(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):313:315 -> a
     89:90:void lambda$findAllFirstLibraryInterfacesOrProgramClassWithDefinition$1(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):318:319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/xm0;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/internal/Bm0;Lcom/android/tools/r8/graph/I2;)V"}
     91:106:boolean isOutlinedAtSameOrLowerLevel(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):333:348 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/androidapi/f;)Z"}
     107:109:boolean com.android.tools.r8.utils.StringUtils.onlyContainsDigits(java.lang.String):435:437 -> a
@@ -293187,7 +292512,7 @@
     115:115:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.graph.AppView.apiLevelCompute():1380:1380 -> a
     115:115:com.android.tools.r8.utils.Pair findAndComputeApiLevelForLibraryDefinition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):222 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/j;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/graph/r2;)Lcom/android/tools/r8/internal/MV;"}
     116:120:com.android.tools.r8.utils.Pair findAndComputeApiLevelForLibraryDefinition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):223:227 -> a
     121:121:com.android.tools.r8.utils.Pair findAndComputeApiLevelForLibraryDefinition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):226:226 -> a
     122:138:com.android.tools.r8.utils.Pair findAndComputeApiLevelForLibraryDefinition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):224:240 -> a
@@ -293208,7 +292533,7 @@
     189:189:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):141:141 -> a
     190:190:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexItemFactory):150:150 -> a
     190:190:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):140 -> a
-    191:191:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2075:2075 -> a
+    191:191:boolean com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.isApiLibraryModelingEnabled():2081:2081 -> a
     191:191:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexItemFactory):150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     191:191:boolean isApiSafeForReference(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.AppView):140 -> a
@@ -293230,15 +292555,15 @@
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.i:
 # {"id":"sourceFile","fileName":"AndroidApp.java"}
     com.android.tools.r8.com.google.common.collect.ImmutableList programResourceProviders -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableMap programResourcesMainDescriptor -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathResourceProviders -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryResourceProviders -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList archiveProvidersToClose -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     com.android.tools.r8.StringResource proguardMapOutputData -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/t0;"}
     com.android.tools.r8.StringResource proguardMapInputData -> g
@@ -293250,14 +292575,14 @@
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():94:94 -> <clinit>
     1:12:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List):204:215 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/Bu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/t0;Lcom/android/tools/r8/t0$a;Ljava/util/List;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/Du;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/t0;Lcom/android/tools/r8/t0$a;Ljava/util/List;Ljava/util/List;)V"}
     1:1:java.util.zip.ZipOutputStream lambda$dumpClassFileResources$2(java.util.zip.ZipOutputStream,java.lang.String):0:0 -> a
     2:6:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration,java.lang.String):111:115 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uo;Ljava/lang/String;)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xo;Ljava/lang/String;)Ljava/util/IdentityHashMap;"}
     7:8:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):221:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)Z"}
     9:9:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):223:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/ClassFileResourceProvider;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/ClassFileResourceProvider;)Z"}
     10:10:com.android.tools.r8.utils.Reporter defaultReporter():227:227 -> a
     10:10:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;)Lcom/android/tools/r8/utils/i$a;"}
@@ -293267,7 +292592,7 @@
     12:19:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):251 -> a
     12:19:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):246 -> a
     20:20:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):239:239 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/utils/i$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/utils/i$a;"}
     21:22:int applicationSize():256:257 -> a
     23:23:int applicationSize():256:256 -> a
     24:24:com.android.tools.r8.com.google.common.io.Closer com.android.tools.r8.com.google.common.io.Closer.create():105:105 -> a
@@ -293277,7 +292602,7 @@
     33:36:void writeForTesting(java.nio.file.Path,com.android.tools.r8.OutputMode):426:429 -> a
     37:38:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):484:485 -> a
     39:43:void dump(java.nio.file.Path,com.android.tools.r8.dump.DumpOptions,com.android.tools.r8.utils.InternalOptions):490:494 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/xm;Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;Lcom/android/tools/r8/internal/zm;Lcom/android/tools/r8/internal/iB;)V"}
     44:49:void dump(java.nio.file.Path,com.android.tools.r8.dump.DumpOptions,com.android.tools.r8.utils.InternalOptions):493:498 -> a
     50:59:void dump(java.nio.file.Path,com.android.tools.r8.dump.DumpOptions,com.android.tools.r8.utils.InternalOptions):495:504 -> a
     60:74:void dump(java.nio.file.Path,com.android.tools.r8.dump.DumpOptions,com.android.tools.r8.utils.InternalOptions):501:515 -> a
@@ -293303,7 +292628,7 @@
     249:254:void dumpArtProfileProviders(java.util.Collection,java.util.zip.ZipOutputStream):605:610 -> a
     255:255:void dumpArtProfileProviders(java.util.Collection,java.util.zip.ZipOutputStream):607:607 -> a
     256:262:void dumpStartupProfileProviders(java.util.Collection,com.android.tools.r8.utils.InternalOptions,java.util.zip.ZipOutputStream):622:628 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/gB;Ljava/util/zip/ZipOutputStream;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/iB;Ljava/util/zip/ZipOutputStream;)V"}
     263:263:void dumpStartupProfileProviders(java.util.Collection,com.android.tools.r8.utils.InternalOptions,java.util.zip.ZipOutputStream):624:624 -> a
     264:264:com.android.tools.r8.ClassFileResourceProvider createClassFileResourceProvider(java.util.Map):636:636 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)Lcom/android/tools/r8/utils/c;"}
@@ -293312,7 +292637,7 @@
     281:281:void dumpAndroidResourcesProvider(com.android.tools.r8.AndroidResourceProvider,java.util.zip.ZipOutputStream,java.lang.String):653:653 -> a
     282:282:void dumpAndroidResourcesProvider(com.android.tools.r8.AndroidResourceProvider,java.util.zip.ZipOutputStream,java.lang.String):652:652 -> a
     283:290:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):674:681 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uo;Ljava/util/zip/ZipOutputStream;Lcom/android/tools/r8/internal/gB;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xo;Ljava/util/zip/ZipOutputStream;Lcom/android/tools/r8/internal/iB;)I"}
     291:291:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):680:680 -> a
     292:292:java.util.List com.android.tools.r8.features.FeatureSplitConfiguration.getFeatureSplits():74:74 -> a
     292:292:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):683 -> a
@@ -293337,13 +292662,13 @@
     441:441:void closeOutputStreams(java.util.Collection):762:762 -> a
     441:441:int dumpProgramResources(java.lang.String,com.android.tools.r8.features.FeatureSplitConfiguration,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):744 -> a
     442:447:java.util.zip.ZipOutputStream lambda$dumpProgramResources$1(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):716:721 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Uo;Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/ld;Ljava/util/Map;Ljava/util/zip/ZipOutputStream;Ljava/lang/String;)Ljava/util/zip/ZipOutputStream;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xo;Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/nd;Ljava/util/Map;Ljava/util/zip/ZipOutputStream;Ljava/lang/String;)Ljava/util/zip/ZipOutputStream;"}
     448:467:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):775:794 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILjava/util/zip/ZipOutputStream;Lcom/android/tools/r8/internal/vu;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILjava/util/zip/ZipOutputStream;Lcom/android/tools/r8/internal/xu;)I"}
     468:468:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):776:776 -> a
     469:469:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):775:775 -> a
     470:476:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):805:811 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YS;ILjava/util/function/Function;Ljava/util/zip/ZipOutputStream;Lcom/android/tools/r8/ProgramResource;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cT;ILjava/util/function/Function;Ljava/util/zip/ZipOutputStream;Lcom/android/tools/r8/ProgramResource;)I"}
     477:478:java.lang.String extractClassDescriptor(byte[]):850:851 -> a
     477:478:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):810 -> a
     479:479:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a
@@ -293359,7 +292684,7 @@
     2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():234:234 -> b
     3:12:void writeToDirectory(java.nio.file.Path,com.android.tools.r8.OutputMode):437:446 -> b
     13:20:void signalFinishedToProviders(com.android.tools.r8.utils.Reporter):885:892 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     1:2:void closeInternalArchiveProviders():136:137 -> c
     3:10:void writeToZipForTesting(java.nio.file.Path,com.android.tools.r8.OutputMode):453:460 -> c
     11:28:void writeToZipForTesting(java.nio.file.Path,com.android.tools.r8.OutputMode):456:473 -> c
@@ -293371,7 +292696,7 @@
     7:10:java.util.List getClassProgramResourcesForTesting():296:299 -> d
     1:1:java.util.List getClasspathResourceProviders():346:346 -> e
     1:31:com.android.tools.r8.utils.Pair getDataResourcesForTesting():306:336 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/MV;"}
     1:1:java.util.List getDexProgramResourcesForTesting():281:281 -> g
     2:6:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):356:360 -> g
     2:6:java.util.List getDexProgramResourcesForTesting():281 -> g
@@ -293438,7 +292763,7 @@
 com.android.tools.r8.utils.AndroidApp$3 -> com.android.tools.r8.utils.d:
 # {"id":"sourceFile","fileName":"AndroidApp.java"}
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,int,com.android.tools.r8.org.objectweb.asm.ClassVisitor,boolean):872:872 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Pc;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rc;)V"}
 com.android.tools.r8.utils.AndroidApp$Builder -> com.android.tools.r8.utils.i$a:
 # {"id":"sourceFile","fileName":"AndroidApp.java"}
     java.util.List programResourceProviders -> a
@@ -293465,11 +292790,11 @@
     com.android.tools.r8.StringResource proguardMapInputData -> l
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/t0$a;"}
     com.android.tools.r8.utils.Reporter reporter -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():899:899 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.Reporter):919:919 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;)V"}
     2:21:void <init>(com.android.tools.r8.utils.Reporter):901:920 -> <init>
     1:1:java.nio.file.Path com.android.tools.r8.shaking.FilteredClassPath.getPath():43:43 -> a
     1:1:com.android.tools.r8.utils.ArchiveResourceProvider createAndAddProvider(com.android.tools.r8.shaking.FilteredClassPath):1065 -> a
@@ -293593,11 +292918,11 @@
 com.android.tools.r8.utils.AndroidApp$Builder$2 -> com.android.tools.r8.utils.h:
 # {"id":"sourceFile","fileName":"AndroidApp.java"}
     java.util.List val$finalProgramResources -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     java.util.List val$finalDataResources -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1335:1335 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)V"}
     1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1343:1344 -> getDataResourceProvider
     1:1:java.util.Collection getProgramResources():1338:1338 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$2$1 -> com.android.tools.r8.utils.g:
@@ -293616,7 +292941,7 @@
     boolean closed -> b
     com.android.tools.r8.ProgramConsumer programConsumer -> c
     com.android.tools.r8.naming.MapConsumer mapConsumer -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kM;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>():42:42 -> <init>
@@ -293624,7 +292949,7 @@
     7:7:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder):46:46 -> <init>
     8:19:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder):36:47 -> <init>
     20:20:void <init>(com.android.tools.r8.utils.InternalOptions):50:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     21:37:void <init>(com.android.tools.r8.utils.InternalOptions):36:52 -> <init>
     38:43:com.android.tools.r8.naming.MapConsumer wrapProguardMapConsumer(com.android.tools.r8.naming.MapConsumer):73:78 -> <init>
     38:43:void <init>(com.android.tools.r8.utils.InternalOptions):52 -> <init>
@@ -293657,7 +292982,7 @@
 com.android.tools.r8.utils.AndroidAppConsumers$2 -> com.android.tools.r8.utils.l:
 # {"id":"sourceFile","fileName":"AndroidAppConsumers.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap files -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     com.android.tools.r8.DexIndexedConsumer val$consumer -> d
     com.android.tools.r8.utils.AndroidAppConsumers this$0 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/utils/r;"}
@@ -293946,34 +293271,34 @@
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
     2:2:boolean forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/util/function/Supplier;)Z"}
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.P5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/util/function/Supplier;)Z"}
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.R5:
 # {"id":"sourceFile","fileName":"BiForEachable.java"}
     void forEach(java.util.function.BiConsumer) -> forEach
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.T5:
 # {"id":"sourceFile","fileName":"BiMapContainer.java"}
     java.util.Map original -> a
     java.util.Map inverse -> b
     1:3:void <init>(java.util.Map,java.util.Map):21:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ju;Lcom/android/tools/r8/internal/Q5;)V"}
-com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.S5:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lu;Lcom/android/tools/r8/internal/S5;)V"}
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.U5:
 # {"id":"sourceFile","fileName":"BiPredicateUtils.java"}
     1:1:java.util.function.BiPredicate alwaysFalse():12:12 -> a
     2:2:boolean lambda$alwaysFalse$0(java.lang.Object,java.lang.Object):12:12 -> a
     1:1:java.util.function.BiPredicate alwaysTrue():16:16 -> b
     2:2:boolean lambda$alwaysTrue$1(java.lang.Object,java.lang.Object):16:16 -> b
-com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.A6:
 # {"id":"sourceFile","fileName":"BitSetUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.B6:
 # {"id":"sourceFile","fileName":"BitUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:boolean isAligned(int,int):25:25 -> a
     1:1:boolean isBitInMaskSet(int,int):17:17 -> b
     1:1:boolean isBitSet(int,int):13:13 -> c
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.F6:
 # {"id":"sourceFile","fileName":"BooleanBox.java"}
     boolean value -> a
     boolean assigned -> b
@@ -293991,7 +293316,7 @@
     1:1:boolean isTrue():35:35 -> e
     1:1:void set():39:39 -> f
     1:1:void unset():48:48 -> g
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.Q6:
 # {"id":"sourceFile","fileName":"BooleanLatticeElement.java"}
     1:1:void <init>():27:27 -> <init>
     1:1:boolean isFalse():40:40 -> a
@@ -294001,13 +293326,13 @@
     1:1:boolean isUnknown():44:44 -> e
     1:1:boolean equals(java.lang.Object):70:70 -> equals
     1:1:int hashCode():75:75 -> hashCode
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.Z6:
 # {"id":"sourceFile","fileName":"BooleanUtils.java"}
     java.lang.Boolean[] VALUES -> a
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:int intValue(boolean):13:13 -> a
     2:2:java.lang.Boolean[] values():21:21 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.k7:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.m7:
 # {"id":"sourceFile","fileName":"Box.java"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(java.lang.Object):17:17 -> <init>
@@ -294015,7 +293340,7 @@
     1:1:java.lang.Object get():44 -> a
     2:2:void com.android.tools.r8.utils.BoxBase.set(java.lang.Object):58:58 -> a
     2:2:void set(java.lang.Object):61 -> a
-com.android.tools.r8.utils.BoxBase -> com.android.tools.r8.internal.l7:
+com.android.tools.r8.utils.BoxBase -> com.android.tools.r8.internal.n7:
 # {"id":"sourceFile","fileName":"BoxBase.java"}
     java.lang.Object value -> a
     1:1:void <init>():18:18 -> <init>
@@ -294029,10 +293354,10 @@
     1:1:boolean isSet():72:72 -> b
     1:5:boolean equals(java.lang.Object):78:82 -> equals
     1:1:int hashCode():87:87 -> hashCode
-com.android.tools.r8.utils.CancelCompilationException -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.utils.CancelCompilationException -> com.android.tools.r8.internal.o8:
 # {"id":"sourceFile","fileName":"CancelCompilationException.java"}
     1:1:void <init>():6:6 -> <init>
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.P9:
 # {"id":"sourceFile","fileName":"CfLineToMethodMapper.java"}
     java.util.Map sourceMethodMapping -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -294047,28 +293372,28 @@
     23:23:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a
     23:23:void readLineNumbersFromClassFiles():62 -> a
     24:28:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:50 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/L9;Lcom/android/tools/r8/ProgramResource;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N9;Lcom/android/tools/r8/ProgramResource;)V"}
     29:29:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):425:425 -> a
     29:29:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.N9:
 # {"id":"sourceFile","fileName":"CfLineToMethodMapper.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nz;"}
     com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P9;"}
     1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):89:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/N9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P9;)V"}
     2:2:void com.android.tools.r8.org.objectweb.asm.ClassVisitor.<init>(int):58:58 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):90 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):87:87 -> <init>
     1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:103 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):109:109 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/AO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lcom/android/tools/r8/internal/EO;"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103:103 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/lz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/nz;"}
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():99:99 -> d
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103 -> d
-com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.O9:
 # {"id":"sourceFile","fileName":"CfLineToMethodMapper.java"}
     java.lang.String nameAndDescriptor -> c
     java.util.Map lineMethodMapping -> d
@@ -294076,27 +293401,27 @@
     1:1:void <init>(java.lang.String,java.util.Map):120 -> <init>
     2:3:void <init>(java.lang.String,java.util.Map):121:122 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/EI;)V"}
-com.android.tools.r8.utils.CfVersionUtils -> R8$$REMOVED$$CLASS$$235:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/II;)V"}
+com.android.tools.r8.utils.CfVersionUtils -> R8$$REMOVED$$CLASS$$224:
 # {"id":"sourceFile","fileName":"CfVersionUtils.java"}
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.db:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.fb:
 # {"id":"sourceFile","fileName":"ChainableStringConsumer.java"}
     com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/db;"}
-com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.cb:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fb;"}
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.eb:
 # {"id":"sourceFile","fileName":"ChainableStringConsumer.java"}
     java.util.function.Consumer val$consumer -> a
     1:1:void <init>(java.util.function.Consumer):15:15 -> <init>
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/db;"}
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.yc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/fb;"}
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.Ac:
 # {"id":"sourceFile","fileName":"ClassMap.java"}
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):59:59 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/internal/gd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ConcurrentHashMap;Lcom/android/tools/r8/internal/id;)V"}
     2:5:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):57:60 -> <init>
     6:6:com.android.tools.r8.graph.ClassKind com.android.tools.r8.utils.ClassProvider.getClassKind():35:35 -> <init>
     6:6:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):60 -> <init>
@@ -294117,19 +293442,19 @@
     48:48:void forceLoad(java.util.function.Predicate):188 -> a
     49:104:void forceLoad(java.util.function.Predicate):191:246 -> a
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():151:157 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Du;"}
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.build():587:587 -> b
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():159 -> b
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():152:152 -> b
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V;"}
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.zc:
 # {"id":"sourceFile","fileName":"ClassMap.java"}
     com.android.tools.r8.utils.ClassMap classMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ac;"}
     com.android.tools.r8.utils.ClassProvider provider -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/id;"}
     com.android.tools.r8.graph.DexType type -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     com.android.tools.r8.graph.DexClass clazz -> e
@@ -294138,7 +293463,7 @@
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():256:256 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):265:265 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yc;Lcom/android/tools/r8/internal/gd;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ac;Lcom/android/tools/r8/internal/id;Lcom/android/tools/r8/graph/I2;)V"}
     2:8:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):262:268 -> <init>
     1:41:com.android.tools.r8.graph.DexClass get():274:314 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/E0;"}
@@ -294147,7 +293472,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)V"}
     63:65:void lambda$get$0(com.android.tools.r8.graph.DexClass):287:289 -> a
     1:1:java.lang.Object get():256:256 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.id:
 # {"id":"sourceFile","fileName":"ClassProvider.java"}
     com.android.tools.r8.graph.ClassKind classKind -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/V;"}
@@ -294157,8 +293482,8 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     java.util.Collection collectTypes() -> a
     1:1:com.android.tools.r8.utils.ClassProvider$FilteringClassProvider without(java.util.Set):75:75 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc0;)Lcom/android/tools/r8/internal/ed;"}
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.cd:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kc0;)Lcom/android/tools/r8/internal/gd;"}
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.ed:
 # {"id":"sourceFile","fileName":"ClassProvider.java"}
     com.android.tools.r8.graph.ClassKind classKind -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/V;"}
@@ -294171,7 +293496,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     10:12:java.util.Collection collectTypes():114:116 -> a
     1:1:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.fd:
 # {"id":"sourceFile","fileName":"ClassProvider.java"}
     java.util.List providers -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -294181,18 +293506,18 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     3:5:java.util.Collection collectTypes():211:213 -> a
     1:8:java.lang.String toString():220:227 -> toString
-com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.gd:
 # {"id":"sourceFile","fileName":"ClassProvider.java"}
     com.android.tools.r8.utils.ClassProvider provider -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gd;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/id;"}
     java.util.Set filteredOut -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():154:154 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.ClassProvider,java.util.Set):160:163 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/gd;Lcom/android/tools/r8/internal/ev;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/id;Lcom/android/tools/r8/internal/gv;)V"}
     1:1:com.android.tools.r8.utils.ClassProvider$FilteringClassProvider without(java.util.Set):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gc0;)Lcom/android/tools/r8/internal/ed;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kc0;)Lcom/android/tools/r8/internal/gd;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> a
     2:2:com.android.tools.r8.utils.ClassProvider$FilteringClassProvider without(java.util.Set):169 -> a
     3:3:com.android.tools.r8.utils.ClassProvider$FilteringClassProvider without(java.util.Set):169:169 -> a
@@ -294209,12 +293534,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     15:16:java.util.Collection collectTypes():183:184 -> a
     1:1:java.lang.String toString():190:190 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.hd:
 # {"id":"sourceFile","fileName":"ClassProvider.java"}
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yu;"}
     1:2:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):131:132 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/wu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/V;Lcom/android/tools/r8/internal/yu;)V"}
     1:1:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):137:137 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Ljava/util/function/Consumer;)V"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):394:394 -> a
@@ -294230,7 +293555,7 @@
     6:7:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):137:138 -> a
     8:8:java.util.Collection collectTypes():144:144 -> a
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.ld:
 # {"id":"sourceFile","fileName":"ClassReferenceUtils.java"}
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():17:18 -> <clinit>
@@ -294238,12 +293563,12 @@
     2:2:java.lang.String toSmaliString(com.android.tools.r8.references.ClassReference):49:49 -> a
     3:3:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.ClassReference,com.android.tools.r8.graph.DexItemFactory):53:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/I2;"}
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.xd:
 # {"id":"sourceFile","fileName":"ClasspathClassCollection.java"}
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <init>
     1:1:void <init>():15 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/id;)V"}
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):12:12 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Ljava/util/function/Supplier;"}
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12:12 -> a
@@ -294253,21 +293578,21 @@
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():38:38 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V;"}
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.ke:
 # {"id":"sourceFile","fileName":"CollectionUtils.java"}
     1:5:void forEachUntilExclusive(java.util.Collection,java.util.function.Consumer,java.lang.Object):48:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Ljava/util/function/Consumer;Ljava/lang/Object;)V"}
     6:10:void forEachUntilExclusive(java.util.Collection,java.util.function.Consumer,java.util.function.Predicate):58:62 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/yY;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/CY;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V"}
     11:12:java.util.Collection sort(java.util.Collection,java.util.Comparator):73:74 -> a
     13:16:java.lang.String[] mapToStringArray(java.util.Collection,java.util.function.Function):79:82 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/function/Function;)[Ljava/lang/String;"}
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.ze:
 # {"id":"sourceFile","fileName":"ComparatorUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:int compareLists(java.util.List,java.util.List):23:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/vu;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/xu;)I"}
     2:4:int compareLists(java.util.List,java.util.List,java.util.Comparator):27:29 -> a
     2:4:int compareLists(java.util.List,java.util.List):23 -> a
     5:7:int compareLists(java.util.List,java.util.List,java.util.Comparator):27:29 -> a
@@ -294276,13 +293601,13 @@
     11:11:java.util.Comparator arrayComparator(java.util.Comparator):65:65 -> a
     12:14:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):66:68 -> a
     15:35:int compareInt2ReferenceMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.Comparator):87:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;Ljava/util/Comparator;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;Ljava/util/Comparator;)I"}
     36:42:java.lang.Integer findSmallestMissingKey(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):119:125 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;)Ljava/lang/Integer;"}
     1:1:java.util.Comparator listComparator(java.util.Comparator):19:19 -> b
-com.android.tools.r8.utils.CompareResult -> R8$$REMOVED$$CLASS$$236:
+com.android.tools.r8.utils.CompareResult -> R8$$REMOVED$$CLASS$$225:
 # {"id":"sourceFile","fileName":"CompareResult.java"}
-com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ae:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.fromComparisonResult(int):37:37 -> a
@@ -294313,7 +293638,7 @@
     8:18:void getStartupProfile(com.android.tools.r8.startup.StartupProfileBuilder):48:58 -> getStartupProfile
     19:20:void getStartupProfile(com.android.tools.r8.startup.StartupProfileBuilder):43:43 -> getStartupProfile
     37:37:void getStartupProfile(com.android.tools.r8.startup.StartupProfileBuilder):60:60 -> getStartupProfile
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.Ug:
 # {"id":"sourceFile","fileName":"ConsumerUtils.java"}
     1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):30:30 -> a
     2:3:void lambda$acceptIfNotSeen$2(java.util.Set,java.util.function.Consumer,java.lang.Object):31:32 -> a
@@ -294325,8 +293650,8 @@
     1:1:java.util.function.Consumer emptyConsumer():43:43 -> b
     2:2:void lambda$emptyThrowingConsumer$7(java.lang.Object):55:55 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():55:55 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tg0;"}
-com.android.tools.r8.utils.CovariantReturnTypeUtils -> com.android.tools.r8.internal.hh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xg0;"}
+com.android.tools.r8.utils.CovariantReturnTypeUtils -> com.android.tools.r8.internal.jh:
 # {"id":"sourceFile","fileName":"CovariantReturnTypeUtils.java"}
     1:1:void modelLibraryMethodsWithCovariantReturnTypes(com.android.tools.r8.graph.AppView):18:18 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
@@ -294346,7 +293671,7 @@
     16:16:void lambda$modelLibraryMethodsWithCovariantReturnTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:18:void lambda$modelLibraryMethodsWithCovariantReturnTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):34:35 -> a
-    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     19:19:void lambda$modelLibraryMethodsWithCovariantReturnTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:void lambda$modelLibraryMethodsWithCovariantReturnTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):36:36 -> a
@@ -294359,7 +293684,7 @@
     23:23:void com.android.tools.r8.graph.MethodCollection.addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):248:248 -> a
     23:23:void com.android.tools.r8.graph.DexClass.addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     23:23:void lambda$modelLibraryMethodsWithCovariantReturnTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):31 -> a
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.si:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.ui:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
     java.util.ArrayDeque workList -> a
     java.util.Map nodeToNodeWithStateMap -> b
@@ -294368,25 +293693,25 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:87:void <init>():22:108 -> <init>
     com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl createDfsNode(java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/qi;"}
     java.util.List getFinalStateForRoots(java.util.Collection) -> a
     com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:java.lang.Object lambda$run$0(java.util.List):133:133 -> a
     2:2:com.android.tools.r8.utils.TraversalContinuation run(java.lang.Object):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Lcom/android/tools/r8/internal/Oh0;"}
     3:7:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.map(java.util.function.Function,java.util.function.Function):36:40 -> a
     3:7:com.android.tools.r8.utils.TraversalContinuation run(java.lang.Object):133 -> a
     com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):121:121 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/qi;"}
     2:2:boolean com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.isNotProcessed():55:55 -> b
     2:2:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):122 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):123:123 -> b
     4:6:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):142:144 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;)Lcom/android/tools/r8/internal/Oh0;"}
     7:7:boolean com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.isFinished():59:59 -> b
     7:7:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):145 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -294405,9 +293730,9 @@
     19:19:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):163:163 -> b
     20:20:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> b
     20:20:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):163 -> b
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.ni:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.pi:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.oi:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.qi:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
     java.lang.Object node -> a
     com.android.tools.r8.utils.DepthFirstSearchWorkListBase$ProcessingState processingState -> b
@@ -294416,19 +293741,19 @@
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>(java.lang.Object):50:50 -> <init>
     2:5:void <init>(java.lang.Object):48:51 -> <init>
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.ri:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
     java.lang.Object state -> d
     1:1:void <init>(java.lang.Object):87:87 -> <init>
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DepthFirstSearchWorkList -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DepthFirstSearchWorkList -> com.android.tools.r8.internal.si:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
     1:1:void <init>():166:166 -> <init>
     com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode,java.util.function.Function) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;Ljava/util/function/Function;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;Ljava/util/function/Function;)V"}
     1:1:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl createDfsNode(java.lang.Object):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/qi;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):193:193 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
     3:3:java.lang.Object com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl.getNode():73:73 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.ir.optimize.string.StringBuilderAppendOptimizer$2.joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode):647 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -294437,8 +293762,8 @@
     4:5:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):193 -> a
     6:6:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):193:193 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):188:188 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.ri:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.ti:
 # {"id":"sourceFile","fileName":"DepthFirstSearchWorkListBase.java"}
     java.util.Map childStateMap -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -294446,38 +293771,38 @@
     1:1:void <clinit>():207:207 -> <clinit>
     1:4:void <init>():207:210 -> <init>
     com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/List;)Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/List;)Lcom/android/tools/r8/internal/Nh0;"}
     com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):207:207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl createDfsNode(java.lang.Object):237:237 -> a
     2:2:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl createDfsNode(java.lang.Object):207 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/oi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/qi;"}
     3:4:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState lambda$internalOnVisit$0(java.util.List,java.lang.Object):248:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/lang/Object;)Lcom/android/tools/r8/internal/pi;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/lang/Object;)Lcom/android/tools/r8/internal/ri;"}
     5:7:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):256:258 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;)Lcom/android/tools/r8/internal/Oh0;"}
     8:8:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):256:256 -> a
     9:9:java.util.List getFinalStateForRoots(java.util.Collection):268:268 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl):207:207 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/oi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qi;)Lcom/android/tools/r8/internal/Oh0;"}
     2:5:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):242:245 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;)Lcom/android/tools/r8/internal/Oh0;"}
     1:1:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl com.android.tools.r8.utils.DepthFirstSearchWorkListBase.getNodeStateForNode(java.lang.Object):129:129 -> c
     1:1:java.lang.Object lambda$getFinalStateForRoots$2(java.lang.Object):268 -> c
     2:2:java.lang.Object lambda$getFinalStateForRoots$2(java.lang.Object):268:268 -> c
     3:4:java.util.List lambda$internalOnJoin$1(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):261:262 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/pi;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ri;)Ljava/util/List;"}
     5:5:java.util.List lambda$internalOnJoin$1(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):261:261 -> c
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.vi:
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.xi:
 # {"id":"sourceFile","fileName":"DequeUtils.java"}
     1:2:java.util.Deque newArrayDeque(java.lang.Object):14:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Ljava/util/ArrayDeque;"}
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Yj:
 # {"id":"sourceFile","fileName":"DescriptorUtils.java"}
     java.util.Map typeNameToLetterMap -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> b
     1:17:void <clinit>():24:40 -> <clinit>
     1:1:boolean isDescriptor(java.lang.String):298:298 -> A
@@ -294635,7 +293960,7 @@
     1:8:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):794:801 -> x
     1:8:com.android.tools.r8.internal.DescriptorUtils$ModuleAndDescriptor com.android.tools.r8.internal.DescriptorUtils.guessJrtModuleAndTypeDescriptor(java.lang.String):0 -> x
       # {"id":"com.android.tools.r8.synthesized"}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Vj;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Xj;"}
     9:9:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):0:0 -> x
     9:9:com.android.tools.r8.internal.DescriptorUtils$ModuleAndDescriptor com.android.tools.r8.internal.DescriptorUtils.guessJrtModuleAndTypeDescriptor(java.lang.String):0 -> x
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":817,"3":818},"outline":"Lcom/android/tools/r8/a;a(IILjava/lang/String;)Ljava/lang/String;"}
@@ -294658,59 +293983,59 @@
     653:653:java.lang.String guessTypeDescriptor(java.lang.String):644:644 -> y
     654:654:java.lang.String guessTypeDescriptor(java.lang.String):644:644 -> y
     1:26:boolean isClassDescriptor(java.lang.String):560:585 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Xj:
 # {"id":"sourceFile","fileName":"DescriptorUtils.java"}
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):773:775 -> <init>
-com.android.tools.r8.utils.DesugarUtils -> com.android.tools.r8.internal.yk:
+com.android.tools.r8.utils.DesugarUtils -> com.android.tools.r8.internal.Ak:
 # {"id":"sourceFile","fileName":"DesugarUtils.java"}
     1:2:com.android.tools.r8.graph.DexString appendFullyQualifiedHolderToMethodName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):14:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/H2;"}
     3:3:com.android.tools.r8.graph.DexString appendFullyQualifiedHolderToMethodName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):14:14 -> a
-com.android.tools.r8.utils.DeterminismChecker -> com.android.tools.r8.internal.il:
+com.android.tools.r8.utils.DeterminismChecker -> com.android.tools.r8.internal.kl:
 # {"id":"sourceFile","fileName":"DeterminismChecker.java"}
     com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier callbackFactory -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/el;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gl;"}
     1:2:void <init>(com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier):74:75 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/el;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gl;)V"}
     1:1:com.android.tools.r8.utils.DeterminismChecker createWithFileBacking(java.nio.file.Path):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/il;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/kl;"}
     2:4:java.lang.String fmtClass(com.android.tools.r8.graph.DexProgramClass):79:81 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Ljava/lang/String;"}
     5:7:void accept(com.android.tools.r8.utils.ThrowingConsumer):90:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
     8:8:void accept(com.android.tools.r8.utils.ThrowingConsumer):90:90 -> a
     9:16:void check(com.android.tools.r8.graph.AppView):96:103 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     17:25:void check(com.android.tools.r8.graph.AppView):96:104 -> a
     26:30:void checkClass(com.android.tools.r8.utils.DeterminismChecker$LineCallback,com.android.tools.r8.graph.DexProgramClass):109:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fl;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hl;Lcom/android/tools/r8/graph/D2;)V"}
     31:31:java.lang.String fmtMethod(com.android.tools.r8.graph.DexEncodedMethod):85:85 -> a
     31:31:void checkMethod(com.android.tools.r8.utils.DeterminismChecker$LineCallback,com.android.tools.r8.graph.DexEncodedMethod):119 -> a
     31:31:void checkClass(com.android.tools.r8.utils.DeterminismChecker$LineCallback,com.android.tools.r8.graph.DexProgramClass):114 -> a
     32:43:void checkMethod(com.android.tools.r8.utils.DeterminismChecker$LineCallback,com.android.tools.r8.graph.DexEncodedMethod):120:131 -> a
     32:43:void checkClass(com.android.tools.r8.utils.DeterminismChecker$LineCallback,com.android.tools.r8.graph.DexProgramClass):114 -> a
     44:44:java.lang.String escape(java.lang.String):140:140 -> a
-com.android.tools.r8.utils.DeterminismChecker$1 -> com.android.tools.r8.internal.el:
+com.android.tools.r8.utils.DeterminismChecker$1 -> com.android.tools.r8.internal.gl:
 # {"id":"sourceFile","fileName":"DeterminismChecker.java"}
     int index -> a
     java.nio.file.Path val$directory -> b
     1:4:void <init>(java.nio.file.Path):34:37 -> <init>
     1:15:com.android.tools.r8.utils.DeterminismChecker$LineCallback createCallback():42:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/fl;"}
-com.android.tools.r8.utils.DeterminismChecker$LineCallback -> com.android.tools.r8.internal.fl:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/hl;"}
+com.android.tools.r8.utils.DeterminismChecker$LineCallback -> com.android.tools.r8.internal.hl:
 # {"id":"sourceFile","fileName":"DeterminismChecker.java"}
     boolean onLine(java.lang.String) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
-com.android.tools.r8.utils.DeterminismChecker$LineCallbackChecker -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.utils.DeterminismChecker$LineCallbackChecker -> com.android.tools.r8.internal.il:
 # {"id":"sourceFile","fileName":"DeterminismChecker.java"}
     java.io.BufferedReader reader -> a
     1:2:void <init>(java.io.BufferedReader):148:149 -> <init>
     1:8:boolean onLine(java.lang.String):154:161 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)V"}
     1:1:void close():170:170 -> close
-com.android.tools.r8.utils.DeterminismChecker$LineCallbackWriter -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.utils.DeterminismChecker$LineCallbackWriter -> com.android.tools.r8.internal.jl:
 # {"id":"sourceFile","fileName":"DeterminismChecker.java"}
     java.io.Writer writer -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/io/BufferedWriter;"}
@@ -294722,10 +294047,10 @@
     2:2:boolean onLine(java.lang.String):185 -> a
     3:4:boolean onLine(java.lang.String):185:186 -> a
     1:1:void close():192:192 -> close
-com.android.tools.r8.utils.DexClassAndFieldEquivalence -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.utils.DexClassAndFieldEquivalence -> com.android.tools.r8.internal.yl:
 # {"id":"sourceFile","fileName":"DexClassAndFieldEquivalence.java"}
     com.android.tools.r8.utils.DexClassAndFieldEquivalence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yl;"}
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):10:10 -> a
@@ -294734,10 +294059,10 @@
     3:3:int doHash(java.lang.Object):10:10 -> a
     4:4:int doHash(com.android.tools.r8.graph.DexClassAndField):28:28 -> a
     4:4:int doHash(java.lang.Object):10 -> a
-com.android.tools.r8.utils.DexClassAndMethodEquivalence -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.utils.DexClassAndMethodEquivalence -> com.android.tools.r8.internal.Cl:
 # {"id":"sourceFile","fileName":"DexClassAndMethodEquivalence.java"}
     com.android.tools.r8.utils.DexClassAndMethodEquivalence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cl;"}
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):10:10 -> a
@@ -294746,7 +294071,7 @@
     3:3:int doHash(java.lang.Object):10:10 -> a
     4:4:int doHash(com.android.tools.r8.graph.DexClassAndMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
-com.android.tools.r8.utils.DexDebugUtils -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.utils.DexDebugUtils -> com.android.tools.r8.internal.Ll:
 # {"id":"sourceFile","fileName":"DexDebugUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -294760,56 +294085,56 @@
     6:6:boolean verifySetPositionFramesFollowedByDefaultEvent(com.android.tools.r8.graph.DexDebugEvent[]):34:34 -> a
     7:7:com.android.tools.r8.utils.DexDebugUtils$PositionInfo com.android.tools.r8.utils.DexDebugUtils$PositionInfo$PositionInfoBuilder.build():111:111 -> a
     7:7:com.android.tools.r8.utils.DexDebugUtils$PositionInfo computePreamblePosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/W0$a;)Lcom/android/tools/r8/internal/Il;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/W0$a;)Lcom/android/tools/r8/internal/Kl;"}
     8:20:com.android.tools.r8.utils.DexDebugUtils$PositionInfo computePreamblePosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):44:56 -> a
     21:21:boolean com.android.tools.r8.graph.DexDebugEvent.isDefaultEvent():0:0 -> a
     21:21:com.android.tools.r8.utils.DexDebugUtils$PositionInfo computePreamblePosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):59 -> a
     22:23:com.android.tools.r8.utils.DexDebugUtils$PositionInfo computePreamblePosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):60:61 -> a
     24:24:com.android.tools.r8.utils.DexDebugUtils$PositionInfo com.android.tools.r8.utils.DexDebugUtils$PositionInfo$PositionInfoBuilder.build():111:111 -> a
     24:24:com.android.tools.r8.utils.DexDebugUtils$PositionInfo computePreamblePosition(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):64 -> a
-com.android.tools.r8.utils.DexDebugUtils$1 -> com.android.tools.r8.internal.Hl:
+com.android.tools.r8.utils.DexDebugUtils$1 -> com.android.tools.r8.internal.Jl:
 # {"id":"sourceFile","fileName":"DexDebugUtils.java"}
     com.android.tools.r8.utils.Box val$existingPositionFrame -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.utils.Box):46:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/k7;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/m7;)V"}
     1:2:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame):49:50 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/S0;)V"}
     3:3:com.android.tools.r8.ir.code.Position com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame.getPosition():633:633 -> a
     3:3:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame):50 -> a
     4:4:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPositionFrame):50:50 -> a
-com.android.tools.r8.utils.DexDebugUtils$PositionInfo -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.utils.DexDebugUtils$PositionInfo -> com.android.tools.r8.internal.Kl:
 # {"id":"sourceFile","fileName":"DexDebugUtils.java"}
     com.android.tools.r8.ir.code.Position framePosition -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     int linePositionAtPcZero -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Position,int):72:74 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;)V"}
-com.android.tools.r8.utils.DexDebugUtils$PositionInfo$PositionInfoBuilder -> R8$$REMOVED$$CLASS$$237:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;)V"}
+com.android.tools.r8.utils.DexDebugUtils$PositionInfo$PositionInfoBuilder -> R8$$REMOVED$$CLASS$$226:
 # {"id":"sourceFile","fileName":"DexDebugUtils.java"}
-com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.am:
 # {"id":"sourceFile","fileName":"DexUtils.java"}
     1:2:java.lang.String getDefaultDexFileName(int):10:11 -> a
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.am:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.cm:
 # {"id":"sourceFile","fileName":"DexVersion.java"}
     int dexVersion -> b
     byte[] dexVersionBytes -> c
     com.android.tools.r8.utils.DexVersion$Layout layout -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.utils.DexVersion V35 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion V37 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion V38 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion V39 -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion V40 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion V41 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm;"}
     com.android.tools.r8.utils.DexVersion[] $VALUES -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/cm;"}
     boolean $assertionsDisabled -> l
     1:7:void <clinit>():12:18 -> <clinit>
     8:8:void <clinit>():12:12 -> <clinit>
@@ -294831,18 +294156,18 @@
     1:1:com.android.tools.r8.utils.DexVersion$Layout getLayout():48:48 -> c
     1:1:boolean isContainerDex():52 -> c
     2:47:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):68:113 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/am;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Lcom/android/tools/r8/internal/cm;"}
     48:48:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):111:111 -> c
     49:49:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):87:87 -> c
     50:50:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):84:84 -> c
     51:51:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):81:81 -> c
     1:1:int compareTo(com.android.tools.r8.utils.structural.Ordered):12:12 -> compareTo
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/s;)I"}
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.bm:
 # {"id":"sourceFile","fileName":"DexVersion.java"}
     int[] $SwitchMap$com$android$tools$r8$utils$AndroidApiLevel -> a
     1:1:void <clinit>():68:68 -> <clinit>
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.cm:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.em:
 # {"id":"sourceFile","fileName":"DirectoryBuilder.java"}
     java.nio.file.Path root -> a
     com.android.tools.r8.origin.Origin origin -> b
@@ -294861,7 +294186,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/origin/PathOrigin;"}
     1:1:java.nio.file.Path getPath():83:83 -> getPath
     1:1:void open():31:31 -> open
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.fm:
 # {"id":"sourceFile","fileName":"DisjointSets.java"}
     java.util.Map parent -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -294880,45 +294205,45 @@
     1:2:boolean isRepresentativeOrNotPresent(java.lang.Object):62:63 -> c
     1:3:java.lang.Object makeSet(java.lang.Object):30:32 -> d
     1:12:java.lang.String toString():156:167 -> toString
-com.android.tools.r8.utils.DominatorChecker -> com.android.tools.r8.internal.im:
+com.android.tools.r8.utils.DominatorChecker -> com.android.tools.r8.internal.km:
 # {"id":"sourceFile","fileName":"DominatorChecker.java"}
     com.android.tools.r8.utils.DominatorChecker FALSE_CHECKER -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/im;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/km;"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:boolean lambda$static$0(com.android.tools.r8.ir.code.BasicBlock):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     boolean check(com.android.tools.r8.ir.code.BasicBlock) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
-com.android.tools.r8.utils.DominatorChecker$1 -> com.android.tools.r8.internal.fm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
+com.android.tools.r8.utils.DominatorChecker$1 -> com.android.tools.r8.internal.hm:
 # {"id":"sourceFile","fileName":"DominatorChecker.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():137:137 -> <clinit>
-com.android.tools.r8.utils.DominatorChecker$PrecomputedDominatorChecker -> com.android.tools.r8.internal.gm:
+com.android.tools.r8.utils.DominatorChecker$PrecomputedDominatorChecker -> com.android.tools.r8.internal.im:
 # {"id":"sourceFile","fileName":"DominatorChecker.java"}
     java.util.Set dominators -> b
     1:2:void <init>(java.util.Set):23:24 -> <init>
     1:1:boolean check(com.android.tools.r8.ir.code.BasicBlock):29:29 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
-com.android.tools.r8.utils.DominatorChecker$TraversingDominatorChecker -> com.android.tools.r8.internal.hm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
+com.android.tools.r8.utils.DominatorChecker$TraversingDominatorChecker -> com.android.tools.r8.internal.jm:
 # {"id":"sourceFile","fileName":"DominatorChecker.java"}
     com.android.tools.r8.ir.code.BasicBlock subgraphEntryBlock -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     com.android.tools.r8.ir.code.BasicBlock subgraphExitBlock -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     java.util.Set knownDominators -> d
     com.android.tools.r8.utils.WorkList workList -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bm0;"}
     com.android.tools.r8.ir.code.BasicBlock prevTargetBlock -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/G5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/I5;"}
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):43:43 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Ljava/util/Set;)V"}
     2:2:com.android.tools.r8.utils.WorkList com.android.tools.r8.utils.WorkList.newIdentityWorkList():39:39 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):37 -> <init>
     3:13:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):37:47 -> <init>
     1:1:boolean checkWithTraversal(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/internal/xm0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/internal/Bm0;)Z"}
     2:2:boolean com.android.tools.r8.utils.WorkList.isEmpty():141:141 -> a
     2:2:boolean checkWithTraversal(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -294939,7 +294264,7 @@
     16:16:boolean checkWithTraversal(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):114 -> a
     17:18:boolean checkWithTraversal(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.WorkList):114:115 -> a
     1:24:boolean check(com.android.tools.r8.ir.code.BasicBlock):52:75 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/G5;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/I5;)Z"}
     25:25:boolean com.android.tools.r8.utils.WorkList.isSeen(java.lang.Object):145:145 -> b
     25:25:boolean check(com.android.tools.r8.ir.code.BasicBlock):75 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -294952,49 +294277,49 @@
     29:29:void com.android.tools.r8.utils.WorkList.clearSeen():171:171 -> b
     29:29:boolean check(com.android.tools.r8.ir.code.BasicBlock):76 -> b
     30:42:boolean check(com.android.tools.r8.ir.code.BasicBlock):77:89 -> b
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.ym:
 # {"id":"sourceFile","fileName":"DumpInputFlags.java"}
     1:1:void <init>():14:14 -> <init>
     boolean shouldDump(com.android.tools.r8.dump.DumpOptions) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm;)Z"}
     1:7:com.android.tools.r8.utils.DumpInputFlags getDefault():21:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ym;"}
     8:8:com.android.tools.r8.utils.DumpInputFlags noDump():33:33 -> a
     8:8:com.android.tools.r8.utils.DumpInputFlags getDefault():29 -> a
     9:9:com.android.tools.r8.utils.DumpInputFlags dumpToDirectory(java.nio.file.Path):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/ym;"}
     java.nio.file.Path getDumpPath() -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToFile(java.nio.file.Path):58:58 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/nio/file/Path;)Lcom/android/tools/r8/internal/ym;"}
     boolean shouldFailCompilation() -> c
     boolean shouldLogDumpInfoMessage() -> d
-com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.sm:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.um:
 # {"id":"sourceFile","fileName":"DumpInputFlags.java"}
     1:1:void <init>():33:33 -> <init>
     1:1:boolean shouldDump(com.android.tools.r8.dump.DumpOptions):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm;)Z"}
     1:1:java.nio.file.Path getDumpPath():37:37 -> b
     1:1:boolean shouldFailCompilation():47:47 -> c
     1:1:boolean shouldLogDumpInfoMessage():52:52 -> d
-com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.tm:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.vm:
 # {"id":"sourceFile","fileName":"DumpInputFlags.java"}
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):58:58 -> <init>
     1:1:java.nio.file.Path getDumpPath():62:62 -> b
     1:1:boolean shouldFailCompilation():67:67 -> c
-com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.um:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.wm:
 # {"id":"sourceFile","fileName":"DumpInputFlags.java"}
     java.nio.file.Path val$directory -> a
     1:1:void <init>(java.nio.file.Path):73:73 -> <init>
     1:1:java.nio.file.Path getDumpPath():77:77 -> b
     1:1:boolean shouldFailCompilation():82:82 -> c
-com.android.tools.r8.utils.DumpInputFlags$DumpInputToFileOrDirectoryFlags -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.utils.DumpInputFlags$DumpInputToFileOrDirectoryFlags -> com.android.tools.r8.internal.xm:
 # {"id":"sourceFile","fileName":"DumpInputFlags.java"}
     1:1:void <init>():95:95 -> <init>
     1:5:boolean shouldDump(com.android.tools.r8.dump.DumpOptions):99:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xm;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zm;)Z"}
     1:1:boolean shouldLogDumpInfoMessage():112:112 -> d
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.nn:
 # {"id":"sourceFile","fileName":"EncodedValueUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -295020,7 +294345,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;I)J"}
     1:5:long parseUnsigned(com.android.tools.r8.dex.DexReader,int):48:52 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/D;I)J"}
-com.android.tools.r8.utils.EntryUtils -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.utils.EntryUtils -> com.android.tools.r8.internal.vn:
 # {"id":"sourceFile","fileName":"EntryUtils.java"}
     1:1:java.util.function.Consumer accept(java.util.function.BiConsumer):14:14 -> a
     2:2:void lambda$accept$0(java.util.function.BiConsumer,java.util.Map$Entry):14:14 -> a
@@ -295039,7 +294364,7 @@
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.so:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.vo:
 # {"id":"sourceFile","fileName":"ExceptionUtils.java"}
     1:6:java.lang.String getMainStackTrace():31:36 -> a
     7:7:boolean lambda$getMainStackTrace$0(java.util.Map$Entry):32:32 -> a
@@ -295047,21 +294372,21 @@
     9:9:java.lang.String lambda$getMainStackTrace$3(java.lang.StackTraceElement):35:35 -> a
     10:10:void lambda$withConsumeResourceHandler$4(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):41:41 -> a
     11:11:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):41:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/StringConsumer;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/StringConsumer;Ljava/lang/String;)V"}
     12:16:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
     12:16:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):41 -> a
     17:17:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):45:45 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/StringConsumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/StringConsumer;)V"}
     18:22:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
     18:22:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):45 -> a
     23:27:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/util/function/Consumer;)V"}
     28:31:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/so$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/vo$a;)V"}
     32:32:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Ljava/lang/Throwable;)Lcom/android/tools/r8/CompilationFailedException;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/lang/Throwable;)Lcom/android/tools/r8/CompilationFailedException;"}
     33:42:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,com.android.tools.r8.utils.TriFunction,java.lang.Class):104:113 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Ljava/lang/Throwable;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Class;)Ljava/lang/Exception;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Ljava/lang/Throwable;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Class;)Ljava/lang/Exception;"}
     43:44:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):174:175 -> a
     43:44:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,com.android.tools.r8.utils.TriFunction,java.lang.Class):116 -> a
     45:45:com.android.tools.r8.position.Position com.android.tools.r8.errors.CompilationError.getPosition():52:52 -> a
@@ -295107,7 +294432,7 @@
     116:116:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):168 -> a
     117:117:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):170:170 -> a
     118:118:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/to;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wo;)V"}
     119:119:void printExitMessage(java.lang.Throwable):203:203 -> a
     119:119:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):197 -> a
     120:120:boolean isExpectedException(java.lang.Throwable):210:210 -> a
@@ -295175,23 +294500,23 @@
     157:157:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):254:254 -> a
     1:1:java.lang.StackTraceElement[] lambda$getMainStackTrace$1(java.util.Map$Entry):33:33 -> b
     2:2:void withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):64:64 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/so$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/vo$a;)V"}
     1:1:void withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/internal/so$a;)V"}
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.so$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/internal/vo$a;)V"}
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.vo$a:
 # {"id":"sourceFile","fileName":"ExceptionUtils.java"}
     void run() -> run
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.to:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.wo:
 # {"id":"sourceFile","fileName":"ExceptionUtils.java"}
     void run() -> run
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.xo:
 # {"id":"sourceFile","fileName":"ExceptionUtils.java"}
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     int $r8$clinit -> d
       # {"id":"com.android.tools.r8.synthesized"}
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):271:273 -> <init>
-com.android.tools.r8.utils.ExtractMarkerUtils -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.utils.ExtractMarkerUtils -> com.android.tools.r8.internal.Ro:
 # {"id":"sourceFile","fileName":"ExtractMarkerUtils.java"}
     1:1:java.util.Collection extractMarkersFromFile(java.nio.file.Path):21:21 -> a
     2:4:java.util.List extractMarkers(com.android.tools.r8.ExtractMarkerCommand$Builder):37:39 -> a
@@ -295208,10 +294533,10 @@
     2:4:java.util.Collection extractMarkerFromDexProgramData(byte[]):26 -> b
     5:5:java.util.List extractMarkers(com.android.tools.r8.ExtractMarkerCommand$Builder):38:38 -> b
     5:5:java.util.Collection extractMarkerFromDexProgramData(byte[]):26 -> b
-com.android.tools.r8.utils.FastMapUtils -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.utils.FastMapUtils -> com.android.tools.r8.internal.To:
 # {"id":"sourceFile","fileName":"FastMapUtils.java"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapInt2ReferenceOpenHashMapOrElse(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.IntObjToObjFunction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lz;Lcom/android/tools/r8/internal/iA;)Lcom/android/tools/r8/internal/az;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nz;Lcom/android/tools/r8/internal/kA;)Lcom/android/tools/r8/internal/cz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet.iterator():501:501 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapInt2ReferenceOpenHashMapOrElse(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.IntObjToObjFunction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):33 -> a
     3:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapInt2ReferenceOpenHashMapOrElse(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.IntObjToObjFunction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):34:45 -> a
@@ -295222,8 +294547,8 @@
     17:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapInt2ReferenceOpenHashMapOrElse(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.IntObjToObjFunction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):47:47 -> a
     18:27:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapInt2ReferenceOpenHashMapOrElse(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.IntObjToObjFunction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):46:55 -> a
     28:28:void lambda$mapInt2ReferenceOpenHashMapOrElse$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/Zy;)V"}
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.up:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/bz;)V"}
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.xp:
 # {"id":"sourceFile","fileName":"FieldReferenceUtils.java"}
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -295244,10 +294569,10 @@
     10:10:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):31:31 -> a
     11:13:com.android.tools.r8.references.FieldReference fieldFromField(java.lang.Class,java.lang.String):50:52 -> a
     14:18:java.lang.String toSourceString(com.android.tools.r8.references.FieldReference):61:65 -> a
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Cp:
 # {"id":"sourceFile","fileName":"FieldSignatureEquivalence.java"}
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zp;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cp;"}
     1:3:void <clinit>():16:18 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
@@ -295257,7 +294582,7 @@
     3:3:int doHash(java.lang.Object):14:14 -> a
     4:4:int doHash(com.android.tools.r8.graph.DexField):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Np:
 # {"id":"sourceFile","fileName":"FileUtils.java"}
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
@@ -295275,7 +294600,7 @@
     23:23:java.nio.file.Path writeTextFile(java.nio.file.Path,java.util.List):113:113 -> a
     24:24:java.nio.file.Path writeTextFile(java.nio.file.Path,java.lang.String[]):118:118 -> a
     25:27:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):124:126 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z40;Ljava/nio/file/Path;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/d50;Ljava/nio/file/Path;)V"}
     28:28:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):188:188 -> a
     29:44:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):218:233 -> a
     1:1:boolean isClassFile(java.nio.file.Path):60:60 -> b
@@ -295296,37 +294621,37 @@
     1:2:boolean isZipFile(java.nio.file.Path):69:70 -> g
     1:1:java.util.List readAllLines(java.nio.file.Path):109:109 -> h
     1:3:byte[] uncheckedReadAllBytes(java.nio.file.Path):102:104 -> i
-com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.internal.Pp:
+com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.internal.Sp:
 # {"id":"sourceFile","fileName":"FilteredArchiveClassFileProvider.java"}
     1:1:java.nio.file.Path com.android.tools.r8.shaking.FilteredClassPath.getPath():43:43 -> <init>
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/K0;)V"}
     2:2:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
-com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.hq:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.jq:
 # {"id":"sourceFile","fileName":"FlagFile.java"}
     1:15:java.lang.String[] expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.iq:
 # {"id":"sourceFile","fileName":"FlagFile.java"}
     java.nio.file.Path path -> f
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Iq:
+com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Kq:
 # {"id":"sourceFile","fileName":"ForEachUtils.java"}
     1:6:boolean allMatch(java.util.function.Consumer,java.util.function.Predicate):13:18 -> a
     7:7:void lambda$allMatch$0(com.android.tools.r8.utils.BooleanBox,java.util.function.Predicate,java.lang.Object):16:16 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Ljava/util/function/Predicate;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Ljava/util/function/Predicate;Ljava/lang/Object;)V"}
     8:8:void com.android.tools.r8.utils.BooleanBox.and(boolean):52:52 -> a
     8:8:void lambda$allMatch$0(com.android.tools.r8.utils.BooleanBox,java.util.function.Predicate,java.lang.Object):16 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Lq:
 # {"id":"sourceFile","fileName":"ForEachable.java"}
     1:2:void forEachWithIndex(com.android.tools.r8.utils.IntObjConsumer):13:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iA;)V"}
     3:3:void lambda$forEachWithIndex$0(com.android.tools.r8.utils.IntObjConsumer,com.android.tools.r8.utils.IntBox,java.lang.Object):14:14 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gA;Lcom/android/tools/r8/internal/Qz;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iA;Lcom/android/tools/r8/internal/Sz;Ljava/lang/Object;)V"}
     void forEach(java.util.function.Consumer) -> forEach
-com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.vr:
 # {"id":"sourceFile","fileName":"FunctionUtils.java"}
     1:1:java.lang.Object applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F2;Ljava/util/function/Function;)Ljava/lang/Object;"}
@@ -295335,7 +294660,7 @@
     5:5:java.lang.Object getFirst(java.lang.Object,java.lang.Object,java.lang.Object):38:38 -> a
     6:6:java.util.function.Function ignoreArgument(java.util.function.Supplier):42:42 -> a
     7:7:java.lang.Object lambda$ignoreArgument$2(java.util.function.Supplier,java.lang.Object):42:42 -> a
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Rs:
 # {"id":"sourceFile","fileName":"HeapUtils.java"}
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void initHotSpotMBean():19:21 -> a
@@ -295346,68 +294671,68 @@
     6:8:void initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.Nt:
 # {"id":"sourceFile","fileName":"IROrdering.java"}
     java.lang.Iterable orderClassMethods(java.lang.Iterable) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;)Ljava/lang/Iterable;"}
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.Jt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;)Ljava/lang/Iterable;"}
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.Lt:
 # {"id":"sourceFile","fileName":"IROrdering.java"}
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lt;"}
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     1:1:java.lang.Iterable orderClassMethods(java.lang.Iterable):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;)Ljava/lang/Iterable;"}
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Kt:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;)Ljava/lang/Iterable;"}
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Mt:
 # {"id":"sourceFile","fileName":"IROrdering.java"}
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mt;"}
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     1:2:java.util.List orderClassMethods(java.lang.Iterable):76:77 -> a
     1:2:java.lang.Iterable orderClassMethods(java.lang.Iterable):57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;)Ljava/lang/Iterable;"}
-com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Ut:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;)Ljava/lang/Iterable;"}
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Wt:
 # {"id":"sourceFile","fileName":"IdentifierUtils.java"}
     1:1:boolean isDexIdentifierPart(int):14:14 -> a
     1:1:boolean isQuestionMark(int):23:23 -> b
     1:1:boolean isSimpleNameChar(int):39:39 -> c
     1:1:boolean isUnicodeSpace(int):28:28 -> d
-com.android.tools.r8.utils.ImmutableArrayUtils -> R8$$REMOVED$$CLASS$$238:
+com.android.tools.r8.utils.ImmutableArrayUtils -> R8$$REMOVED$$CLASS$$227:
 # {"id":"sourceFile","fileName":"ImmutableArrayUtils.java"}
-com.android.tools.r8.utils.Int2ObjectMapUtils -> R8$$REMOVED$$CLASS$$239:
+com.android.tools.r8.utils.Int2ObjectMapUtils -> R8$$REMOVED$$CLASS$$228:
 # {"id":"sourceFile","fileName":"Int2ObjectMapUtils.java"}
-com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.Kz:
 # {"id":"sourceFile","fileName":"Int2StructuralItemArrayMap.java"}
     int[] keys -> b
     java.util.List values -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
     1:4:void <init>(int[],java.util.List):24:27 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([ILcom/android/tools/r8/internal/vu;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([ILcom/android/tools/r8/internal/xu;)V"}
     1:1:com.android.tools.r8.utils.structural.StructuralItem self():18:18 -> K
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/x;"}
     1:1:int[] lambda$specify$0(com.android.tools.r8.utils.Int2StructuralItemArrayMap):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iz;)[I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kz;)[I"}
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):42:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/A;)V"}
     3:4:void forEach(java.util.function.BiConsumer):55:56 -> a
     1:1:java.util.Collection lambda$specify$1(com.android.tools.r8.utils.Int2StructuralItemArrayMap):42:42 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iz;)Ljava/util/Collection;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kz;)Ljava/util/Collection;"}
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> r
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/utils/structural/y;"}
-com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.Jz:
 # {"id":"sourceFile","fileName":"Int2StructuralItemArrayMap.java"}
     java.util.List keys -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder values -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/su;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uu;"}
     1:1:void <init>():85:85 -> <init>
     2:3:void <init>():82:83 -> <init>
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Sz:
 # {"id":"sourceFile","fileName":"IntBox.java"}
     int value -> a
     boolean $assertionsDisabled -> b
@@ -295425,16 +294750,16 @@
     1:2:int incrementAndGet(int):67:68 -> d
     1:2:int incrementAndGet():63 -> d
     3:3:void set(int):72:72 -> d
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.iA:
 # {"id":"sourceFile","fileName":"IntObjConsumer.java"}
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.jA:
 # {"id":"sourceFile","fileName":"IntObjPredicate.java"}
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.kA:
 # {"id":"sourceFile","fileName":"IntObjToObjFunction.java"}
     java.lang.Object apply(int,java.lang.Object) -> a
-com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.internal.VA:
 # {"id":"sourceFile","fileName":"InternalArchiveClassFileProvider.java"}
     java.nio.file.Path path -> a
     com.android.tools.r8.origin.Origin origin -> b
@@ -295465,12 +294790,12 @@
     1:11:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):84:94 -> getProgramResource
     12:17:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):90:95 -> getProgramResource
     18:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:97 -> getProgramResource
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer -> com.android.tools.r8.internal.dB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     1:1:void <init>():34:34 -> <init>
     void finished(com.android.tools.r8.graph.AppView) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder -> com.android.tools.r8.internal.WA:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder -> com.android.tools.r8.internal.YA:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     com.android.tools.r8.ProgramResource$Kind kind -> a
     java.util.List content -> b
@@ -295495,20 +294820,20 @@
     22:23:byte[] build():84:85 -> a
     24:24:byte[] build():78:78 -> a
     25:25:java.lang.Integer lambda$build$0(java.lang.Integer,com.android.tools.r8.utils.Pair):76:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Lcom/android/tools/r8/internal/IV;)Ljava/lang/Integer;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Lcom/android/tools/r8/internal/MV;)Ljava/lang/Integer;"}
     26:27:java.lang.String getGlobalSyntheticFileName(java.lang.String):89:90 -> a
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsCfConsumer -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsCfConsumer -> com.android.tools.r8.internal.ZA:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):171:171 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/GlobalSyntheticsConsumer;Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():176:176 -> a
     1:2:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase.addGlobal(java.lang.String,com.android.tools.r8.ByteDataView):261:262 -> accept
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):181 -> accept
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexIndexedConsumer -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexIndexedConsumer -> com.android.tools.r8.internal.aB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     com.android.tools.r8.GlobalSyntheticsConsumer clientConsumer -> a
     com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder builder -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YA;"}
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer):101:101 -> <init>
     2:5:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer):99:102 -> <init>
     1:1:void finished(com.android.tools.r8.graph.AppView):123:123 -> a
@@ -295539,7 +294864,7 @@
     3:3:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):111 -> accept
     1:1:boolean combineSyntheticClassesWithPrimaryClass():135:135 -> combineSyntheticClassesWithPrimaryClass
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):116:116 -> finished
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexPerFileConsumer -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexPerFileConsumer -> com.android.tools.r8.internal.bB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):144:144 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/GlobalSyntheticsConsumer;Lcom/android/tools/r8/graph/y;)V"}
@@ -295547,7 +294872,7 @@
     1:2:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase.addGlobal(java.lang.String,com.android.tools.r8.ByteDataView):261:262 -> accept
     1:2:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):158 -> accept
     1:1:boolean combineSyntheticClassesWithPrimaryClass():163:163 -> combineSyntheticClassesWithPrimaryClass
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase -> com.android.tools.r8.internal.cB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramConsumer.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -295561,7 +294886,7 @@
     2:6:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):189:193 -> <init>
     com.android.tools.r8.ProgramResource$Kind getKind() -> a
     1:1:void lambda$finished$0(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType,byte[]):213:213 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WA;Lcom/android/tools/r8/graph/I2;[B)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YA;Lcom/android/tools/r8/graph/I2;[B)V"}
     2:2:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder.addGlobalSynthetic(java.lang.String,byte[]):55:55 -> a
     2:2:void lambda$finished$0(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType,byte[]):213 -> a
     3:3:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder.add(java.lang.String,byte[]):59:59 -> a
@@ -295584,7 +294909,7 @@
     22:22:void lambda$finished$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):254 -> a
     23:23:void lambda$finished$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):251:251 -> a
     24:24:void lambda$finished$2(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType):243:243 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WA;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YA;Lcom/android/tools/r8/graph/I2;)V"}
     25:25:void lambda$finished$2(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType):242:242 -> a
     26:26:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder.addGlobalSynthetic(java.lang.String,byte[]):55:55 -> a
     26:26:void lambda$finished$2(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType):242 -> a
@@ -295611,7 +294936,7 @@
     86:86:void finished(com.android.tools.r8.graph.AppView):257 -> a
     87:87:void finished(com.android.tools.r8.graph.AppView):257:257 -> a
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):200:200 -> finished
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider -> com.android.tools.r8.internal.fB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramProvider.java"}
     java.util.List providers -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -295622,18 +294947,18 @@
     2:5:void <init>(java.util.List):44:47 -> <init>
     1:1:com.android.tools.r8.utils.OneShotByteResource com.android.tools.r8.utils.OneShotByteResource.create(com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,byte[],java.util.Set):22:22 -> a
     1:1:com.android.tools.r8.ProgramResource lambda$ensureResources$0(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider$GlobalsEntryOrigin,byte[],java.util.Set,com.android.tools.r8.ProgramResource$Kind):92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cB;[BLjava/util/Set;Lcom/android/tools/r8/ProgramResource$Kind;)Lcom/android/tools/r8/ProgramResource;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eB;[BLjava/util/Set;Lcom/android/tools/r8/ProgramResource$Kind;)Lcom/android/tools/r8/ProgramResource;"}
     2:47:void ensureResources():59:104 -> a
     48:49:void ensureResources():99:100 -> a
     50:90:void ensureResources():67:107 -> a
     91:92:java.lang.String guessTypeDescriptor(java.lang.String):112:113 -> a
     1:4:java.util.Collection getProgramResources():52:55 -> getProgramResources
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider$GlobalsEntryOrigin -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramProvider$GlobalsEntryOrigin -> com.android.tools.r8.internal.eB:
 # {"id":"sourceFile","fileName":"InternalGlobalSyntheticsProgramProvider.java"}
     java.lang.String entryName -> f
     1:2:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):33:34 -> <init>
     1:1:java.lang.String part():39:39 -> part
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.iB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enableFieldValueAnalysis -> A
     boolean addAndroidPlatformBuildToMarker -> A0
@@ -295656,7 +294981,7 @@
     boolean skipReadingDexCode -> E1
     boolean enableClassInlining -> F
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> F0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     com.android.tools.r8.StringConsumer mainDexListConsumer -> F1
     boolean enableClassStaticizer -> G
     boolean enableVarHandleDesugaring -> G0
@@ -295673,14 +294998,14 @@
     com.android.tools.r8.StringConsumer configurationConsumer -> J1
     boolean enableServiceLoaderRewriting -> K
     com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> K0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HU;"}
     com.android.tools.r8.utils.ThrowingBiConsumer loadMachineDesugaredLibrarySpecification -> K1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Rg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vg0;"}
     boolean enableNameReflectionOptimization -> L
     com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> L0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HU;"}
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification machineDesugaredLibrarySpecification -> L1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/WL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aM;"}
     boolean enableStringConcatenationOptimization -> M
     boolean processCovariantReturnTypeAnnotations -> M0
     boolean relocatorCompilation -> M1
@@ -295718,7 +295043,7 @@
     com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> X0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/w4;"}
     com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> X1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     boolean enableEnumValueOptimization -> Y
     boolean configurationDebugging -> Y0
     int EXPERIMENTAL_DEX_VERSION -> Y1
@@ -295728,7 +295053,7 @@
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> a0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$m;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$m;"}
     boolean debug -> a1
     java.util.concurrent.atomic.AtomicBoolean cancelled -> b
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> b0
@@ -295737,73 +295062,73 @@
     com.android.tools.r8.CancelCompilationChecker cancelCompilationChecker -> c
     boolean enableRedundantFieldLoadElimination -> c0
     com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions -> c1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$p;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$p;"}
     com.android.tools.r8.AndroidResourceProvider androidResourceProvider -> d
     boolean enableRedundantConstNumberOptimization -> d0
     com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> d1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$c;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$c;"}
     com.android.tools.r8.AndroidResourceConsumer androidResourceConsumer -> e
     boolean enableLoopUnrolling -> e0
     com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions cfCodeAnalysisOptions -> e1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$d;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$d;"}
     java.util.List androidResourceProguardMapStrings -> f
     boolean enableCheckAllInstructionsDuringStackMapVerification -> f0
     com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> f1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$e;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$e;"}
     com.android.tools.r8.ResourceShrinkerConfiguration resourceShrinkerConfiguration -> g
     java.lang.String synthesizedClassPrefix -> g0
     com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> g1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$i;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$i;"}
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y2;"}
     int threadCount -> h0
     com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions singleCallerInlinerOptions -> h1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kb0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ob0;"}
     com.android.tools.r8.utils.Reporter reporter -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z40;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/d50;"}
     boolean invalidDebugInfoFatal -> i0
     com.android.tools.r8.optimize.compose.JetpackComposeOptions jetpackComposeOptions -> i1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/NC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PC;"}
     com.android.tools.r8.ProgramConsumer programConsumer -> j
     boolean invalidDebugInfoStrict -> j0
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> j1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$h;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$h;"}
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver programClassConflictResolver -> k
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/b;"}
     boolean ignoreJavaLibraryOverride -> k0
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions verticalClassMergerOptions -> k1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gl0;"}
     com.android.tools.r8.GlobalSyntheticsConsumer globalSyntheticsConsumer -> l
     boolean enableCfByteCodePassThrough -> l0
     com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions openClosedInterfacesOptions -> l1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$l;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$l;"}
     com.android.tools.r8.SyntheticInfoConsumer syntheticInfoConsumer -> m
     boolean emitRecordAnnotationsInDex -> m0
     com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> m1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$o;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$o;"}
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> n
     boolean emitNestAnnotationsInDex -> n0
     com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions redundantBridgeRemovalOptions -> n1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/h20;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/l20;"}
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> o
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Uo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xo;"}
     boolean forceNestDesugaring -> o0
     com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> o1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kB;"}
     java.util.List outputInspections -> p
     boolean emitPermittedSubclassesAnnotationsInDex -> p0
     com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> p1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$a;"}
     com.android.tools.r8.threading.ThreadingModule lazyThreadingModule -> q
     com.android.tools.r8.utils.DumpInputFlags dumpInputFlags -> q0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ym;"}
     com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> q1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$f;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$f;"}
     boolean printTimes -> r
     com.android.tools.r8.dump.DumpOptions dumpOptions -> r0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zm;"}
     com.android.tools.r8.utils.InternalOptions$MappingComposeOptions mappingComposeOptions -> r1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$k;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$k;"}
     boolean printMemory -> s
     com.android.tools.r8.dex.Marker$Tool tool -> s0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W$b;"}
@@ -295812,25 +295137,25 @@
     boolean ensureJvmCompatibleStepOutBehavior -> t
     boolean hasMarker -> t0
     com.android.tools.r8.profile.startup.StartupOptions startupOptions -> t1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xd0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bd0;"}
     boolean passthroughDexCode -> u
     com.android.tools.r8.dex.Marker marker -> u0
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W;"}
     com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions instrumentationOptions -> u1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nw;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pw;"}
     boolean enableNeverMergePrefixes -> v
     java.util.Set extensiveLoggingFilter -> v0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> v1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$q;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$q;"}
     com.android.tools.r8.utils.InternalOptions$NeverMergeGroup neverMerge -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lB;"}
     java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> w0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gv;"}
     java.util.List mainDexKeepRules -> w1
     boolean libraryInterfacesMayHaveStaticInitialization -> x
     java.util.List methodsFilter -> x0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xu;"}
     boolean minimalMainDex -> x1
     boolean enableFieldBitAccessAnalysis -> y
     com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> y0
@@ -295839,554 +295164,554 @@
     boolean enableFieldAssignmentTracker -> z
     boolean intermediate -> z0
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> z1
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$j;"}
     1:41:void <clinit>():140:180 -> <clinit>
     42:42:int com.android.tools.r8.utils.DexVersion.getIntValue():56:56 -> <clinit>
     42:42:void <clinit>():180 -> <clinit>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     43:43:void <clinit>():180:180 -> <clinit>
     1:1:void <init>():258:258 -> <init>
-    2:214:void <init>():192:404 -> <init>
-    215:215:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    215:215:void <init>():404 -> <init>
-    216:216:void <init>():404:404 -> <init>
-    217:217:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    217:217:void <init>():404 -> <init>
-    218:520:void <init>():404:706 -> <init>
-    521:521:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
-    521:521:void <init>():708 -> <init>
-    522:1107:void <init>():708:1293 -> <init>
-    1108:1113:void <init>():259:264 -> <init>
-    1114:1114:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):268:268 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/Z40;)V"}
-    1115:1327:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):192:404 -> <init>
-    1328:1328:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    1328:1328:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):404 -> <init>
-    1329:1329:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):404:404 -> <init>
-    1330:1330:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    1330:1330:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):404 -> <init>
-    1331:1633:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):404:706 -> <init>
-    1634:1634:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
-    1634:1634:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):708 -> <init>
-    1635:2220:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):708:1293 -> <init>
-    2221:2229:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):269:277 -> <init>
-    2230:2230:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):282:282 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/shaking/Y2;Lcom/android/tools/r8/internal/Z40;)V"}
-    2231:2443:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):192:404 -> <init>
-    2444:2444:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    2444:2444:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):404 -> <init>
-    2445:2445:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):404:404 -> <init>
-    2446:2446:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
-    2446:2446:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):404 -> <init>
-    2447:2749:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):404:706 -> <init>
-    2750:2750:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
-    2750:2750:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):708 -> <init>
-    2751:3336:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):708:1293 -> <init>
-    3337:3341:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):283:287 -> <init>
-    3342:3342:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.shaking.ProguardConfiguration.getDexItemFactory():513:513 -> <init>
-    3342:3342:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):288 -> <init>
+    2:213:void <init>():192:403 -> <init>
+    214:214:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    214:214:void <init>():403 -> <init>
+    215:215:void <init>():403:403 -> <init>
+    216:216:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    216:216:void <init>():403 -> <init>
+    217:519:void <init>():403:705 -> <init>
+    520:520:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
+    520:520:void <init>():707 -> <init>
+    521:1113:void <init>():707:1299 -> <init>
+    1114:1119:void <init>():259:264 -> <init>
+    1120:1120:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):268:268 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/internal/d50;)V"}
+    1121:1332:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):192:403 -> <init>
+    1333:1333:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    1333:1333:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):403 -> <init>
+    1334:1334:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):403:403 -> <init>
+    1335:1335:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    1335:1335:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):403 -> <init>
+    1336:1638:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):403:705 -> <init>
+    1639:1639:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
+    1639:1639:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):707 -> <init>
+    1640:2232:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):707:1299 -> <init>
+    2233:2241:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):269:277 -> <init>
+    2242:2242:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):282:282 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/CompilationMode;Lcom/android/tools/r8/shaking/Y2;Lcom/android/tools/r8/internal/d50;)V"}
+    2243:2454:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):192:403 -> <init>
+    2455:2455:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    2455:2455:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):403 -> <init>
+    2456:2456:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):403:403 -> <init>
+    2457:2457:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of(java.lang.Object):100:100 -> <init>
+    2457:2457:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):403 -> <init>
+    2458:2760:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):403:705 -> <init>
+    2761:2761:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():89:89 -> <init>
+    2761:2761:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):707 -> <init>
+    2762:3354:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):707:1299 -> <init>
+    3355:3359:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):283:287 -> <init>
+    3360:3360:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.shaking.ProguardConfiguration.getDexItemFactory():513:513 -> <init>
+    3360:3360:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):288 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3343:3348:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):288:293 -> <init>
-    3349:3351:void disableAllOptimizations():334:336 -> <init>
-    3349:3351:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):296 -> <init>
-    3352:3354:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):298:300 -> <init>
-    3355:3360:void keepDebugRelatedInformation():317:322 -> <init>
-    3355:3360:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):301 -> <init>
-    3361:3361:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):303:303 -> <init>
-    3362:3362:boolean com.android.tools.r8.shaking.ProguardConfiguration.isProtoShrinkingEnabled():666:666 -> <init>
-    3362:3362:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):304 -> <init>
-    3363:3367:void enableProtoShrinking():326:330 -> <init>
-    3363:3367:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):305 -> <init>
-    1:3:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1074:1076 -> A
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+    3361:3366:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):288:293 -> <init>
+    3367:3369:void disableAllOptimizations():333:335 -> <init>
+    3367:3369:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):296 -> <init>
+    3370:3372:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):298:300 -> <init>
+    3373:3377:void keepDebugRelatedInformation():317:321 -> <init>
+    3373:3377:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):301 -> <init>
+    3378:3378:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):303:303 -> <init>
+    3379:3379:boolean com.android.tools.r8.shaking.ProguardConfiguration.isProtoShrinkingEnabled():666:666 -> <init>
+    3379:3379:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):304 -> <init>
+    3380:3384:void enableProtoShrinking():325:329 -> <init>
+    3380:3384:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):305 -> <init>
+    1:3:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1080:1082 -> A
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> A
-    4:4:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1076 -> A
-    5:8:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1077:1080 -> A
+    4:4:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1082 -> A
+    5:8:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1083:1086 -> A
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> A
-    9:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1080 -> A
-    1:3:java.util.Set getExtensiveLoggingFilter():1063:1065 -> B
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ev;"}
+    9:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():1086 -> A
+    1:3:java.util.Set getExtensiveLoggingFilter():1069:1071 -> B
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gv;"}
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> B
-    4:4:java.util.Set getExtensiveLoggingFilter():1065 -> B
-    5:8:java.util.Set getExtensiveLoggingFilter():1066:1069 -> B
+    4:4:java.util.Set getExtensiveLoggingFilter():1071 -> B
+    5:8:java.util.Set getExtensiveLoggingFilter():1072:1075 -> B
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> B
-    9:9:java.util.Set getExtensiveLoggingFilter():1069 -> B
-    1:1:com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions getInstrumentationOptions():1055:1055 -> C
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nw;"}
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():576:576 -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mB;"}
-    2:2:boolean hasConsumer():572:572 -> D
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():576 -> D
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():576:576 -> D
-    4:4:boolean isGeneratingDexIndexed():629:629 -> D
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():577 -> D
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():578:578 -> D
-    6:6:boolean isGeneratingDexFilePerClassFile():633:633 -> D
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():579 -> D
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():580:580 -> D
-    8:8:boolean isGeneratingClassFiles():637:637 -> D
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():581 -> D
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():582:584 -> D
-    1:1:com.android.tools.r8.optimize.compose.JetpackComposeOptions getJetpackComposeOptions():995:995 -> E
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/NC;"}
-    1:5:com.android.tools.r8.dex.Marker getMarker():531:535 -> F
+    9:9:java.util.Set getExtensiveLoggingFilter():1075 -> B
+    1:1:com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions getInstrumentationOptions():1061:1061 -> C
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pw;"}
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():575:575 -> D
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oB;"}
+    2:2:boolean hasConsumer():571:571 -> D
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():575 -> D
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():575:575 -> D
+    4:4:boolean isGeneratingDexIndexed():628:628 -> D
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():576 -> D
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():577:577 -> D
+    6:6:boolean isGeneratingDexFilePerClassFile():632:632 -> D
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():578 -> D
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():579:579 -> D
+    8:8:boolean isGeneratingClassFiles():636:636 -> D
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():580 -> D
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():581:583 -> D
+    1:1:com.android.tools.r8.optimize.compose.JetpackComposeOptions getJetpackComposeOptions():1001:1001 -> E
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/PC;"}
+    1:5:com.android.tools.r8.dex.Marker getMarker():530:534 -> F
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/dex/W;"}
-    6:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):540:543 -> F
-    6:9:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    6:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):539:542 -> F
+    6:9:com.android.tools.r8.dex.Marker getMarker():534 -> F
     10:10:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167:167 -> F
-    10:10:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    10:10:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    10:10:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    10:10:com.android.tools.r8.dex.Marker getMarker():534 -> F
     11:11:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167:167 -> F
-    11:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    11:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    11:11:com.android.tools.r8.dex.Marker getMarker():534 -> F
     12:12:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167:167 -> F
-    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    12:12:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    12:12:com.android.tools.r8.dex.Marker getMarker():534 -> F
     13:13:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    13:13:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    13:13:com.android.tools.r8.dex.Marker getMarker():534 -> F
     14:14:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     14:14:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167 -> F
-    14:14:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    14:14:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    14:14:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    14:14:com.android.tools.r8.dex.Marker getMarker():534 -> F
     15:15:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):167:167 -> F
-    15:15:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    15:15:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    15:15:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    15:15:com.android.tools.r8.dex.Marker getMarker():534 -> F
     16:16:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):168:168 -> F
-    16:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    16:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    16:16:com.android.tools.r8.dex.Marker getMarker():534 -> F
     17:17:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setCompilationMode(com.android.tools.r8.CompilationMode):168:168 -> F
-    17:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
-    17:17:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    18:18:boolean isGeneratingClassFiles():637:637 -> F
-    18:18:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
-    18:18:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    19:19:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544:544 -> F
-    19:19:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    17:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):542 -> F
+    17:17:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    18:18:boolean isGeneratingClassFiles():636:636 -> F
+    18:18:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    18:18:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    19:19:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543:543 -> F
+    19:19:com.android.tools.r8.dex.Marker getMarker():534 -> F
     20:20:boolean com.android.tools.r8.dex.Marker.hasBackend():173:173 -> F
     20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setBackend(com.android.tools.r8.dex.Marker$Backend):205 -> F
-    20:20:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
-    20:20:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    20:20:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    20:20:com.android.tools.r8.dex.Marker getMarker():534 -> F
     21:21:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     21:21:boolean com.android.tools.r8.dex.Marker.hasBackend():173 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setBackend(com.android.tools.r8.dex.Marker$Backend):205 -> F
-    21:21:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
-    21:21:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    21:21:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    21:21:com.android.tools.r8.dex.Marker getMarker():534 -> F
     22:22:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     22:22:boolean com.android.tools.r8.dex.Marker.hasBackend():173 -> F
     22:22:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setBackend(com.android.tools.r8.dex.Marker$Backend):205 -> F
-    22:22:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
-    22:22:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    22:22:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    22:22:com.android.tools.r8.dex.Marker getMarker():534 -> F
     23:24:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setBackend(com.android.tools.r8.dex.Marker$Backend):205:206 -> F
-    23:24:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
-    23:24:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    25:25:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544:544 -> F
-    25:25:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    23:24:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543 -> F
+    23:24:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    25:25:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):543:543 -> F
+    25:25:com.android.tools.r8.dex.Marker getMarker():534 -> F
     26:26:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):215:215 -> F
-    26:26:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    26:26:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    26:26:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    26:26:com.android.tools.r8.dex.Marker getMarker():534 -> F
     27:27:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     27:27:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):215 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    27:27:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    27:27:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    27:27:com.android.tools.r8.dex.Marker getMarker():534 -> F
     28:28:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     28:28:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):215 -> F
-    28:28:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    28:28:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    28:28:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    28:28:com.android.tools.r8.dex.Marker getMarker():534 -> F
     29:30:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):215:216 -> F
-    29:30:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    29:30:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    29:30:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    29:30:com.android.tools.r8.dex.Marker getMarker():534 -> F
     31:31:void com.android.tools.r8.com.google.gson.JsonObject.addProperty(java.lang.String,java.lang.Boolean):114:114 -> F
     31:31:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):216 -> F
-    31:31:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    31:31:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    31:31:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    31:31:com.android.tools.r8.dex.Marker getMarker():534 -> F
     32:32:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> F
     32:32:void com.android.tools.r8.com.google.gson.JsonObject.addProperty(java.lang.String,java.lang.Boolean):114 -> F
     32:32:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setHasChecksums(boolean):216 -> F
-    32:32:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):545 -> F
-    32:32:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    33:36:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):549:552 -> F
-    33:36:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    32:32:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):544 -> F
+    32:32:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    33:36:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):548:551 -> F
+    33:36:com.android.tools.r8.dex.Marker getMarker():534 -> F
     37:37:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getIdentifier():94:94 -> F
-    37:37:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    37:37:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):551 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    37:37:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    37:37:com.android.tools.r8.dex.Marker getMarker():534 -> F
     38:38:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getIdentifier():94:94 -> F
-    38:38:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
-    38:38:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    39:39:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553:553 -> F
-    39:39:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    38:38:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):551 -> F
+    38:38:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    39:39:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552:552 -> F
+    39:39:com.android.tools.r8.dex.Marker getMarker():534 -> F
     40:40:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getIdentifier():94:94 -> F
-    40:40:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
+    40:40:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    40:40:com.android.tools.r8.dex.Marker getMarker():534 -> F
     41:41:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getIdentifier():94:94 -> F
-    41:41:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    41:41:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    42:42:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553:553 -> F
-    42:42:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    41:41:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    41:41:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    42:42:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552:552 -> F
+    42:42:com.android.tools.r8.dex.Marker getMarker():534 -> F
     43:43:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):136:136 -> F
-    43:43:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    43:43:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    43:43:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    43:43:com.android.tools.r8.dex.Marker getMarker():534 -> F
     44:44:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     44:44:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):136 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:44:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    44:44:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    44:44:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    44:44:com.android.tools.r8.dex.Marker getMarker():534 -> F
     45:45:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     45:45:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):136 -> F
-    45:45:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    45:45:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    45:45:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    45:45:com.android.tools.r8.dex.Marker getMarker():534 -> F
     46:48:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):136:138 -> F
-    46:48:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    46:48:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    46:48:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    46:48:com.android.tools.r8.dex.Marker getMarker():534 -> F
     49:49:void com.android.tools.r8.com.google.gson.JsonArray.add(java.lang.String):116:116 -> F
     49:49:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):139 -> F
-    49:49:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    49:49:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    49:49:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    49:49:com.android.tools.r8.dex.Marker getMarker():534 -> F
     50:50:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):141:141 -> F
-    50:50:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    50:50:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    50:50:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    50:50:com.android.tools.r8.dex.Marker getMarker():534 -> F
     51:51:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> F
     51:51:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):141 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    51:51:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    51:51:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    51:51:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    51:51:com.android.tools.r8.dex.Marker getMarker():534 -> F
     52:52:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> F
     52:52:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setDesugaredLibraryIdentifiers(java.lang.String[]):141 -> F
-    52:52:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):553 -> F
-    52:52:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    53:54:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):555:556 -> F
-    53:54:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    52:52:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):552 -> F
+    52:52:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    53:54:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):554:555 -> F
+    53:54:com.android.tools.r8.dex.Marker getMarker():534 -> F
     55:55:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setSha1(java.lang.String):150:150 -> F
-    55:55:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):556 -> F
-    55:55:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    55:55:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):555 -> F
+    55:55:com.android.tools.r8.dex.Marker getMarker():534 -> F
     56:56:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     56:56:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setSha1(java.lang.String):150 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):556 -> F
-    56:56:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    56:56:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):555 -> F
+    56:56:com.android.tools.r8.dex.Marker getMarker():534 -> F
     57:57:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     57:57:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setSha1(java.lang.String):150 -> F
-    57:57:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):556 -> F
-    57:57:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    57:57:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):555 -> F
+    57:57:com.android.tools.r8.dex.Marker getMarker():534 -> F
     58:59:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setSha1(java.lang.String):150:151 -> F
-    58:59:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):556 -> F
-    58:59:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    60:61:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):558:559 -> F
-    60:61:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    58:59:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):555 -> F
+    58:59:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    60:61:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):557:558 -> F
+    60:61:com.android.tools.r8.dex.Marker getMarker():534 -> F
     62:62:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setR8Mode(java.lang.String):235:235 -> F
-    62:62:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):559 -> F
-    62:62:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    62:62:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):558 -> F
+    62:62:com.android.tools.r8.dex.Marker getMarker():534 -> F
     63:63:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     63:63:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setR8Mode(java.lang.String):235 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):559 -> F
-    63:63:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    63:63:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):558 -> F
+    63:63:com.android.tools.r8.dex.Marker getMarker():534 -> F
     64:64:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     64:64:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setR8Mode(java.lang.String):235 -> F
-    64:64:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):559 -> F
-    64:64:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    64:64:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):558 -> F
+    64:64:com.android.tools.r8.dex.Marker getMarker():534 -> F
     65:66:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setR8Mode(java.lang.String):235:236 -> F
-    65:66:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):559 -> F
-    65:66:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    67:67:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561:561 -> F
-    67:67:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    65:66:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):558 -> F
+    65:66:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    67:67:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):560:560 -> F
+    67:67:com.android.tools.r8.dex.Marker getMarker():534 -> F
     68:68:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():246:246 -> F
-    68:68:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    68:68:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    68:68:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    68:68:com.android.tools.r8.dex.Marker getMarker():534 -> F
     69:69:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     69:69:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():246 -> F
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    69:69:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    69:69:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    69:69:com.android.tools.r8.dex.Marker getMarker():534 -> F
     70:70:boolean com.android.tools.r8.com.google.gson.JsonObject.has(java.lang.String):175:175 -> F
     70:70:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():246 -> F
-    70:70:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    70:70:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    70:70:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    70:70:com.android.tools.r8.dex.Marker getMarker():534 -> F
     71:72:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():246:247 -> F
-    71:72:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    71:72:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    71:72:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    71:72:com.android.tools.r8.dex.Marker getMarker():534 -> F
     73:73:void com.android.tools.r8.com.google.gson.JsonObject.addProperty(java.lang.String,java.lang.Boolean):114:114 -> F
     73:73:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():247 -> F
-    73:73:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    73:73:com.android.tools.r8.dex.Marker getMarker():535 -> F
+    73:73:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    73:73:com.android.tools.r8.dex.Marker getMarker():534 -> F
     74:74:void com.android.tools.r8.com.google.gson.JsonObject.add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):69:69 -> F
     74:74:void com.android.tools.r8.com.google.gson.JsonObject.addProperty(java.lang.String,java.lang.Boolean):114 -> F
     74:74:com.android.tools.r8.dex.Marker com.android.tools.r8.dex.Marker.setAndroidPlatformBuild():247 -> F
-    74:74:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):562 -> F
-    74:74:com.android.tools.r8.dex.Marker getMarker():535 -> F
-    1:2:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():756:757 -> G
+    74:74:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):561 -> F
+    74:74:com.android.tools.r8.dex.Marker getMarker():534 -> F
+    1:2:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():755:756 -> G
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/y2;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions getOpenClosedInterfacesOptions():1043:1043 -> H
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$l;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions getOpenClosedInterfacesOptions():1049:1049 -> H
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$l;"}
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():236:236 -> I
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/shaking/Y2;"}
-    1:1:com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions getRedundantBridgeRemovalOptions():1035:1035 -> J
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/h20;"}
-    1:1:com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions getSingleCallerInlinerOptions():999:999 -> K
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kb0;"}
-    1:1:com.android.tools.r8.profile.startup.StartupOptions getStartupOptions():1051:1051 -> L
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xd0;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$TestingOptions getTestingOptions():1059:1059 -> M
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$q;"}
+    1:1:com.android.tools.r8.optimize.redundantbridgeremoval.RedundantBridgeRemovalOptions getRedundantBridgeRemovalOptions():1041:1041 -> J
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/l20;"}
+    1:1:com.android.tools.r8.optimize.singlecaller.SingleCallerInlinerOptions getSingleCallerInlinerOptions():1005:1005 -> K
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ob0;"}
+    1:1:com.android.tools.r8.profile.startup.StartupOptions getStartupOptions():1057:1057 -> L
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bd0;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$TestingOptions getTestingOptions():1065:1065 -> M
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$q;"}
     1:4:com.android.tools.r8.threading.ThreadingModule getThreadingModule():310:313 -> N
-    1:1:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1246:1246 -> O
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gj0;"}
+    1:1:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1252:1252 -> O
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/kj0;"}
     2:2:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.requiresTypeRewriting():252:252 -> O
-    2:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1246 -> O
+    2:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1252 -> O
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.requiresTypeRewriting():252:252 -> O
-    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1246 -> O
+    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1252 -> O
     4:4:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.getRewriteDerivedTypeOnly():127:127 -> O
     4:4:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.requiresTypeRewriting():252 -> O
-    4:4:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1246 -> O
+    4:4:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1252 -> O
     5:5:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.requiresTypeRewriting():252:252 -> O
-    5:5:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1246 -> O
+    5:5:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1252 -> O
     6:6:com.android.tools.r8.ir.desugar.TypeRewriter com.android.tools.r8.ir.desugar.TypeRewriter.empty():18:18 -> O
-    6:6:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1248 -> O
-    7:7:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1247:1247 -> O
-    1:1:com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions getVerticalClassMergerOptions():1003:1003 -> P
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Cl0;"}
-    1:1:boolean hasMappingFileSupport():1169:1169 -> Q
-    1:1:boolean hasMethodsFilter():1521:1521 -> R
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():991:991 -> S
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$h;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():987:987 -> T
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$i;"}
-    1:1:boolean isGeneratingClassFiles():637:637 -> U
-    1:1:boolean isCfDesugaring():645 -> U
-    2:2:boolean isCfDesugaring():645:645 -> U
-    1:1:boolean isDesugaredLibraryCompilation():608:608 -> V
+    6:6:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1254 -> O
+    7:7:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():1253:1253 -> O
+    1:1:com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions getVerticalClassMergerOptions():1009:1009 -> P
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gl0;"}
+    1:1:boolean hasMappingFileSupport():1175:1175 -> Q
+    1:1:boolean hasMethodsFilter():1527:1527 -> R
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():997:997 -> S
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$h;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():993:993 -> T
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$i;"}
+    1:1:boolean isGeneratingClassFiles():636:636 -> U
+    1:1:boolean isCfDesugaring():644 -> U
+    2:2:boolean isCfDesugaring():644:644 -> U
+    1:1:boolean isDesugaredLibraryCompilation():607:607 -> V
     2:2:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification.isLibraryCompilation():71:71 -> V
-    2:2:boolean isDesugaredLibraryCompilation():608 -> V
+    2:2:boolean isDesugaredLibraryCompilation():607 -> V
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:boolean isDesugaring():641:641 -> W
-    1:1:boolean isForceProguardCompatibilityEnabled():810:810 -> X
-    1:1:boolean isGeneratingClassFiles():637:637 -> Y
-    1:1:boolean isGeneratingDexIndexed():629:629 -> Z
-    1:1:boolean isGeneratingDex():625 -> Z
-    2:2:boolean isGeneratingDexFilePerClassFile():633:633 -> Z
-    2:2:boolean isGeneratingDex():625 -> Z
-    1:1:boolean lambda$new$0(java.lang.String,java.lang.Long):430:430 -> a
-    2:3:void setMarker(com.android.tools.r8.dex.Marker):526:527 -> a
+    1:1:boolean isDesugaring():640:640 -> W
+    1:1:boolean isForceProguardCompatibilityEnabled():809:809 -> X
+    1:1:boolean isGeneratingClassFiles():636:636 -> Y
+    1:1:boolean isGeneratingDexIndexed():628:628 -> Z
+    1:1:boolean isGeneratingDex():624 -> Z
+    2:2:boolean isGeneratingDexFilePerClassFile():632:632 -> Z
+    2:2:boolean isGeneratingDex():624 -> Z
+    1:1:boolean lambda$new$0(java.lang.String,java.lang.Long):429:429 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):525:526 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/W;)V"}
-    4:4:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags):568:568 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wm;)V"}
-    5:8:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):882:885 -> a
+    4:4:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags):567:567 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ym;)V"}
+    5:8:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):888:891 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/shaking/M$a;)Z"}
-    9:9:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():1015:1015 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$a;"}
-    10:10:com.android.tools.r8.utils.Pair lambda$recordLibraryAndProgramDuplicate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):1122:1122 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/IV;"}
-    11:21:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1131:1141 -> a
+    9:9:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():1021:1021 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$a;"}
+    10:10:com.android.tools.r8.utils.Pair lambda$recordLibraryAndProgramDuplicate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):1128:1128 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/internal/MV;"}
+    11:21:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1137:1147 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    22:31:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1140:1149 -> a
+    22:31:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1146:1155 -> a
     32:32:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    32:32:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1149 -> a
+    32:32:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1150:1150 -> a
+    33:33:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1156:1156 -> a
     34:34:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    34:34:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1150 -> a
+    34:34:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1150:1150 -> a
-    36:36:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1146:1146 -> a
+    35:35:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1156:1156 -> a
+    36:36:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1152:1152 -> a
     37:37:void com.android.tools.r8.utils.Reporter.info(com.android.tools.r8.Diagnostic):93:93 -> a
-    37:37:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1146 -> a
-    38:40:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1151:1153 -> a
-    41:51:void configureDesugaredLibrary(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String):1195:1205 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tk;Ljava/lang/String;)V"}
-    52:52:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):1209:1209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tk;)V"}
-    53:57:void lambda$setDesugaredLibrarySpecification$2(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):1220:1224 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tk;Ljava/lang/String;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/x0;)V"}
-    58:63:void loadMachineDesugaredLibrarySpecification(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):1233:1238 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/graph/x0;)V"}
-    64:66:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1302:1304 -> a
+    37:37:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1152 -> a
+    38:40:void reportLibraryAndProgramDuplicates(com.android.tools.r8.graph.AppView):1157:1159 -> a
+    41:51:void configureDesugaredLibrary(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String):1201:1211 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vk;Ljava/lang/String;)V"}
+    52:52:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):1215:1215 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vk;)V"}
+    53:57:void lambda$setDesugaredLibrarySpecification$2(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):1226:1230 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vk;Ljava/lang/String;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/x0;)V"}
+    58:63:void loadMachineDesugaredLibrarySpecification(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):1239:1244 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/graph/x0;)V"}
+    64:66:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1308:1310 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Ljava/lang/String;"}
-    67:67:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1319:1319 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aQ;)Lcom/android/tools/r8/errors/IncompleteNestNestDesugarDiagnosic;"}
+    67:67:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1325:1325 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;)Lcom/android/tools/r8/errors/IncompleteNestNestDesugarDiagnosic;"}
     68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.nest.Nest.getHostClass():65:65 -> a
-    68:68:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1320 -> a
+    68:68:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     69:69:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():723:723 -> a
-    69:69:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1320 -> a
+    69:69:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    70:70:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1320:1320 -> a
-    71:79:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1404:1412 -> a
+    70:70:com.android.tools.r8.errors.IncompleteNestNestDesugarDiagnosic createIncompleteNestNestDesugarDiagnosic(com.android.tools.r8.ir.desugar.nest.Nest):1326:1326 -> a
+    71:79:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1410:1418 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Ljava/lang/String;Ljava/util/Set;)V"}
-    80:80:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1411:1411 -> a
-    81:81:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1405:1405 -> a
-    82:82:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$3(com.android.tools.r8.graph.DexMethod):1412:1412 -> a
+    80:80:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1417:1417 -> a
+    81:81:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1411:1411 -> a
+    82:82:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$3(com.android.tools.r8.graph.DexMethod):1418:1418 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/references/MethodReference;"}
-    83:86:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1417:1420 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/bb;)V"}
-    87:91:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1425:1429 -> a
+    83:86:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1423:1426 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/origin/Origin;Lcom/android/tools/r8/internal/db;)V"}
+    87:91:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1431:1435 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/origin/Origin;II)V"}
-    92:96:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1433:1437 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/yB;)V"}
+    92:96:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1439:1443 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/AB;)V"}
     97:97:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> a
-    97:97:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1438 -> a
+    97:97:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1444 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     98:98:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClassAndMember.getOrigin():74:74 -> a
-    98:98:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1438 -> a
-    99:101:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1438:1440 -> a
-    102:102:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1434:1434 -> a
-    103:103:java.util.List lambda$warningInvalidDebugInfo$6(com.android.tools.r8.origin.Origin):1438:1438 -> a
-    104:109:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1526:1531 -> a
+    98:98:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1444 -> a
+    99:101:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1444:1446 -> a
+    102:102:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.errors.InvalidDebugInfoException):1440:1440 -> a
+    103:103:java.util.List lambda$warningInvalidDebugInfo$6(com.android.tools.r8.origin.Origin):1444:1444 -> a
+    104:109:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1532:1537 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
-    110:113:boolean canHaveBugPresentUntilExclusive(com.android.tools.r8.utils.AndroidApiLevel):2522:2525 -> a
+    110:113:boolean canHaveBugPresentUntilExclusive(com.android.tools.r8.utils.AndroidApiLevel):2528:2531 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Z"}
-    114:114:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2496:2496 -> a
-    114:114:boolean canHaveBugPresentUntilExclusive(com.android.tools.r8.utils.AndroidApiLevel):2523 -> a
-    115:115:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2776:2776 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;)Lcom/android/tools/r8/internal/bb;"}
-    116:116:boolean isGeneratingClassFiles():637:637 -> a
-    116:116:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2776 -> a
-    117:117:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2776:2776 -> a
-    118:118:boolean isDesugaring():641:641 -> a
-    118:118:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2777 -> a
-    119:119:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2781:2781 -> a
+    114:114:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2502:2502 -> a
+    114:114:boolean canHaveBugPresentUntilExclusive(com.android.tools.r8.utils.AndroidApiLevel):2529 -> a
+    115:115:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2782:2782 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;)Lcom/android/tools/r8/internal/db;"}
+    116:116:boolean isGeneratingClassFiles():636:636 -> a
+    116:116:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2782 -> a
+    117:117:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2782:2782 -> a
+    118:118:boolean isDesugaring():640:640 -> a
+    118:118:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2783 -> a
+    119:119:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2787:2787 -> a
     120:120:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    120:120:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2782 -> a
-    1:1:boolean hasConsumer():572:572 -> a0
-    1:1:boolean isInterfaceMethodDesugaringEnabled():2729 -> a0
-    2:4:boolean isInterfaceMethodDesugaringEnabled():2732:2734 -> a0
-    1:2:void recordLibraryAndProgramDuplicate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass):1120:1121 -> b
+    120:120:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2788 -> a
+    1:1:boolean hasConsumer():571:571 -> a0
+    1:1:boolean isInterfaceMethodDesugaringEnabled():2735 -> a0
+    2:4:boolean isInterfaceMethodDesugaringEnabled():2738:2740 -> a0
+    1:2:void recordLibraryAndProgramDuplicate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass):1126:1127 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/q2;Lcom/android/tools/r8/graph/I2;)V"}
-    3:6:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String):1214:1217 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tk;Ljava/lang/String;)V"}
-    7:7:boolean assertionsEnabled():1278:1278 -> b
-    8:10:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1324:1326 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aQ;)Ljava/lang/String;"}
+    3:6:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.lang.String):1220:1223 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vk;Ljava/lang/String;)V"}
+    7:7:boolean assertionsEnabled():1284:1284 -> b
+    8:10:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1330:1332 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eQ;)Ljava/lang/String;"}
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.nest.Nest.getHostClass():65:65 -> b
-    11:11:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1327 -> b
+    11:11:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1333 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:14:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1329:1331 -> b
-    15:15:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1328:1328 -> b
+    12:14:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1335:1337 -> b
+    15:15:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1334:1334 -> b
     16:16:java.util.List com.android.tools.r8.ir.desugar.nest.Nest.getMembers():69:69 -> b
-    16:16:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1332 -> b
-    17:19:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1332:1334 -> b
-    20:26:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1333:1339 -> b
+    16:16:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1338 -> b
+    17:19:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1338:1340 -> b
+    20:26:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1339:1345 -> b
     27:27:boolean com.android.tools.r8.ir.desugar.nest.Nest.hasMissingMembers():81:81 -> b
-    27:27:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1340 -> b
-    28:28:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1341:1341 -> b
+    27:27:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1346 -> b
+    28:28:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1347:1347 -> b
     29:29:java.util.List com.android.tools.r8.ir.desugar.nest.Nest.getMissingMembers():73:73 -> b
-    29:29:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1342 -> b
-    30:45:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1342:1357 -> b
-    46:46:java.util.List lambda$warningInvalidParameterAnnotations$5(com.android.tools.r8.origin.Origin):1428:1428 -> b
-    47:52:boolean hasFeaturePresentFrom(com.android.tools.r8.utils.AndroidApiLevel):2506:2511 -> b
+    29:29:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1348 -> b
+    30:45:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1348:1363 -> b
+    46:46:java.util.List lambda$warningInvalidParameterAnnotations$5(com.android.tools.r8.origin.Origin):1434:1434 -> b
+    47:52:boolean hasFeaturePresentFrom(com.android.tools.r8.utils.AndroidApiLevel):2512:2517 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)Z"}
-    53:53:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2496:2496 -> b
-    53:53:boolean hasFeaturePresentFrom(com.android.tools.r8.utils.AndroidApiLevel):2507 -> b
-    1:2:boolean isMinifying():780:781 -> b0
-    3:5:boolean isMinifying():780:782 -> b0
-    1:2:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):761:762 -> c
+    53:53:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2502:2502 -> b
+    53:53:boolean hasFeaturePresentFrom(com.android.tools.r8.utils.AndroidApiLevel):2513 -> b
+    1:2:boolean isMinifying():779:780 -> b0
+    3:5:boolean isMinifying():779:781 -> b0
+    1:2:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):760:761 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/y2;)V"}
-    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():979:979 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$c;"}
-    4:4:java.util.List lambda$warningMissingEnclosingMember$4(com.android.tools.r8.origin.Origin):1419:1419 -> c
+    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():985:985 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$c;"}
+    4:4:java.util.List lambda$warningMissingEnclosingMember$4(com.android.tools.r8.origin.Origin):1425:1425 -> c
     1:1:boolean isOptimizedResourceShrinking():232:232 -> c0
-    1:1:boolean canHaveArtCheckCastVerifierBug():3092:3092 -> d
+    1:1:boolean canHaveArtCheckCastVerifierBug():3098:3098 -> d
     1:1:boolean hasProguardConfiguration():228:228 -> d0
-    1:1:boolean isOptimizing():766 -> d0
-    2:2:boolean isOptimizing():766:766 -> d0
-    1:1:boolean canHaveArtStringNewInitBug():2956:2956 -> e
-    1:3:boolean isRepackagingEnabled():802:804 -> e0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1562:1562 -> e0
-    4:4:boolean isRepackagingEnabled():804 -> e0
+    1:1:boolean isOptimizing():765 -> d0
+    2:2:boolean isOptimizing():765:765 -> d0
+    1:1:boolean canHaveArtStringNewInitBug():2962:2962 -> e
+    1:3:boolean isRepackagingEnabled():801:803 -> e0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1568:1568 -> e0
+    4:4:boolean isRepackagingEnabled():803 -> e0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1546:1546 -> e0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1562 -> e0
-    5:5:boolean isRepackagingEnabled():804 -> e0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1552:1552 -> e0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1568 -> e0
+    5:5:boolean isRepackagingEnabled():803 -> e0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    6:6:boolean isRepackagingEnabled():805:805 -> e0
-    7:7:boolean isForceProguardCompatibilityEnabled():810:810 -> e0
-    7:7:boolean isRepackagingEnabled():805 -> e0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():3130:3130 -> f
-    1:2:boolean isShrinking():774:775 -> f0
-    3:5:boolean isShrinking():774:776 -> f0
-    1:1:boolean canHaveIssueWithInlinedMonitors():3229:3229 -> g
-    1:2:boolean keepInnerClassStructure():899:900 -> g0
-    1:1:boolean canInitNewInstanceUsingSuperclassConstructor():3239:3239 -> h
-    1:1:com.android.tools.r8.utils.InternalOptions$MappingComposeOptions mappingComposeOptions():1019:1019 -> h0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$k;"}
-    1:1:com.android.tools.r8.utils.AndroidApiLevel defaultAndStaticInterfaceMethodsApiLevel():2621:2621 -> i
-    1:1:com.android.tools.r8.utils.AndroidApiLevel defaultInterfaceMethodsApiLevel():2625 -> i
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():2633 -> i
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():2633:2633 -> i
-    1:1:void prepareForReportingLibraryAndProgramDuplicates():1127:1127 -> i0
-    1:1:boolean canUseDexPc2PcAsDebugInformation():2692:2692 -> j
+    6:6:boolean isRepackagingEnabled():804:804 -> e0
+    7:7:boolean isForceProguardCompatibilityEnabled():809:809 -> e0
+    7:7:boolean isRepackagingEnabled():804 -> e0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():3136:3136 -> f
+    1:2:boolean isShrinking():773:774 -> f0
+    3:5:boolean isShrinking():773:775 -> f0
+    1:1:boolean canHaveIssueWithInlinedMonitors():3235:3235 -> g
+    1:2:boolean keepInnerClassStructure():905:906 -> g0
+    1:1:boolean canInitNewInstanceUsingSuperclassConstructor():3245:3245 -> h
+    1:1:com.android.tools.r8.utils.InternalOptions$MappingComposeOptions mappingComposeOptions():1025:1025 -> h0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$k;"}
+    1:1:com.android.tools.r8.utils.AndroidApiLevel defaultAndStaticInterfaceMethodsApiLevel():2627:2627 -> i
+    1:1:com.android.tools.r8.utils.AndroidApiLevel defaultInterfaceMethodsApiLevel():2631 -> i
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():2639 -> i
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():2639:2639 -> i
+    1:1:void prepareForReportingLibraryAndProgramDuplicates():1133:1133 -> i0
+    1:1:boolean canUseDexPc2PcAsDebugInformation():2698:2698 -> j
     2:2:boolean com.android.tools.r8.utils.InternalOptions$LineNumberOptimization.isOn():159:159 -> j
-    2:2:boolean canUseDexPc2PcAsDebugInformation():2692 -> j
-    1:32:boolean printWarnings():1446:1477 -> j0
+    2:2:boolean canUseDexPc2PcAsDebugInformation():2698 -> j
+    1:32:boolean printWarnings():1452:1483 -> j0
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
-    33:72:boolean printWarnings():1473:1512 -> j0
-    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():2709:2709 -> k
-    2:2:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2496:2496 -> k
-    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():2710 -> k
-    3:3:boolean allowDiscardingResidualDebugInfo():2699:2699 -> k
-    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():2711 -> k
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():1007:1007 -> k0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$o;"}
-    1:1:boolean canUseNestBasedAccess():2653:2653 -> l
-    1:1:com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions():975:975 -> l0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$p;"}
-    1:1:boolean canUseNotInstruction():2826:2826 -> m
-    1:1:boolean shouldDesugarRecords():689:689 -> m0
-    2:2:boolean canUseRecords():2657:2657 -> m0
-    2:2:boolean shouldDesugarRecords():689 -> m0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel privateInterfaceMethodsApiLevel():2637:2637 -> n
-    1:1:boolean canUsePrivateInterfaceMethods():2641 -> n
-    2:2:boolean canUsePrivateInterfaceMethods():2641:2641 -> n
-    1:1:boolean shouldDesugarVarHandle():701:701 -> n0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel varHandleApiLevel():2645:2645 -> n0
-    2:2:boolean canUseVarHandle():2649 -> n0
-    2:2:boolean shouldDesugarVarHandle():701 -> n0
-    3:3:boolean canUseVarHandle():2649:2649 -> n0
-    3:3:boolean shouldDesugarVarHandle():701 -> n0
-    4:4:boolean shouldDesugarVarHandle():701:701 -> n0
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2800:2800 -> o
-    1:1:boolean shouldRerunEnqueuer():621:621 -> o0
-    1:1:boolean canUseSpacesInSimpleName():2673:2673 -> p
+    33:72:boolean printWarnings():1479:1518 -> j0
+    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():2715:2715 -> k
+    2:2:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):2502:2502 -> k
+    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():2716 -> k
+    3:3:boolean allowDiscardingResidualDebugInfo():2705:2705 -> k
+    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():2717 -> k
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():1013:1013 -> k0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$o;"}
+    1:1:boolean canUseNestBasedAccess():2659:2659 -> l
+    1:1:com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions rewriteArrayOptions():981:981 -> l0
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$p;"}
+    1:1:boolean canUseNotInstruction():2832:2832 -> m
+    1:1:boolean shouldDesugarRecords():688:688 -> m0
+    2:2:boolean canUseRecords():2663:2663 -> m0
+    2:2:boolean shouldDesugarRecords():688 -> m0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel privateInterfaceMethodsApiLevel():2643:2643 -> n
+    1:1:boolean canUsePrivateInterfaceMethods():2647 -> n
+    2:2:boolean canUsePrivateInterfaceMethods():2647:2647 -> n
+    1:1:boolean shouldDesugarVarHandle():700:700 -> n0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel varHandleApiLevel():2651:2651 -> n0
+    2:2:boolean canUseVarHandle():2655 -> n0
+    2:2:boolean shouldDesugarVarHandle():700 -> n0
+    3:3:boolean canUseVarHandle():2655:2655 -> n0
+    3:3:boolean shouldDesugarVarHandle():700 -> n0
+    4:4:boolean shouldDesugarVarHandle():700:700 -> n0
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2806:2806 -> o
+    1:1:boolean shouldRerunEnqueuer():620:620 -> o0
+    1:1:boolean canUseSpacesInSimpleName():2679:2679 -> p
     2:2:boolean com.android.tools.r8.graph.DexItemFactory.getSkipNameValidationForTesting():1127:1127 -> p
-    2:2:boolean canUseSpacesInSimpleName():2673 -> p
+    2:2:boolean canUseSpacesInSimpleName():2679 -> p
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean canUseSpacesInSimpleName():2673:2674 -> p
-    1:7:void signalFinishedToConsumers():661:667 -> p0
+    3:4:boolean canUseSpacesInSimpleName():2679:2680 -> p
+    1:7:void signalFinishedToConsumers():660:666 -> p0
     8:8:java.util.List com.android.tools.r8.features.FeatureSplitConfiguration.getFeatureSplits():74:74 -> p0
-    8:8:void signalFinishedToConsumers():668 -> p0
+    8:8:void signalFinishedToConsumers():667 -> p0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:21:void signalFinishedToConsumers():668:680 -> p0
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():983:983 -> q
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$e;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():1023:1023 -> r
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$f;"}
+    9:21:void signalFinishedToConsumers():667:679 -> p0
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():989:989 -> q
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$e;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():1029:1029 -> r
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$f;"}
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():187:187 -> s
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/B1;"}
-    1:12:void disableGlobalOptimizations():340:351 -> t
-    1:1:void disableNameReflectionOptimization():2492:2492 -> u
-    1:1:com.android.tools.r8.optimize.accessmodification.AccessModifierOptions getAccessModifierOptions():1027:1027 -> v
+    1:12:void disableGlobalOptimizations():339:350 -> t
+    1:1:void disableNameReflectionOptimization():2498:2498 -> u
+    1:1:com.android.tools.r8.optimize.accessmodification.AccessModifierOptions getAccessModifierOptions():1033:1033 -> v
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/R1;"}
-    1:1:com.android.tools.r8.profile.art.ArtProfileOptions getArtProfileOptions():1047:1047 -> w
+    1:1:com.android.tools.r8.profile.art.ArtProfileOptions getArtProfileOptions():1053:1053 -> w
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/n4;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions getCfCodeAnalysisOptions():1031:1031 -> x
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/gB$d;"}
-    1:1:com.android.tools.r8.ClassFileConsumer getClassFileConsumer():657:657 -> y
-    1:1:com.android.tools.r8.DexIndexedConsumer getDexIndexedConsumer():649:649 -> z
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.fB:
+    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions getCfCodeAnalysisOptions():1037:1037 -> x
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/iB$d;"}
+    1:1:com.android.tools.r8.ClassFileConsumer getClassFileConsumer():656:656 -> y
+    1:1:com.android.tools.r8.DexIndexedConsumer getDexIndexedConsumer():648:648 -> z
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.hB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
     1:1:com.android.tools.r8.utils.OffOrAuto[] com.android.tools.r8.utils.OffOrAuto.values():7:7 -> <clinit>
-    1:1:void <clinit>():2682 -> <clinit>
-    2:2:void <clinit>():2682:2682 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.gB$a:
+    1:1:void <clinit>():2688 -> <clinit>
+    2:2:void <clinit>():2688:2688 -> <clinit>
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.iB$a:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enableLibraryApiModeling -> a
     java.lang.String androidApiExtensionPackages -> b
@@ -296399,85 +295724,85 @@
     java.util.Map fieldApiMapping -> i
     java.util.Map classApiMapping -> j
     java.util.function.BiConsumer tracedMethodApiLevelCallback -> k
-    1:39:void <init>():2015:2053 -> <init>
-    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):2057:2068 -> a
+    1:39:void <init>():2021:2059 -> <init>
+    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):2063:2074 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Ljava/util/function/BiConsumer;)V"}
-    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):2062:2062 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):2068:2068 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/internal/y2;)V"}
-    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):2066:2066 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):2072:2072 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/references/FieldReference;Lcom/android/tools/r8/internal/y2;)V"}
-    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):2070:2070 -> a
+    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):2076:2076 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/references/MethodReference;Lcom/android/tools/r8/internal/y2;)V"}
-    16:16:void disableApiCallerIdentification():2104:2104 -> a
-    1:5:void disableApiModeling():2087:2091 -> b
-    1:2:void disableOutliningAndStubbing():2099:2100 -> c
-    1:1:boolean isApiCallerIdentificationEnabled():2083:2083 -> d
-com.android.tools.r8.utils.InternalOptions$ApplyInliningToInlineePredicate -> com.android.tools.r8.internal.gB$b:
+    16:16:void disableApiCallerIdentification():2110:2110 -> a
+    1:5:void disableApiModeling():2093:2097 -> b
+    1:2:void disableOutliningAndStubbing():2105:2106 -> c
+    1:1:boolean isApiCallerIdentificationEnabled():2089:2089 -> d
+com.android.tools.r8.utils.InternalOptions$ApplyInliningToInlineePredicate -> com.android.tools.r8.internal.iB$b:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean test(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;I)Z"}
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.gB$c:
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.iB$c:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enabled -> a
     boolean enableMethodStaticizing -> b
     boolean forceSyntheticsForInstanceInitializers -> c
     com.android.tools.r8.utils.InternalOptions this$0 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1653:1653 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1653:1658 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-    1:1:void disableOptimization():1661:1661 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1699:1699 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/gB$c;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1685:1685 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/gB$c;"}
-    2:5:boolean isEnabled():1669:1672 -> b
-    2:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1685 -> b
-    6:8:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1685:1687 -> b
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1694:1694 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/gB$c;"}
-com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions -> com.android.tools.r8.internal.gB$d:
+    1:1:void <clinit>():1659:1659 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1659:1664 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+    1:1:void disableOptimization():1667:1667 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1705:1705 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/iB$c;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1691:1691 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/iB$c;"}
+    2:5:boolean isEnabled():1675:1678 -> b
+    2:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1691 -> b
+    6:8:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1691:1693 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1700:1700 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/iB$c;"}
+com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions -> com.android.tools.r8.internal.iB$d:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean allowUnreachableCfBlocks -> a
     boolean enableUnverifiableCodeReporting -> b
-    1:4:void <init>():1704:1707 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions setAllowUnreachableCfBlocks(boolean):1718:1718 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/gB$d;"}
-    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions setEnableUnverifiableCodeReporting(boolean):1724:1724 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/gB$d;"}
-com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.gB$e:
+    1:4:void <init>():1710:1713 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions setAllowUnreachableCfBlocks(boolean):1724:1724 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/iB$d;"}
+    1:1:com.android.tools.r8.utils.InternalOptions$CfCodeAnalysisOptions setEnableUnverifiableCodeReporting(boolean):1730:1730 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/iB$d;"}
+com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.iB$e:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     int classInliningInstructionAllowance -> a
     com.android.tools.r8.utils.InternalOptions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1729:1729 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1729:1731 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.gB$f:
+    1:1:void <clinit>():1735:1735 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1735:1737 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.iB$f:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1581:1595 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.gB$g:
+    1:15:void <init>():1587:1601 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.iB$g:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$g;"}
     com.android.tools.r8.utils.InternalOptions$DesugarState[] $VALUES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/gB$g;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/iB$g;"}
     1:2:void <clinit>():164:165 -> <clinit>
     3:3:void <clinit>():163:163 -> <clinit>
     1:1:void <init>(java.lang.String,int):163:163 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:boolean isOn():172:172 -> a
     1:1:com.android.tools.r8.utils.InternalOptions$DesugarState[] values():163:163 -> values
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/gB$g;"}
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.gB$h:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/iB$g;"}
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.iB$h:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enable -> a
     boolean enableClassInitializerDeadlockDetection -> b
@@ -296486,24 +295811,24 @@
     boolean enableSyntheticMerging -> e
     boolean restrictToSynthetics -> f
     com.android.tools.r8.utils.InternalOptions this$0 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
-    1:11:void <init>(com.android.tools.r8.utils.InternalOptions):1831:1841 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-    1:1:void disable():1844:1844 -> a
-    2:2:void enableIf(boolean):1856:1856 -> a
-    3:7:boolean isEnabled(com.android.tools.r8.graph.AppView$WholeProgramOptimizations):1876:1880 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
+    1:11:void <init>(com.android.tools.r8.utils.InternalOptions):1837:1847 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+    1:1:void disable():1850:1850 -> a
+    2:2:void enableIf(boolean):1862:1862 -> a
+    3:7:boolean isEnabled(com.android.tools.r8.graph.AppView$WholeProgramOptimizations):1882:1886 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Z"}
-    8:8:boolean isEnabled(com.android.tools.r8.graph.AppView$WholeProgramOptimizations):1879:1879 -> a
-    1:1:void disableSyntheticMerging():1848:1848 -> b
-    2:2:void setEnableInterfaceMerging(boolean):1912:1912 -> b
-    1:1:void enable():1852:1852 -> c
-    2:2:void setEnableSameFilePolicy(boolean):1916:1916 -> c
-    1:1:int getMaxClassGroupSizeInR8():1860:1860 -> d
-    1:1:boolean isRestrictedToSynthetics():1900:1900 -> e
-    1:1:void setEnableClassInitializerDeadlockDetection():1904:1904 -> f
-    1:1:void setEnableInterfaceMerging():1908:1908 -> g
-    1:1:void setRestrictToSynthetics():1920:1920 -> h
-com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.gB$i:
+    8:8:boolean isEnabled(com.android.tools.r8.graph.AppView$WholeProgramOptimizations):1885:1885 -> a
+    1:1:void disableSyntheticMerging():1854:1854 -> b
+    2:2:void setEnableInterfaceMerging(boolean):1918:1918 -> b
+    1:1:void enable():1858:1858 -> c
+    2:2:void setEnableSameFilePolicy(boolean):1922:1922 -> c
+    1:1:int getMaxClassGroupSizeInR8():1866:1866 -> d
+    1:1:boolean isRestrictedToSynthetics():1906:1906 -> e
+    1:1:void setEnableClassInitializerDeadlockDetection():1910:1910 -> f
+    1:1:void setEnableInterfaceMerging():1914:1914 -> g
+    1:1:void setRestrictToSynthetics():1926:1926 -> h
+com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.iB$i:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enableConstructorInlining -> a
     boolean enableInlining -> b
@@ -296517,140 +295842,140 @@
     boolean enableInliningOfInvokesWithNullableReceivers -> j
     boolean disableInliningOfLibraryMethodOverrides -> k
     com.android.tools.r8.utils.InternalOptions$ApplyInliningToInlineePredicate applyInliningToInlineePredicateForTesting -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$b;"}
     com.android.tools.r8.utils.InternalOptions options -> m
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):1787:1787 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-    2:4:void <init>(com.android.tools.r8.utils.InternalOptions):1752:1754 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):1793:1793 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+    2:4:void <init>(com.android.tools.r8.utils.InternalOptions):1758:1760 -> <init>
     5:5:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):68:68 -> <init>
-    5:5:void <init>(com.android.tools.r8.utils.InternalOptions):1755 -> <init>
+    5:5:void <init>(com.android.tools.r8.utils.InternalOptions):1761 -> <init>
     6:6:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):67:67 -> <init>
-    6:6:void <init>(com.android.tools.r8.utils.InternalOptions):1755 -> <init>
-    7:10:void <init>(com.android.tools.r8.utils.InternalOptions):1755:1758 -> <init>
+    6:6:void <init>(com.android.tools.r8.utils.InternalOptions):1761 -> <init>
+    7:10:void <init>(com.android.tools.r8.utils.InternalOptions):1761:1764 -> <init>
     11:12:int com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):93:94 -> <init>
-    11:12:void <init>(com.android.tools.r8.utils.InternalOptions):1759 -> <init>
-    13:42:void <init>(com.android.tools.r8.utils.InternalOptions):1759:1788 -> <init>
-    1:1:void disableInlining(com.android.tools.r8.utils.InternalOptions):1792:1792 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-    2:2:void setEnableConstructorInlining(boolean):1816:1816 -> a
-    1:1:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1796:1796 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+    11:12:void <init>(com.android.tools.r8.utils.InternalOptions):1765 -> <init>
+    13:42:void <init>(com.android.tools.r8.utils.InternalOptions):1765:1794 -> <init>
+    1:1:void disableInlining(com.android.tools.r8.utils.InternalOptions):1798:1798 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+    2:2:void setEnableConstructorInlining(boolean):1822:1822 -> a
+    1:1:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1802:1802 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():82:82 -> b
-    2:2:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1796 -> b
-    3:3:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1796:1796 -> b
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.hB:
+    2:2:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1802 -> b
+    3:3:void setOnlyForceInlining(com.android.tools.r8.utils.InternalOptions):1802:1802 -> b
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.jB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     com.android.tools.r8.graph.DexMethod method -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     int expectedParameterCount -> b
     int actualParameterCount -> c
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):1090:1093 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):1096:1099 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/graph/w2;)V"}
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.kB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1574:1576 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.gB$j:
+    1:3:void <init>():1580:1582 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.iB$j:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$j;"}
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$j;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$j;"}
     1:2:void <clinit>():151:152 -> <clinit>
     1:1:void <init>(java.lang.String,int):150:150 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.utils.InternalOptions$MappingComposeOptions -> com.android.tools.r8.internal.gB$k:
+com.android.tools.r8.utils.InternalOptions$MappingComposeOptions -> com.android.tools.r8.internal.iB$k:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enableExperimentalMappingComposition -> a
     boolean allowEmptyMappedRanges -> b
     boolean allowNonExistingOriginalRanges -> c
-    1:4:void <init>():2003:2006 -> <init>
+    1:4:void <init>():2009:2012 -> <init>
     5:5:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):68:68 -> <init>
-    5:5:void <init>():2007 -> <init>
+    5:5:void <init>():2013 -> <init>
     6:6:boolean com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):67:67 -> <init>
-    6:6:void <init>():2007 -> <init>
-    7:11:void <init>():2007:2011 -> <init>
-com.android.tools.r8.utils.InternalOptions$NeverMergeGroup -> com.android.tools.r8.internal.jB:
+    6:6:void <init>():2013 -> <init>
+    7:11:void <init>():2013:2017 -> <init>
+com.android.tools.r8.utils.InternalOptions$NeverMergeGroup -> com.android.tools.r8.internal.lB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     java.util.List prefixes -> a
     java.util.List exceptionPrefixes -> b
-    1:3:void <init>(java.util.List,java.util.List):381:383 -> <init>
-    1:3:com.android.tools.r8.utils.InternalOptions$NeverMergeGroup map(java.util.function.Function):395:397 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/jB;"}
-com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions -> com.android.tools.r8.internal.gB$l:
+    1:3:void <init>(java.util.List,java.util.List):380:382 -> <init>
+    1:3:com.android.tools.r8.utils.InternalOptions$NeverMergeGroup map(java.util.function.Function):394:396 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/lB;"}
+com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions -> com.android.tools.r8.internal.iB$l:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean allowOpenInterfaces -> a
     java.util.List suppressions -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1924:1924 -> <clinit>
-    1:16:void <init>():1924:1939 -> <init>
-    1:1:void disallowOpenInterfaces():1942:1942 -> a
-    2:3:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions suppressSingleOpenInterface(com.android.tools.r8.references.ClassReference):1946:1947 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/gB$l;"}
-    4:4:boolean lambda$suppressSingleOpenInterface$0(com.android.tools.r8.references.ClassReference,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1949:1949 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-    5:7:boolean isSuppressed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1997:1999 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-    8:8:boolean lambda$isSuppressed$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression):1999:1999 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/kB;)Z"}
-    1:2:void suppressAllOpenInterfaces():1954:1955 -> b
-    3:3:boolean lambda$suppressAllOpenInterfaces$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1955:1955 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-    1:2:void suppressAllOpenInterfacesDueToMissingClasses():1959:1960 -> c
-    3:3:boolean lambda$suppressAllOpenInterfacesDueToMissingClasses$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1961:1961 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-    1:2:void suppressZipFileAssignmentsToJavaLangAutoCloseable():1973:1974 -> d
-    3:9:boolean lambda$suppressZipFileAssignmentsToJavaLangAutoCloseable$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1976:1982 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression -> com.android.tools.r8.internal.kB:
+    1:1:void <clinit>():1930:1930 -> <clinit>
+    1:16:void <init>():1930:1945 -> <init>
+    1:1:void disallowOpenInterfaces():1948:1948 -> a
+    2:3:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions suppressSingleOpenInterface(com.android.tools.r8.references.ClassReference):1952:1953 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;)Lcom/android/tools/r8/internal/iB$l;"}
+    4:4:boolean lambda$suppressSingleOpenInterface$0(com.android.tools.r8.references.ClassReference,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1955:1955 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/references/ClassReference;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+    5:7:boolean isSuppressed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):2003:2005 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+    8:8:boolean lambda$isSuppressed$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression):2005:2005 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;Lcom/android/tools/r8/internal/mB;)Z"}
+    1:2:void suppressAllOpenInterfaces():1960:1961 -> b
+    3:3:boolean lambda$suppressAllOpenInterfaces$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1961:1961 -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+    1:2:void suppressAllOpenInterfacesDueToMissingClasses():1965:1966 -> c
+    3:3:boolean lambda$suppressAllOpenInterfacesDueToMissingClasses$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1967:1967 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+    1:2:void suppressZipFileAssignmentsToJavaLangAutoCloseable():1979:1980 -> d
+    3:9:boolean lambda$suppressZipFileAssignmentsToJavaLangAutoCloseable$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1982:1988 -> d
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression -> com.android.tools.r8.internal.mB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean isSuppressed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Wi0;Lcom/android/tools/r8/graph/E0;)Z"}
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.gB$m:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/aj0;Lcom/android/tools/r8/graph/E0;)Z"}
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.iB$m:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
     int threshold -> d
-    1:5:void <init>():1566:1570 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.gB$n:
+    1:5:void <init>():1572:1576 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.iB$n:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$n;"}
-    1:8:void <clinit>():1536:1543 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1534:1534 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$n;"}
+    1:8:void <clinit>():1542:1549 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1540:1540 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-    1:1:boolean isFlattenPackageHierarchy():1550:1550 -> a
-    1:1:boolean isMinification():1558:1558 -> b
-    1:1:boolean isRepackageClasses():1554:1554 -> c
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.gB$o:
+    1:1:boolean isFlattenPackageHierarchy():1556:1556 -> a
+    1:1:boolean isMinification():1564:1564 -> b
+    1:1:boolean isRepackageClasses():1560:1560 -> c
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.iB$o:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
     boolean enableEnumLiteProtoShrinking -> e
-    1:7:void <init>():2112:2118 -> <init>
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():2144:2144 -> a
-    1:1:boolean isProtoShrinkingEnabled():2136:2136 -> b
-com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions -> com.android.tools.r8.internal.gB$p:
+    1:7:void <init>():2118:2124 -> <init>
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():2150:2150 -> a
+    1:1:boolean isProtoShrinkingEnabled():2142:2142 -> b
+com.android.tools.r8.utils.InternalOptions$RewriteArrayOptions -> com.android.tools.r8.internal.iB$p:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     int maxMaterializingConstants -> a
     com.android.tools.r8.utils.InternalOptions this$0 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1598:1598 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.utils.InternalOptions):1598:1606 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.gB$q:
+    1:1:void <clinit>():1604:1604 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.utils.InternalOptions):1604:1612 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.iB$q:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     java.util.function.Function repackagingConfigurationFactory -> A
     boolean forceIRForCfToCfDesugar -> A0
@@ -296659,7 +295984,7 @@
     java.util.function.Function horizontalClassMergingPolicyRewriter -> C
     boolean allowInvalidCfAccessFlags -> C0
     com.android.tools.r8.utils.TriFunction horizontalClassMergingTarget -> D
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Oh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sh0;"}
     boolean verifyInputs -> D0
     java.util.function.BiConsumer namingLensConsumer -> E
     boolean checkForNotExpandingMainDexTracingResult -> E0
@@ -296695,14 +296020,14 @@
     int limitNumberOfClassesPerDex -> T0
     boolean enableBridgeHoistingToSharedSyntheticSuperclass -> U
     com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> U0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$q$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$q$a;"}
     boolean enableCheckCastAndInstanceOfRemoval -> V
     java.lang.Runnable hookInIrConversion -> V0
     boolean enableDeadSwitchCaseElimination -> W
     boolean measureProguardIfRuleEvaluations -> W0
     boolean enableEnqueuerDeferredTracingForReferenceFields -> X
     com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> X0
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB$q$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB$q$b;"}
     boolean enableInvokeSuperToInvokeVirtualRewriting -> Y
     java.util.function.Consumer callSiteOptimizationInfoInspector -> Y0
     boolean enableLegacyClassDefOrdering -> Z
@@ -296735,7 +296060,7 @@
     boolean hasReadCheckDeterminism -> k
     boolean forcePcBasedEncoding -> k0
     com.android.tools.r8.utils.DeterminismChecker determinismChecker -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/il;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kl;"}
     int pcBasedDebugEncodingOverheadThreshold -> l0
     boolean usePcEncodingInCfForTesting -> m
     java.util.Set validInliningReasons -> m0
@@ -296759,7 +296084,7 @@
     byte[] forceDexVersionBytes -> v
     boolean trackDesugaredAPIConversions -> v0
     com.android.tools.r8.utils.IROrdering irOrdering -> w
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nt;"}
     boolean enumUnboxingRewriteJavaCGeneratedMethod -> w0
     java.util.function.BiFunction mixedSectionLayoutStrategyInspector -> x
     boolean assertConsistentRenamingOfSignature -> x0
@@ -296767,67 +296092,67 @@
     boolean allowStaticInterfaceMethodsForPreNApiLevel -> y0
     java.util.function.Consumer processingContextsConsumer -> z
     int verificationSizeLimitInBytesOverride -> z0
-    1:1:void <clinit>():2168:2168 -> <clinit>
-    1:80:void <init>():2168:2247 -> <init>
+    1:1:void <clinit>():2174:2174 -> <clinit>
+    1:80:void <init>():2174:2253 -> <init>
     81:81:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer.emptyConsumer():12:12 -> <init>
-    81:81:void <init>():2283 -> <init>
-    82:278:void <init>():2283:2479 -> <init>
-    1:1:boolean canUseLir(com.android.tools.r8.graph.AppView):2182:2182 -> a
+    81:81:void <init>():2289 -> <init>
+    82:278:void <init>():2289:2485 -> <init>
+    1:1:boolean canUseLir(com.android.tools.r8.graph.AppView):2188:2188 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Z"}
-    2:3:void exitLirSupportedPhase():2201:2202 -> a
-    4:11:com.android.tools.r8.utils.DeterminismChecker getDeterminismChecker():2251:2258 -> a
-    4:11:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):2274 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;)V"}
-    12:12:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):2276:2276 -> a
-    13:13:void setDeterminismChecker(com.android.tools.r8.utils.DeterminismChecker):2262:2262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/il;)V"}
-    14:14:com.android.tools.r8.dex.MixedSectionLayoutStrategy lambda$new$0(com.android.tools.r8.dex.MixedSectionLayoutStrategy,com.android.tools.r8.dex.VirtualFile):2296:2296 -> a
+    2:3:void exitLirSupportedPhase():2207:2208 -> a
+    4:11:com.android.tools.r8.utils.DeterminismChecker getDeterminismChecker():2257:2264 -> a
+    4:11:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):2280 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)V"}
+    12:12:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):2282:2282 -> a
+    13:13:void setDeterminismChecker(com.android.tools.r8.utils.DeterminismChecker):2268:2268 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kl;)V"}
+    14:14:com.android.tools.r8.dex.MixedSectionLayoutStrategy lambda$new$0(com.android.tools.r8.dex.MixedSectionLayoutStrategy,com.android.tools.r8.dex.VirtualFile):2302:2302 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/Y;Lcom/android/tools/r8/dex/t0;)Lcom/android/tools/r8/dex/Y;"}
-    15:15:void setMixedSectionLayoutStrategyInspector(java.util.function.BiFunction):2301:2301 -> a
-    16:16:com.android.tools.r8.graph.DexProgramClass lambda$new$1(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):2316:2316 -> a
+    15:15:void setMixedSectionLayoutStrategyInspector(java.util.function.BiFunction):2307:2307 -> a
+    16:16:com.android.tools.r8.graph.DexProgramClass lambda$new$1(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):2322:2322 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/lang/Iterable;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/D2;"}
-    17:17:void lambda$new$2(java.util.Deque):2330:2330 -> a
-    1:1:boolean isKeepAnnotationsEnabled():2175:2175 -> b
-    2:9:com.android.tools.r8.utils.DeterminismChecker getDeterminismChecker():2251:2258 -> b
-    2:9:void checkDeterminism(com.android.tools.r8.graph.AppView):2266 -> b
+    17:17:void lambda$new$2(java.util.Deque):2336:2336 -> a
+    1:1:boolean isKeepAnnotationsEnabled():2181:2181 -> b
+    2:9:com.android.tools.r8.utils.DeterminismChecker getDeterminismChecker():2257:2264 -> b
+    2:9:void checkDeterminism(com.android.tools.r8.graph.AppView):2272 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
-    10:10:void checkDeterminism(com.android.tools.r8.graph.AppView):2268:2268 -> b
-    1:1:boolean isPreLirPhase():2211:2211 -> c
-    1:1:boolean isSupportedLirPhase():2215:2215 -> d
-    1:2:void skipLirPhasesForTestingFinalOutput():2206:2207 -> e
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.gB$q$a:
+    10:10:void checkDeterminism(com.android.tools.r8.graph.AppView):2274:2274 -> b
+    1:1:boolean isPreLirPhase():2217:2217 -> c
+    1:1:boolean isSupportedLirPhase():2221:2221 -> d
+    1:2:void skipLirPhasesForTestingFinalOutput():2212:2213 -> e
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.iB$q$a:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():2449:2451 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):2455:2456 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod):2456:2456 -> a
+    1:3:void <init>():2455:2457 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):2461:2462 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod):2462:2462 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;Lcom/android/tools/r8/graph/H0;)I"}
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.gB$q$b:
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.iB$q$b:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     int numberOfProguardIfRuleClassEvaluations -> a
     int numberOfProguardIfRuleMemberEvaluations -> b
-    1:4:void <init>():2466:2469 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.lB:
+    1:4:void <init>():2472:2475 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.nB:
 # {"id":"sourceFile","fileName":"InternalOptions.java"}
     com.android.tools.r8.cf.CfVersion version -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bb;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/db;"}
     com.android.tools.r8.graph.DexType type -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
-    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):1102:1104 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bb;Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.mB:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):1108:1110 -> <init>
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/db;Lcom/android/tools/r8/graph/I2;)V"}
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.oB:
 # {"id":"sourceFile","fileName":"InternalOutputMode.java"}
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/mB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/oB;"}
     1:3:void <clinit>():8:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:boolean isGeneratingClassFiles():13:13 -> a
-com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.hC:
 # {"id":"sourceFile","fileName":"IterableUtils.java"}
     1:7:boolean allIdentical(java.lang.Iterable,java.util.function.Function):27:33 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;Ljava/util/function/Function;)Z"}
@@ -296837,14 +296162,14 @@
     15:15:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):106:106 -> a
     16:16:int size(java.lang.Iterable):126:126 -> a
     17:17:java.lang.Iterable flatten(java.lang.Iterable):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lu;)Ljava/lang/Iterable;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nu;)Ljava/lang/Iterable;"}
     18:18:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):177:177 -> a
     19:19:com.android.tools.r8.com.google.common.collect.FluentIterable com.android.tools.r8.com.google.common.collect.FluentIterable.concat(java.lang.Iterable):276:276 -> a
     19:19:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable):503 -> a
     19:19:java.lang.Iterable flatMap(java.lang.Iterable,java.util.function.Function):177 -> a
     20:20:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
     20:20:boolean testPairs(java.util.function.BiPredicate,java.lang.Iterable,java.lang.Iterable):198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiPredicate;Lcom/android/tools/r8/internal/hC;Lcom/android/tools/r8/internal/hC;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiPredicate;Lcom/android/tools/r8/internal/jC;Lcom/android/tools/r8/internal/jC;)Z"}
     21:21:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
     21:21:boolean testPairs(java.util.function.BiPredicate,java.lang.Iterable,java.lang.Iterable):199 -> a
     22:22:boolean com.android.tools.r8.com.google.common.collect.TransformedIterator.hasNext():46:46 -> a
@@ -296865,33 +296190,33 @@
     3:4:java.util.List toNewArrayList(java.lang.Iterable):133:134 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Ljava/util/ArrayList;"}
     5:5:java.lang.Iterable transform(java.lang.Iterable,java.util.function.Function):139:139 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/hC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/jC;"}
     6:6:java.lang.Iterable singleton(java.lang.Object):147:147 -> b
     1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):95:96 -> c
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):106:106 -> d
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):53:53 -> d
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):106 -> d
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.oC:
 # {"id":"sourceFile","fileName":"IteratorUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:3:int countRemaining(java.util.Iterator):42:44 -> a
     4:4:void lambda$countRemaining$0(com.android.tools.r8.utils.IntBox,java.lang.Object):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Ljava/lang/Object;)V"}
     5:7:java.lang.Object nextUntil(java.util.Iterator,java.util.function.Predicate):86:88 -> a
     8:11:java.lang.Object peekNext(java.util.ListIterator):114:117 -> a
     12:18:java.lang.Object previousUntil(java.util.ListIterator,java.util.function.Predicate):124:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K5;Ljava/util/function/Predicate;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M5;Ljava/util/function/Predicate;)Ljava/lang/Object;"}
     19:23:void skip(com.android.tools.r8.ir.code.InstructionIterator,int):179:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lw;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nw;I)V"}
     1:1:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasPrevious():53:53 -> b
     1:1:java.lang.Object previousUntilUnsafe(java.util.ListIterator,java.util.function.Predicate):134 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/K5;Ljava/util/function/Predicate;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M5;Ljava/util/function/Predicate;)Ljava/lang/Object;"}
     2:3:java.lang.Object previousUntilUnsafe(java.util.ListIterator,java.util.function.Predicate):135:136 -> b
     4:7:java.lang.Object peekPrevious(java.util.ListIterator):100:103 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> R8$$REMOVED$$CLASS$$240:
+com.android.tools.r8.utils.IteratorUtils$1 -> R8$$REMOVED$$CLASS$$229:
 # {"id":"sourceFile","fileName":"IteratorUtils.java"}
-com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.nC:
 # {"id":"sourceFile","fileName":"IteratorUtils.java"}
     java.lang.Object next -> b
     java.util.Iterator val$iterator -> c
@@ -296906,7 +296231,7 @@
     2:4:java.lang.Object next():79 -> next
     5:5:java.lang.Object next():79:79 -> next
     6:6:java.lang.Object next():77:77 -> next
-com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.QC:
 # {"id":"sourceFile","fileName":"JoiningStringConsumer.java"}
     java.lang.String separator -> b
     com.android.tools.r8.StringConsumer consumer -> c
@@ -296917,7 +296242,7 @@
     1:1:com.android.tools.r8.StringConsumer getConsumer():42:42 -> a
     1:4:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:32 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):37:38 -> finished
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.DI:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.HI:
 # {"id":"sourceFile","fileName":"LRUCacheTable.java"}
     int rowCapacity -> b
     int columnCapacity -> c
@@ -296925,20 +296250,20 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/internal/xA;Lcom/android/tools/r8/internal/xA;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/internal/zA;Lcom/android/tools/r8/internal/zA;)V"}
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.CI:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.GI:
 # {"id":"sourceFile","fileName":"LRUCacheTable.java"}
     int columnCapacity -> b
     1:2:void <init>(int,float):17:18 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.ZI:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.dJ:
 # {"id":"sourceFile","fileName":"LazyBox.java"}
     java.util.function.Supplier supplier -> b
     1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
     1:1:java.lang.Object computeIfAbsent():18:18 -> c
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.iJ:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.mJ:
 # {"id":"sourceFile","fileName":"LebUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
@@ -296954,12 +296279,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/y;I)V"}
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.yJ:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.CJ:
 # {"id":"sourceFile","fileName":"LensUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:39:java.util.Map mutableRewriteMap(java.util.Map,java.util.function.IntFunction,java.util.function.BiFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction):46:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/Oh0;Lcom/android/tools/r8/internal/Oh0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/Sh0;Lcom/android/tools/r8/internal/Sh0;)Ljava/util/Map;"}
     40:48:java.util.Map mutableRewriteMap(java.util.Map,java.util.function.IntFunction,java.util.function.BiFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction):81:89 -> a
     49:49:java.util.Map com.android.tools.r8.utils.MapUtils.trimCapacityIfSizeLessThan(java.util.Map,java.util.function.IntFunction,int):159:159 -> a
     49:49:java.util.Map mutableRewriteMap(java.util.Map,java.util.function.IntFunction,java.util.function.BiFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.utils.TriFunction):89 -> a
@@ -296972,15 +296297,15 @@
     56:56:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.lens.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):557:557 -> a
     56:56:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/F2;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/F2;Ljava/util/function/Consumer;)V"}
     57:57:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):115:115 -> a
     58:58:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     58:58:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):115 -> a
     59:62:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):115:118 -> a
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.zJ:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.DJ:
 # {"id":"sourceFile","fileName":"LibraryClassCollection.java"}
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):13:13 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gd;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/id;)V"}
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):11:11 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;)Ljava/util/function/Supplier;"}
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):11:11 -> a
@@ -296988,10 +296313,10 @@
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():32:32 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V;"}
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.utils.LinkedHashSetUtils -> com.android.tools.r8.internal.PJ:
+com.android.tools.r8.utils.LinkedHashSetUtils -> com.android.tools.r8.internal.TJ:
 # {"id":"sourceFile","fileName":"LinkedHashSetUtils.java"}
     1:1:void addAll(java.util.LinkedHashSet,java.util.LinkedHashSet):12:12 -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.aL:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.eL:
 # {"id":"sourceFile","fileName":"ListUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -297006,11 +296331,11 @@
     17:17:java.lang.Object lambda$mapOrElse$2(java.util.function.Function,int,java.lang.Object):146:146 -> a
     18:18:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):146:146 -> a
     19:34:java.util.List mapOrElse(java.util.List,com.android.tools.r8.utils.IntObjToObjFunction,java.util.List):156:171 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/iA;Ljava/util/List;)Ljava/util/List;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/kA;Ljava/util/List;)Ljava/util/List;"}
     35:36:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):208:209 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Ljava/util/ArrayList;"}
     37:37:java.util.List newArrayListWithoutIndices(java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):215:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/vu;Lcom/android/tools/r8/internal/Kz;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xu;Lcom/android/tools/r8/internal/Mz;)Ljava/util/ArrayList;"}
     38:38:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.size():249:249 -> a
     38:38:java.util.List newArrayListWithoutIndices(java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):215 -> a
     39:40:java.util.List newArrayListWithoutIndices(java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):215:216 -> a
@@ -297028,9 +296353,9 @@
     65:66:java.lang.Object fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):303:304 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/Collection;Ljava/util/function/BiFunction;)Ljava/lang/Object;"}
     67:68:void forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):310:311 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/aL$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/eL$a;)V"}
     69:71:java.util.List sort(java.lang.Iterable,java.util.Comparator,int):324:326 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hC;Ljava/util/Comparator;I)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jC;Ljava/util/Comparator;I)Ljava/util/ArrayList;"}
     72:73:java.util.List sort(java.util.Collection,java.util.Comparator):331:332 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Ljava/util/Comparator;)Ljava/util/ArrayList;"}
     74:74:java.util.List destructiveSort(java.util.List,java.util.Comparator):337:337 -> a
@@ -297042,12 +296367,12 @@
     16:16:java.lang.Object last(java.util.List):94:94 -> b
     17:18:int lastIndexMatching(java.util.List,java.util.function.Predicate):98:99 -> b
     19:21:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):251:253 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Lcom/android/tools/r8/internal/vu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Lcom/android/tools/r8/internal/xu;"}
     1:3:java.util.List reverse(java.util.List):285:287 -> c
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.aL$a:
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.eL$a:
 # {"id":"sourceFile","fileName":"ListUtils.java"}
     void accept(java.lang.Object,int) -> accept
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.JL:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.NL:
 # {"id":"sourceFile","fileName":"LongInterval.java"}
     long min -> a
     long max -> b
@@ -297062,7 +296387,7 @@
     1:1:boolean isSingleValue():36:36 -> d
     1:2:boolean equals(java.lang.Object):70:71 -> equals
     1:1:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.eM:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.iM:
 # {"id":"sourceFile","fileName":"MainDexListParser.java"}
     1:1:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.internal.MainDexListParser.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):0 -> a
@@ -297082,13 +296407,13 @@
     37:55:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):35:53 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/t0;Lcom/android/tools/r8/graph/B1;)Ljava/util/Set;"}
     56:56:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MapConsumerUtils -> com.android.tools.r8.internal.hM:
+com.android.tools.r8.utils.MapConsumerUtils -> com.android.tools.r8.internal.lM:
 # {"id":"sourceFile","fileName":"MapConsumerUtils.java"}
     1:1:com.android.tools.r8.naming.MapConsumer wrapExistingMapConsumerIfNotNull(com.android.tools.r8.naming.MapConsumer,java.lang.Object,java.util.function.Function):39:39 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/Q;Ljava/lang/Object;Ljava/util/function/Function;)Lcom/android/tools/r8/naming/Q;"}
     2:2:com.android.tools.r8.naming.MapConsumer wrapExistingMapConsumer(com.android.tools.r8.naming.MapConsumer,com.android.tools.r8.naming.MapConsumer):19:19 -> a
     2:2:com.android.tools.r8.naming.MapConsumer wrapExistingMapConsumerIfNotNull(com.android.tools.r8.naming.MapConsumer,java.lang.Object,java.util.function.Function):39 -> a
-com.android.tools.r8.utils.MapConsumerUtils$1 -> com.android.tools.r8.internal.gM:
+com.android.tools.r8.utils.MapConsumerUtils$1 -> com.android.tools.r8.internal.kM:
 # {"id":"sourceFile","fileName":"MapConsumerUtils.java"}
     com.android.tools.r8.naming.MapConsumer val$existingMapConsumer -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/Q;"}
@@ -297099,12 +296424,12 @@
     1:2:void accept(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.naming.ClassNameMapper):22:23 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/DiagnosticsHandler;Lcom/android/tools/r8/naming/b;)V"}
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):28:29 -> finished
-com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.jM:
+com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.nM:
 # {"id":"sourceFile","fileName":"MapIdTemplateProvider.java"}
     java.lang.String template -> a
     java.lang.String cachedValue -> b
     java.util.Map HANDLERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> d
     1:8:void <clinit>():12:19 -> <clinit>
     1:1:void <init>(java.lang.String):57:57 -> <init>
@@ -297117,7 +296442,7 @@
     10:18:com.android.tools.r8.MapIdProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):43:51 -> a
     19:19:void lambda$get$0(com.android.tools.r8.MapIdEnvironment,java.lang.String,com.android.tools.r8.MapIdProvider):67:67 -> a
     1:8:java.lang.String get(com.android.tools.r8.MapIdEnvironment):63:70 -> get
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.mM:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.qM:
 # {"id":"sourceFile","fileName":"MapUtils.java"}
     1:1:java.util.Map clone(java.util.Map,java.util.Map,java.util.function.Function):31:31 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/HashMap;Ljava/util/function/Function;)Ljava/util/Map;"}
@@ -297127,7 +296452,7 @@
     10:10:java.lang.Object lambda$ignoreKey$1(java.util.function.Supplier,java.lang.Object):55:55 -> a
     11:12:java.util.IdentityHashMap newIdentityHashMap(java.util.function.Consumer):60:61 -> a
     13:14:java.util.IdentityHashMap newIdentityHashMap(com.android.tools.r8.utils.BiForEachable,int):67:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/P5;I)Ljava/util/IdentityHashMap;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/R5;I)Ljava/util/IdentityHashMap;"}
     15:15:boolean lambda$removeIdentityMappings$2(java.util.Map$Entry):80:80 -> a
     16:16:void removeIdentityMappings(java.util.Map):80:80 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/AbstractMap;)V"}
@@ -297136,22 +296461,22 @@
     19:19:java.lang.Object removeOrDefault(java.util.Map,java.lang.Object,java.lang.Object):88:88 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/AbstractMap;Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;"}
     20:20:java.lang.String toString(java.util.Map):94:94 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ry;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ty;)Ljava/lang/String;"}
     21:21:java.lang.String toString(java.util.Map):93:93 -> a
     22:22:java.util.Map transform(java.util.Map,java.util.function.IntFunction,java.util.function.Function,java.util.function.Function,com.android.tools.r8.utils.TriFunction):103:103 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/android/tools/r8/internal/Oh0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/android/tools/r8/internal/Sh0;)Ljava/util/Map;"}
     23:23:java.lang.Object lambda$transform$5(java.util.function.Function,java.lang.Object,java.lang.Object):106:106 -> a
     24:25:java.util.Map transform(java.util.Map,java.util.function.IntFunction,java.util.function.BiFunction,java.util.function.BiFunction,com.android.tools.r8.utils.TriFunction):117:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Oh0;)Ljava/util/Map;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Ljava/util/function/IntFunction;Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/Sh0;)Ljava/util/Map;"}
     26:36:void lambda$transform$7(java.util.function.BiFunction,java.util.function.BiFunction,java.util.Map,com.android.tools.r8.utils.TriFunction,java.lang.Object,java.lang.Object):120:130 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Ljava/util/Map;Lcom/android/tools/r8/internal/Oh0;Ljava/lang/Object;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Ljava/util/Map;Lcom/android/tools/r8/internal/Sh0;Ljava/lang/Object;Ljava/lang/Object;)V"}
     37:38:java.util.Map trimCapacityOfIdentityHashMapIfSizeLessThan(java.util.Map,int):167:168 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;I)Ljava/util/Map;"}
     39:40:java.util.Map trimCapacity(java.util.Map,java.util.function.IntFunction):152:153 -> a
     39:40:java.util.Map trimCapacityOfIdentityHashMapIfSizeLessThan(java.util.Map,int):168 -> a
     1:1:java.lang.String lambda$toString$4(java.util.Map$Entry):94:94 -> b
     2:2:java.lang.Object lambda$transform$6(java.util.function.Function,java.lang.Object,java.lang.Object):107:107 -> b
-com.android.tools.r8.utils.MarkerInfoConsumerDataImpl -> com.android.tools.r8.internal.OM:
+com.android.tools.r8.utils.MarkerInfoConsumerDataImpl -> com.android.tools.r8.internal.SM:
 # {"id":"sourceFile","fileName":"MarkerInfoConsumerDataImpl.java"}
     com.android.tools.r8.origin.Origin origin -> a
     java.util.List markerInfos -> b
@@ -297160,7 +296485,7 @@
     1:1:com.android.tools.r8.origin.Origin getInputOrigin():24:24 -> getInputOrigin
     1:1:java.util.Collection getMarkers():34:34 -> getMarkers
     1:1:boolean hasMarkers():29:29 -> hasMarkers
-com.android.tools.r8.utils.MarkerInfoImpl -> com.android.tools.r8.internal.PM:
+com.android.tools.r8.utils.MarkerInfoImpl -> com.android.tools.r8.internal.TM:
 # {"id":"sourceFile","fileName":"MarkerInfoImpl.java"}
     com.android.tools.r8.dex.Marker marker -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/W;"}
@@ -297208,7 +296533,7 @@
     3:3:boolean isR8():33 -> isR8
     1:1:boolean isR8ModeCompatibility():83:83 -> isR8ModeCompatibility
     1:1:boolean isR8ModeFull():88:88 -> isR8ModeFull
-com.android.tools.r8.utils.MarkerInfoToInternalMarkerConsumer -> com.android.tools.r8.internal.QM:
+com.android.tools.r8.utils.MarkerInfoToInternalMarkerConsumer -> com.android.tools.r8.internal.UM:
 # {"id":"sourceFile","fileName":"MarkerInfoToInternalMarkerConsumer.java"}
     java.util.List markers -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -297220,13 +296545,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void acceptMarkerInfo(com.android.tools.r8.MarkerInfoConsumerData):26:26 -> acceptMarkerInfo
     1:1:void finished():32:32 -> finished
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.XN:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.bO:
 # {"id":"sourceFile","fileName":"MethodJavaSignatureEquivalence.java"}
     boolean ignoreName -> a
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bO;"}
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bO;"}
     1:4:void <clinit>():17:20 -> <clinit>
     1:2:void <init>(boolean):25:26 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):15:15 -> a
@@ -297251,7 +296576,7 @@
     13:13:int com.android.tools.r8.graph.DexTypeList.hashCode():123:123 -> a
     13:13:int doHash(com.android.tools.r8.graph.DexMethod):50 -> a
     13:13:int doHash(java.lang.Object):15 -> a
-com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.pO:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.tO:
 # {"id":"sourceFile","fileName":"MethodReferenceUtils.java"}
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -297311,10 +296636,10 @@
     4:4:com.android.tools.r8.references.MethodReference mainMethod(com.android.tools.r8.references.ClassReference):105 -> b
     5:5:com.android.tools.r8.references.MethodReference mainMethod(com.android.tools.r8.references.ClassReference):105:105 -> b
     6:6:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference):178:178 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.sO:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.wO:
 # {"id":"sourceFile","fileName":"MethodSignatureEquivalence.java"}
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sO;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wO;"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):14:14 -> a
@@ -297323,30 +296648,30 @@
     3:3:int doHash(java.lang.Object):14:14 -> a
     4:4:int doHash(com.android.tools.r8.graph.DexMethod):31:31 -> a
     4:4:int doHash(java.lang.Object):14 -> a
-com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.tS:
+com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.xS:
 # {"id":"sourceFile","fileName":"NumberUtils.java"}
     1:1:boolean is16Bit(long):31:31 -> a
     1:1:boolean is32Bit(long):39:39 -> b
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.yU:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.CU:
 # {"id":"sourceFile","fileName":"ObjectUtils.java"}
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/E0;Ljava/util/function/Predicate;Z)Z"}
     2:2:boolean identical(java.lang.Object,java.lang.Object):21:21 -> a
     3:3:boolean notIdentical(java.lang.Object,java.lang.Object):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wi0;Ljava/lang/Object;)Z"}
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.DU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aj0;Ljava/lang/Object;)Z"}
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.HU:
 # {"id":"sourceFile","fileName":"OffOrAuto.java"}
     com.android.tools.r8.utils.OffOrAuto Off -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HU;"}
     com.android.tools.r8.utils.OffOrAuto Auto -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/HU;"}
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/DU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/HU;"}
     1:2:void <clinit>():8:9 -> <clinit>
     3:3:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.internal.EU:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.internal.IU:
 # {"id":"sourceFile","fileName":"OneShotByteResource.java"}
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.ProgramResource$Kind kind -> b
@@ -297356,62 +296681,62 @@
     1:1:void <clinit>():13:13 -> <clinit>
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):26:31 -> <init>
     1:1:com.android.tools.r8.utils.OneShotByteResource create(com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,byte[],java.util.Set):22:22 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/ArchiveEntryOrigin;[BLjava/util/Set;)Lcom/android/tools/r8/internal/EU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ProgramResource$Kind;Lcom/android/tools/r8/origin/ArchiveEntryOrigin;[BLjava/util/Set;)Lcom/android/tools/r8/internal/IU;"}
     1:1:java.io.InputStream getByteStream():46:46 -> getByteStream
     1:3:byte[] getBytes():51:53 -> getBytes
     1:1:java.util.Set getClassDescriptors():59:59 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OneShotCollectionConsumer -> R8$$REMOVED$$CLASS$$241:
+com.android.tools.r8.utils.OneShotCollectionConsumer -> R8$$REMOVED$$CLASS$$230:
 # {"id":"sourceFile","fileName":"OneShotCollectionConsumer.java"}
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.QU:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.UU:
 # {"id":"sourceFile","fileName":"OptionalBool.java"}
     com.android.tools.r8.utils.OptionalBool TRUE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.utils.OptionalBool FALSE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/UU;"}
     1:49:void <clinit>():9:57 -> <clinit>
     1:1:void <init>():81:81 -> <init>
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):84:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/UU;"}
     1:1:boolean equals(java.lang.Object):100:100 -> equals
     int ordinal() -> f
     1:1:com.android.tools.r8.utils.OptionalBool unknown():88:88 -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/UU;"}
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.NU:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.RU:
 # {"id":"sourceFile","fileName":"OptionalBool.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:boolean isTrue():14:14 -> d
     1:1:int ordinal():24:24 -> f
     1:1:java.lang.String toString():29:29 -> toString
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.OU:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.SU:
 # {"id":"sourceFile","fileName":"OptionalBool.java"}
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isFalse():38:38 -> a
     1:1:int ordinal():48:48 -> f
     1:1:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.PU:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.TU:
 # {"id":"sourceFile","fileName":"OptionalBool.java"}
     1:1:void <init>():58:58 -> <init>
     1:1:boolean isUnknown():62:62 -> e
     1:1:int ordinal():72:72 -> f
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.utils.OptionalUtils -> R8$$REMOVED$$CLASS$$242:
+com.android.tools.r8.utils.OptionalUtils -> R8$$REMOVED$$CLASS$$231:
 # {"id":"sourceFile","fileName":"OptionalUtils.java"}
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.WU:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.aV:
 # {"id":"sourceFile","fileName":"OptionsParsing.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VU;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZU;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"}
     14:18:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):39:43 -> a
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/VU;Ljava/lang/String;)Ljava/lang/Boolean;"}
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.VU:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ZU;Ljava/lang/String;)Ljava/lang/Boolean;"}
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.ZU:
 # {"id":"sourceFile","fileName":"OptionsParsing.java"}
     java.lang.String[] args -> a
     int nextIndex -> b
@@ -297419,34 +296744,34 @@
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.eV:
 # {"id":"sourceFile","fileName":"OriginWithPosition.java"}
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):14:16 -> <init>
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.gV:
+com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.kV:
 # {"id":"sourceFile","fileName":"OriginalSourceFiles.java"}
     com.android.tools.r8.utils.OriginalSourceFiles UNREACHABLE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/dV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hV;"}
     com.android.tools.r8.utils.OriginalSourceFiles FROM_CLASSES -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iV;"}
     1:9:void <clinit>():15:23 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.dV:
+com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.hV:
 # {"id":"sourceFile","fileName":"OriginalSourceFiles.java"}
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):19:19 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.eV:
+com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.iV:
 # {"id":"sourceFile","fileName":"OriginalSourceFiles.java"}
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.fV:
+com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.jV:
 # {"id":"sourceFile","fileName":"OriginalSourceFiles.java"}
     java.util.Map val$map -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -297454,7 +296779,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/H2;"}
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.CV:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.GV:
 # {"id":"sourceFile","fileName":"OutputBuilder.java"}
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
@@ -297466,14 +296791,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/origin/PathOrigin;"}
     java.nio.file.Path getPath() -> getPath
     void open() -> open
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.IV:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.MV:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object first -> a
     java.lang.Object second -> b
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
     1:1:java.lang.Object getFirst():29:29 -> a
     2:2:com.android.tools.r8.utils.Pair create(java.lang.Object,java.lang.Object):60:60 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;)Lcom/android/tools/r8/internal/MV;"}
     1:1:java.lang.Object getSecond():33:33 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
@@ -297488,7 +296813,7 @@
 com.android.tools.r8.utils.PartitionMapZipContainer$Consumer -> com.android.tools.r8.utils.t:
 # {"id":"sourceFile","fileName":"PartitionMapZipContainer.java"}
     com.android.tools.r8.utils.Box zipBuilderBox -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/k7;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/m7;"}
     java.nio.file.Path path -> b
     1:1:void <init>(java.nio.file.Path):63:63 -> <init>
     2:6:void <init>(java.nio.file.Path):60:64 -> <init>
@@ -297519,7 +296844,7 @@
     3:5:java.lang.Object com.android.tools.r8.utils.Box.computeIfAbsentThrowing(com.android.tools.r8.utils.ThrowingSupplier):37:39 -> finished
     3:5:void finished(com.android.tools.r8.DiagnosticsHandler):92 -> finished
     6:8:void finished(com.android.tools.r8.DiagnosticsHandler):92:94 -> finished
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.nX:
 # {"id":"sourceFile","fileName":"PredicateSet.java"}
     java.util.Set elements -> a
     java.util.List predicates -> b
@@ -297528,14 +296853,14 @@
     1:1:boolean addElement(java.lang.Object):20:20 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)V"}
     2:6:boolean contains(java.lang.Object):43:47 -> a
-com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.kX:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.oX:
 # {"id":"sourceFile","fileName":"PredicateUtils.java"}
     1:2:java.lang.Object findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
     3:3:boolean lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
     4:4:java.util.function.Predicate not(java.util.function.Predicate):22:22 -> a
     5:5:java.util.function.Predicate isNull(java.util.function.Function):26:26 -> a
     6:6:boolean lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.sX:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.wX:
 # {"id":"sourceFile","fileName":"PreloadedClassFileProvider.java"}
     java.util.Map content -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -297543,12 +296868,12 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:3:com.android.tools.r8.ClassFileResourceProvider fromClassData(java.lang.String,byte[]):57:59 -> a
     4:4:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder builder():71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sX$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wX$a;"}
     1:1:java.util.Set getClassDescriptors():43:43 -> getClassDescriptors
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.sX$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.wX$a:
 # {"id":"sourceFile","fileName":"PreloadedClassFileProvider.java"}
     java.util.Map content -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashMap;"}
@@ -297557,15 +296882,15 @@
     1:1:void <init>():78:78 -> <init>
     2:2:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[B)Lcom/android/tools/r8/internal/sX$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[B)Lcom/android/tools/r8/internal/wX$a;"}
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sX;"}
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.tX:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/wX;"}
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.xX:
 # {"id":"sourceFile","fileName":"PreloadedClassFileProvider.java"}
     java.lang.String descriptor -> f
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.mY:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.qY:
 # {"id":"sourceFile","fileName":"ProgramClassCollection.java"}
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/dex/b;"}
@@ -297580,14 +296905,14 @@
     3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):51:51 -> a
     3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):22 -> a
     4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):29:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/dex/b;)Lcom/android/tools/r8/internal/mY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/dex/b;)Lcom/android/tools/r8/internal/qY;"}
     10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):32:32 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/dex/b;Ljava/util/function/Supplier;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;"}
     11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver wrappedConflictResolver(com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.utils.Reporter):73:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/internal/Z40;)Lcom/android/tools/r8/dex/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/internal/d50;)Lcom/android/tools/r8/dex/b;"}
     12:14:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):105:107 -> a
     12:14:com.android.tools.r8.graph.DexProgramClass lambda$wrappedConflictResolver$1(com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/internal/Z40;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/D2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/ClassConflictResolver;Lcom/android/tools/r8/internal/d50;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)Lcom/android/tools/r8/graph/D2;"}
     15:15:com.android.tools.r8.graph.DexProgramClass mergeIfLegacySynthetics(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):129:129 -> a
     15:15:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):109 -> a
     15:15:com.android.tools.r8.graph.DexProgramClass lambda$wrappedConflictResolver$1(com.android.tools.r8.ClassConflictResolver,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74 -> a
@@ -297696,14 +297021,14 @@
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():61:61 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/graph/V;"}
     1:1:java.lang.String toString():46:46 -> toString
-com.android.tools.r8.utils.ProgramConsumerUtils -> com.android.tools.r8.internal.oY:
+com.android.tools.r8.utils.ProgramConsumerUtils -> com.android.tools.r8.internal.sY:
 # {"id":"sourceFile","fileName":"ProgramConsumerUtils.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.sY:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.wY:
 # {"id":"sourceFile","fileName":"ProgramMethodEquivalence.java"}
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/sY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wY;"}
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):10:10 -> a
@@ -297712,19 +297037,19 @@
     3:3:int doHash(java.lang.Object):10:10 -> a
     4:4:int doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
-com.android.tools.r8.utils.QuadConsumer -> com.android.tools.r8.internal.g10:
+com.android.tools.r8.utils.QuadConsumer -> com.android.tools.r8.internal.k10:
 # {"id":"sourceFile","fileName":"QuadConsumer.java"}
     void accept(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.ReachabilitySensitiveValue -> com.android.tools.r8.internal.u10:
+com.android.tools.r8.utils.ReachabilitySensitiveValue -> com.android.tools.r8.internal.y10:
 # {"id":"sourceFile","fileName":"ReachabilitySensitiveValue.java"}
     com.android.tools.r8.utils.ReachabilitySensitiveValue DISABLED -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y10;"}
     com.android.tools.r8.utils.ReachabilitySensitiveValue ENABLED -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/u10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/y10;"}
     1:2:void <clinit>():8:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.Z40:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.d50:
 # {"id":"sourceFile","fileName":"Reporter.java"}
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     java.util.List diagnosticsLevelMapping -> b
@@ -297754,14 +297079,14 @@
     1:1:void error(com.android.tools.r8.Diagnostic):111:111 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):93:93 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):102:102 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.W40:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.a50:
 # {"id":"sourceFile","fileName":"Reporter.java"}
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.X40:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.b50:
 # {"id":"sourceFile","fileName":"Reporter.java"}
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():73:73 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.Y40:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.c50:
 # {"id":"sourceFile","fileName":"Reporter.java"}
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
@@ -297769,10 +297094,10 @@
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:13:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:44 -> a
     14:14:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):38:38 -> a
-com.android.tools.r8.utils.ResourceShrinkerUtils -> com.android.tools.r8.internal.p50:
+com.android.tools.r8.utils.ResourceShrinkerUtils -> com.android.tools.r8.internal.t50:
 # {"id":"sourceFile","fileName":"ResourceShrinkerUtils.java"}
     1:11:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState createResourceShrinkerState(com.android.tools.r8.graph.AppView):17:27 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/m10;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/q10;"}
     12:12:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState createResourceShrinkerState(com.android.tools.r8.graph.AppView):24:24 -> a
     13:13:boolean com.android.tools.r8.utils.InternalOptions.hasFeatureSplitConfiguration():220:220 -> a
     13:13:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState createResourceShrinkerState(com.android.tools.r8.graph.AppView):29 -> a
@@ -297785,7 +297110,7 @@
     33:33:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState createResourceShrinkerState(com.android.tools.r8.graph.AppView):42 -> a
     34:34:com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState createResourceShrinkerState(com.android.tools.r8.graph.AppView):42:42 -> a
     35:52:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):55:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/m10;Ljava/util/Collection;Lcom/android/tools/r8/FeatureSplit;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/q10;Ljava/util/Collection;Lcom/android/tools/r8/FeatureSplit;)V"}
     53:53:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResFileProvider(java.util.function.Supplier,java.lang.String):144:144 -> a
     53:53:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -297804,15 +297129,15 @@
     62:63:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResourceTable(java.io.InputStream,com.android.tools.r8.FeatureSplit):148:149 -> a
     62:63:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):62 -> a
     64:65:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.com.android.aapt.Resources$ResourceTable.parseFrom(java.io.InputStream):4061:4062 -> a
-    64:65:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):340 -> a
+    64:65:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):345 -> a
     64:65:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResourceTable(java.io.InputStream,com.android.tools.r8.FeatureSplit):149 -> a
     64:65:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):62 -> a
-    66:66:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):341:341 -> a
+    66:66:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):346:346 -> a
     66:66:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResourceTable(java.io.InputStream,com.android.tools.r8.FeatureSplit):149 -> a
     66:66:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):62 -> a
     67:67:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResourceTable(java.io.InputStream,com.android.tools.r8.FeatureSplit):148:148 -> a
     67:67:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):62 -> a
-    68:68:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):344:344 -> a
+    68:68:com.android.tools.r8.com.android.aapt.Resources$ResourceTable com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState$R8ResourceShrinkerModel.instantiateFromResourceTable(java.io.InputStream,boolean):349:349 -> a
     68:68:void com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState.addResourceTable(java.io.InputStream,com.android.tools.r8.FeatureSplit):149 -> a
     68:68:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):62 -> a
     69:69:void addResources(com.android.tools.r8.graph.AppView,com.android.tools.r8.resourceshrinker.r8integration.R8ResourceShrinkerState,java.util.Collection,com.android.tools.r8.FeatureSplit):58:58 -> a
@@ -297841,19 +297166,19 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/AndroidResourceInput;)Ljava/io/InputStream;"}
     1:3:java.io.InputStream wrapThrowingInputStreamResource(com.android.tools.r8.graph.AppView,com.android.tools.r8.AndroidResourceInput):83:85 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/AndroidResourceInput;)Ljava/io/InputStream;"}
-com.android.tools.r8.utils.ResourceShrinkerUtils$1 -> com.android.tools.r8.internal.o50:
+com.android.tools.r8.utils.ResourceShrinkerUtils$1 -> com.android.tools.r8.internal.s50:
 # {"id":"sourceFile","fileName":"ResourceShrinkerUtils.java"}
     int[] $SwitchMap$com$android$tools$r8$AndroidResourceInput$Kind -> a
     1:1:void <clinit>():56:56 -> <clinit>
-com.android.tools.r8.utils.RetracerForCodePrinting -> com.android.tools.r8.internal.L90:
+com.android.tools.r8.utils.RetracerForCodePrinting -> com.android.tools.r8.internal.P90:
 # {"id":"sourceFile","fileName":"RetracerForCodePrinting.java"}
     com.android.tools.r8.retrace.Retracer retracer -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/M90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Q90;"}
     com.android.tools.r8.utils.RetracerForCodePrinting EMPTY -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/L90;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P90;"}
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):39:40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/M90;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Q90;)V"}
     1:1:java.lang.String toDescriptor(com.android.tools.r8.graph.DexType):72:72 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Ljava/lang/String;"}
     2:4:java.lang.String typeToString(com.android.tools.r8.graph.DexType,java.util.function.Function,java.util.function.Function):61:63 -> a
@@ -297907,7 +297232,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Ljava/lang/String;"}
     1:1:java.lang.String toSourceString(com.android.tools.r8.graph.DexField):142:142 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/l1;)Ljava/lang/String;"}
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.wa0:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.Aa0:
 # {"id":"sourceFile","fileName":"SegmentTree.java"}
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
@@ -297919,33 +297244,33 @@
     1:2:java.lang.Object find(int):27:28 -> a
     3:4:java.util.Map$Entry findEntry(java.lang.Integer):32:33 -> a
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):37:76 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/Object;)Lcom/android/tools/r8/internal/wa0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/Object;)Lcom/android/tools/r8/internal/Aa0;"}
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):44:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/k7;Ljava/lang/Integer;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(IILcom/android/tools/r8/internal/m7;Ljava/lang/Integer;)Z"}
     49:49:int size():81:81 -> a
     50:52:void visitSegments(java.util.function.Consumer):94:96 -> a
     53:53:void lambda$visitSegments$1(java.util.function.Consumer,java.lang.Object):99:99 -> a
-com.android.tools.r8.utils.SelfRetraceTest -> com.android.tools.r8.internal.xa0:
+com.android.tools.r8.utils.SelfRetraceTest -> com.android.tools.r8.internal.Ba0:
 # {"id":"sourceFile","fileName":"SelfRetraceTest.java"}
     1:1:void test():25:25 -> a
     2:2:void foo3():13:13 -> a
     2:2:void foo2():17 -> a
     2:2:void foo1():21 -> a
     2:2:void test():26 -> a
-com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.ya0:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.Ca0:
 # {"id":"sourceFile","fileName":"SemanticVersion.java"}
     int major -> b
     int minor -> c
     int patch -> d
     java.lang.String prerelease -> e
     com.android.tools.r8.utils.SemanticVersion MIN -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca0;"}
     com.android.tools.r8.utils.SemanticVersion MAX -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ca0;"}
     1:3:void <clinit>():10:12 -> <clinit>
     1:5:void <init>(int,int,int,java.lang.String):53:57 -> <init>
     1:27:com.android.tools.r8.utils.SemanticVersion parse(java.lang.String):15:41 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;)Lcom/android/tools/r8/internal/Ca0;"}
     28:28:com.android.tools.r8.utils.SemanticVersion create(int,int,int,java.lang.String):65:65 -> a
     28:28:com.android.tools.r8.utils.SemanticVersion parse(java.lang.String):45 -> a
     29:29:com.android.tools.r8.utils.SemanticVersion parse(java.lang.String):43:43 -> a
@@ -297954,32 +297279,32 @@
     32:32:com.android.tools.r8.utils.SemanticVersion parse(java.lang.String):17:17 -> a
     33:33:com.android.tools.r8.utils.SemanticVersion create(int,int,int,java.lang.String):65:65 -> a
     33:33:com.android.tools.r8.utils.SemanticVersion create(int,int,int):61 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(III)Lcom/android/tools/r8/internal/Ca0;"}
     34:34:int getMajor():77:77 -> a
     35:41:boolean isNewer(com.android.tools.r8.utils.SemanticVersion):89:95 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ya0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ca0;)Z"}
     1:1:int getMinor():81:81 -> b
     2:2:boolean isNewerOrEqual(com.android.tools.r8.utils.SemanticVersion):99:99 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ya0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ca0;)Z"}
     1:1:int getPatch():85:85 -> c
     1:1:int compareTo(java.lang.Object):8:8 -> compareTo
     2:5:int compareTo(com.android.tools.r8.utils.SemanticVersion):126:129 -> compareTo
     2:5:int compareTo(java.lang.Object):8 -> compareTo
     1:1:com.android.tools.r8.utils.SemanticVersion max():73:73 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ya0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ca0;"}
     1:8:boolean equals(java.lang.Object):104:111 -> equals
     1:1:int hashCode():116:116 -> hashCode
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.utils.SerializationUtils -> com.android.tools.r8.internal.La0:
+com.android.tools.r8.utils.SerializationUtils -> com.android.tools.r8.internal.Pa0:
 # {"id":"sourceFile","fileName":"SerializationUtils.java"}
     1:3:void writeUTFOfIntSize(java.io.DataOutputStream,java.lang.String):22:24 -> a
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.Na0:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.Ra0:
 # {"id":"sourceFile","fileName":"SetUtils.java"}
     1:1:java.util.Set newConcurrentHashSet():33:33 -> a
     2:2:java.util.Set newConcurrentHashSet(int):37:37 -> a
     3:4:java.util.HashSet newHashSet(java.lang.Object[]):48:49 -> a
     5:6:java.util.Set newIdentityHashSet(com.android.tools.r8.utils.ForEachable):67:68 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Ljava/util/Set;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Ljava/util/Set;"}
     7:8:java.util.Set newIdentityHashSet(java.lang.Iterable):73:74 -> a
     9:11:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):79:81 -> a
     12:15:java.util.Set newIdentityHashSet(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):86:89 -> a
@@ -297997,16 +297322,16 @@
     3:3:java.util.Set newIdentityHashSet(java.lang.Object[]):62:62 -> b
     4:4:java.util.Set newIdentityHashSet(int):94:94 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):104:104 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Lcom/android/tools/r8/internal/gv;"}
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):104 -> b
     7:8:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):105:106 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):111:111 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Lcom/android/tools/r8/internal/ev;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Lcom/android/tools/r8/internal/gv;"}
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet.builder():440:440 -> c
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):111 -> c
     3:8:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):112:117 -> c
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.Ac0:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.Ec0:
 # {"id":"sourceFile","fileName":"SortingStringConsumer.java"}
     java.util.List accepted -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -298016,12 +297341,12 @@
     1:1:void lambda$finished$0(com.android.tools.r8.DiagnosticsHandler,java.lang.String):35:35 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:29 -> accept
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):34:36 -> finished
-com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.Cc0:
+com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.Gc0:
 # {"id":"sourceFile","fileName":"SourceFileTemplateProvider.java"}
     java.lang.String template -> a
     java.lang.String cachedValue -> b
     java.util.Map HANDLERS -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Du;"}
     boolean $assertionsDisabled -> d
     1:9:void <clinit>():12:20 -> <clinit>
     1:1:void <init>(java.lang.String):58:58 -> <init>
@@ -298051,7 +297376,7 @@
     22:22:void <clinit>():20 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:4:void printCurrentStack(long):51:54 -> printCurrentStack
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.ae0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.ee0:
 # {"id":"sourceFile","fileName":"StreamUtils.java"}
     1:2:byte[] streamToByteArrayClose(java.io.InputStream):18:19 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
@@ -298067,7 +297392,7 @@
     1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.Ef0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.If0:
 # {"id":"sourceFile","fileName":"StringUtils.java"}
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String[] EMPTY_ARRAY -> b
@@ -298078,14 +297403,14 @@
     11:12:java.util.List split(java.lang.String,char):103:104 -> a
     13:25:java.lang.String[] splitKnownSize(java.lang.String,char,int):120:132 -> a
     26:28:void lambda$splitKnownSize$0(com.android.tools.r8.utils.IntBox,int,java.lang.String[],java.lang.String):127:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;I[Ljava/lang/String;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;I[Ljava/lang/String;Ljava/lang/String;)V"}
     29:34:boolean appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):140:145 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/Object;)Z"}
     35:38:java.lang.StringBuilder appendLeftPadded(java.lang.StringBuilder,java.lang.String,int):163:166 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Ljava/lang/StringBuilder;)V"}
     39:39:java.lang.StringBuilder append(java.lang.StringBuilder,java.util.Collection):179:179 -> a
     40:50:java.lang.StringBuilder append(java.lang.StringBuilder,java.lang.Iterable,java.lang.String,com.android.tools.r8.utils.StringUtils$BraceType):184:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/Iterable;Ljava/lang/String;Lcom/android/tools/r8/internal/Ef0$a;)Ljava/lang/StringBuilder;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;Ljava/lang/Iterable;Ljava/lang/String;Lcom/android/tools/r8/internal/If0$a;)Ljava/lang/StringBuilder;"}
     51:52:java.lang.StringBuilder appendLines(java.lang.StringBuilder,java.lang.String[]):199:200 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/StringBuilder;[Ljava/lang/String;)V"}
     53:53:java.lang.String join(java.lang.String,java.lang.String[]):206:206 -> a
@@ -298094,11 +297419,11 @@
     56:56:java.lang.String join(java.lang.String,java.util.stream.Stream,java.util.function.Function):218:218 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/stream/Stream;Ljava/util/function/Function;)Ljava/lang/String;"}
     57:57:java.lang.String join(java.lang.String,java.lang.Object[],java.util.function.Function,com.android.tools.r8.utils.StringUtils$BraceType):223:223 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[Ljava/lang/Object;Ljava/util/function/Function;Lcom/android/tools/r8/internal/Ef0$a;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;[Ljava/lang/Object;Ljava/util/function/Function;Lcom/android/tools/r8/internal/If0$a;)Ljava/lang/String;"}
     58:58:java.lang.String join(java.lang.String,java.lang.Iterable,com.android.tools.r8.utils.StringUtils$BraceType):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/Iterable;Lcom/android/tools/r8/internal/Ef0$a;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/Iterable;Lcom/android/tools/r8/internal/If0$a;)Ljava/lang/String;"}
     59:61:java.lang.String join(java.lang.String,java.lang.Iterable,java.util.function.Function,com.android.tools.r8.utils.StringUtils$BraceType):232:234 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/Iterable;Ljava/util/function/Function;Lcom/android/tools/r8/internal/Ef0$a;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/Iterable;Ljava/util/function/Function;Lcom/android/tools/r8/internal/If0$a;)Ljava/lang/String;"}
     62:62:java.lang.String lines(java.util.List):238:238 -> a
     63:67:java.lang.String lines(java.util.List,java.lang.String):242:246 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;"}
@@ -298144,24 +297469,24 @@
     1:1:java.lang.String toUpperCase(java.lang.String):512:512 -> j
     1:9:java.lang.String trim(java.lang.String):419:427 -> k
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):262:266 -> l
-com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.Df0:
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.Hf0:
 # {"id":"sourceFile","fileName":"StringUtils.java"}
     int[] $SwitchMap$com$android$tools$r8$utils$StringUtils$BraceType -> a
     1:1:com.android.tools.r8.utils.StringUtils$BraceType[] com.android.tools.r8.utils.StringUtils$BraceType.values():33:33 -> <clinit>
     1:1:void <clinit>():40 -> <clinit>
     2:2:void <clinit>():40:40 -> <clinit>
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.Ef0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.If0$a:
 # {"id":"sourceFile","fileName":"StringUtils.java"}
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ef0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/If0$a;"}
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ef0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/If0$a;"}
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ef0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/If0$a;"}
     com.android.tools.r8.utils.StringUtils$BraceType NONE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ef0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/If0$a;"}
     com.android.tools.r8.utils.StringUtils$BraceType[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Ef0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/If0$a;"}
     1:4:void <clinit>():34:37 -> <clinit>
     5:5:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
@@ -298176,15 +297501,15 @@
     8:8:java.lang.String right():53:53 -> b
     9:9:java.lang.String right():52:52 -> b
     10:10:java.lang.String right():51:51 -> b
-com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.Vf0:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.Zf0:
 # {"id":"sourceFile","fileName":"SupplierUtils.java"}
     1:3:java.lang.Object lambda$memoize$1(com.android.tools.r8.utils.ThrowingSupplier):21:23 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ch0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gh0;)Ljava/lang/Object;"}
     1:1:java.util.function.Supplier memoize(com.android.tools.r8.utils.ThrowingSupplier):18:18 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ch0;)Ljava/util/function/Supplier;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gh0;)Ljava/util/function/Supplier;"}
     2:8:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):108:114 -> b
     2:8:java.util.function.Supplier memoize(com.android.tools.r8.utils.ThrowingSupplier):18 -> b
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.gg0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.kg0:
 # {"id":"sourceFile","fileName":"SymbolGenerationUtils.java"}
     java.util.Set RESERVED_NAMES -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/HashSet;"}
@@ -298200,19 +297525,19 @@
     10:10:void <clinit>():21 -> <clinit>
     11:19:void <clinit>():21:29 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/gg0$a;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/kg0$a;)Ljava/lang/String;"}
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):45:78 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):33 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.gg0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.kg0$a:
 # {"id":"sourceFile","fileName":"SymbolGenerationUtils.java"}
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gg0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kg0$a;"}
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gg0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kg0$a;"}
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
-com.android.tools.r8.utils.SystemPropertyUtils -> com.android.tools.r8.internal.tg0:
+com.android.tools.r8.utils.SystemPropertyUtils -> com.android.tools.r8.internal.xg0:
 # {"id":"sourceFile","fileName":"SystemPropertyUtils.java"}
     1:1:java.lang.String getSystemPropertyForDevelopment(java.lang.String):30:30 -> a
     2:2:boolean isSystemPropertySet(java.lang.String):53:53 -> a
@@ -298223,64 +297548,64 @@
     3:3:java.lang.Object applySystemProperty(java.lang.String,java.util.function.Function,java.util.function.Supplier):18 -> a
     4:6:java.lang.Object applySystemProperty(java.lang.String,java.util.function.Function,java.util.function.Supplier):19:21 -> a
     7:13:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):76:82 -> a
-com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.internal.Jg0:
+com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.internal.Ng0:
 # {"id":"sourceFile","fileName":"ThreadUtils.java"}
     1:1:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):56:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/Ug0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/Yg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
     2:2:java.lang.Object lambda$processItemsWithResults$0(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object,int):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;Ljava/lang/Object;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yg0;Ljava/lang/Object;I)Ljava/lang/Object;"}
     3:3:java.util.Collection processItemsWithResultsThatMatches(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):67:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/Ug0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/Yg0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
     4:4:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):77:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/ah0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/eh0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
     5:5:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):97:97 -> a
     5:5:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):77 -> a
     6:6:java.util.Collection processItemsWithResultsThatMatches(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):88:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/ah0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;Lcom/android/tools/r8/internal/eh0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
     7:7:java.util.Collection processItemsWithResultsThatMatches(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):87:87 -> a
     8:8:java.util.Collection processItemsWithResultsThatMatches(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):108:108 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;Lcom/android/tools/r8/internal/ah0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;Lcom/android/tools/r8/internal/eh0;Ljava/util/function/Predicate;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)Ljava/util/ArrayList;"}
     9:9:void com.android.tools.r8.threading.TaskCollection.<init>(com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):34:34 -> a
     9:9:java.util.Collection processItemsWithResultsThatMatches(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):108 -> a
     10:15:java.util.Collection processItemsWithResultsThatMatches(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):110:115 -> a
     16:16:java.util.concurrent.ExecutionException com.android.tools.r8.utils.UncheckedExecutionException.rethrow():19:19 -> a
     16:16:java.util.Collection processItemsWithResultsThatMatches(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.function.Predicate,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):113 -> a
     17:17:java.lang.Object lambda$processItemsWithResultsThatMatches$2(com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object,int):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ah0;Ljava/lang/Object;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eh0;Ljava/lang/Object;I)Ljava/lang/Object;"}
     18:18:void lambda$processItemsWithResultsThatMatches$3(com.android.tools.r8.threading.TaskCollection,com.android.tools.r8.utils.ThrowingReferenceIntFunction,int,java.lang.Object):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wg0;Lcom/android/tools/r8/internal/ah0;ILjava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ag0;Lcom/android/tools/r8/internal/eh0;ILjava/lang/Object;)V"}
     19:21:void com.android.tools.r8.threading.TaskCollection.submitUnchecked(java.util.concurrent.Callable):116:118 -> a
     19:21:void lambda$processItemsWithResultsThatMatches$3(com.android.tools.r8.threading.TaskCollection,com.android.tools.r8.utils.ThrowingReferenceIntFunction,int,java.lang.Object):111 -> a
     22:22:void processItems(java.util.Collection,java.util.function.Consumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):124:124 -> a
     23:23:void lambda$processItems$4(java.util.function.Consumer,java.lang.Object,int):126:126 -> a
     24:29:void processItems(java.util.Collection,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThreadUtils$WorkLoad):139:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/aL$a;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Jg0$a;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Collection;Lcom/android/tools/r8/internal/eL$a;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/Ng0$a;)V"}
     30:30:void lambda$processItems$5(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Ljava/lang/Object;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Ljava/lang/Object;I)V"}
     31:31:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):155:155 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     32:32:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):164:164 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;Lcom/android/tools/r8/internal/Zg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;Lcom/android/tools/r8/internal/dh0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     33:33:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):97:97 -> a
     33:33:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):164 -> a
     34:34:java.lang.Object lambda$processItems$6(com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.lang.Object,int):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Zg0;Ljava/lang/Object;I)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/dh0;Ljava/lang/Object;I)Ljava/lang/Object;"}
     35:35:void processMap(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):180:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Rg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Vg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     36:36:java.lang.Object lambda$processMap$7(com.android.tools.r8.utils.ThrowingBiConsumer,java.lang.Object,java.lang.Object):183:183 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rg0;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vg0;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}
     37:37:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):197:197 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Sg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/Wg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     38:38:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):196:196 -> a
     39:39:java.lang.Object lambda$processMapWithResults$8(com.android.tools.r8.utils.ThrowingBiFunction,java.util.Map$Entry):198:198 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sg0;Ljava/util/Map$Entry;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Wg0;Ljava/util/Map$Entry;)Ljava/lang/Object;"}
     40:40:void processMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):210:210 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/threading/ThreadingModule;Ljava/util/concurrent/ExecutorService;)V"}
     41:41:void processMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.threading.ThreadingModule,java.util.concurrent.ExecutorService):209:209 -> a
     42:42:void lambda$processMethods$9(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.graph.DexProgramClass):211:211 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Tg0;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;Lcom/android/tools/r8/graph/D2;)V"}
     43:43:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):236:236 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)Ljava/util/concurrent/ExecutorService;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)Ljava/util/concurrent/ExecutorService;"}
     44:44:java.util.concurrent.ExecutorService getExecutorService(int,com.android.tools.r8.threading.ThreadingModule):231:231 -> a
     44:44:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):236 -> a
     45:45:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int,com.android.tools.r8.threading.ThreadingModule):219:219 -> a
@@ -298295,51 +297620,51 @@
     47:47:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):236 -> a
     48:49:int getNumberOfThreads(java.util.concurrent.ExecutorService):240:241 -> a
     1:1:java.lang.Object lambda$processItemsWithResultsThatMatches$1(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object,int):68:68 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ug0;Ljava/lang/Object;I)Ljava/lang/Object;"}
-com.android.tools.r8.utils.ThreadUtils$WorkLoad -> com.android.tools.r8.internal.Jg0$a:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Yg0;Ljava/lang/Object;I)Ljava/lang/Object;"}
+com.android.tools.r8.utils.ThreadUtils$WorkLoad -> com.android.tools.r8.internal.Ng0$a:
 # {"id":"sourceFile","fileName":"ThreadUtils.java"}
     int threshold -> b
     com.android.tools.r8.utils.ThreadUtils$WorkLoad HEAVY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jg0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng0$a;"}
     com.android.tools.r8.utils.ThreadUtils$WorkLoad LIGHT -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Jg0$a;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ng0$a;"}
     1:13:void <clinit>():23:35 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):39:40 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(IILjava/lang/String;)V"}
     1:1:int getThreshold():44:44 -> a
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.Qg0:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.Ug0:
 # {"id":"sourceFile","fileName":"ThrowingAction.java"}
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.Rg0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.Vg0:
 # {"id":"sourceFile","fileName":"ThrowingBiConsumer.java"}
     void accept(java.lang.Object,java.lang.Object) -> accept
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.Sg0:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.Wg0:
 # {"id":"sourceFile","fileName":"ThrowingBiFunction.java"}
     java.lang.Object apply(java.lang.Object,java.lang.Object) -> apply
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.Tg0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.Xg0:
 # {"id":"sourceFile","fileName":"ThrowingConsumer.java"}
     1:7:void acceptWithRuntimeException(java.lang.Object):21:27 -> a
     8:8:com.android.tools.r8.utils.ThrowingConsumer unreachable():32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Tg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xg0;"}
     void accept(java.lang.Object) -> accept
     1:1:void lambda$unreachable$0(java.lang.Object):33:33 -> b
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.Ug0:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.Yg0:
 # {"id":"sourceFile","fileName":"ThrowingFunction.java"}
     java.lang.Object apply(java.lang.Object) -> apply
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.Wg0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.ah0:
 # {"id":"sourceFile","fileName":"ThrowingIntIterator.java"}
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:2:void forEachRemaining(java.util.function.IntConsumer):12:13 -> a
     3:6:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xg0;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bh0;)I"}
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.Xg0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.bh0:
 # {"id":"sourceFile","fileName":"ThrowingIntSupplier.java"}
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> R8$$REMOVED$$CLASS$$243:
+com.android.tools.r8.utils.ThrowingIterator -> R8$$REMOVED$$CLASS$$232:
 # {"id":"sourceFile","fileName":"ThrowingIterator.java"}
-com.android.tools.r8.utils.ThrowingIterator$1 -> com.android.tools.r8.internal.Yg0:
+com.android.tools.r8.utils.ThrowingIterator$1 -> com.android.tools.r8.internal.ch0:
 # {"id":"sourceFile","fileName":"ThrowingIterator.java"}
     java.util.Iterator val$it -> a
     1:1:void <init>(java.util.Iterator):38:38 -> <init>
@@ -298354,33 +297679,33 @@
     4:4:java.util.List com.android.tools.r8.utils.ThrowingIterator.take(int):31:31 -> a
     5:5:java.util.List com.android.tools.r8.utils.ThrowingIterator.take(int):29:29 -> a
     6:6:com.android.tools.r8.utils.ThrowingIterator com.android.tools.r8.utils.ThrowingIterator.fromIterator(java.util.Iterator):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;)Lcom/android/tools/r8/internal/Yg0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Iterator;)Lcom/android/tools/r8/internal/ch0;"}
     7:7:boolean hasNext():41:41 -> a
     7:7:java.lang.Object com.android.tools.r8.utils.ThrowingIterator.computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):19 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ch0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gh0;)Ljava/lang/Object;"}
     8:8:java.lang.Object next():46:46 -> a
     8:8:java.lang.Object com.android.tools.r8.utils.ThrowingIterator.computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):20 -> a
     9:9:java.lang.Object com.android.tools.r8.utils.ThrowingIterator.computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):22:22 -> a
     10:10:boolean hasNext():41:41 -> a
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.Zg0:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.dh0:
 # {"id":"sourceFile","fileName":"ThrowingReferenceIntConsumer.java"}
     void accept(java.lang.Object,int) -> accept
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.ah0:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.eh0:
 # {"id":"sourceFile","fileName":"ThrowingReferenceIntFunction.java"}
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.ch0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.gh0:
 # {"id":"sourceFile","fileName":"ThrowingSupplier.java"}
     java.lang.Object get() -> get
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.lh0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.ph0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     com.android.tools.r8.utils.Timing$Node top -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh0;"}
     java.util.Deque stack -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
     boolean trackMemory -> c
     int MINIMUM_REPORT_PERCENTAGE -> d
     com.android.tools.r8.utils.Timing EMPTY -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/eh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ih0;"}
     boolean $assertionsDisabled -> f
     1:3:void <clinit>():24:26 -> <clinit>
     4:5:int com.android.tools.r8.utils.SystemPropertyUtils.parseSystemPropertyOrDefault(java.lang.String,int):87:88 -> <clinit>
@@ -298388,14 +297713,14 @@
     6:9:void <clinit>():27:30 -> <clinit>
     1:5:void <init>(java.lang.String,boolean):153:157 -> <init>
     1:1:com.android.tools.r8.utils.Timing empty():69:69 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/ph0;"}
     2:4:com.android.tools.r8.utils.Timing create(java.lang.String,com.android.tools.r8.utils.InternalOptions):131:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Ljava/lang/String;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Ljava/lang/String;)Lcom/android/tools/r8/internal/ph0;"}
     5:8:com.android.tools.r8.utils.Timing create(java.lang.String,com.android.tools.r8.utils.InternalOptions):132:135 -> a
     9:9:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;)Lcom/android/tools/r8/internal/nh0;"}
     10:11:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):405:406 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/nh0;"}
     12:12:boolean verifyUnambiguous(com.android.tools.r8.utils.Timing$Node,java.lang.String):396:396 -> a
     12:12:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):406 -> a
     13:13:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):407:407 -> a
@@ -298426,9 +297751,9 @@
     48:50:void begin(java.lang.String):451 -> a
     51:54:void begin(java.lang.String):453:456 -> a
     55:60:void time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):460:465 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Qg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Ug0;)V"}
     61:66:java.lang.Object time(java.lang.String,com.android.tools.r8.utils.ThrowingSupplier):469:474 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ch0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/gh0;)Ljava/lang/Object;"}
     1:1:long percentage(long,long):411:411 -> b
     1:1:java.lang.String prettyPercentage(long,long):415 -> b
     2:2:java.lang.String prettyPercentage(long,long):415:415 -> b
@@ -298436,28 +297761,28 @@
     4:5:void end():478:479 -> b
     1:1:java.lang.String prettyTime(long):419:419 -> c
     2:7:void report():483:488 -> c
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.eh0:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.ih0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     1:1:void <init>(java.lang.String,boolean):31:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):34:34 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/nh0;"}
     2:2:void begin(java.lang.String):55:55 -> a
     1:1:void end():60:60 -> b
     1:1:void report():65:65 -> c
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.dh0:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.hh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):34:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/eh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ih0;)V"}
     1:1:void add(java.util.Collection):38:38 -> a
     2:2:void end():43:43 -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.fh0:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.jh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     long used -> a
     1:2:void <init>(long):163:164 -> <init>
     1:1:long usedDelta(com.android.tools.r8.utils.Timing$MemInfo):172:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fh0;)J"}
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.gh0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jh0;)J"}
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.kh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     java.lang.String title -> a
     boolean trackMemory -> b
@@ -298483,7 +297808,7 @@
     21:23:void <init>(java.lang.String,boolean):190:192 -> <init>
     1:1:long duration():213:213 -> a
     2:2:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):222:222 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gh0;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kh0;)Ljava/lang/String;"}
     3:3:long duration():213:213 -> a
     3:3:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):223 -> a
     4:4:long duration():213:213 -> a
@@ -298491,7 +297816,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.lang.String toString(com.android.tools.r8.utils.Timing$Node):223:223 -> a
     6:6:void report(int,com.android.tools.r8.utils.Timing$Node):227:227 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/kh0;)V"}
     7:7:long duration():213:213 -> a
     7:7:void report(int,com.android.tools.r8.utils.Timing$Node):227 -> a
     8:8:void report(int,com.android.tools.r8.utils.Timing$Node):227:227 -> a
@@ -298514,7 +297839,7 @@
     32:34:void report(int,com.android.tools.r8.utils.Timing$Node):250:252 -> a
     35:42:void report(int,com.android.tools.r8.utils.Timing$Node):248:255 -> a
     43:43:void lambda$report$0(int,com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):255:255 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/gh0;Lcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/kh0;Lcom/android/tools/r8/internal/kh0;)V"}
     44:58:void printMemory(int):267:281 -> a
     59:59:void printMemory(int):274:274 -> a
     1:5:void end():204:208 -> b
@@ -298531,64 +297856,64 @@
     2:2:long duration():213:213 -> toString
     2:2:java.lang.String toString():218 -> toString
     3:3:java.lang.String toString():218:218 -> toString
-com.android.tools.r8.utils.Timing$TimingDelegateBase -> R8$$REMOVED$$CLASS$$244:
+com.android.tools.r8.utils.Timing$TimingDelegateBase -> R8$$REMOVED$$CLASS$$233:
 # {"id":"sourceFile","fileName":"Timing.java"}
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.jh0:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.nh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     com.android.tools.r8.utils.Timing$Node parent -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh0;"}
     com.android.tools.r8.utils.Timing$Node merged -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/hh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
     int taskCount -> c
     com.android.tools.r8.utils.Timing$Node slowest -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh0;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():287:287 -> <clinit>
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.utils.Timing):294:294 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;ILcom/android/tools/r8/internal/ph0;)V"}
     2:7:void <init>(java.lang.String,int,com.android.tools.r8.utils.Timing):291:296 -> <init>
     1:17:void add(java.util.Collection):357:373 -> a
     18:23:void lambda$add$1(com.android.tools.r8.utils.Timing$TimingMerger$Item,boolean,java.util.Deque,java.lang.String,com.android.tools.r8.utils.Timing$Node):375:380 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ih0;ZLjava/util/Deque;Ljava/lang/String;Lcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mh0;ZLjava/util/Deque;Ljava/lang/String;Lcom/android/tools/r8/internal/kh0;)V"}
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):376:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/lang/String;)Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLjava/lang/String;)Lcom/android/tools/r8/internal/kh0;"}
     25:25:void end():387:387 -> a
     26:26:boolean com.android.tools.r8.utils.Timing.verifyUnambiguous(com.android.tools.r8.utils.Timing$Node,java.lang.String):396:396 -> a
     26:26:void end():387 -> a
     27:28:void end():388:389 -> a
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.hh0:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.lh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/nh0;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():297:297 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.Timing$TimingMerger,java.lang.String,boolean,int):297:297 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/jh0;Ljava/lang/String;ZI)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/nh0;Ljava/lang/String;ZI)V"}
     1:15:void report(int,com.android.tools.r8.utils.Timing$Node):300:314 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/kh0;)V"}
     16:34:void report(int,com.android.tools.r8.utils.Timing$Node):308:326 -> a
     35:35:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):321:321 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/internal/kh0;)V"}
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):326:326 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/internal/gh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;Lcom/android/tools/r8/internal/kh0;)V"}
     1:1:java.lang.String toString():332:332 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.ih0:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.mh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh0;"}
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kh0;"}
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):350:352 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gh0;Lcom/android/tools/r8/internal/gh0;)V"}
-com.android.tools.r8.utils.Timing$TimingWithCancellation -> com.android.tools.r8.internal.kh0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kh0;Lcom/android/tools/r8/internal/kh0;)V"}
+com.android.tools.r8.utils.Timing$TimingWithCancellation -> com.android.tools.r8.internal.oh0:
 # {"id":"sourceFile","fileName":"Timing.java"}
     com.android.tools.r8.utils.Timing com.android.tools.r8.utils.Timing$TimingDelegateBase.timing -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ph0;"}
     com.android.tools.r8.utils.InternalOptions options -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):115:115 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/ph0;)V"}
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):150:150 -> <init>
     2:2:void com.android.tools.r8.utils.Timing$TimingDelegateBase.<init>(java.lang.String,com.android.tools.r8.utils.Timing):76 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):115 -> <init>
@@ -298596,11 +297921,11 @@
     3:3:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):115 -> <init>
     4:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):116:116 -> <init>
     1:1:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing$TimingDelegateBase.beginMerger(java.lang.String,int):82:82 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)Lcom/android/tools/r8/internal/nh0;"}
     2:2:void com.android.tools.r8.utils.Timing$TimingDelegateBase.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Qg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/Ug0;)V"}
     3:3:java.lang.Object com.android.tools.r8.utils.Timing$TimingDelegateBase.time(java.lang.String,com.android.tools.r8.utils.ThrowingSupplier):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/ch0;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Lcom/android/tools/r8/internal/gh0;)Ljava/lang/Object;"}
     4:4:void begin(java.lang.String):121:121 -> a
     5:5:boolean com.android.tools.r8.utils.InternalOptions.checkIfCancelled():202:202 -> a
     5:5:void begin(java.lang.String):121 -> a
@@ -298614,68 +297939,68 @@
     15:15:void begin(java.lang.String):122:122 -> a
     1:1:void com.android.tools.r8.utils.Timing$TimingDelegateBase.end():102:102 -> b
     1:1:void com.android.tools.r8.utils.Timing$TimingDelegateBase.report():107:107 -> c
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.Kh0:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.Oh0:
 # {"id":"sourceFile","fileName":"TraversalContinuation.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.utils.TraversalContinuation$Break asBreak():18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lh0;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation continueIf(boolean):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Z)Lcom/android/tools/r8/internal/Oh0;"}
     3:3:com.android.tools.r8.utils.TraversalContinuation ifContinueThen(java.util.function.Function):134:134 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     4:4:com.android.tools.r8.utils.TraversalContinuation$Break doBreak(java.lang.Object):152:152 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Hh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;)Lcom/android/tools/r8/internal/Lh0;"}
     1:1:com.android.tools.r8.utils.TraversalContinuation$Continue asContinue():31:31 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nh0;"}
     1:1:boolean isBreak():14:14 -> c
     1:1:boolean isContinue():27:27 -> d
     1:1:boolean shouldBreak():156:156 -> e
-com.android.tools.r8.utils.TraversalContinuation$Break -> com.android.tools.r8.internal.Hh0:
+com.android.tools.r8.utils.TraversalContinuation$Break -> com.android.tools.r8.internal.Lh0:
 # {"id":"sourceFile","fileName":"TraversalContinuation.java"}
     java.lang.Object value -> b
     com.android.tools.r8.utils.TraversalContinuation$Break BREAK_NO_VALUE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Kh0;"}
     1:1:void <clinit>():85:85 -> <clinit>
     1:2:void <init>(java.lang.Object):101:102 -> <init>
     1:1:com.android.tools.r8.utils.TraversalContinuation$Break asBreak():120:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Hh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Lh0;"}
     1:1:boolean isBreak():115:115 -> c
     1:1:java.lang.Object getValue():106:106 -> f
-com.android.tools.r8.utils.TraversalContinuation$Break$1 -> com.android.tools.r8.internal.Gh0:
+com.android.tools.r8.utils.TraversalContinuation$Break$1 -> com.android.tools.r8.internal.Kh0:
 # {"id":"sourceFile","fileName":"TraversalContinuation.java"}
     1:1:void <init>(java.lang.Object):86:86 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Object getValue():89:89 -> f
-com.android.tools.r8.utils.TraversalContinuation$Continue -> com.android.tools.r8.internal.Jh0:
+com.android.tools.r8.utils.TraversalContinuation$Continue -> com.android.tools.r8.internal.Nh0:
 # {"id":"sourceFile","fileName":"TraversalContinuation.java"}
     java.lang.Object value -> b
     com.android.tools.r8.utils.TraversalContinuation$Continue CONTINUE_NO_VALUE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ih0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Mh0;"}
     1:1:void <clinit>():45:45 -> <clinit>
     1:2:void <init>(java.lang.Object):61:62 -> <init>
     1:1:com.android.tools.r8.utils.TraversalContinuation$Continue asContinue():80:80 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Jh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Nh0;"}
     1:1:boolean isContinue():75:75 -> d
     1:1:java.lang.Object getValue():66:66 -> f
     1:1:java.lang.Object getValueOrDefault(java.lang.Object):70:70 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/lang/Object;"}
-com.android.tools.r8.utils.TraversalContinuation$Continue$1 -> com.android.tools.r8.internal.Ih0:
+com.android.tools.r8.utils.TraversalContinuation$Continue$1 -> com.android.tools.r8.internal.Mh0:
 # {"id":"sourceFile","fileName":"TraversalContinuation.java"}
     1:1:void <init>(java.lang.Object):46:46 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     1:1:java.lang.Object getValue():49:49 -> f
     1:1:java.lang.Object getValueOrDefault(java.lang.Object):55:55 -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Ljava/lang/Object;"}
-com.android.tools.r8.utils.TraversalUtils -> com.android.tools.r8.internal.Lh0:
+com.android.tools.r8.utils.TraversalUtils -> com.android.tools.r8.internal.Ph0:
 # {"id":"sourceFile","fileName":"TraversalUtils.java"}
     1:1:java.lang.Object getFirst(java.util.function.Function):20:20 -> a
     2:4:boolean isSizeExactly(java.util.function.Consumer,int):40:42 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/util/function/Consumer;)Z"}
     5:7:boolean isSizeExactly(java.util.function.Consumer,int):41:43 -> a
     8:8:com.android.tools.r8.utils.TraversalContinuation lambda$isSizeExactly$0(com.android.tools.r8.utils.IntBox,int):42:42 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;I)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;I)Lcom/android/tools/r8/internal/Oh0;"}
     9:9:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> a
     9:9:com.android.tools.r8.utils.TraversalContinuation lambda$isSizeExactly$0(com.android.tools.r8.utils.IntBox,int):42 -> a
     10:12:boolean isSizeGreaterThan(java.util.function.Consumer,int):48:50 -> a
@@ -298683,22 +298008,22 @@
     13:15:boolean isSizeGreaterThan(java.util.function.Consumer,int):49:51 -> a
     16:16:com.android.tools.r8.utils.TraversalContinuation$Continue com.android.tools.r8.utils.TraversalContinuation.doContinue(java.lang.Object):143:143 -> a
     16:16:com.android.tools.r8.utils.TraversalContinuation traverseIterable(java.lang.Iterable,java.util.function.BiFunction,java.lang.Object):59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/Collection;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/util/Collection;Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     17:20:com.android.tools.r8.utils.TraversalContinuation traverseIterable(java.lang.Iterable,java.util.function.BiFunction,java.lang.Object):60:63 -> a
     1:1:com.android.tools.r8.utils.TraversalContinuation lambda$isSizeGreaterThan$1(com.android.tools.r8.utils.IntBox,int):50:50 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;I)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;I)Lcom/android/tools/r8/internal/Oh0;"}
     2:2:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> b
     2:2:com.android.tools.r8.utils.TraversalContinuation lambda$isSizeGreaterThan$1(com.android.tools.r8.utils.IntBox,int):50 -> b
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.Nh0:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.Rh0:
 # {"id":"sourceFile","fileName":"TriConsumer.java"}
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.Oh0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.Sh0:
 # {"id":"sourceFile","fileName":"TriFunction.java"}
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.Ph0:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.Th0:
 # {"id":"sourceFile","fileName":"TriPredicate.java"}
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.bj0:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.fj0:
 # {"id":"sourceFile","fileName":"TypeReferenceUtils.java"}
     java.util.Comparator COMPARATOR -> a
     boolean $assertionsDisabled -> b
@@ -298721,7 +298046,7 @@
     45:45:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):99:99 -> b
     46:69:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):97:120 -> b
     70:75:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):118:123 -> b
-com.android.tools.r8.utils.UTF8TextInputStream -> com.android.tools.r8.internal.Aj0:
+com.android.tools.r8.utils.UTF8TextInputStream -> com.android.tools.r8.internal.Ej0:
 # {"id":"sourceFile","fileName":"UTF8TextInputStream.java"}
     java.io.InputStream inputStream -> a
     1:1:void <init>(java.nio.file.Path):21:21 -> <init>
@@ -298729,7 +298054,7 @@
     3:4:void <init>(java.io.InputStream):29:30 -> <init>
     1:1:java.nio.charset.Charset getCharset():40:40 -> getCharset
     1:1:java.io.InputStream getInputStream():35:35 -> getInputStream
-com.android.tools.r8.utils.UTF8TextOutputStream -> com.android.tools.r8.internal.Bj0:
+com.android.tools.r8.utils.UTF8TextOutputStream -> com.android.tools.r8.internal.Fj0:
 # {"id":"sourceFile","fileName":"UTF8TextOutputStream.java"}
     java.io.OutputStream outputStream -> a
     1:1:void <init>(java.nio.file.Path):20:20 -> <init>
@@ -298737,7 +298062,7 @@
     2:3:void <init>(java.nio.file.Path):20 -> <init>
     1:1:java.nio.charset.Charset getCharset():34:34 -> getCharset
     1:1:java.io.OutputStream getOutputStream():29:29 -> getOutputStream
-com.android.tools.r8.utils.UncheckedExecutionException -> com.android.tools.r8.internal.Dj0:
+com.android.tools.r8.utils.UncheckedExecutionException -> com.android.tools.r8.internal.Hj0:
 # {"id":"sourceFile","fileName":"UncheckedExecutionException.java"}
     java.util.concurrent.ExecutionException exception -> b
     1:2:void <init>(java.util.concurrent.ExecutionException):14:15 -> <init>
@@ -298751,15 +298076,15 @@
     1:8:java.lang.String getDiagnosticMessage():40:47 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():30:30 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():35:35 -> getPosition
-com.android.tools.r8.utils.ValueUtils -> com.android.tools.r8.internal.ol0:
+com.android.tools.r8.utils.ValueUtils -> com.android.tools.r8.internal.sl0:
 # {"id":"sourceFile","fileName":"ValueUtils.java"}
     1:15:com.android.tools.r8.utils.ValueUtils$ArrayValues computeSingleUseArrayValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):130:144 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/LB;)Lcom/android/tools/r8/internal/nl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/NB;)Lcom/android/tools/r8/internal/rl0;"}
     16:16:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():123:123 -> a
     16:16:com.android.tools.r8.utils.ValueUtils$ArrayValues computeSingleUseArrayValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):144 -> a
     17:28:com.android.tools.r8.utils.ValueUtils$ArrayValues computeSingleUseArrayValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):144:155 -> a
     29:65:com.android.tools.r8.utils.ValueUtils$ArrayValues computeArrayValuesInternal(com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Instruction,boolean):213:249 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iQ;ILcom/android/tools/r8/internal/Iw;Z)Lcom/android/tools/r8/internal/nl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/mQ;ILcom/android/tools/r8/internal/Kw;Z)Lcom/android/tools/r8/internal/rl0;"}
     66:78:com.android.tools.r8.utils.DominatorChecker com.android.tools.r8.utils.DominatorChecker.create(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):126:138 -> a
     66:78:com.android.tools.r8.utils.ValueUtils$ArrayValues computeArrayValuesInternal(com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Instruction,boolean):249 -> a
     79:105:com.android.tools.r8.utils.DominatorChecker com.android.tools.r8.utils.DominatorChecker.create(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):137:163 -> a
@@ -298772,28 +298097,28 @@
     108:111:com.android.tools.r8.utils.DominatorChecker com.android.tools.r8.utils.DominatorChecker.create(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):168:171 -> a
     108:111:com.android.tools.r8.utils.ValueUtils$ArrayValues computeArrayValuesInternal(com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Instruction,boolean):249 -> a
     112:145:com.android.tools.r8.utils.ValueUtils$ArrayValues computeArrayValuesInternal(com.android.tools.r8.ir.code.NewArrayEmpty,int,com.android.tools.r8.ir.code.Instruction,boolean):253:286 -> a
-com.android.tools.r8.utils.ValueUtils$ArrayValues -> com.android.tools.r8.internal.nl0:
+com.android.tools.r8.utils.ValueUtils$ArrayValues -> com.android.tools.r8.internal.rl0:
 # {"id":"sourceFile","fileName":"ValueUtils.java"}
     java.util.List elementValues -> a
     com.android.tools.r8.ir.code.ArrayPut[] arrayPutsByIndex -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/N3;"}
     com.android.tools.r8.ir.code.Value arrayValue -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xk0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bl0;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():57:57 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):62:64 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Ljava/util/ArrayList;)V"}
     4:6:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ArrayPut[]):67:69 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;[Lcom/android/tools/r8/internal/N3;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;[Lcom/android/tools/r8/internal/N3;)V"}
     1:2:com.android.tools.r8.ir.code.ArrayPut[] getArrayPutsByIndex():100:101 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/N3;"}
     1:10:java.util.List getElementValues():74:83 -> b
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.vl0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.zl0:
 # {"id":"sourceFile","fileName":"VersionProperties.java"}
     java.lang.String sha -> a
     java.lang.String releaser -> b
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zl0;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
     2:7:com.android.tools.r8.utils.VersionProperties get():28:33 -> <clinit>
@@ -298807,34 +298132,34 @@
     1:1:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.Yl0:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.cm0:
 # {"id":"sourceFile","fileName":"Visibility.java"}
     com.android.tools.r8.utils.Visibility PUBLIC -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm0;"}
     com.android.tools.r8.utils.Visibility PROTECTED -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm0;"}
     com.android.tools.r8.utils.Visibility PRIVATE -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm0;"}
     com.android.tools.r8.utils.Visibility PACKAGE_PRIVATE -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cm0;"}
     com.android.tools.r8.utils.Visibility[] $VALUES -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"[Lcom/android/tools/r8/internal/cm0;"}
     1:4:void <clinit>():10:13 -> <clinit>
     5:5:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):9:9 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILjava/lang/String;)V"}
     1:1:com.android.tools.r8.utils.Visibility[] values():9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/Yl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()[Lcom/android/tools/r8/internal/cm0;"}
     1:15:java.lang.String toString():33:47 -> toString
     16:16:java.lang.String toString():44:44 -> toString
     17:17:java.lang.String toString():41:41 -> toString
     18:18:java.lang.String toString():38:38 -> toString
     19:19:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.Xl0:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.bm0:
 # {"id":"sourceFile","fileName":"Visibility.java"}
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():33:33 -> <clinit>
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.xm0:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.Bm0:
 # {"id":"sourceFile","fileName":"WorkList.java"}
     java.util.Deque workingList -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
@@ -298847,17 +298172,17 @@
     2:3:void addIfNotSeen(java.lang.Object[]):85:86 -> a
     4:5:boolean addFirstIfNotSeen(java.lang.Object):99:100 -> a
     6:6:void lambda$process$0(java.util.function.Consumer,java.lang.Object,com.android.tools.r8.utils.WorkList):107:107 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;Lcom/android/tools/r8/internal/xm0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Ljava/lang/Object;Lcom/android/tools/r8/internal/Bm0;)V"}
     7:7:com.android.tools.r8.utils.WorkList process(java.util.function.Consumer):107:107 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;)V"}
     8:9:com.android.tools.r8.utils.WorkList process(java.util.function.BiConsumer):111:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;)Lcom/android/tools/r8/internal/Bm0;"}
     10:10:com.android.tools.r8.utils.TraversalContinuation lambda$run$1(java.util.function.Function,java.lang.Object,com.android.tools.r8.utils.WorkList):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Lcom/android/tools/r8/internal/xm0;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Ljava/lang/Object;Lcom/android/tools/r8/internal/Bm0;)Lcom/android/tools/r8/internal/Oh0;"}
     11:11:com.android.tools.r8.utils.TraversalContinuation run(java.util.function.Function):118:118 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;)Lcom/android/tools/r8/internal/Oh0;"}
     12:13:com.android.tools.r8.utils.TraversalContinuation run(java.util.function.BiFunction):123:124 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     14:14:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():156:156 -> a
     14:14:com.android.tools.r8.utils.TraversalContinuation run(java.util.function.BiFunction):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -298869,9 +298194,9 @@
     2:3:boolean addIfNotSeen(java.lang.Object):91:92 -> b
     4:4:boolean hasNext():137:137 -> b
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Iterable):33:34 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/Bm0;"}
     3:3:com.android.tools.r8.utils.WorkList newIdentityWorkList():39:39 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xm0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bm0;"}
     4:4:void addIgnoringSeenSet(java.lang.Object):73:73 -> c
     1:1:boolean markAsSeen(java.lang.Object):149:149 -> d
     2:2:java.lang.Object next():157:157 -> d
@@ -298882,7 +298207,7 @@
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:boolean lambda$unzip$5(java.util.zip.ZipEntry):0:0 -> a
     2:12:void writeResourcesToZip(java.util.List,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.io.Closer,java.util.zip.ZipOutputStream):62:72 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Cd;Ljava/util/zip/ZipOutputStream;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Ljava/util/Set;Ljava/util/Set;Lcom/android/tools/r8/internal/Ed;Ljava/util/zip/ZipOutputStream;)V"}
     13:13:boolean com.android.tools.r8.androidapi.AndroidApiDataAccess.isApiDatabaseEntry(java.lang.String):48:48 -> a
     13:13:void writeResourcesToZip(java.util.List,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.io.Closer,java.util.zip.ZipOutputStream):72 -> a
     14:26:void writeResourcesToZip(java.util.List,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.io.Closer,java.util.zip.ZipOutputStream):68:80 -> a
@@ -298898,7 +298223,7 @@
     49:55:boolean containsEntry(java.nio.file.Path,java.lang.String):115:121 -> a
     56:56:boolean lambda$containsEntry$0(java.util.zip.ZipEntry,java.lang.String):119:119 -> a
     57:57:void lambda$containsEntry$1(com.android.tools.r8.utils.BooleanBox,java.lang.String,java.util.zip.ZipEntry,java.io.InputStream):119:119 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/D6;Ljava/lang/String;Ljava/util/zip/ZipEntry;Ljava/io/InputStream;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/F6;Ljava/lang/String;Ljava/util/zip/ZipEntry;Ljava/io/InputStream;)V"}
     58:64:java.nio.file.Path map(java.nio.file.Path,java.nio.file.Path,java.util.function.BiFunction):128:134 -> a
     65:65:void lambda$map$2(com.android.tools.r8.utils.ZipUtils$ZipBuilder,java.util.function.BiFunction,java.util.zip.ZipEntry,java.io.InputStream):132:132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/v$b;Ljava/util/function/BiFunction;Ljava/util/zip/ZipEntry;Ljava/io/InputStream;)V"}
@@ -298956,10 +298281,10 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/String;Ljava/lang/String;)Lcom/android/tools/r8/utils/v$b;"}
     31:32:java.nio.file.Path build():338:339 -> a
     1:1:java.util.zip.ZipOutputStream getOutputStream():288:288 -> b
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.hO:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.lO:
 # {"id":"sourceFile","fileName":"MethodOverridesCollector.java"}
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):36:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Ljava/util/Collection;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Ljava/util/Collection;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/CY;"}
     6:6:boolean com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.isEmpty():98:98 -> a
     6:6:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):55 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -298969,15 +298294,15 @@
     18:18:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator.getResult():176:176 -> a
     18:18:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):66 -> a
     19:23:void lambda$findAllMethodsAndOverridesThatMatches$0(java.util.function.Predicate,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):42:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/graph/C5;)V"}
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.fO:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/graph/C5;)V"}
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.jO:
 # {"id":"sourceFile","fileName":"MethodOverridesCollector.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet classRootMethods -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     java.util.Map interfaceMethodsOfInterest -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):81:81 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/CY;)V"}
     2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):73:82 -> <init>
     12:12:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):83 -> <init>
@@ -298988,7 +298313,7 @@
     18:18:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> <init>
     18:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):86 -> <init>
     1:2:void lambda$visit$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexProgramClass):100:101 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/D2;)V"}
     3:3:void lambda$visit$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexProgramClass):100:100 -> a
     4:4:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):143:143 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/graph/D2;)V"}
@@ -299029,23 +298354,23 @@
     24:24:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClassLegacy(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethodSignature):825:825 -> l
     24:24:void visit(com.android.tools.r8.graph.DexProgramClass):114 -> l
     25:36:void visit(com.android.tools.r8.graph.DexProgramClass):115:126 -> l
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.gO:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.kO:
 # {"id":"sourceFile","fileName":"MethodOverridesCollector.java"}
     java.util.Map methodsOfInterest -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.ProgramMethodSet result -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/CY;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):164:164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/yY;Lcom/android/tools/r8/internal/yY;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/CY;Lcom/android/tools/r8/internal/CY;)V"}
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):154:166 -> <init>
     1:3:void addRootMethod(com.android.tools.r8.graph.ProgramMethod):170:172 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)V"}
     4:4:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> a
     4:4:void addRootMethod(com.android.tools.r8.graph.ProgramMethod):172 -> a
     5:5:void lambda$visit$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexProgramClass):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/D2;)V"}
     6:6:void lambda$visit$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)V"}
     7:7:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexClassAndMethod):111:111 -> a
     7:7:void lambda$visit$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):192 -> a
     8:8:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> a
@@ -299059,19 +298384,19 @@
     6:6:void com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):99:99 -> l
     6:6:void visit(com.android.tools.r8.graph.DexProgramClass):185 -> l
     7:7:void visit(com.android.tools.r8.graph.DexProgramClass):190:190 -> l
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.U5:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.W5:
 # {"id":"sourceFile","fileName":"BidirectionalManyToManyMap.java"}
     boolean containsKey(java.lang.Object) -> containsKey
     boolean containsValue(java.lang.Object) -> containsValue
     java.util.Set getKeys(java.lang.Object) -> d
     boolean isEmpty() -> isEmpty
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.V5:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.X5:
 # {"id":"sourceFile","fileName":"BidirectionalManyToManyRepresentativeMap.java"}
     1:1:java.lang.Object getRepresentativeValueOrDefault(java.lang.Object,java.lang.Object):29:29 -> a
     java.lang.Object getRepresentativeValue(java.lang.Object) -> b
     1:1:java.lang.Object getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> b
     java.lang.Object getRepresentativeKey(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.Y5:
 # {"id":"sourceFile","fileName":"BidirectionalManyToOneHashMap.java"}
     java.util.Map backing -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/AbstractMap;"}
@@ -299101,7 +298426,7 @@
     1:1:java.util.Set keySet():87:87 -> keySet
     1:3:java.lang.Object put(java.lang.Object,java.lang.Object):139:141 -> put
     1:1:java.util.Set values():152:152 -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.Z5:
 # {"id":"sourceFile","fileName":"BidirectionalManyToOneMap.java"}
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.util.Map getForwardMap() -> e
@@ -299109,7 +298434,7 @@
     java.lang.Object getOrDefault(java.lang.Object,java.lang.Object) -> getOrDefault
     java.util.Set keySet() -> keySet
     java.util.Set values() -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.Y5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.a6:
 # {"id":"sourceFile","fileName":"BidirectionalManyToOneRepresentativeHashMap.java"}
     java.util.Map representatives -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -299118,16 +298443,16 @@
     1:2:void <init>(java.util.Map,java.util.Map,java.util.Map):26:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;Ljava/util/IdentityHashMap;)V"}
     1:1:com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap newIdentityHashMap():20:20 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/a6;"}
     2:2:void forEachManyToOneMapping(com.android.tools.r8.utils.TriConsumer):38:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;)V"}
     3:3:boolean hasExplicitRepresentativeKey(java.lang.Object):58:58 -> a
     3:3:void lambda$forEachManyToOneMapping$0(com.android.tools.r8.utils.TriConsumer,java.util.Set,java.lang.Object):43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nh0;Ljava/util/Set;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Rh0;Ljava/util/Set;Ljava/lang/Object;)V"}
     4:4:void lambda$forEachManyToOneMapping$0(com.android.tools.r8.utils.TriConsumer,java.util.Set,java.lang.Object):43:43 -> a
     5:5:void lambda$forEachManyToOneMapping$0(com.android.tools.r8.utils.TriConsumer,java.util.Set,java.lang.Object):40:40 -> a
     6:6:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap):89:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/a6;)V"}
     7:7:void lambda$putAll$1(java.util.Set,java.lang.Object,java.lang.Object):91:91 -> a
     8:8:void setRepresentative(java.lang.Object,java.lang.Object):53:53 -> a
     8:8:void lambda$putAll$1(java.util.Set,java.lang.Object,java.lang.Object):93 -> a
@@ -299146,9 +298471,9 @@
     3:3:java.lang.Object remove(java.lang.Object):102:102 -> f
     4:4:java.lang.Object removeRepresentativeFor(java.lang.Object):48:48 -> f
     4:4:java.lang.Object remove(java.lang.Object):103 -> f
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.b6:
 # {"id":"sourceFile","fileName":"BidirectionalManyToOneRepresentativeMap.java"}
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.c6:
 # {"id":"sourceFile","fileName":"BidirectionalOneToManyHashMap.java"}
     java.util.Map backing -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -299177,7 +298502,7 @@
     2:2:java.util.Set getValues(java.lang.Object):93 -> e
     1:1:java.util.Set lambda$put$2(java.lang.Object):139:139 -> f
     1:1:boolean isEmpty():98:98 -> isEmpty
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.d6:
 # {"id":"sourceFile","fileName":"BidirectionalOneToManyRepresentativeHashMap.java"}
     java.util.Map representatives -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -299187,17 +298512,17 @@
     1:3:java.lang.Object getRepresentativeValue(java.lang.Object):37:39 -> b
     1:1:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap.getKey(java.lang.Object):77:77 -> c
     1:1:java.lang.Object getRepresentativeKey(java.lang.Object):32 -> c
-com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.e6:
 # {"id":"sourceFile","fileName":"BidirectionalOneToOneHashMap.java"}
     com.android.tools.r8.com.google.common.collect.BiMap backing -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gs;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Is;"}
     1:1:void <init>():22:22 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):25:26 -> <init>
     2:3:void <init>():22 -> <init>
     1:1:void forEachManyToOneMapping(java.util.function.BiConsumer):65:65 -> a
     2:2:void lambda$forEachManyToOneMapping$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):65:65 -> a
     3:3:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):153:153 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/c6;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/e6;)V"}
     4:4:void forEach(java.util.function.BiConsumer):55:55 -> a
     4:4:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToManyMap):153 -> a
     1:1:java.lang.Object get(java.lang.Object):80:80 -> b
@@ -299236,25 +298561,25 @@
     1:1:java.util.Set values():173:173 -> values
     1:1:java.util.Collection values():16 -> values
     2:2:java.util.Set values():173:173 -> values
-com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.f6:
 # {"id":"sourceFile","fileName":"BidirectionalOneToOneMap.java"}
-com.android.tools.r8.utils.collections.DexClassAndFieldMap -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.utils.collections.DexClassAndFieldMap -> com.android.tools.r8.internal.zl:
 # {"id":"sourceFile","fileName":"DexClassAndFieldMap.java"}
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):19:19 -> <init>
     1:1:com.android.tools.r8.utils.collections.DexClassAndFieldMap create():23:23 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xl;"}
-com.android.tools.r8.utils.collections.DexClassAndFieldMapBase -> com.android.tools.r8.internal.yl:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/zl;"}
+com.android.tools.r8.utils.collections.DexClassAndFieldMapBase -> com.android.tools.r8.internal.Al:
 # {"id":"sourceFile","fileName":"DexClassAndFieldMapBase.java"}
     1:1:void <init>(java.util.function.Supplier):17:17 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):13:13 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/po;"}
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndField):22:22 -> b
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):13 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndField):22 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):13 -> b
-com.android.tools.r8.utils.collections.DexClassAndMemberMap -> com.android.tools.r8.internal.zl:
+com.android.tools.r8.utils.collections.DexClassAndMemberMap -> com.android.tools.r8.internal.Bl:
 # {"id":"sourceFile","fileName":"DexClassAndMemberMap.java"}
     java.util.Map backing -> b
     1:2:void <init>(java.util.function.Supplier):32:33 -> <init>
@@ -299263,9 +298588,9 @@
     1:1:java.lang.Object compute(com.android.tools.r8.graph.DexClassAndMember,java.util.function.BiFunction):46:46 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;Ljava/util/function/BiFunction;)Ljava/lang/Object;"}
     2:2:java.lang.Object lambda$compute$0(java.util.function.BiFunction,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/internal/mo;Ljava/lang/Object;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/graph/G0;Lcom/android/tools/r8/internal/po;Ljava/lang/Object;)Ljava/lang/Object;"}
     3:3:java.lang.Object computeIfAbsent(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.util.function.Function):54:54 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/mo;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/po;)Ljava/lang/Object;"}
     4:4:void forEachKey(java.util.function.Consumer):83:83 -> a
     5:5:java.lang.Object get(com.android.tools.r8.graph.DexClassAndMember):97:97 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Ljava/lang/Object;"}
@@ -299282,15 +298607,15 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:boolean lambda$removeIf$6(java.util.function.BiPredicate,java.util.Map$Entry):163:163 -> a
     16:18:boolean removeIf(com.android.tools.r8.utils.TriPredicate):167:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ph0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Th0;)V"}
     19:19:boolean lambda$removeIf$7(com.android.tools.r8.utils.TriPredicate,java.util.Map$Entry):169:169 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ph0;Ljava/util/Map$Entry;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Th0;Ljava/util/Map$Entry;)Z"}
     20:20:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     20:20:boolean lambda$removeIf$7(com.android.tools.r8.utils.TriPredicate,java.util.Map$Entry):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     21:21:boolean lambda$removeIf$7(com.android.tools.r8.utils.TriPredicate,java.util.Map$Entry):169:169 -> a
     22:24:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.BiFunction):192:194 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;)Lcom/android/tools/r8/internal/Oh0;"}
     25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     25:25:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.BiFunction):194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -299302,27 +298627,27 @@
     29:29:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     29:29:void lambda$forEach$2(java.util.function.BiConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/mo;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiConsumer;Lcom/android/tools/r8/internal/po;Ljava/lang/Object;)V"}
     30:30:void lambda$forEach$2(java.util.function.BiConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,java.lang.Object):79:79 -> a
     31:31:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     31:31:void lambda$forEachKey$3(java.util.function.Consumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):83 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/mo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/po;)V"}
     32:32:void lambda$forEachKey$3(java.util.function.Consumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):83:83 -> a
     33:33:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     33:33:void lambda$getKeys$4(java.util.List,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/mo;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;Lcom/android/tools/r8/internal/po;)V"}
     34:34:void lambda$getKeys$4(java.util.List,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):106:106 -> a
     com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember) -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/po;"}
     1:1:void forEachValue(java.util.function.Consumer):87:87 -> b
     2:3:java.lang.Object put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:142 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;Ljava/lang/Object;)Ljava/lang/Object;"}
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> b
     4:4:java.lang.Object lambda$computeIfAbsent$1(java.util.function.Function,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/mo;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/internal/po;)Ljava/lang/Object;"}
     5:5:java.lang.Object lambda$computeIfAbsent$1(java.util.function.Function,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):54:54 -> b
     1:1:void clear():42:42 -> clear
     1:1:boolean containsKey(java.lang.Object):60:60 -> containsKey
@@ -299358,37 +298683,37 @@
     2:2:java.lang.Object remove(java.lang.Object):153 -> remove
     1:1:int size():179:179 -> size
     1:1:java.util.Collection values():204:204 -> values
-com.android.tools.r8.utils.collections.DexClassAndMethodMap -> com.android.tools.r8.internal.Bl:
+com.android.tools.r8.utils.collections.DexClassAndMethodMap -> com.android.tools.r8.internal.Dl:
 # {"id":"sourceFile","fileName":"DexClassAndMethodMap.java"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):21:21 -> <init>
     2:2:void <init>(java.util.Map):25:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMethod):47:47 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Lcom/android/tools/r8/internal/po;"}
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> a
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMethod):47 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):16:16 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/po;"}
     1:1:com.android.tools.r8.utils.collections.DexClassAndMethodMap create():29:29 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bl;"}
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.El:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dl;"}
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.Gl:
 # {"id":"sourceFile","fileName":"DexClassAndMethodSet.java"}
     com.android.tools.r8.utils.collections.DexClassAndMethodSet EMPTY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Cl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El;"}
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
-com.android.tools.r8.utils.collections.DexClassAndMethodSet$EmptyDexClassAndMethodSet -> com.android.tools.r8.internal.Cl:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet$EmptyDexClassAndMethodSet -> com.android.tools.r8.internal.El:
 # {"id":"sourceFile","fileName":"DexClassAndMethodSet.java"}
     1:1:void <init>():56:56 -> <init>
     1:1:java.util.Map createBacking():60:60 -> a
     1:1:java.util.Map createBacking(int):65:65 -> j
-com.android.tools.r8.utils.collections.DexClassAndMethodSet$IdentityDexClassAndMethodSet -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet$IdentityDexClassAndMethodSet -> com.android.tools.r8.internal.Fl:
 # {"id":"sourceFile","fileName":"DexClassAndMethodSet.java"}
     1:1:void <init>():69:69 -> <init>
     1:1:java.util.Map createBacking():73:73 -> a
     1:1:java.util.Map createBacking(int):78:78 -> j
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.Hl:
 # {"id":"sourceFile","fileName":"DexClassAndMethodSetBase.java"}
     java.util.Map backing -> b
     boolean $assertionsDisabled -> c
@@ -299435,13 +298760,13 @@
     1:1:java.util.stream.Stream stream():150:150 -> stream
     1:1:java.lang.Object[] toArray():155:155 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):160:160 -> toArray
-com.android.tools.r8.utils.collections.DexMethodSignatureBiMap -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.utils.collections.DexMethodSignatureBiMap -> com.android.tools.r8.internal.Ql:
 # {"id":"sourceFile","fileName":"DexMethodSignatureBiMap.java"}
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):23:23 -> <init>
     2:2:void <init>():15 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):19:19 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;)V"}
     4:4:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(java.util.Map):88:88 -> <init>
     4:4:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):19 -> <init>
     5:5:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):79:79 -> <init>
@@ -299453,7 +298778,7 @@
     7:7:void <init>(com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):19 -> <init>
     8:8:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):23:23 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(I)V"}
-com.android.tools.r8.utils.collections.DexMethodSignatureMap -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.utils.collections.DexMethodSignatureMap -> com.android.tools.r8.internal.Rl:
 # {"id":"sourceFile","fileName":"DexMethodSignatureMap.java"}
     java.util.Map backing -> b
     1:2:void <init>(java.util.Map):26:27 -> <init>
@@ -299493,7 +298818,7 @@
     1:1:boolean containsKey(java.lang.Object):187:187 -> containsKey
     1:1:boolean containsValue(java.lang.Object):192:192 -> containsValue
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap create():31:31 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Pl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Rl;"}
     1:1:java.util.Set entrySet():80:80 -> entrySet
     1:1:void forEach(java.util.function.BiConsumer):94:94 -> forEach
     1:1:java.lang.Object get(java.lang.Object):197:197 -> get
@@ -299521,18 +298846,18 @@
     1:1:void replaceAll(java.util.function.BiFunction):99:99 -> replaceAll
     1:1:int size():263:263 -> size
     1:1:java.util.Collection values():75:75 -> values
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Ql:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Sl:
 # {"id":"sourceFile","fileName":"DexMethodSignatureSet.java"}
     java.util.Set backing -> b
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     1:2:void <clinit>():23:24 -> <clinit>
     1:2:void <init>(java.util.Set):28:29 -> <init>
     1:1:boolean add(com.android.tools.r8.graph.DexMethod):0:0 -> a
     1:1:boolean com.android.tools.r8.internal.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Z"}
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Hc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5},"outline":"Lcom/android/tools/r8/internal/Jc;a(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/z2;"}
     2:2:boolean add(com.android.tools.r8.graph.DexMethodSignature):54:54 -> a
     2:2:boolean add(com.android.tools.r8.graph.DexMethod):58 -> a
     2:2:boolean com.android.tools.r8.internal.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethod):0 -> a
@@ -299544,14 +298869,14 @@
     5:5:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():208 -> a
     5:5:boolean add(com.android.tools.r8.graph.DexMethod):58 -> a
     6:6:com.android.tools.r8.utils.collections.DexMethodSignatureSet create():33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sl;"}
     7:7:boolean add(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     8:8:boolean add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H0;)Z"}
     9:9:void addAllMethods(java.lang.Iterable):75:75 -> a
     10:10:void addAll(com.android.tools.r8.utils.collections.DexMethodSignatureSet):79:79 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;)V"}
     11:11:boolean addAll(java.util.Collection):71:71 -> a
     11:11:void addAll(com.android.tools.r8.utils.collections.DexMethodSignatureSet):79 -> a
     12:13:void addAll(java.lang.Iterable,java.util.function.Function):83:84 -> a
@@ -299560,7 +298885,7 @@
     2:2:boolean add(java.lang.Object):21 -> add
     1:1:boolean addAll(java.util.Collection):71:71 -> addAll
     1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet createLinked():45:45 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Sl;"}
     2:2:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;)Z"}
     3:3:boolean contains(com.android.tools.r8.graph.DexMethodSignature):99:99 -> b
@@ -299581,7 +298906,7 @@
     1:1:int size():167:167 -> size
     1:1:java.lang.Object[] toArray():172:172 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):177:177 -> toArray
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Pm:
 # {"id":"sourceFile","fileName":"EmptyBidirectionalOneToOneMap.java"}
     1:1:void <init>():15:15 -> <init>
     1:1:void forEachManyToOneMapping(java.util.function.BiConsumer):43:43 -> a
@@ -299597,7 +298922,7 @@
     1:1:boolean isEmpty():102:102 -> isEmpty
     1:1:java.util.Set keySet():107:107 -> keySet
     1:1:java.util.Set values():112:112 -> values
-com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.Xt:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.Zt:
 # {"id":"sourceFile","fileName":"IdentityHashSetFromMap.java"}
     java.util.Map backing -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
@@ -299607,7 +298932,7 @@
     1:1:com.android.tools.r8.graph.DexReference lambda$newProgramDerivedContextSet$0(com.android.tools.r8.graph.ProgramDerivedContext):26:26 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/z5;)Lcom/android/tools/r8/graph/F2;"}
     2:2:java.util.Set newProgramDerivedContextSet():26:26 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Xt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Zt;"}
     1:1:boolean add(java.lang.Object):62:62 -> add
     1:2:boolean addAll(java.util.Collection):79:80 -> addAll
     1:1:void clear():113:113 -> clear
@@ -299629,14 +298954,14 @@
     1:1:int size():31:31 -> size
     1:1:java.lang.Object[] toArray():52:52 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):57:57 -> toArray
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.mu:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.ou:
 # {"id":"sourceFile","fileName":"ImmutableDeque.java"}
     boolean isClosed -> b
     1:1:void <init>(java.util.Collection):20:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/List;)V"}
     2:2:void <init>(java.util.Collection):17:17 -> <init>
     1:1:java.util.Deque of(java.lang.Object[]):111:111 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Lcom/android/tools/r8/internal/mu;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"([Ljava/lang/Object;)Lcom/android/tools/r8/internal/ou;"}
     2:2:void close():24:24 -> a
     2:2:java.util.Deque of(java.lang.Object[]):112 -> a
     1:4:boolean add(java.lang.Object):93:96 -> add
@@ -299656,40 +298981,40 @@
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.su:
 # {"id":"sourceFile","fileName":"ImmutableInt2ReferenceSortedMap.java"}
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ly;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ny;"}
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ly;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ny;)V"}
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):96:96 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(II)Lcom/android/tools/r8/internal/Gz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.subMap(int,int):1146:1146 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):96 -> a
     3:3:int firstIntKey():118:118 -> a
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129:129 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.headMap(java.lang.Integer):34:34 -> a
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):141:141 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.subMap(java.lang.Integer,java.lang.Integer):50:50 -> a
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer):141 -> a
     8:8:java.lang.Object put(int,java.lang.Object):158:158 -> a
     9:9:java.lang.Object put(java.lang.Integer,java.lang.Object):163:163 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):108:108 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):135:135 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Integer;)Lcom/android/tools/r8/internal/Gz;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.tailMap(java.lang.Integer):42:42 -> b
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):135 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():78:78 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():17 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():78:78 -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():78:78 -> c
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):102:102 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Ez;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/Gz;"}
     1:1:java.lang.Object compute(java.lang.Object,java.util.function.BiFunction):17:17 -> compute
     2:2:java.lang.Object compute(java.lang.Integer,java.util.function.BiFunction):179:179 -> compute
     2:2:java.lang.Object compute(java.lang.Object,java.util.function.BiFunction):17 -> compute
@@ -299702,7 +299027,7 @@
     1:1:int lastIntKey():123:123 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():85:85 -> e
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/mU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():175:175 -> e
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():85 -> e
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> e
@@ -299726,7 +299051,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129 -> headMap
     3:3:java.util.SortedMap headMap(java.lang.Object):17 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():85:85 -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uU;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():175:175 -> i
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():85 -> i
     1:1:boolean isEmpty():113:113 -> isEmpty
@@ -299738,9 +299063,9 @@
     2:2:java.lang.Integer lastKey():153 -> k
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():90:90 -> keySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():17 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qA;"}
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():90:90 -> keySet
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tA;"}
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():90:90 -> keySet
     3:3:java.util.Set keySet():17 -> keySet
     1:1:java.lang.Integer lastKey():153:153 -> lastKey
@@ -299773,45 +299098,45 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.tailMap(java.lang.Integer):42:42 -> tailMap
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):135 -> tailMap
     3:3:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> R8$$REMOVED$$CLASS$$245:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> R8$$REMOVED$$CLASS$$234:
 # {"id":"sourceFile","fileName":"ImmutableInt2ReferenceSortedMap.java"}
-com.android.tools.r8.utils.collections.LinkedProgramMethodSet -> com.android.tools.r8.internal.ZJ:
+com.android.tools.r8.utils.collections.LinkedProgramMethodSet -> com.android.tools.r8.internal.dK:
 # {"id":"sourceFile","fileName":"LinkedProgramMethodSet.java"}
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     1:1:java.util.Map createBacking():24:24 -> a
     1:1:java.util.Map createBacking(int):29:29 -> j
-com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.ML:
+com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.QL:
 # {"id":"sourceFile","fileName":"LongLivedClassSetBuilder.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.lens.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):23:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
     1:1:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder createConcurrentBuilderForIdentitySet(com.android.tools.r8.graph.lens.GraphLens):29:29 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/ML;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/QL;"}
     2:9:java.util.Set build(com.android.tools.r8.graph.AppView):63:70 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Ljava/util/Set;"}
-com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.NL:
+com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.RL:
 # {"id":"sourceFile","fileName":"LongLivedCollectionBuilder.java"}
     java.util.function.IntFunction factory -> a
     java.util.function.IntFunction factoryForBuilder -> b
     com.android.tools.r8.graph.lens.GraphLens appliedGraphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.lang.Object backing -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.lens.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):27:31 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.OL:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.SL:
 # {"id":"sourceFile","fileName":"LongLivedProgramMethodMapBuilder.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.lens.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):30:30 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder createConcurrentBuilderForNonConcurrentMap(com.android.tools.r8.graph.lens.GraphLens):40:40 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/OL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/SL;"}
     2:2:java.lang.Object computeIfAbsent(com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.graph.lens.GraphLens):46:46 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/function/Function;Lcom/android/tools/r8/internal/ls;)Ljava/lang/Object;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/function/Function;Lcom/android/tools/r8/internal/ns;)Ljava/lang/Object;"}
     3:3:boolean com.android.tools.r8.utils.collections.LongLivedCollectionBuilder.verifyIsRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):39:39 -> a
     3:3:java.lang.Object computeIfAbsent(com.android.tools.r8.graph.ProgramMethod,java.util.function.Function,com.android.tools.r8.graph.lens.GraphLens):46 -> a
     4:4:boolean com.android.tools.r8.utils.collections.LongLivedCollectionBuilder.isRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):35:35 -> a
@@ -299823,11 +299148,11 @@
     7:7:java.lang.Object lambda$computeIfAbsent$0(java.util.function.Function,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/graph/C5;)Ljava/lang/Object;"}
     8:24:com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder rewrittenWithLens(java.util.function.BiFunction,com.android.tools.r8.graph.lens.GraphLens):69:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/OL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/BiFunction;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/SL;"}
     25:28:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexMethod,java.lang.Object):77:80 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/function/BiFunction;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/function/BiFunction;Ljava/util/Map;Lcom/android/tools/r8/graph/w2;Ljava/lang/Object;)V"}
     29:29:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/function/Function;)Lcom/android/tools/r8/internal/xY;"}
     30:30:boolean com.android.tools.r8.utils.collections.LongLivedCollectionBuilder.verifyIsRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):39:39 -> a
     30:30:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92 -> a
     31:31:boolean com.android.tools.r8.utils.collections.LongLivedCollectionBuilder.isRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):35:35 -> a
@@ -299837,28 +299162,28 @@
     32:32:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92 -> a
     33:34:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):94:95 -> a
     35:38:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):97:100 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/tY;Ljava/util/function/Function;Lcom/android/tools/r8/graph/w2;Ljava/lang/Object;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/xY;Ljava/util/function/Function;Lcom/android/tools/r8/graph/w2;Ljava/lang/Object;)V"}
     39:39:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):141:141 -> a
     39:39:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:java.lang.Object com.android.tools.r8.utils.collections.DexClassAndMemberMap.put(com.android.tools.r8.graph.DexClassAndMember,java.lang.Object):142:142 -> a
     40:40:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):100 -> a
     41:41:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):102:102 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.PL:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.TL:
 # {"id":"sourceFile","fileName":"LongLivedProgramMethodSetBuilder.java"}
     java.util.function.IntFunction factory -> a
     java.util.function.IntFunction factoryForBuilder -> b
     com.android.tools.r8.graph.lens.GraphLens appliedGraphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Set methods -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():26:26 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.lens.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):43:47 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V"}
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createConcurrentForIdentitySet(com.android.tools.r8.graph.lens.GraphLens):58:58 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/TL;"}
     2:2:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):70:70 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:boolean isRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):90:90 -> a
     3:3:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):182 -> a
     3:3:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):70 -> a
@@ -299866,14 +299191,14 @@
     4:4:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):70 -> a
     5:5:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.lens.GraphLens):71:71 -> a
     6:6:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):97:97 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PL;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TL;)V"}
     7:7:boolean isRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):90:90 -> a
     7:7:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):97 -> a
     8:14:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):98:104 -> a
     15:15:void remove(com.android.tools.r8.graph.DexMethod):112:112 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     16:16:void remove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):116:116 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)V"}
     17:17:boolean isEmpty():178:178 -> a
     17:17:void remove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):116 -> a
     18:18:boolean isRewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):90:90 -> a
@@ -299883,60 +299208,60 @@
     19:19:void remove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):116 -> a
     20:20:void remove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):117:117 -> a
     21:21:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder removeAll(java.lang.Iterable):121:121 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Iterable;)Lcom/android/tools/r8/internal/TL;"}
     22:22:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder removeIf(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate):127:127 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/Predicate;)Lcom/android/tools/r8/internal/TL;"}
     23:29:boolean lambda$removeIf$1(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):130:136 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Ljava/util/function/Predicate;Lcom/android/tools/r8/graph/w2;)Z"}
     30:37:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView):165:172 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Lcom/android/tools/r8/internal/CY;"}
     38:38:boolean lambda$verifyIsRewrittenWithNewerLens$2(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens):190:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;)Z"}
     39:42:void dump(com.android.tools.r8.utils.DeterminismChecker$LineCallback):196:199 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/fl;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/hl;)V"}
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForIdentitySet(com.android.tools.r8.graph.lens.GraphLens):52:52 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/TL;"}
     1:13:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder rewrittenWithLens(com.android.tools.r8.graph.lens.GraphLens):148:160 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/PL;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/TL;"}
     1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.lens.GraphLens):187:190 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)V"}
     5:5:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> d
     5:5:com.android.tools.r8.graph.lens.NonIdentityGraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.findPrevious(java.util.function.Predicate):61 -> d
     5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.lens.GraphLens):190 -> d
     6:6:com.android.tools.r8.graph.lens.NonIdentityGraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.findPrevious(java.util.function.Predicate):62:62 -> d
     6:6:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.lens.GraphLens):190 -> d
     7:7:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.lens.GraphLens):189:189 -> d
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.OP:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.SP:
 # {"id":"sourceFile","fileName":"MutableBidirectionalManyToOneMap.java"}
     void put(java.lang.Iterable,java.lang.Object) -> a
     java.util.Set removeValue(java.lang.Object) -> a
     1:1:void putAll(com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):21:21 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/W5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Y5;)V"}
     2:2:void removeValues(java.util.Collection):35:35 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)V"}
     java.lang.Object put(java.lang.Object,java.lang.Object) -> put
     1:1:void putAll(java.util.Map):25:25 -> putAll
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap -> com.android.tools.r8.internal.PP:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap -> com.android.tools.r8.internal.TP:
 # {"id":"sourceFile","fileName":"MutableBidirectionalOneToOneMap.java"}
-com.android.tools.r8.utils.collections.ProgramFieldMap -> com.android.tools.r8.internal.qY:
+com.android.tools.r8.utils.collections.ProgramFieldMap -> com.android.tools.r8.internal.uY:
 # {"id":"sourceFile","fileName":"ProgramFieldMap.java"}
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):20:20 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramFieldMap create():24:24 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramFieldMap createConcurrent():28:28 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/qY;"}
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.rY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/uY;"}
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.vY:
 # {"id":"sourceFile","fileName":"ProgramFieldSet.java"}
     java.util.Map backing -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/lang/Object;"}
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/rY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/vY;"}
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():21:23 -> <clinit>
     1:2:void <init>(java.util.Map):27:28 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet create():32:32 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vY;"}
     2:3:boolean add(com.android.tools.r8.graph.ProgramField):44:45 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/A5;)Z"}
     4:4:boolean com.android.tools.r8.graph.ProgramField.isStructurallyEqualTo(com.android.tools.r8.graph.ProgramField):53:53 -> a
@@ -299945,66 +299270,66 @@
     6:6:boolean removeIf(java.util.function.Predicate):96:96 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)V"}
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet createConcurrent():36:36 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/rY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/vY;"}
     1:1:java.util.Iterator iterator():79:79 -> iterator
-com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.tY:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.xY:
 # {"id":"sourceFile","fileName":"ProgramMethodMap.java"}
     com.android.tools.r8.utils.collections.ProgramMethodMap EMPTY -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xY;"}
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):21:21 -> <init>
     2:2:void <init>(java.util.Map):25:25 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/HashMap;)V"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap create(int):33:33 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/xY;"}
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):16:16 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/mo;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/G0;)Lcom/android/tools/r8/internal/po;"}
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMethod):47:47 -> b
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):16 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.com.google.common.base.Equivalence.wrap(java.lang.Object):172:172 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMethod):47 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexClassAndMember):16 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap create():29:29 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap createConcurrent():37:37 -> l
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/tY;"}
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.uY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/xY;"}
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.yY:
 # {"id":"sourceFile","fileName":"ProgramMethodMultiset.java"}
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/xf;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zf;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):22:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/xf;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/zf;)V"}
     1:1:void forEachEntry(java.util.function.ObjIntConsumer):43:43 -> a
     2:2:boolean removeIf(java.util.function.Predicate):47:47 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;)V"}
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     3:3:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Lcom/android/tools/r8/internal/mo;I)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/ObjIntConsumer;Lcom/android/tools/r8/internal/po;I)V"}
     4:4:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):43:43 -> a
     5:5:java.lang.Object com.android.tools.r8.com.google.common.base.Equivalence$Wrapper.get():216:216 -> a
     5:5:boolean lambda$removeIf$1(java.util.function.Predicate,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/mo;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/po;)Z"}
     6:6:boolean lambda$removeIf$1(java.util.function.Predicate,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):47:47 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.yY:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.CY:
 # {"id":"sourceFile","fileName":"ProgramMethodSet.java"}
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AY;"}
     boolean $assertionsDisabled -> e
     1:3:void <clinit>():24:26 -> <clinit>
     1:1:void <init>():29:29 -> <init>
     2:2:void <init>(int):37:37 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):45:45 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.graph.ProgramMethod):49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/CY;"}
     2:2:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.graph.ProgramMethod):50:50 -> a
     3:4:com.android.tools.r8.utils.collections.ProgramMethodSet create(com.android.tools.r8.utils.ForEachable):55:56 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Lcom/android/tools/r8/internal/CY;"}
     5:5:boolean createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/j1;)V"}
     6:6:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):92:92 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/CY;"}
     7:7:java.util.Iterator com.android.tools.r8.utils.collections.DexClassAndMethodSetBase.iterator():103:103 -> a
     7:7:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):95 -> a
     8:11:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):95:98 -> a
@@ -300034,65 +299359,65 @@
     45:45:boolean lambda$withoutPrunedItems$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;Lcom/android/tools/r8/graph/C5;)Z"}
     46:46:com.android.tools.r8.utils.collections.ProgramMethodSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):138:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J5;)Lcom/android/tools/r8/internal/CY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create():41:41 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createConcurrent():67:67 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/CY;"}
     1:1:java.util.Map com.android.tools.r8.utils.collections.SortedProgramMethodSet.createBacking(int):55:55 -> j
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):45:45 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/yY;"}
-com.android.tools.r8.utils.collections.ProgramMethodSet$ConcurrentProgramMethodSet -> com.android.tools.r8.internal.vY:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(I)Lcom/android/tools/r8/internal/CY;"}
+com.android.tools.r8.utils.collections.ProgramMethodSet$ConcurrentProgramMethodSet -> com.android.tools.r8.internal.zY:
 # {"id":"sourceFile","fileName":"ProgramMethodSet.java"}
     1:1:void <init>():142:142 -> <init>
     1:1:java.util.Map createBacking():146:146 -> a
     1:1:java.util.Map createBacking(int):151:151 -> j
-com.android.tools.r8.utils.collections.ProgramMethodSet$EmptyProgramMethodSet -> com.android.tools.r8.internal.wY:
+com.android.tools.r8.utils.collections.ProgramMethodSet$EmptyProgramMethodSet -> com.android.tools.r8.internal.AY:
 # {"id":"sourceFile","fileName":"ProgramMethodSet.java"}
     1:1:void <init>():155:155 -> <init>
     1:1:java.util.Map createBacking():159:159 -> a
     1:1:java.util.Map createBacking(int):164:164 -> j
-com.android.tools.r8.utils.collections.ProgramMethodSet$IdentityProgramMethodSet -> com.android.tools.r8.internal.xY:
+com.android.tools.r8.utils.collections.ProgramMethodSet$IdentityProgramMethodSet -> com.android.tools.r8.internal.BY:
 # {"id":"sourceFile","fileName":"ProgramMethodSet.java"}
     1:1:void <init>():171:171 -> <init>
     2:2:void <init>(int):175:175 -> <init>
     1:1:java.util.Map createBacking():180:180 -> a
     1:1:java.util.Map createBacking(int):185:185 -> j
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.zc0:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.Dc0:
 # {"id":"sourceFile","fileName":"SortedProgramMethodSet.java"}
     int $r8$clinit -> f
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>():26:26 -> <init>
     1:1:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):64:64 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/d1;Ljava/util/function/Consumer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/d1;Ljava/util/function/Consumer;)V"}
     2:2:void lambda$rewrittenWithLens$0(java.util.function.Consumer,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Consumer;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/graph/C5;)V"}
     3:3:void lambda$toDefinitionSet$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):73:73 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/C5;)V"}
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():30:30 -> b
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):40 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Jq;)Lcom/android/tools/r8/internal/yc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lq;)Lcom/android/tools/r8/internal/Cc0;"}
     2:2:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):41:41 -> b
     3:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):61:62 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yc0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/Cc0;"}
     5:7:java.util.Set toDefinitionSet():71:73 -> b
-com.android.tools.r8.utils.collections.SortedProgramMethodSet$EmptySortedProgramMethodSet -> com.android.tools.r8.internal.xc0:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet$EmptySortedProgramMethodSet -> com.android.tools.r8.internal.Bc0:
 # {"id":"sourceFile","fileName":"SortedProgramMethodSet.java"}
     1:1:void <init>():85:85 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):85:85 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/CY;"}
     2:2:java.util.Map createBacking():89:89 -> a
-com.android.tools.r8.utils.collections.SortedProgramMethodSet$TreeSortedProgramMethodSet -> com.android.tools.r8.internal.yc0:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet$TreeSortedProgramMethodSet -> com.android.tools.r8.internal.Cc0:
 # {"id":"sourceFile","fileName":"SortedProgramMethodSet.java"}
     1:1:void <init>():93:93 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.lens.GraphLens):93:93 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/yY;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/d1;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/CY;"}
     2:2:java.util.Map createBacking():97:97 -> a
-com.android.tools.r8.utils.collections.ThrowingSet -> com.android.tools.r8.internal.bh0:
+com.android.tools.r8.utils.collections.ThrowingSet -> com.android.tools.r8.internal.fh0:
 # {"id":"sourceFile","fileName":"ThrowingSet.java"}
     com.android.tools.r8.utils.collections.ThrowingSet INSTANCE -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/bh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/fh0;"}
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
     1:1:boolean add(java.lang.Object):29:29 -> add
@@ -300108,7 +299433,7 @@
     1:1:int size():79:79 -> size
     1:1:java.lang.Object[] toArray():84:84 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):89:89 -> toArray
-com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.Bh:
 # {"id":"sourceFile","fileName":"DFSStack.java"}
     java.util.Deque stack -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayDeque;"}
@@ -300117,32 +299442,32 @@
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(java.util.Deque,java.util.Set):18:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayDeque;Ljava/util/Set;)V"}
-com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.Ch:
+com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.Eh:
 # {"id":"sourceFile","fileName":"DFSWorklistItem.java"}
     java.lang.Object value -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Lm;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Nm;"}
     1:2:void <init>(java.lang.Object):11:12 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)V"}
     1:1:com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited():28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bh;"}
-com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Ah:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dh;"}
+com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Ch:
 # {"id":"sourceFile","fileName":"DFSWorklistItem.java"}
     1:1:void <init>(java.lang.Object):55:55 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)V"}
-com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Bh:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)V"}
+com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Dh:
 # {"id":"sourceFile","fileName":"DFSWorklistItem.java"}
     1:1:void <init>(java.lang.Object):34:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lm;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Nm;)V"}
     1:1:com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited():44:44 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bh;"}
-com.android.tools.r8.utils.positions.ClassFilePositionToMappedRangeMapper -> com.android.tools.r8.internal.Yb:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Dh;"}
+com.android.tools.r8.utils.positions.ClassFilePositionToMappedRangeMapper -> com.android.tools.r8.internal.ac:
 # {"id":"sourceFile","fileName":"ClassFilePositionToMappedRangeMapper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RW;ZZI)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/VW;ZZI)Ljava/util/ArrayList;"}
     2:10:java.util.List getPcEncodedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper):105:113 -> a
     2:10:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):38 -> a
     11:11:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
@@ -300194,7 +299519,7 @@
     103:103:java.util.List getMappedPositionsRemapped(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean):90:90 -> a
     103:103:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):39 -> a
     104:104:void updateDebugInfoInCodeObjects():45:45 -> a
-com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper -> com.android.tools.r8.internal.Vl:
 # {"id":"sourceFile","fileName":"DexPositionToNoPcMappedRangeMapper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -300206,14 +299531,14 @@
     4:4:boolean com.android.tools.r8.utils.InternalOptions$LineNumberOptimization.isOff():155:155 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView):180 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView):180:180 -> <init>
-com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$DexDebugPositionStateVisitor -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$DexDebugPositionStateVisitor -> com.android.tools.r8.internal.Tl:
 # {"id":"sourceFile","fileName":"DexPositionToNoPcMappedRangeMapper.java"}
     com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter positionEventEmitter -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ul;"}
     java.util.List mappedPositions -> h
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.positions.PositionRemapper positionRemapper -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VW;"}
     java.util.List processedEvents -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     int emittedPc -> k
@@ -300221,7 +299546,7 @@
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():83:83 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,java.util.List,com.android.tools.r8.graph.DexItemFactory,int,com.android.tools.r8.graph.DexMethod,boolean):104:104 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/RW;Ljava/util/ArrayList;ILcom/android/tools/r8/graph/w2;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ul;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/VW;Ljava/util/ArrayList;ILcom/android/tools/r8/graph/w2;Z)V"}
     2:19:void <init>(com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,java.util.List,com.android.tools.r8.graph.DexItemFactory,int,com.android.tools.r8.graph.DexMethod,boolean):91:108 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):123:126 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O0$b;)V"}
@@ -300253,7 +299578,7 @@
     4:5:void com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter.emitAdvancePc(int):56:57 -> d
     4:5:void flushPc():114 -> d
     6:6:void flushPc():115:115 -> d
-com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper$PositionEventEmitter -> com.android.tools.r8.internal.Ul:
 # {"id":"sourceFile","fileName":"DexPositionToNoPcMappedRangeMapper.java"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
@@ -300262,7 +299587,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     int previousPc -> d
     com.android.tools.r8.ir.code.Position previousPosition -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     java.util.List processedEvents -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     boolean $assertionsDisabled -> g
@@ -300270,32 +299595,32 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):45:45 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/B1;Lcom/android/tools/r8/graph/w2;Ljava/util/ArrayList;)V"}
     2:12:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):38:48 -> <init>
-com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper -> com.android.tools.r8.internal.Xl:
 # {"id":"sourceFile","fileName":"DexPositionToPcMappedRangeMapper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder pcBasedDebugInfo -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cX;"}
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder):31:33 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/YW;)V"}
-com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper$1 -> com.android.tools.r8.internal.Ul:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/cX;)V"}
+com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper$1 -> com.android.tools.r8.internal.Wl:
 # {"id":"sourceFile","fileName":"DexPositionToPcMappedRangeMapper.java"}
     com.android.tools.r8.utils.IntBox val$firstDefaultEventPc -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Qz;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sz;"}
     com.android.tools.r8.utils.Pair val$lastPosition -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/MV;"}
     com.android.tools.r8.utils.positions.PositionRemapper val$positionRemapper -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/RW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/VW;"}
     java.util.List val$mappedPositions -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper this$0 -> k
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vl;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xl;"}
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():49:49 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper,int,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.positions.PositionRemapper,java.util.List):49:49 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Vl;ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/IV;Lcom/android/tools/r8/internal/RW;Ljava/util/ArrayList;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xl;ILcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/MV;Lcom/android/tools/r8/internal/VW;Ljava/util/ArrayList;)V"}
     1:12:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):52:63 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/O0$b;)V"}
     13:17:void com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper.remapAndAddForPc(com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder,int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.positions.PositionRemapper,java.util.List):101:105 -> a
@@ -300310,12 +299635,12 @@
     22:22:void com.android.tools.r8.utils.Pair.setSecond(java.lang.Object):41:41 -> a
     22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.utils.positions.LineNumberOptimizer -> com.android.tools.r8.internal.MJ:
+com.android.tools.r8.utils.positions.LineNumberOptimizer -> com.android.tools.r8.internal.QJ:
 # {"id":"sourceFile","fileName":"LineNumberOptimizer.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):49:49 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;Lcom/android/tools/r8/internal/gV;Lcom/android/tools/r8/internal/Sh;)Lcom/android/tools/r8/naming/J0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;Lcom/android/tools/r8/internal/kV;Lcom/android/tools/r8/internal/Uh;)Lcom/android/tools/r8/naming/J0;"}
     2:13:boolean shouldEmitOriginalMappingFile(com.android.tools.r8.graph.AppView):88:99 -> a
     2:13:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):50 -> a
     14:17:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):51:54 -> a
@@ -300330,14 +299655,14 @@
     60:61:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):82 -> a
     62:63:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):82:83 -> a
     64:64:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):112:112 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/gV;Lcom/android/tools/r8/internal/Sh;)Lcom/android/tools/r8/naming/b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/utils/i;Lcom/android/tools/r8/internal/kV;Lcom/android/tools/r8/internal/Uh;)Lcom/android/tools/r8/naming/b;"}
     65:65:com.android.tools.r8.utils.positions.PositionToMappedRangeMapper com.android.tools.r8.utils.positions.PositionToMappedRangeMapper.create(com.android.tools.r8.graph.AppView):30:30 -> a
     65:65:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):115 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     66:66:com.android.tools.r8.utils.positions.PositionToMappedRangeMapper com.android.tools.r8.utils.positions.PositionToMappedRangeMapper.create(com.android.tools.r8.graph.AppView):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):115 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> a
     67:67:com.android.tools.r8.utils.positions.PositionToMappedRangeMapper com.android.tools.r8.utils.positions.PositionToMappedRangeMapper.create(com.android.tools.r8.graph.AppView):30 -> a
     67:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):115 -> a
     68:69:com.android.tools.r8.utils.positions.PositionToMappedRangeMapper com.android.tools.r8.utils.positions.PositionToMappedRangeMapper.create(com.android.tools.r8.graph.AppView):31:32 -> a
@@ -300394,18 +299719,18 @@
     198:206:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):263:271 -> a
     207:207:java.util.List lambda$groupMethodsByRenamedName$1(com.android.tools.r8.graph.DexString):270:270 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/H2;)Ljava/util/List;"}
-com.android.tools.r8.utils.positions.MappedPosition -> com.android.tools.r8.internal.nM:
+com.android.tools.r8.utils.positions.MappedPosition -> com.android.tools.r8.internal.rM:
 # {"id":"sourceFile","fileName":"MappedPosition.java"}
     int obfuscatedLine -> a
     com.android.tools.r8.ir.code.Position position -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/PW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
     1:3:void <init>(com.android.tools.r8.ir.code.Position,int):14:16 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/internal/TW;)V"}
     1:1:int getObfuscatedLine():20:20 -> a
-com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder -> com.android.tools.r8.internal.qM:
+com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder -> com.android.tools.r8.internal.uM:
 # {"id":"sourceFile","fileName":"MappedPositionToClassNameMapperBuilder.java"}
     com.android.tools.r8.utils.OriginalSourceFiles originalSourceFiles -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/kV;"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.naming.ClassNameMapper$Builder classNameMapperBuilder -> c
@@ -300420,7 +299745,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/t0;"}
     int maxGap -> h
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):87:87 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/gV;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/kV;)V"}
     2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):77:78 -> <init>
     4:4:com.android.tools.r8.naming.PositionRangeAllocator$CardinalPositionRangeAllocator com.android.tools.r8.naming.PositionRangeAllocator.createCardinalPositionRangeAllocator():19:19 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):81 -> <init>
@@ -300428,10 +299753,10 @@
     6:6:com.android.tools.r8.naming.PositionRangeAllocator$NonCardinalPositionRangeAllocator com.android.tools.r8.naming.PositionRangeAllocator.createNonCardinalPositionRangeAllocator():23:23 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):83 -> <init>
     7:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):83:92 -> <init>
-    17:17:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2483 -> <init>
+    17:17:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2489 -> <init>
     17:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):92 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:20:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2485 -> <init>
+    18:20:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2491 -> <init>
     18:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):92 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):92:92 -> <init>
     22:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.OriginalSourceFiles):91:93 -> <init>
@@ -300442,12 +299767,12 @@
     1:1:void lambda$addSourceFileLinesForPrunedClasses$0(java.lang.Object):135 -> a
     2:5:void addSourceFileLinesForPrunedClasses():118:121 -> a
     6:18:void lambda$addSourceFileLinesForPrunedClasses$1(com.android.tools.r8.utils.IntBox,java.util.Map$Entry):123:135 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Qz;Ljava/util/Map$Entry;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sz;Ljava/util/Map$Entry;)V"}
     1:3:com.android.tools.r8.naming.ClassNameMapper build():111:113 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/naming/b;"}
-com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionRange -> R8$$REMOVED$$CLASS$$246:
+com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionRange -> R8$$REMOVED$$CLASS$$235:
 # {"id":"sourceFile","fileName":"MappedPositionToClassNameMapperBuilder.java"}
-com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder -> com.android.tools.r8.internal.oM:
+com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder -> com.android.tools.r8.internal.sM:
 # {"id":"sourceFile","fileName":"MappedPositionToClassNameMapperBuilder.java"}
     com.android.tools.r8.graph.DexProgramClass clazz -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
@@ -300457,21 +299782,21 @@
     com.android.tools.r8.naming.ClassNaming$Builder builder -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/naming/k$a;"}
     com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder this$0 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/qM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/uM;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():149:149 -> <clinit>
     1:7:void <init>(com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.lang.String):158:164 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qM;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/lang/String;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uM;Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/I2;Ljava/lang/String;)V"}
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
     1:1:void lambda$addFields$2(java.lang.Object):207 -> a
     2:6:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSourceFile(com.android.tools.r8.utils.OriginalSourceFiles):171:175 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gV;)Lcom/android/tools/r8/internal/oM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/kV;)Lcom/android/tools/r8/internal/sM;"}
     7:7:com.android.tools.r8.naming.mappinginformation.FileNameInformation com.android.tools.r8.naming.mappinginformation.FileNameInformation.build(java.lang.String):57:57 -> a
     7:7:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSourceFile(com.android.tools.r8.utils.OriginalSourceFiles):175 -> a
     8:8:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSourceFile(com.android.tools.r8.utils.OriginalSourceFiles):175:175 -> a
     9:9:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSourceFile(com.android.tools.r8.utils.OriginalSourceFiles):174:174 -> a
     10:10:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSynthetic(com.android.tools.r8.synthesis.SyntheticItems):181:181 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;)Lcom/android/tools/r8/internal/oM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/synthesis/I;)Lcom/android/tools/r8/internal/sM;"}
     11:11:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):473:473 -> a
     11:11:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSynthetic(com.android.tools.r8.synthesis.SyntheticItems):181 -> a
     12:12:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):469:469 -> a
@@ -300480,11 +299805,11 @@
     13:15:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSynthetic(com.android.tools.r8.synthesis.SyntheticItems):182:184 -> a
     16:16:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addSynthetic(com.android.tools.r8.synthesis.SyntheticItems):183:183 -> a
     17:17:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addFields():191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/oM;"}
-    18:18:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2483 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/sM;"}
+    18:18:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2489 -> a
     18:18:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addFields():191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:21:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2485 -> a
+    19:21:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2491 -> a
     19:21:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addFields():191 -> a
     22:22:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addFields():192:192 -> a
     23:24:void lambda$addFields$4(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.graph.DexEncodedField):194:195 -> a
@@ -300513,7 +299838,7 @@
     55:58:void lambda$addFields$4(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.graph.DexEncodedField):210 -> a
     59:59:void lambda$addFields$4(com.android.tools.r8.naming.MapVersion,com.android.tools.r8.graph.DexEncodedField):213:213 -> a
     60:63:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):225:228 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/List;Lcom/android/tools/r8/internal/RW;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Ljava/util/List;Lcom/android/tools/r8/internal/VW;Z)V"}
     64:64:boolean com.android.tools.r8.graph.DexEncodedMethod.supportsPendingInlineFrame():797:797 -> a
     64:64:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):235 -> a
     65:65:boolean markAsCompilerSynthetic(com.android.tools.r8.graph.ProgramMethod):470:470 -> a
@@ -300581,7 +299906,7 @@
     114:114:void com.android.tools.r8.utils.OneShotCollectionConsumer.add(java.lang.Object):21:21 -> a
     114:114:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):262 -> a
     115:118:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):265:268 -> a
-    119:121:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2483:2485 -> a
+    119:121:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():2489:2491 -> a
     119:121:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):268 -> a
     122:122:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$MappedPositionToClassNamingBuilder addMappedPositions(com.android.tools.r8.graph.ProgramMethod,java.util.List,com.android.tools.r8.utils.positions.PositionRemapper,boolean):269:269 -> a
     123:125:boolean isIdentityMapping(com.android.tools.r8.naming.MapVersion,java.util.List,com.android.tools.r8.utils.OneShotCollectionConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):591:593 -> a
@@ -300730,10 +300055,10 @@
     324:324:void lambda$addMappedPositions$11(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):412:412 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     325:339:void lambda$addMappedPositions$12(boolean,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.positions.PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,java.util.function.Function,com.android.tools.r8.naming.MemberNaming$MethodSignature,boolean,java.lang.Integer,com.android.tools.r8.ir.code.Position):426:440 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Qz;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/ex;Ljava/util/function/Function;Lcom/android/tools/r8/naming/V$b;ZLjava/lang/Integer;Lcom/android/tools/r8/internal/PW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(ZLcom/android/tools/r8/internal/Sz;Lcom/android/tools/r8/internal/XW;Lcom/android/tools/r8/internal/gx;Ljava/util/function/Function;Lcom/android/tools/r8/naming/V$b;ZLjava/lang/Integer;Lcom/android/tools/r8/internal/TW;)V"}
     340:350:void lambda$addMappedPositions$12(boolean,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.positions.PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,java.util.function.Function,com.android.tools.r8.naming.MemberNaming$MethodSignature,boolean,java.lang.Integer,com.android.tools.r8.ir.code.Position):433:443 -> a
     351:351:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$13(com.android.tools.r8.graph.DexMethod):448:448 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/pM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/tM;"}
     352:355:com.android.tools.r8.references.MethodReference computeMappedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):510:513 -> a
     352:355:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$13(com.android.tools.r8.graph.DexMethod):448 -> a
     356:357:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> a
@@ -300745,7 +300070,7 @@
     359:361:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$13(com.android.tools.r8.graph.DexMethod):448 -> a
     362:362:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$13(com.android.tools.r8.graph.DexMethod):448:448 -> a
     363:364:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.ir.code.Position,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.PositionRangeAllocator$CardinalPositionRangeAllocator,boolean):529:530 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/naming/g;Lcom/android/tools/r8/internal/PW;Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/s0;Z)Lcom/android/tools/r8/naming/k$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Function;Lcom/android/tools/r8/naming/g;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/naming/V$b;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/N0;Lcom/android/tools/r8/naming/s0;Z)Lcom/android/tools/r8/naming/k$b;"}
     365:365:boolean com.android.tools.r8.ir.code.Position.isD8R8Synthesized():65:65 -> a
     365:365:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.ir.code.Position,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.PositionRangeAllocator$CardinalPositionRangeAllocator,boolean):530 -> a
     366:367:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.ir.code.Position,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.PositionRangeAllocator$CardinalPositionRangeAllocator,boolean):530:531 -> a
@@ -300799,7 +300124,7 @@
     2:2:void lambda$addMappedPositions$6(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):318:318 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/naming/k$b;Lcom/android/tools/r8/naming/mappinginformation/e;)V"}
     3:3:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$9(com.android.tools.r8.graph.DexMethod):342:342 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/pM;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/internal/tM;"}
     4:7:com.android.tools.r8.references.MethodReference computeMappedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):510:513 -> b
     4:7:com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder lambda$addMappedPositions$9(com.android.tools.r8.graph.DexMethod):342 -> b
     8:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):179:180 -> b
@@ -300823,7 +300148,7 @@
     1:1:void lambda$addSynthetic$1(java.lang.Object):184 -> f
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> g
     1:1:void lambda$getMappedRangesForPosition$14(java.lang.Object):564 -> g
-com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder -> com.android.tools.r8.internal.pM:
+com.android.tools.r8.utils.positions.MappedPositionToClassNameMapperBuilder$OutlineFixupBuilder -> com.android.tools.r8.internal.tM:
 # {"id":"sourceFile","fileName":"MappedPositionToClassNameMapperBuilder.java"}
     com.android.tools.r8.references.MethodReference outlineMethod -> a
     java.util.List mappedOutlinePositions -> b
@@ -300845,7 +300170,7 @@
     24:24:void fixup():734:734 -> a
     25:25:void fixup():717:717 -> a
     26:26:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):729:729 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cx;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ex;Ljava/lang/Integer;Ljava/lang/Integer;)V"}
     27:27:int getMinifiedLinePosition(int,java.util.List):741:741 -> a
     27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):729 -> a
     28:28:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.positions.MappedPosition.getPosition():24:24 -> a
@@ -300864,18 +300189,18 @@
     1:1:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():17:17 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.utils.positions.PositionRemapper -> com.android.tools.r8.internal.TW:
+com.android.tools.r8.utils.positions.PositionRemapper -> com.android.tools.r8.internal.XW:
 # {"id":"sourceFile","fileName":"PositionRemapper.java"}
     com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/IV;"}
-com.android.tools.r8.utils.positions.PositionRemapper$IdentityPositionRemapper -> com.android.tools.r8.internal.QW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/MV;"}
+com.android.tools.r8.utils.positions.PositionRemapper$IdentityPositionRemapper -> com.android.tools.r8.internal.UW:
 # {"id":"sourceFile","fileName":"PositionRemapper.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():51:51 -> <init>
     1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):56:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/IV;"}
-com.android.tools.r8.utils.positions.PositionRemapper$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.RW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/MV;"}
+com.android.tools.r8.utils.positions.PositionRemapper$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.VW:
 # {"id":"sourceFile","fileName":"PositionRemapper.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -300884,20 +300209,20 @@
     java.util.Map parsedKotlinSourceDebugExtensions -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.CfLineToMethodMapper lineToMethodMapper -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/N9;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/P9;"}
     com.android.tools.r8.utils.positions.PositionRemapper baseRemapper -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/TW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/XW;"}
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/j1;"}
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/k0$b;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/kotlin/l0$b;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():107:107 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.positions.PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):122:122 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/TW;Lcom/android/tools/r8/internal/N9;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/XW;Lcom/android/tools/r8/internal/P9;)V"}
     2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.positions.PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):111:126 -> <init>
     1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):131:132 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/MV;"}
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     3:3:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):133 -> a
     4:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):133:133 -> a
@@ -300938,7 +300263,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     70:70:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):180:180 -> a
     71:83:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):175:187 -> a
-com.android.tools.r8.utils.positions.PositionRemapper$OptimizingPositionRemapper -> com.android.tools.r8.internal.SW:
+com.android.tools.r8.utils.positions.PositionRemapper$OptimizingPositionRemapper -> com.android.tools.r8.internal.WW:
 # {"id":"sourceFile","fileName":"PositionRemapper.java"}
     int maxLineDelta -> a
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -300948,16 +300273,16 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():66:66 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):72:72 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:4:void <init>(com.android.tools.r8.utils.InternalOptions):68:70 -> <init>
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> <init>
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> <init>
     5:5:void <init>(com.android.tools.r8.utils.InternalOptions):76 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():637:637 -> <init>
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():636:636 -> <init>
     6:6:void <init>(com.android.tools.r8.utils.InternalOptions):76 -> <init>
     7:7:void <init>(com.android.tools.r8.utils.InternalOptions):76:76 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):81:81 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/PW;)Lcom/android/tools/r8/internal/IV;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/TW;)Lcom/android/tools/r8/internal/MV;"}
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     2:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):81 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -300975,23 +300300,23 @@
     21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.code.Position.getMethod():97:97 -> a
     21:21:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):97 -> a
     22:23:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):97:98 -> a
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper -> com.android.tools.r8.internal.ZW:
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper -> com.android.tools.r8.internal.dX:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RW;ZZI)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/VW;ZZI)Ljava/util/ArrayList;"}
     void updateDebugInfoInCodeObjects() -> a
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$DexPositionToMappedRangeMapper -> com.android.tools.r8.internal.UW:
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$DexPositionToMappedRangeMapper -> com.android.tools.r8.internal.YW:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper noPcMapper -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Tl;"}
-    com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper pcMapper -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Vl;"}
+    com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper pcMapper -> b
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Xl;"}
     com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder pcBasedDebugInfoRecorder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/YW;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cX;"}
     1:7:void <init>(com.android.tools.r8.graph.AppView):42:48 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):59:59 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/RW;ZZI)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/VW;ZZI)Ljava/util/ArrayList;"}
     2:6:java.util.List com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,int):38:42 -> a
     2:6:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):59 -> a
     7:9:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.positions.DexPositionToPcMappedRangeMapper.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):114:116 -> a
@@ -301111,7 +300436,7 @@
     139:139:java.util.List com.android.tools.r8.utils.positions.DexPositionToNoPcMappedRangeMapper.optimizeDexCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper):223:223 -> a
     139:139:java.util.List getMappedPositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.positions.PositionRemapper,boolean,boolean,int):60 -> a
     140:140:void updateDebugInfoInCodeObjects():65:65 -> a
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$NativePcSupport -> com.android.tools.r8.internal.VW:
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$NativePcSupport -> com.android.tools.r8.internal.ZW:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():149:149 -> <clinit>
@@ -301121,7 +300446,7 @@
     2:2:void recordPcMappingFor(com.android.tools.r8.graph.ProgramMethod,int):164 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)V"}
     3:3:void updateDebugInfoInCodeObjects():170:170 -> a
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport -> com.android.tools.r8.internal.XW:
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport -> com.android.tools.r8.internal.bX:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     java.util.List codesToUpdate -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -301133,14 +300458,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)V"}
     7:8:void updateDebugInfoInCodeObjects():132:133 -> a
     9:13:void lambda$updateDebugInfoInCodeObjects$0(java.util.Map,com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo):135:139 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/WW;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Map;Lcom/android/tools/r8/internal/aX;)V"}
     14:14:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.getMaxPc():105:105 -> a
     14:14:void lambda$updateDebugInfoInCodeObjects$0(java.util.Map,com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo):139 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:16:void lambda$updateDebugInfoInCodeObjects$0(java.util.Map,com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo):139:140 -> a
     17:17:com.android.tools.r8.graph.DexDebugInfo buildPc2PcDebugInfo(com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo):145:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/WW;)Lcom/android/tools/r8/graph/W0;"}
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo -> com.android.tools.r8.internal.WW:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/aX;)Lcom/android/tools/r8/graph/W0;"}
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$Pc2PcMappingSupport$UpdateInfo -> com.android.tools.r8.internal.aX:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     com.android.tools.r8.graph.DexCode code -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/J0;"}
@@ -301150,21 +300475,21 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/J0;II)V"}
     1:2:boolean equals(java.lang.Object):103:104 -> equals
     1:1:int hashCode():109:109 -> hashCode
-com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.YW:
+com.android.tools.r8.utils.positions.PositionToMappedRangeMapper$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.cX:
 # {"id":"sourceFile","fileName":"PositionToMappedRangeMapper.java"}
     int getPcEncoding(int) -> a
     void recordPcMappingFor(com.android.tools.r8.graph.ProgramMethod,int) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;I)V"}
     void updateDebugInfoInCodeObjects() -> a
-com.android.tools.r8.utils.positions.PositionUtils -> com.android.tools.r8.internal.aX:
+com.android.tools.r8.utils.positions.PositionUtils -> com.android.tools.r8.internal.eX:
 # {"id":"sourceFile","fileName":"PositionUtils.java"}
     1:6:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):33:38 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/graph/j1;)Z"}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2699:2699 -> a
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/graph/j1;)Z"}
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2705:2705 -> a
     7:7:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexCode):47 -> a
     7:7:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2699:2699 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2705:2705 -> a
     8:8:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexCode):47 -> a
     8:8:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):38 -> a
     9:17:boolean mustHaveResidualDebugInfo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexCode):51:59 -> a
@@ -301466,9 +300791,9 @@
 com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.utils.structural.m:
 # {"id":"sourceFile","fileName":"HasherWrapper.java"}
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ns;"}
     1:2:void <init>(com.android.tools.r8.com.google.common.hash.Hasher):45:46 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ns;)V"}
     1:1:void putBoolean(boolean):51:51 -> a
     2:2:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putBoolean(boolean):34:34 -> a
     2:2:void putBoolean(boolean):51 -> a
@@ -301755,65 +301080,65 @@
 com.android.tools.r8.utils.structural.StructuralSpecification$1 -> com.android.tools.r8.utils.structural.z:
 # {"id":"sourceFile","fileName":"StructuralSpecification.java"}
     com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept val$compare -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AK;"}
     com.android.tools.r8.utils.structural.StructuralItem$HashingAccept val$hasher -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/wK;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/AK;"}
     1:1:void <init>(com.android.tools.r8.utils.structural.StructuralSpecification,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):129:129 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wK;Lcom/android/tools/r8/internal/wK;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/AK;Lcom/android/tools/r8/internal/AK;)V"}
     1:1:int acceptCompareTo(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.CompareToVisitor):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Ljava/lang/Object;Lcom/android/tools/r8/utils/structural/a;)I"}
     2:2:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):129:129 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/lang/Object;Lcom/android/tools/r8/utils/structural/o;)V"}
     3:3:int acceptCompareTo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.structural.CompareToVisitor):133:133 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/utils/structural/a;)I"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/utils/structural/a;)I"}
     4:4:int lambda$acceptCompareTo$0(com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.CompareToVisitor,java.lang.Object,java.lang.Object):134:134 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/utils/structural/v;Lcom/android/tools/r8/utils/structural/a;Ljava/lang/Object;Ljava/lang/Object;)I"}
     5:8:void acceptHashing(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.structural.HashingVisitor):142:145 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/az;Lcom/android/tools/r8/utils/structural/o;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cz;Lcom/android/tools/r8/utils/structural/o;)V"}
     9:9:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     9:9:void acceptHashing(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.structural.HashingVisitor):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:void com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence.visitInt(int):47:47 -> a
     10:10:void acceptHashing(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.structural.HashingVisitor):145 -> a
     11:11:void acceptHashing(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.structural.HashingVisitor):146:146 -> a
-com.android.tools.r8.utils.threads.ThreadTask -> com.android.tools.r8.internal.Hg0:
+com.android.tools.r8.utils.threads.ThreadTask -> com.android.tools.r8.internal.Lg0:
 # {"id":"sourceFile","fileName":"ThreadTask.java"}
     void run(com.android.tools.r8.utils.Timing) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     1:1:void onJoin():21:21 -> a
     1:3:void runWithRuntimeException(com.android.tools.r8.utils.Timing):15:17 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ph0;)V"}
     4:4:boolean shouldRun():24:24 -> b
-com.android.tools.r8.utils.threads.ThreadTaskUtils -> com.android.tools.r8.internal.Ig0:
+com.android.tools.r8.utils.threads.ThreadTaskUtils -> com.android.tools.r8.internal.Mg0:
 # {"id":"sourceFile","fileName":"ThreadTaskUtils.java"}
     1:1:void lambda$processTask$0(com.android.tools.r8.utils.threads.ThreadTask):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lg0;)V"}
     2:2:void processTask(com.android.tools.r8.utils.threads.ThreadTask,com.android.tools.r8.threading.TaskCollection):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Hg0;Lcom/android/tools/r8/internal/wg0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Lg0;Lcom/android/tools/r8/internal/Ag0;)V"}
     3:3:void processTaskWithTiming(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.threads.ThreadTask,int,com.android.tools.r8.threading.TaskCollection,java.util.List):71:71 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/Hg0;ILcom/android/tools/r8/internal/wg0;Ljava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Lg0;ILcom/android/tools/r8/internal/Ag0;Ljava/util/List;)V"}
     4:9:void executeTask(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.threads.ThreadTask,int,java.util.List):79:84 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/Hg0;ILjava/util/List;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Lg0;ILjava/util/List;)V"}
     1:1:void lambda$processTaskWithTiming$1(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.threads.ThreadTask,int,java.util.List):71:71 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;Lcom/android/tools/r8/internal/Hg0;ILjava/util/List;)V"}
-com.android.tools.r8.verticalclassmerging.ClassMerger -> com.android.tools.r8.internal.Cc:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;Lcom/android/tools/r8/internal/Lg0;ILjava/util/List;)V"}
+com.android.tools.r8.verticalclassmerging.ClassMerger -> com.android.tools.r8.internal.Ec:
 # {"id":"sourceFile","fileName":"ClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/B1;"}
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder lensBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El0;"}
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder outerLensBuilder -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El0;"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder verticallyMergedClassesBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ll0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl0;"}
     com.android.tools.r8.graph.DexProgramClass source -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.graph.DexProgramClass target -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     com.android.tools.r8.classmerging.ClassMergerSharedData sharedData -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Gc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ic;"}
     java.util.List synthesizedBridges -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     java.util.function.Predicate virtualMethodsTargetedByInvokeSuperInImmediateSubclass -> j
@@ -301822,7 +301147,7 @@
     boolean $assertionsDisabled -> l
     1:9:void <clinit>():56:64 -> <clinit>
     1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.classmerging.ClassMergerSharedData,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):85:92 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Al0;Lcom/android/tools/r8/internal/Gc;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ll0;Lcom/android/tools/r8/internal/Kl0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/El0;Lcom/android/tools/r8/internal/Ic;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Pl0;Lcom/android/tools/r8/internal/Ol0;)V"}
     9:9:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> <init>
     9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.classmerging.ClassMergerSharedData,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):93 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -301865,22 +301190,22 @@
     128:128:void merge():285 -> a
     129:131:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):579:581 -> a
     129:131:void merge():285 -> a
-    132:132:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1709:1709 -> a
+    132:132:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setClassFileVersion(com.android.tools.r8.cf.CfVersion):1720:1720 -> a
     132:132:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):582 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     132:132:void merge():285 -> a
     133:133:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.graph.DexEncodedMember.getApiLevelForDefinition():106:106 -> a
     133:133:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):583 -> a
     133:133:void merge():285 -> a
-    134:134:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1694:1694 -> a
+    134:134:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):1705:1705 -> a
     134:134:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):583 -> a
     134:134:void merge():285 -> a
-    135:135:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1699:1699 -> a
+    135:135:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1710:1710 -> a
     135:135:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):584 -> a
     135:135:void merge():285 -> a
     136:137:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):585:586 -> a
     136:137:void merge():285 -> a
-    138:138:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1689:1689 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1700:1700 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):586 -> a
     138:138:void merge():285 -> a
     139:142:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):587:590 -> a
@@ -301913,7 +301238,7 @@
     257:260:void merge():386:389 -> a
     261:266:void merge():386:391 -> a
     267:267:boolean lambda$merge$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexMethod):186:186 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/w2;)Z"}
     268:268:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.contains(com.android.tools.r8.graph.DexMethod):103:103 -> a
     268:268:boolean lambda$merge$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexMethod):186 -> a
     269:269:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> a
@@ -301940,7 +301265,7 @@
     276:276:boolean com.android.tools.r8.utils.collections.DexMethodSignatureMap.containsKey(com.android.tools.r8.graph.DexMethod):174 -> a
     276:276:boolean lambda$merge$0(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.DexMethod):188 -> a
     277:277:void lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Pl;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/function/Predicate;Lcom/android/tools/r8/internal/Rl;Lcom/android/tools/r8/graph/C5;)V"}
     278:280:com.android.tools.r8.graph.DexEncodedMethod moveDirectMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):641:643 -> a
     278:280:void lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.utils.collections.DexMethodSignatureMap,com.android.tools.r8.graph.ProgramMethod):193 -> a
     281:283:com.android.tools.r8.graph.DexEncodedMethod moveInstanceInitializer(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):652:654 -> a
@@ -302002,7 +301327,7 @@
     309:309:boolean lambda$merge$7(java.util.Set,com.android.tools.r8.graph.DexField):330:330 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/l1;)Z"}
     310:312:void lambda$setupVirtualMethodsTargetedByInvokeSuperInImmediateSubclass$9(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):406:408 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/C5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/C5;)V"}
     313:332:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):442:461 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;Ljava/util/Collection;Ljava/util/Collection;)V"}
     333:336:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):70:73 -> a
@@ -302171,18 +301496,18 @@
     20:20:com.android.tools.r8.graph.DexEncodedMethod moveMethod(com.android.tools.r8.graph.DexEncodedMethod):662:662 -> d
     21:22:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toTypeSubstitutedMethodAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1144:1145 -> d
     21:22:com.android.tools.r8.graph.DexEncodedMethod moveMethod(com.android.tools.r8.graph.DexEncodedMethod):662 -> d
-com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger -> com.android.tools.r8.internal.cg:
 # {"id":"sourceFile","fileName":"ConnectedComponentVerticalClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     java.util.Collection groups -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/LinkedList;"}
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder lensBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El0;"}
     java.util.List synthesizedBridges -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder verticallyMergedClassesBuilder -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ll0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl0;"}
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):31:31 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Ljava/util/LinkedList;)V"}
     2:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection):24:28 -> <init>
@@ -302192,33 +301517,33 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$run$0(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.DexType lambda$run$0(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):43:43 -> a
     3:4:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder run(com.android.tools.r8.classmerging.ClassMergerSharedData):42:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;)Lcom/android/tools/r8/internal/Hl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;)Lcom/android/tools/r8/internal/Ll0;"}
     5:6:java.util.List com.android.tools.r8.utils.ListUtils.sort(java.util.Collection,java.util.Comparator):331:332 -> a
     5:6:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder run(com.android.tools.r8.classmerging.ClassMergerSharedData):43 -> a
     7:20:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder run(com.android.tools.r8.classmerging.ClassMergerSharedData):44:57 -> a
     21:21:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult.builder(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder):34:34 -> a
     21:21:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder run(com.android.tools.r8.classmerging.ClassMergerSharedData):57 -> a
     22:22:com.android.tools.r8.verticalclassmerging.ClassMerger lambda$run$1(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/Kl0;)Lcom/android/tools/r8/internal/Cc;"}
-com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Wm:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/Ol0;)Lcom/android/tools/r8/internal/Ec;"}
+com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Ym:
 # {"id":"sourceFile","fileName":"EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper.java"}
     1:1:void <init>():16:16 -> <init>
     1:1:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):28:28 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/internal/I5;)V"}
     2:2:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):37:37 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O90;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S90;Lcom/android/tools/r8/internal/I5;)V"}
     3:3:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):57:57 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/I5;)V"}
     4:4:void processWorklist():62:62 -> a
-com.android.tools.r8.verticalclassmerging.IllegalAccessDetector -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.verticalclassmerging.IllegalAccessDetector -> com.android.tools.r8.internal.gu:
 # {"id":"sourceFile","fileName":"IllegalAccessDetector.java"}
     com.android.tools.r8.graph.AppView appViewWithClassHierarchy -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):28:30 -> <init>
@@ -302231,7 +301556,7 @@
     4:4:boolean checkRewrittenFieldType(com.android.tools.r8.graph.DexClassAndField):76:76 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/F0;)Z"}
     5:6:boolean checkRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):82:83 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/QU;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/UU;)V"}
     7:7:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     7:7:boolean checkRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):83 -> a
     8:8:boolean checkRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):83:83 -> a
@@ -302262,7 +301587,7 @@
     34:34:boolean checkRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):99 -> a
     35:37:boolean checkRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):99:101 -> a
     38:40:boolean internalCheckTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):118:120 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/I2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/I2;)Z"}
     41:41:com.android.tools.r8.graph.Definition com.android.tools.r8.graph.UseRegistry.getContext():56:56 -> a
     41:41:boolean internalCheckTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):120 -> a
     42:42:boolean internalCheckTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):120:120 -> a
@@ -302395,96 +301720,96 @@
     23:23:boolean checkRewrittenFieldReference(com.android.tools.r8.graph.DexField):69 -> i
     24:24:boolean checkFoundPackagePrivateAccess():34:34 -> i
     24:24:boolean checkRewrittenFieldReference(com.android.tools.r8.graph.DexField):69 -> i
-com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode -> com.android.tools.r8.internal.wv:
 # {"id":"sourceFile","fileName":"IncompleteVerticalClassMergerBridgeCode.java"}
     com.android.tools.r8.graph.DexMethod method -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.graph.DexMethod invocationTarget -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/w2;"}
     com.android.tools.r8.ir.code.InvokeType type -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/cC;"}
     boolean isInterface -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():38:38 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,boolean):46:50 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Z)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Z)V"}
     1:1:int computeHashCode():147:147 -> G0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():152:152 -> M0
     1:1:boolean isEmptyVoidMethod():157:157 -> T0
     1:1:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexItemFactory):61:61 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/w2;ZLcom/android/tools/r8/graph/B1;)Lcom/android/tools/r8/graph/i0;"}
     2:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):137:137 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/QN$a;)Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/UN$a;)Lcom/android/tools/r8/internal/Dt;"}
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):162:162 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/a6;)V"}
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):167:167 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/xh;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/e0;Lcom/android/tools/r8/internal/zh;)V"}
     5:5:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.RetracerForCodePrinting):177:177 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/L90;)Ljava/lang/String;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/P90;)Ljava/lang/String;"}
     1:1:boolean computeEquals(java.lang.Object):142:142 -> c
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.NA:
 # {"id":"sourceFile","fileName":"InterfaceTypeToClassTypeLensCodeRewriterHelper.java"}
     1:1:void <init>():40:40 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/I5;)V"}
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/internal/I5;)V"}
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O90;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S90;Lcom/android/tools/r8/internal/I5;)V"}
     void processWorklist() -> a
     1:2:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):47:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/LA;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/NA;"}
     3:3:boolean com.android.tools.r8.graph.lens.GraphLens.isVerticalClassMergerLens():0:0 -> a
     3:3:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):51 -> a
     4:7:com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.NonIdentityGraphLens,com.android.tools.r8.graph.lens.GraphLens):52:55 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens):48:48 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/zR;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/DR;)Z"}
     9:9:boolean com.android.tools.r8.graph.lens.GraphLens.isVerticalClassMergerLens():0:0 -> a
     9:9:boolean lambda$create$0(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.NonIdentityGraphLens):48 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.PA:
 # {"id":"sourceFile","fileName":"InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.ir.code.IRCode code -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Bt;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Dt;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/zR;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/DR;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     java.util.Map worklist -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):51:51 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Bt;Lcom/android/tools/r8/internal/zR;Lcom/android/tools/r8/internal/ls;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Dt;Lcom/android/tools/r8/internal/DR;Lcom/android/tools/r8/internal/ns;)V"}
     2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):45:55 -> <init>
     1:2:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):66:67 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/LB;Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/NB;Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/internal/I5;)V"}
     3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.lens.MethodLookupResult.getPrototypeChanges():43:43 -> a
     3:3:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.getArgumentInfoCollection():142:142 -> a
     4:4:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111:111 -> a
+    5:5:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:109 -> a
     5:5:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    6:6:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111 -> a
+    6:6:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
     6:6:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
     7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    7:7:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111 -> a
+    7:7:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3.iterator():1061:1061 -> a
-    8:8:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111 -> a
+    8:8:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
     8:8:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
-    9:9:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111:111 -> a
+    9:9:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:109 -> a
     9:9:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
     10:10:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator.next():1040:1040 -> a
-    10:10:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111 -> a
+    10:10:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109 -> a
     10:10:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
-    11:12:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():111:112 -> a
+    11:12:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.hasRemovedArguments():109:110 -> a
     11:12:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):68 -> a
     13:13:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):70:70 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():86:86 -> a
@@ -302497,12 +301822,12 @@
     24:24:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):88 -> a
     25:26:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):88:89 -> a
     27:33:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):100:106 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/O90;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/S90;Lcom/android/tools/r8/internal/I5;)V"}
     34:34:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):243:243 -> a
     34:34:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):105 -> a
     35:36:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):107:108 -> a
     37:39:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):136:138 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/qp;Lcom/android/tools/r8/internal/G5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/tp;Lcom/android/tools/r8/internal/I5;)V"}
     40:40:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):243:243 -> a
     40:40:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):138 -> a
     41:44:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):139:142 -> a
@@ -302556,9 +301881,9 @@
     102:103:com.android.tools.r8.ir.code.InstructionListIterator insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):224:225 -> a
     102:103:void processWorklist():175 -> a
     104:106:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):188:190 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Iw;ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kw;ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
     107:117:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):252:262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Xk0;Lcom/android/tools/r8/internal/G5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Z)Lcom/android/tools/r8/internal/QU;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/bl0;Lcom/android/tools/r8/internal/I5;Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;Z)Lcom/android/tools/r8/internal/UU;"}
     118:122:boolean isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):234:238 -> a
     118:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):267 -> a
     123:129:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):268:274 -> a
@@ -302566,7 +301891,7 @@
     131:131:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):263:263 -> a
     132:132:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):258:258 -> a
     133:133:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):253:253 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.OA:
 # {"id":"sourceFile","fileName":"InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java"}
     int operandIndex -> a
     com.android.tools.r8.graph.DexType originalType -> b
@@ -302575,7 +301900,7 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/I2;"}
     1:4:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):283:286 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(ILcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)V"}
-com.android.tools.r8.verticalclassmerging.InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.verticalclassmerging.InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.UB:
 # {"id":"sourceFile","fileName":"InvokeSpecialToDefaultLibraryMethodUseRegistry.java"}
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():10:10 -> <clinit>
@@ -302592,24 +301917,24 @@
     10:11:void com.android.tools.r8.graph.UseRegistryWithResult.setResult(java.lang.Object):25:26 -> g
     10:11:void handleInvokeSpecial(com.android.tools.r8.graph.DexMethod):37 -> g
     10:11:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):26 -> g
-com.android.tools.r8.verticalclassmerging.InvokeSuperExtractor -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.verticalclassmerging.InvokeSuperExtractor -> com.android.tools.r8.internal.aC:
 # {"id":"sourceFile","fileName":"InvokeSuperExtractor.java"}
     com.android.tools.r8.graph.AppView appViewWithLiveness -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet methodsOfInterest -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     com.android.tools.r8.utils.collections.DexMethodSignatureSet result -> i
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Sl;"}
     com.android.tools.r8.graph.DexProgramClass source -> j
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():18:18 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexProgramClass):33:39 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/internal/Ql;Lcom/android/tools/r8/graph/D2;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/internal/Sl;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:void registerInvokeSpecial(com.android.tools.r8.graph.DexMethod):44:44 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)V"}
     1:1:void handleInvokeSuper(com.android.tools.r8.graph.DexMethod):53:53 -> g
@@ -302662,14 +301987,14 @@
     20:20:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> g
     20:20:void handleInvokeSuper(com.android.tools.r8.graph.DexMethod):63 -> g
     20:20:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):49 -> g
-com.android.tools.r8.verticalclassmerging.MergeMayLeadToNoSuchMethodErrorUseRegistry -> com.android.tools.r8.internal.rN:
+com.android.tools.r8.verticalclassmerging.MergeMayLeadToNoSuchMethodErrorUseRegistry -> com.android.tools.r8.internal.vN:
 # {"id":"sourceFile","fileName":"MergeMayLeadToNoSuchMethodErrorUseRegistry.java"}
     com.android.tools.r8.graph.AppView appViewWithLiveness -> f
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.graph.lens.GraphLens graphLens -> g
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.lens.GraphLens codeLens -> h
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ls;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/ns;"}
     com.android.tools.r8.graph.DexProgramClass source -> i
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
     boolean $assertionsDisabled -> j
@@ -302701,7 +302026,7 @@
     21:24:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):58:61 -> g
     25:26:void com.android.tools.r8.graph.UseRegistryWithResult.setResult(java.lang.Object) -> g
     25:26:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):61 -> g
-com.android.tools.r8.verticalclassmerging.VerticalClassMerger -> com.android.tools.r8.internal.zl0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMerger -> com.android.tools.r8.internal.Dl0:
 # {"id":"sourceFile","fileName":"VerticalClassMerger.java"}
     com.android.tools.r8.graph.AppView appView -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -302710,7 +302035,7 @@
     com.android.tools.r8.classmerging.ClassMergerMode mode -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"I"}
     com.android.tools.r8.utils.InternalOptions options -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():48:48 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerMode):55:59 -> <init>
@@ -302718,7 +302043,7 @@
     1:1:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult.getVerticallyMergedClasses():46:46 -> a
     1:1:void lambda$updateKeepInfoForMergedClasses$4(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Il0;Lcom/android/tools/r8/shaking/o1;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml0;Lcom/android/tools/r8/shaking/o1;)V"}
     2:2:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():51:51 -> a
     2:2:void lambda$updateKeepInfoForMergedClasses$4(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):286 -> a
     3:3:void lambda$updateKeepInfoForMergedClasses$4(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):287:287 -> a
@@ -302729,12 +302054,12 @@
     7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode.getMethod():66:66 -> a
     7:7:void lambda$updateArtProfiles$3(com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):271 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/uv;Lcom/android/tools/r8/internal/WX;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/wv;Lcom/android/tools/r8/internal/aY;)V"}
     8:8:void lambda$updateArtProfiles$3(com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode,com.android.tools.r8.profile.rewriting.ProfileAdditions$ProfileAdditionsBuilder):271:271 -> a
     9:10:com.android.tools.r8.verticalclassmerging.VerticalClassMerger createForFinalClassMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):76:77 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/zl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Dl0;"}
     11:12:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:99 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     13:13:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo com.android.tools.r8.graph.ImmediateProgramSubtypingInfo.createWithDeterministicOrder(com.android.tools.r8.graph.AppView):43:43 -> a
     13:13:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):100 -> a
     14:23:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):103:112 -> a
@@ -302780,20 +302105,20 @@
     57:58:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):155:156 -> a
     59:59:boolean lambda$run$0(java.util.Set):108:108 -> a
     60:61:java.util.Collection getConnectedComponentMergers(java.util.List,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):179:180 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/X3;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Ljava/util/ArrayList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/graph/X3;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Ljava/util/ArrayList;"}
     62:62:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     62:62:java.util.Collection getConnectedComponentMergers(java.util.List,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):180 -> a
     63:82:java.util.Collection getConnectedComponentMergers(java.util.List,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):181:200 -> a
     83:102:java.util.Collection getConnectedComponentMergers(java.util.List,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):185:204 -> a
     103:104:com.android.tools.r8.utils.Timing lambda$getConnectedComponentMergers$1(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.concurrent.ExecutorService,java.util.List,java.util.Set):188:189 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/X3;Ljava/util/Collection;Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/Set;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/X3;Ljava/util/Collection;Ljava/util/concurrent/ExecutorService;Ljava/util/List;Ljava/util/Set;)Lcom/android/tools/r8/internal/ph0;"}
     105:107:com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger com.android.tools.r8.verticalclassmerging.VerticalClassMergerPolicyExecutor.run(java.util.Set,java.util.Collection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):43:45 -> a
     105:107:com.android.tools.r8.utils.Timing lambda$getConnectedComponentMergers$1(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.concurrent.ExecutorService,java.util.List,java.util.Set):191 -> a
     108:108:boolean com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger.isEmpty():38:38 -> a
     108:108:com.android.tools.r8.utils.Timing lambda$getConnectedComponentMergers$1(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.concurrent.ExecutorService,java.util.List,java.util.Set):192 -> a
     109:113:com.android.tools.r8.utils.Timing lambda$getConnectedComponentMergers$1(com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.concurrent.ExecutorService,java.util.List,java.util.Set):193:197 -> a
     114:115:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult applyConnectedComponentMergers(com.android.tools.r8.classmerging.ClassMergerSharedData,java.util.Collection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):214:215 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Ljava/util/ArrayList;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/Il0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Ljava/util/ArrayList;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Ml0;"}
     116:116:com.android.tools.r8.utils.Timing$TimingMerger com.android.tools.r8.utils.Timing.beginMerger(java.lang.String,java.util.concurrent.ExecutorService):401:401 -> a
     116:116:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult applyConnectedComponentMergers(com.android.tools.r8.classmerging.ClassMergerSharedData,java.util.Collection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):215 -> a
     117:117:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult.builder(com.android.tools.r8.graph.AppView):27:27 -> a
@@ -302808,7 +302133,7 @@
     147:147:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder.build():83:83 -> a
     147:147:com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult applyConnectedComponentMergers(com.android.tools.r8.classmerging.ClassMergerSharedData,java.util.Collection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):234 -> a
     148:151:com.android.tools.r8.utils.Timing lambda$applyConnectedComponentMergers$2(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder,com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger):222:225 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/internal/Hl0;Lcom/android/tools/r8/internal/ag;)Lcom/android/tools/r8/internal/lh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/internal/Ll0;Lcom/android/tools/r8/internal/cg;)Lcom/android/tools/r8/internal/ph0;"}
     152:154:void com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder.merge(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder):76:78 -> a
     152:154:com.android.tools.r8.utils.Timing lambda$applyConnectedComponentMergers$2(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder,com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger):225 -> a
     155:155:void com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder.merge(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder):150:150 -> a
@@ -302820,7 +302145,7 @@
     156:158:com.android.tools.r8.utils.Timing lambda$applyConnectedComponentMergers$2(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder,com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger):225 -> a
     159:160:com.android.tools.r8.utils.Timing lambda$applyConnectedComponentMergers$2(com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder,com.android.tools.r8.verticalclassmerging.ConnectedComponentVerticalClassMerger):226:227 -> a
     161:163:void updateArtProfiles(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):260:262 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bl0;Lcom/android/tools/r8/internal/Il0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fl0;Lcom/android/tools/r8/internal/Ml0;Lcom/android/tools/r8/internal/ph0;)V"}
     164:164:boolean com.android.tools.r8.profile.rewriting.ProfileCollectionAdditions.isNop():0:0 -> a
     164:164:void updateArtProfiles(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):262 -> a
     165:165:void updateArtProfiles(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):265:265 -> a
@@ -302834,9 +302159,9 @@
     169:169:void updateArtProfiles(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):270:270 -> a
     170:175:void updateArtProfiles(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):269:274 -> a
     176:187:void updateKeepInfoForMergedClasses(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult,com.android.tools.r8.utils.Timing):279:290 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Il0;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml0;Lcom/android/tools/r8/internal/ph0;)V"}
     188:198:void removeMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):298:308 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml0;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql0;Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     199:199:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():51:51 -> a
     199:199:void removeMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):310 -> a
     200:200:void removeMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):311:311 -> a
@@ -302846,12 +302171,12 @@
     203:203:void removeMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):312 -> a
     204:206:void removeMergedClasses(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):313:315 -> a
     207:207:boolean lambda$removeMergedClasses$5(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):307:307 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ml0;Lcom/android/tools/r8/graph/D2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ql0;Lcom/android/tools/r8/graph/D2;)Z"}
     208:208:boolean com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.isMergeSource(com.android.tools.r8.graph.DexType):81:81 -> a
     208:208:boolean lambda$removeMergedClasses$5(com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):307 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     209:212:void finalizeSynthesizedBridges(java.util.List,com.android.tools.r8.utils.Timing):321:324 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/ArrayList;Lcom/android/tools/r8/internal/ph0;)V"}
     213:213:com.android.tools.r8.graph.DexMethod com.android.tools.r8.verticalclassmerging.IncompleteVerticalClassMergerBridgeCode.getMethod():66:66 -> a
     213:213:void finalizeSynthesizedBridges(java.util.List,com.android.tools.r8.utils.Timing):324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -302925,7 +302250,7 @@
     274:274:void lambda$finalizeSynthesizedBridges$7(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):336:336 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/shaking/o1;)V"}
     275:275:boolean verifyGraphLens(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):376:376 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Bl0;Lcom/android/tools/r8/internal/Il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Fl0;Lcom/android/tools/r8/internal/Ml0;)V"}
     276:276:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     276:276:boolean verifyGraphLens(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):378 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -302939,10 +302264,10 @@
     295:305:boolean verifyGraphLens(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):397:407 -> a
     306:306:boolean verifyGraphLens(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):406:406 -> a
     1:2:com.android.tools.r8.verticalclassmerging.VerticalClassMerger createForInitialClassMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):64:65 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/zl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Dl0;"}
     3:3:boolean shouldRun():93:93 -> b
     3:3:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82 -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/lh0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/concurrent/ExecutorService;Lcom/android/tools/r8/internal/ph0;)V"}
     4:4:boolean com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions.isEnabled(com.android.tools.r8.classmerging.ClassMergerMode):30:30 -> b
     4:4:boolean shouldRun():93 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -302961,20 +302286,20 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:27:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):87:89 -> b
     1:2:com.android.tools.r8.verticalclassmerging.VerticalClassMerger createForIntermediateClassMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):70:71 -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/lh0;)Lcom/android/tools/r8/internal/zl0;"}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.Bl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/ph0;)Lcom/android/tools/r8/internal/Dl0;"}
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.Fl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerGraphLens.java"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses mergedClasses -> n
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql0;"}
     java.util.Map contextualSuperToImplementationInContexts -> o
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap extraNewMethodSignatures -> p
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Set staticizedMethods -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():70:70 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Set):89:89 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ml0;Lcom/android/tools/r8/internal/c6;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/Y5;Lcom/android/tools/r8/internal/c6;Ljava/util/Set;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ql0;Lcom/android/tools/r8/internal/e6;Ljava/util/IdentityHashMap;Lcom/android/tools/r8/internal/a6;Lcom/android/tools/r8/internal/e6;Ljava/util/Set;)V"}
     2:2:com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.getBidirectionalMap():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Set):90 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -302983,7 +302308,7 @@
     1:1:void com.android.tools.r8.graph.lens.MethodLookupResult$Builder.<init>(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):66 -> a
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult$Builder com.android.tools.r8.graph.lens.MethodLookupResult.builder(com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens):35 -> a
     1:1:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):178 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/internal/ks;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/internal/ms;)Lcom/android/tools/r8/internal/cO;"}
     2:3:com.android.tools.r8.graph.lens.MethodLookupResult com.android.tools.r8.graph.lens.MethodLookupResult$Builder.build():85:86 -> a
     2:3:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):182 -> a
     4:6:com.android.tools.r8.graph.lens.MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType,com.android.tools.r8.graph.lens.GraphLens,com.android.tools.r8.graph.lens.GraphLens$LookupMethodContinuation):183:185 -> a
@@ -302991,8 +302316,8 @@
     7:7:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):250 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/proto/j;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/proto/j;"}
     8:12:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):252:256 -> a
-    13:13:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):281:281 -> a
-    13:13:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():277 -> a
+    13:13:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod(boolean):279:279 -> a
+    13:13:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder.setIsConvertedToStaticMethod():275 -> a
     13:13:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):257 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     14:14:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):258:258 -> a
@@ -303007,7 +302332,7 @@
     23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):262 -> a
     24:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):262:265 -> a
     28:28:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):264:264 -> a
-    29:29:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():65:65 -> a
+    29:29:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.proto.ArgumentInfoCollection.empty():63:63 -> a
     29:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73 -> a
     29:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):264 -> a
     30:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForExtraParameters(java.util.List):73:73 -> a
@@ -303015,7 +302340,7 @@
     31:33:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):266:268 -> a
     34:34:boolean isStaticized(com.android.tools.r8.graph.DexMethod):108:108 -> a
     34:34:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):287 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/aC;)Lcom/android/tools/r8/internal/aC;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/cC;)Lcom/android/tools/r8/internal/cC;"}
     35:38:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):288:291 -> a
     39:39:boolean com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.hasInterfaceBeenMergedIntoClass(com.android.tools.r8.graph.DexType):89:89 -> a
     39:39:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):291 -> a
@@ -303027,7 +302352,7 @@
     42:42:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):292 -> a
     43:44:com.android.tools.r8.ir.code.InvokeType mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeType):293:294 -> a
     45:45:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):191:191 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/YN;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ls;)Lcom/android/tools/r8/internal/YN;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/cO;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/internal/ns;)Lcom/android/tools/r8/internal/cO;"}
     46:46:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.lens.MemberLookupResult.getReference():27:27 -> a
     46:46:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -303109,7 +302434,7 @@
     98:99:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):230:231 -> a
     100:100:com.android.tools.r8.graph.lens.MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.lens.MethodLookupResult,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):229:229 -> a
     101:101:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):305:305 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;)Z"}
     102:102:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> a
     102:102:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):306 -> a
     103:103:boolean isContextFreeForMethods(com.android.tools.r8.graph.lens.GraphLens):306:306 -> a
@@ -303144,7 +302469,7 @@
     7:7:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):141 -> d
     8:8:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):140:140 -> d
     1:1:com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens asVerticalClassMergerLens():118:118 -> e
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Bl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Fl0;"}
     2:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):274:275 -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;)Lcom/android/tools/r8/graph/w2;"}
     4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):242:242 -> e
@@ -303156,7 +302481,7 @@
     3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.lens.NestedGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):242:242 -> f
     3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignatureForMapping(com.android.tools.r8.graph.DexMethod):281 -> f
     4:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):314:314 -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ls;Lcom/android/tools/r8/graph/w2;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/ns;Lcom/android/tools/r8/graph/w2;)Z"}
     5:5:com.android.tools.r8.graph.lens.GraphLens com.android.tools.r8.graph.lens.NonIdentityGraphLens.getPrevious():38:38 -> f
     5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):314 -> f
     6:6:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.lens.GraphLens):314:314 -> f
@@ -303221,20 +302546,20 @@
     2:2:boolean com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.isMergeSource(com.android.tools.r8.graph.DexType):81:81 -> m
     2:2:boolean lambda$internalDescribeLookupMethod$4(com.android.tools.r8.graph.DexType):213 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Al0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.El0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerGraphLens.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Map pendingNewFieldSignatureUpdates -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Map contextualSuperToImplementationInContexts -> c
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     java.util.Map pendingNewMethodSignatureUpdates -> e
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> f
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/c6;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/e6;"}
     java.util.Map pendingExtraNewMethodSignatureUpdates -> g
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/IdentityHashMap;"}
     java.util.Set staticizedMethods -> h
@@ -303244,7 +302569,7 @@
     1:1:void <clinit>():344:344 -> <clinit>
     1:23:void <init>():344:366 -> <init>
     1:1:com.android.tools.r8.classmerging.ClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.MergedClasses):344:344 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/sN;)Lcom/android/tools/r8/internal/Fc;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/wN;)Lcom/android/tools/r8/internal/Hc;"}
     2:3:com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses):474:475 -> a
     2:3:com.android.tools.r8.classmerging.ClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.MergedClasses):344 -> a
     4:4:void commitPendingUpdates():376:376 -> a
@@ -303311,7 +302636,7 @@
     104:106:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):521:523 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/C5;Lcom/android/tools/r8/graph/D2;)V"}
     107:144:void merge(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder):527:564 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Al0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/El0;)V"}
     145:164:void lambda$merge$3(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):530:549 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;Lcom/android/tools/r8/graph/w2;Lcom/android/tools/r8/graph/w2;)V"}
     165:165:void com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.setRepresentative(java.lang.Object,java.lang.Object):53:53 -> a
@@ -303368,21 +302693,21 @@
     4:4:boolean com.android.tools.r8.graph.DexMethod.isNotIdenticalTo(com.android.tools.r8.graph.DexMethod):35:35 -> c
     4:4:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):533 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions -> com.android.tools.r8.internal.Cl0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerOptions -> com.android.tools.r8.internal.Gl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerOptions.java"}
     com.android.tools.r8.utils.InternalOptions options -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     boolean enabled -> b
     boolean enableInitial -> c
     boolean enableBridgeAnalysis -> d
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):17:17 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/gB;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/iB;)V"}
     2:7:void <init>(com.android.tools.r8.utils.InternalOptions):13:18 -> <init>
     1:1:void disable():22:22 -> a
     2:2:void setEnableBridgeAnalysis(boolean):52:52 -> a
     1:1:void disableInitial():26:26 -> b
     2:2:void setEnabled(boolean):48:48 -> b
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerPolicyExecutor -> com.android.tools.r8.internal.El0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerPolicyExecutor -> com.android.tools.r8.internal.Il0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerPolicyExecutor.java"}
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/X3;"}
@@ -303393,7 +302718,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$createInitialMergeGroupsWithDeterministicOrder$0(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Lcom/android/tools/r8/graph/I2;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Lcom/android/tools/r8/graph/I2;"}
     2:2:com.android.tools.r8.graph.DexType lambda$createInitialMergeGroupsWithDeterministicOrder$0(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):58:58 -> a
     3:5:java.util.Collection createInitialMergeGroupsWithDeterministicOrder(java.util.Set):50:52 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/Set;)Ljava/util/ArrayList;"}
@@ -303407,38 +302732,38 @@
     15:15:java.util.List com.android.tools.r8.utils.ListUtils.destructiveSort(java.util.List,java.util.Comparator):337:337 -> a
     15:15:java.util.Collection createInitialMergeGroupsWithDeterministicOrder(java.util.Set):57 -> a
     16:17:java.util.LinkedList apply(com.android.tools.r8.classmerging.Policy,java.util.LinkedList,java.util.concurrent.ExecutorService):65:66 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/GW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/KW;Ljava/util/LinkedList;Ljava/util/concurrent/ExecutorService;)Ljava/util/LinkedList;"}
     18:19:java.util.LinkedList apply(com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing,java.util.LinkedList):72:73 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gl0;Ljava/util/LinkedList;)Ljava/util/LinkedList;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/util/LinkedList;)Ljava/util/LinkedList;"}
     20:23:boolean lambda$apply$1(com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing,java.lang.Object,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):75:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Gl0;Ljava/lang/Object;Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/lang/Object;Lcom/android/tools/r8/internal/Ol0;)Z"}
     24:24:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     24:24:boolean lambda$apply$1(com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing,java.lang.Object,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:25:boolean lambda$apply$1(com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing,java.lang.Object,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):79:79 -> a
     26:26:boolean lambda$apply$1(com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing,java.lang.Object,com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):78:78 -> a
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerPolicyScheduler -> com.android.tools.r8.internal.Fl0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerPolicyScheduler -> com.android.tools.r8.internal.Jl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerPolicyScheduler.java"}
     1:1:java.util.List getPolicies(com.android.tools.r8.graph.AppView):37:37 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)Ljava/util/List;"}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult -> com.android.tools.r8.internal.Il0:
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult -> com.android.tools.r8.internal.Ml0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerResult.java"}
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder lensBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El0;"}
     java.util.List synthesizedBridges -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses verticallyMergedClasses -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ml0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ql0;"}
     1:4:void <init>(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses):20:23 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Al0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ml0;)V"}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder -> com.android.tools.r8.internal.Hl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/El0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ql0;)V"}
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult$Builder -> com.android.tools.r8.internal.Ll0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerResult.java"}
     com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder lensBuilder -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Al0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/El0;"}
     java.util.List synthesizedBridges -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
     com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder verticallyMergedClassesBuilder -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Ll0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Pl0;"}
     1:4:void <init>(com.android.tools.r8.graph.AppView):60:63 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"()V"}
     5:5:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.builder():38:38 -> <init>
@@ -303446,8 +302771,8 @@
     6:9:void <init>(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder):69:72 -> <init>
     6:9:void <init>(com.android.tools.r8.graph.AppView):60 -> <init>
     10:13:void <init>(com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder,java.util.List,com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder):69:72 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Al0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Ll0;)V"}
-com.android.tools.r8.verticalclassmerging.VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.Jl0:
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/El0;Ljava/util/ArrayList;Lcom/android/tools/r8/internal/Pl0;)V"}
+com.android.tools.r8.verticalclassmerging.VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.Nl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerTreeFixer.java"}
     java.util.List synthesizedBridges -> n
       # {"id":"com.android.tools.r8.residualsignature","signature":"Ljava/util/ArrayList;"}
@@ -303457,7 +302782,7 @@
     1:1:com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder com.android.tools.r8.verticalclassmerging.VerticalClassMergerGraphLens$Builder.createBuilderForFixup(com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):370 -> <init>
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):40 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Gc;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Il0;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;Lcom/android/tools/r8/internal/Ic;Lcom/android/tools/r8/graph/X3;Lcom/android/tools/r8/internal/Ml0;)V"}
     2:2:com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult.getVerticallyMergedClasses():46:46 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):41 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):36:36 -> <init>
@@ -303465,7 +302790,7 @@
     4:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):42 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.classmerging.ClassMergerSharedData,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.verticalclassmerging.VerticalClassMergerResult):42:42 -> <init>
     1:2:void traverseProgramClassesDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):88:89 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ol;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Ljava/util/Set;Lcom/android/tools/r8/internal/Ql;)V"}
     3:3:boolean com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses.isMergeSource(com.android.tools.r8.graph.DexType):81:81 -> a
     3:3:void traverseProgramClassesDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureBiMap):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -303518,7 +302843,7 @@
     17:17:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):79 -> d
     18:18:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):79:79 -> d
     19:19:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):78:78 -> d
-com.android.tools.r8.verticalclassmerging.VerticalMergeGroup -> com.android.tools.r8.internal.Kl0:
+com.android.tools.r8.verticalclassmerging.VerticalMergeGroup -> com.android.tools.r8.internal.Ol0:
 # {"id":"sourceFile","fileName":"VerticalMergeGroup.java"}
     com.android.tools.r8.graph.DexProgramClass source -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/D2;"}
@@ -303527,18 +302852,18 @@
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):14:16 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
     1:1:int size():29:29 -> size
-com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.Ml0:
+com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.Ql0:
 # {"id":"sourceFile","fileName":"VerticallyMergedClasses.java"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap mergedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/b6;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfacesToClasses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfacesToInterfaces -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/X5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Z5;"}
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):31:34 -> <init>
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Z5;Lcom/android/tools/r8/internal/X5;Lcom/android/tools/r8/internal/X5;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/b6;Lcom/android/tools/r8/internal/Z5;Lcom/android/tools/r8/internal/Z5;)V"}
     1:1:com.android.tools.r8.graph.DexType getMergeTargetOrDefault(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):58:58 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;Lcom/android/tools/r8/graph/I2;)Lcom/android/tools/r8/graph/I2;"}
     2:2:java.util.Set getSources():62:62 -> a
@@ -303553,14 +302878,14 @@
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
     1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):85:85 -> d
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/I2;)Z"}
-com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder -> com.android.tools.r8.internal.Ll0:
+com.android.tools.r8.verticalclassmerging.VerticallyMergedClasses$Builder -> com.android.tools.r8.internal.Pl0:
 # {"id":"sourceFile","fileName":"VerticallyMergedClasses.java"}
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap mergedClasses -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/a6;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap mergedInterfacesToClasses -> b
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
     com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap mergedInterfacesToInterfaces -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/W5;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/Y5;"}
     1:4:void <init>():115:118 -> <init>
     5:5:com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap.newIdentityHashMap():22:22 -> <init>
     5:5:void <init>():121 -> <init>
@@ -303570,7 +302895,7 @@
     8:8:void <init>():124:124 -> <init>
     1:6:void add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):127:132 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)V"}
-com.android.tools.r8.verticalclassmerging.policies.NoAbstractMethodsOnAbstractClassesPolicy -> com.android.tools.r8.internal.qQ:
+com.android.tools.r8.verticalclassmerging.policies.NoAbstractMethodsOnAbstractClassesPolicy -> com.android.tools.r8.internal.uQ:
 # {"id":"sourceFile","fileName":"NoAbstractMethodsOnAbstractClassesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303579,7 +302904,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23:23 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23 -> a
@@ -303613,20 +302938,20 @@
     22:23:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):31 -> a
     24:27:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):32:35 -> a
     1:1:java.lang.String getName():44:44 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoAnnotationClassesPolicy -> com.android.tools.r8.internal.sQ:
+com.android.tools.r8.verticalclassmerging.policies.NoAnnotationClassesPolicy -> com.android.tools.r8.internal.wQ:
 # {"id":"sourceFile","fileName":"NoAnnotationClassesPolicy.java"}
     1:1:void <init>():8:8 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():613:613 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12 -> a
     1:1:java.lang.String getName():17:17 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoClassInitializationChangesPolicy -> com.android.tools.r8.internal.xQ:
+com.android.tools.r8.verticalclassmerging.policies.NoClassInitializationChangesPolicy -> com.android.tools.r8.internal.BQ:
 # {"id":"sourceFile","fileName":"NoClassInitializationChangesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303635,13 +302960,13 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Object):18:18 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Ljava/lang/Object;)Z"}
     2:2:java.lang.Object preprocess(java.util.Collection):18:18 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Ljava/lang/Object;"}
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.util.Map):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/util/Map;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Ljava/util/Map;)Z"}
     4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     4:4:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.util.Map):36 -> a
     5:14:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.util.Map):38:47 -> a
@@ -303665,7 +302990,7 @@
     8:8:java.util.Map preprocess(java.util.Collection):62 -> b
     9:9:java.util.Map preprocess(java.util.Collection):62:62 -> b
     1:1:java.lang.String getName():70:70 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoDirectlyInstantiatedClassesPolicy -> com.android.tools.r8.internal.JQ:
+com.android.tools.r8.verticalclassmerging.policies.NoDirectlyInstantiatedClassesPolicy -> com.android.tools.r8.internal.NQ:
 # {"id":"sourceFile","fileName":"NoDirectlyInstantiatedClassesPolicy.java"}
     com.android.tools.r8.graph.ObjectAllocationInfoCollection allocationInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/o5;"}
@@ -303678,22 +303003,22 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23:23 -> a
     1:1:java.lang.String getName():28:28 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoEnclosingMethodAttributesPolicy -> com.android.tools.r8.internal.KQ:
+com.android.tools.r8.verticalclassmerging.policies.NoEnclosingMethodAttributesPolicy -> com.android.tools.r8.internal.OQ:
 # {"id":"sourceFile","fileName":"NoEnclosingMethodAttributesPolicy.java"}
     1:1:void <init>():8:8 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12:12 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):13 -> a
     4:4:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):13:13 -> a
     1:1:java.lang.String getName():18:18 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoFieldResolutionChangesPolicy -> com.android.tools.r8.internal.NQ:
+com.android.tools.r8.verticalclassmerging.policies.NoFieldResolutionChangesPolicy -> com.android.tools.r8.internal.RQ:
 # {"id":"sourceFile","fileName":"NoFieldResolutionChangesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303702,7 +303027,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):30 -> a
     3:16:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):34:47 -> a
@@ -303718,7 +303043,7 @@
     25:25:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):51:51 -> a
     25:25:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):30 -> a
     1:1:java.lang.String getName():65:65 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoIllegalAccessesPolicy -> com.android.tools.r8.internal.OQ:
+com.android.tools.r8.verticalclassmerging.policies.NoIllegalAccessesPolicy -> com.android.tools.r8.internal.SQ:
 # {"id":"sourceFile","fileName":"NoIllegalAccessesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303729,7 +303054,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27:27 -> a
@@ -303754,7 +303079,7 @@
     54:54:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):87 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$0(com.android.tools.r8.graph.ProgramMethod):78:78 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Oh0;"}
     56:56:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):132:132 -> a
     56:56:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$0(com.android.tools.r8.graph.ProgramMethod):79 -> a
     57:57:java.lang.Object com.android.tools.r8.graph.UseRegistryWithResult.getResult():21:21 -> a
@@ -303763,19 +303088,19 @@
     57:57:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$0(com.android.tools.r8.graph.ProgramMethod):79 -> a
     58:63:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$0(com.android.tools.r8.graph.ProgramMethod):79:84 -> a
     1:1:java.lang.String getName():92:92 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoInnerClassAttributesPolicy -> com.android.tools.r8.internal.QQ:
+com.android.tools.r8.verticalclassmerging.policies.NoInnerClassAttributesPolicy -> com.android.tools.r8.internal.UQ:
 # {"id":"sourceFile","fileName":"NoInnerClassAttributesPolicy.java"}
     1:1:void <init>():8:8 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):12:12 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):13 -> a
     4:4:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):13:13 -> a
     1:1:java.lang.String getName():18:18 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoInterfacesWithInvokeSpecialToDefaultMethodIntoClassPolicy -> com.android.tools.r8.internal.UQ:
+com.android.tools.r8.verticalclassmerging.policies.NoInterfacesWithInvokeSpecialToDefaultMethodIntoClassPolicy -> com.android.tools.r8.internal.YQ:
 # {"id":"sourceFile","fileName":"NoInterfacesWithInvokeSpecialToDefaultMethodIntoClassPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303784,7 +303109,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):26 -> a
     3:7:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):29:33 -> a
@@ -303792,7 +303117,7 @@
     8:8:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:com.android.tools.r8.utils.TraversalContinuation lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):35:35 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Oh0;"}
     10:10:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):132:132 -> a
     10:10:com.android.tools.r8.utils.TraversalContinuation lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):36 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -303804,7 +303129,7 @@
     13:13:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> a
     13:13:com.android.tools.r8.utils.TraversalContinuation lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):38 -> a
     1:1:java.lang.String getName():45:45 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoInterfacesWithUnknownSubtypesPolicy -> com.android.tools.r8.internal.VQ:
+com.android.tools.r8.verticalclassmerging.policies.NoInterfacesWithUnknownSubtypesPolicy -> com.android.tools.r8.internal.ZQ:
 # {"id":"sourceFile","fileName":"NoInterfacesWithUnknownSubtypesPolicy.java"}
     com.android.tools.r8.graph.ObjectAllocationInfoCollection allocationInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/o5;"}
@@ -303817,21 +303142,21 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23:24 -> a
     1:1:java.lang.String getName():29:29 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoInvokeSuperNoSuchMethodErrorsPolicy -> com.android.tools.r8.internal.WQ:
+com.android.tools.r8.verticalclassmerging.policies.NoInvokeSuperNoSuchMethodErrorsPolicy -> com.android.tools.r8.internal.aR:
 # {"id":"sourceFile","fileName":"NoInvokeSuperNoSuchMethodErrorsPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):20:22 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27:27 -> a
@@ -303841,7 +303166,7 @@
     13:13:boolean mergeMayLeadToNoSuchMethodError(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToNoSuchMethodError$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):43:43 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Kh0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/C5;)Lcom/android/tools/r8/internal/Oh0;"}
     15:15:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):132:132 -> a
     15:15:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToNoSuchMethodError$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):45 -> a
     16:16:java.lang.Object com.android.tools.r8.graph.UseRegistryWithResult.getResult():21:21 -> a
@@ -303853,19 +303178,19 @@
     18:18:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):125:125 -> a
     18:18:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToNoSuchMethodError$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):46 -> a
     1:1:java.lang.String getName():54:54 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoKeptClassesPolicy -> com.android.tools.r8.internal.YQ:
+com.android.tools.r8.verticalclassmerging.policies.NoKeptClassesPolicy -> com.android.tools.r8.internal.cR:
 # {"id":"sourceFile","fileName":"NoKeptClassesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     java.util.Set keptClasses -> d
     1:4:void <init>(com.android.tools.r8.graph.AppView):32:35 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):41:41 -> a
     3:3:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.graph.AppView.getKeepInfo(com.android.tools.r8.graph.DexProgramClass):805:805 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):41 -> a
@@ -303926,7 +303251,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     31:33:java.util.Set getPinnedClasses():87:89 -> m
     34:34:java.util.Set getPinnedClasses():88:88 -> m
-com.android.tools.r8.verticalclassmerging.policies.NoLockMergingPolicy -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.verticalclassmerging.policies.NoLockMergingPolicy -> com.android.tools.r8.internal.eR:
 # {"id":"sourceFile","fileName":"NoLockMergingPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303935,7 +303260,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):21 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
     3:4:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23:24 -> a
@@ -303952,7 +303277,7 @@
     11:11:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
     12:12:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):28:28 -> a
     1:1:java.lang.String getName():34:34 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoMethodResolutionChangesPolicy -> com.android.tools.r8.internal.bR:
+com.android.tools.r8.verticalclassmerging.policies.NoMethodResolutionChangesPolicy -> com.android.tools.r8.internal.fR:
 # {"id":"sourceFile","fileName":"NoMethodResolutionChangesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -303963,24 +303288,24 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):28 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):28:28 -> a
     4:67:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):32:95 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/D2;Lcom/android/tools/r8/graph/D2;)Z"}
     68:74:void lambda$methodResolutionMayChange$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.LookupMethodTarget):82:88 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/k7;Lcom/android/tools/r8/graph/y4;)V"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/j1;Lcom/android/tools/r8/internal/m7;Lcom/android/tools/r8/graph/y4;)V"}
     75:75:void lambda$methodResolutionMayChange$1(com.android.tools.r8.graph.LookupLambdaTarget):93:93 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/x4;)V"}
     1:1:java.lang.String getName():106:106 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoNestedMergingPolicy -> com.android.tools.r8.internal.dR:
+com.android.tools.r8.verticalclassmerging.policies.NoNestedMergingPolicy -> com.android.tools.r8.internal.hR:
 # {"id":"sourceFile","fileName":"NoNestedMergingPolicy.java"}
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Object):12:12 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Ljava/lang/Object;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.util.Map):18 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -304002,7 +303327,7 @@
     1:1:java.util.Map preprocess(java.util.Collection):29:29 -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Ljava/util/IdentityHashMap;"}
     1:1:java.lang.String getName():39:39 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoNonSerializableClassIntoSerializableClassPolicy -> com.android.tools.r8.internal.eR:
+com.android.tools.r8.verticalclassmerging.policies.NoNonSerializableClassIntoSerializableClassPolicy -> com.android.tools.r8.internal.iR:
 # {"id":"sourceFile","fileName":"NoNonSerializableClassIntoSerializableClassPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -304011,23 +303336,23 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):21 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
     3:5:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):29:31 -> a
     1:1:java.lang.String getName():36:36 -> f
-com.android.tools.r8.verticalclassmerging.policies.NoServiceInterfacesPolicy -> com.android.tools.r8.internal.hR:
+com.android.tools.r8.verticalclassmerging.policies.NoServiceInterfacesPolicy -> com.android.tools.r8.internal.lR:
 # {"id":"sourceFile","fileName":"NoServiceInterfacesPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
     com.android.tools.r8.utils.InternalOptions options -> c
-      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/gB;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/internal/iB;"}
     1:3:void <init>(com.android.tools.r8.graph.AppView):17:19 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):26:26 -> a
@@ -304042,7 +303367,7 @@
     7:7:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27 -> a
     8:8:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):27:27 -> a
     1:1:java.lang.String getName():32:32 -> f
-com.android.tools.r8.verticalclassmerging.policies.SameApiReferenceLevelPolicy -> com.android.tools.r8.internal.ga0:
+com.android.tools.r8.verticalclassmerging.policies.SameApiReferenceLevelPolicy -> com.android.tools.r8.internal.ka0:
 # {"id":"sourceFile","fileName":"SameApiReferenceLevelPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -304051,7 +303376,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView):19:20 -> <init>
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/graph/y;)V"}
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):26 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -304094,7 +303419,7 @@
     28:28:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):33:33 -> a
     1:1:java.lang.String getName():38:38 -> f
     1:1:boolean shouldSkipPolicy():43:43 -> l
-com.android.tools.r8.verticalclassmerging.policies.SameFeatureSplitPolicy -> com.android.tools.r8.internal.ia0:
+com.android.tools.r8.verticalclassmerging.policies.SameFeatureSplitPolicy -> com.android.tools.r8.internal.ma0:
 # {"id":"sourceFile","fileName":"SameFeatureSplitPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -304103,7 +303428,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24:24 -> a
@@ -304144,7 +303469,7 @@
     13:14:boolean com.android.tools.r8.features.FeatureSplitBoundaryOptimizationUtils.isSafeForVerticalClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):97:98 -> a
     13:14:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24 -> a
     1:1:java.lang.String getName():30:30 -> f
-com.android.tools.r8.verticalclassmerging.policies.SameMainDexGroupPolicy -> com.android.tools.r8.internal.na0:
+com.android.tools.r8.verticalclassmerging.policies.SameMainDexGroupPolicy -> com.android.tools.r8.internal.ra0:
 # {"id":"sourceFile","fileName":"SameMainDexGroupPolicy.java"}
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/shaking/Y1;"}
@@ -304158,7 +303483,7 @@
     3:3:void <init>(com.android.tools.r8.graph.AppView):20 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25:25 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:3:boolean com.android.tools.r8.shaking.MainDexInfo.isNone():87:88 -> a
     2:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25 -> a
     4:4:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25:25 -> a
@@ -304179,18 +303504,18 @@
     1:1:boolean shouldSkipPolicy():38:38 -> l
     2:3:boolean com.android.tools.r8.shaking.MainDexInfo.isNone():87:88 -> l
     2:3:boolean shouldSkipPolicy():38 -> l
-com.android.tools.r8.verticalclassmerging.policies.SameNestPolicy -> com.android.tools.r8.internal.pa0:
+com.android.tools.r8.verticalclassmerging.policies.SameNestPolicy -> com.android.tools.r8.internal.ta0:
 # {"id":"sourceFile","fileName":"SameNestPolicy.java"}
     1:1:void <init>():10:10 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):16 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):17 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):18:18 -> a
     1:1:java.lang.String getName():23:23 -> f
-com.android.tools.r8.verticalclassmerging.policies.SameStartupPartitionPolicy -> com.android.tools.r8.internal.ua0:
+com.android.tools.r8.verticalclassmerging.policies.SameStartupPartitionPolicy -> com.android.tools.r8.internal.ya0:
 # {"id":"sourceFile","fileName":"SameStartupPartitionPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -304199,7 +303524,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getTarget():24:24 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):23 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24:24 -> a
@@ -304216,7 +303541,7 @@
     8:9:boolean com.android.tools.r8.profile.startup.optimization.StartupBoundaryOptimizationUtils.isSafeForVerticalClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):49:50 -> a
     8:9:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24 -> a
     1:1:java.lang.String getName():30:30 -> f
-com.android.tools.r8.verticalclassmerging.policies.SuccessfulVirtualMethodResolutionInTargetPolicy -> com.android.tools.r8.internal.Sf0:
+com.android.tools.r8.verticalclassmerging.policies.SuccessfulVirtualMethodResolutionInTargetPolicy -> com.android.tools.r8.internal.Wf0:
 # {"id":"sourceFile","fileName":"SuccessfulVirtualMethodResolutionInTargetPolicy.java"}
     com.android.tools.r8.graph.AppView appView -> b
       # {"id":"com.android.tools.r8.residualsignature","signature":"Lcom/android/tools/r8/graph/y;"}
@@ -304225,7 +303550,7 @@
     1:1:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.verticalclassmerging.VerticalMergeGroup.getSource():20:20 -> a
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22:22 -> a
     3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$5.iterator():742:742 -> a
     3:3:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):22 -> a
@@ -304253,24 +303578,24 @@
     17:18:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):24 -> a
     19:19:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup):25:25 -> a
     1:1:java.lang.String getName():34:34 -> f
-com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicy -> com.android.tools.r8.internal.Dl0:
+com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicy -> com.android.tools.r8.internal.Hl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerPolicy.java"}
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;)Z"}
     1:1:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Object):9:9 -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Ljava/lang/Object;)Z"}
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Void):16:16 -> a
     2:2:boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Object):9 -> a
     3:3:java.lang.Object preprocess(java.util.Collection):9:9 -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Ljava/lang/Object;"}
-com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing -> com.android.tools.r8.internal.Gl0:
+com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing -> com.android.tools.r8.internal.Kl0:
 # {"id":"sourceFile","fileName":"VerticalClassMergerPolicyWithPreprocessing.java"}
     1:1:void <init>():10:10 -> <init>
     boolean canMerge(com.android.tools.r8.verticalclassmerging.VerticalMergeGroup,java.lang.Object) -> a
-      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Kl0;Ljava/lang/Object;)Z"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"(Lcom/android/tools/r8/internal/Ol0;Ljava/lang/Object;)Z"}
     java.lang.Object preprocess(java.util.Collection) -> a
       # {"id":"com.android.tools.r8.residualsignature","signature":"(Ljava/util/LinkedList;)Ljava/lang/Object;"}
     1:1:com.android.tools.r8.verticalclassmerging.policies.VerticalClassMergerPolicyWithPreprocessing asVerticalClassMergerPolicy():23:23 -> d
-      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Gl0;"}
+      # {"id":"com.android.tools.r8.residualsignature","signature":"()Lcom/android/tools/r8/internal/Kl0;"}
     1:1:boolean isVerticalClassMergerPolicy():18:18 -> k
diff --git a/r8.spdx.json b/r8.spdx.json
index 6f68316..d4ffd9b 100644
--- a/r8.spdx.json
+++ b/r8.spdx.json
@@ -2,7 +2,7 @@
   "SPDXID" : "SPDXRef-DOCUMENT",
   "spdxVersion" : "SPDX-2.3",
   "creationInfo" : {
-    "created" : "2024-06-14T09:06:53Z",
+    "created" : "2024-06-20T18:24:38Z",
     "creators" : [ "Tool: spdx-gradle-plugin", "Organization: Google LLC" ]
   },
   "name" : "R8 Compiler Suite",
@@ -53,7 +53,7 @@
     "name" : "GNU LESSER GENERAL PUBLIC LICENSE 2.1",
     "seeAlsos" : [ "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html" ]
   } ],
-  "documentNamespace" : "https://spdx.google/502c19c4-75bd-55f4-a0c5-70582308b111",
+  "documentNamespace" : "https://spdx.google/6a14d714-acb9-5bd6-bbf2-b58ac35d8fcc",
   "packages" : [ {
     "SPDXID" : "SPDXRef-gnrtd0",
     "copyrightText" : "NOASSERTION",
@@ -64,9 +64,9 @@
     "licenseDeclared" : "NOASSERTION",
     "licenseInfoFromFiles" : [ ],
     "name" : "r8",
-    "sourceInfo" : "git+https://r8.googlesource.com/r8/@b66227ea8c3d479f94beb3b214ad182d27251a7a#r8[:]",
+    "sourceInfo" : "git+https://r8.googlesource.com/r8/@8a19a218c47d2d629fcc12df3cbb52a7baadb06a#r8[:]",
     "supplier" : "Organization: Google LLC",
-    "versionInfo" : "8.6.8-dev"
+    "versionInfo" : "8.6.10-dev"
   }, {
     "SPDXID" : "SPDXRef-gnrtd1",
     "checksums" : [ {
@@ -393,48 +393,48 @@
     "SPDXID" : "SPDXRef-gnrtd15",
     "checksums" : [ {
       "algorithm" : "SHA1",
-      "checksumValue" : "f6158a6a298a459b5a8a4701881e2890a25414de"
+      "checksumValue" : "48228e400bdde2de1bb5af4e91373387b327b84c"
     }, {
       "algorithm" : "SHA256",
-      "checksumValue" : "941ec1f5f4a8cb8c5982b38d2ef438a03945ce1e37f2111876890b5ed90c2f64"
+      "checksumValue" : "ad8f1c7dbc5ac46f5cbd2d2e5de39c56c9db65dd7de716a84e01ce208758aee6"
     } ],
     "copyrightText" : "NOASSERTION",
-    "downloadLocation" : "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-metadata-jvm/2.0.0-Beta5/kotlin-metadata-jvm-2.0.0-Beta5.jar",
+    "downloadLocation" : "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-metadata-jvm/2.0.0/kotlin-metadata-jvm-2.0.0.jar",
     "externalRefs" : [ {
       "referenceCategory" : "PACKAGE-MANAGER",
-      "referenceLocator" : "pkg:maven/org.jetbrains.kotlin/kotlin-metadata-jvm@2.0.0-Beta5?repository_url=repo1.maven.org%2Fmaven2",
+      "referenceLocator" : "pkg:maven/org.jetbrains.kotlin/kotlin-metadata-jvm@2.0.0?repository_url=repo1.maven.org%2Fmaven2",
       "referenceType" : "purl"
     } ],
     "filesAnalyzed" : false,
     "licenseConcluded" : "NOASSERTION",
     "licenseDeclared" : "Apache-2.0",
     "licenseInfoFromFiles" : [ ],
-    "name" : "org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.0-Beta5",
+    "name" : "org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.0",
     "supplier" : "Organization: JetBrains",
-    "versionInfo" : "2.0.0-Beta5"
+    "versionInfo" : "2.0.0"
   }, {
     "SPDXID" : "SPDXRef-gnrtd16",
     "checksums" : [ {
       "algorithm" : "SHA256",
-      "checksumValue" : "bc97646d4a7c7f0b49e809fe65aa5d6c654d59f337ad0ce2a6180f5717697d69"
+      "checksumValue" : "240938c4aab8e73e888703e3e7d3f87383ffe5bd536d6d5e3c100d4cd0379fcf"
     }, {
       "algorithm" : "SHA1",
-      "checksumValue" : "763714203113a7f4a5477122be0c6c588df0116e"
+      "checksumValue" : "b48df2c4aede9586cc931ead433bc02d6fd7879e"
     } ],
     "copyrightText" : "NOASSERTION",
-    "downloadLocation" : "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta5/kotlin-stdlib-2.0.0-Beta5.jar",
+    "downloadLocation" : "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0.jar",
     "externalRefs" : [ {
       "referenceCategory" : "PACKAGE-MANAGER",
-      "referenceLocator" : "pkg:maven/org.jetbrains.kotlin/kotlin-stdlib@2.0.0-Beta5?repository_url=repo1.maven.org%2Fmaven2",
+      "referenceLocator" : "pkg:maven/org.jetbrains.kotlin/kotlin-stdlib@2.0.0?repository_url=repo1.maven.org%2Fmaven2",
       "referenceType" : "purl"
     } ],
     "filesAnalyzed" : false,
     "licenseConcluded" : "NOASSERTION",
     "licenseDeclared" : "Apache-2.0",
     "licenseInfoFromFiles" : [ ],
-    "name" : "org.jetbrains.kotlin:kotlin-stdlib:2.0.0-Beta5",
+    "name" : "org.jetbrains.kotlin:kotlin-stdlib:2.0.0",
     "supplier" : "Organization: JetBrains",
-    "versionInfo" : "2.0.0-Beta5"
+    "versionInfo" : "2.0.0"
   }, {
     "SPDXID" : "SPDXRef-gnrtd17",
     "checksums" : [ {
@@ -491,9 +491,9 @@
     "licenseDeclared" : "NOASSERTION",
     "licenseInfoFromFiles" : [ ],
     "name" : "r8",
-    "sourceInfo" : "git+https://r8.googlesource.com/r8/@b66227ea8c3d479f94beb3b214ad182d27251a7a#r8[:]",
+    "sourceInfo" : "git+https://r8.googlesource.com/r8/@8a19a218c47d2d629fcc12df3cbb52a7baadb06a#r8[:]",
     "supplier" : "Organization: Google LLC",
-    "versionInfo" : "8.6.8-dev"
+    "versionInfo" : "8.6.10-dev"
   }, {
     "SPDXID" : "SPDXRef-gnrtd20",
     "copyrightText" : "NOASSERTION",
@@ -504,35 +504,12 @@
     "licenseDeclared" : "NOASSERTION",
     "licenseInfoFromFiles" : [ ],
     "name" : "r8",
-    "sourceInfo" : "git+https://r8.googlesource.com/r8/@b66227ea8c3d479f94beb3b214ad182d27251a7a#r8[:]",
+    "sourceInfo" : "git+https://r8.googlesource.com/r8/@8a19a218c47d2d629fcc12df3cbb52a7baadb06a#r8[:]",
     "supplier" : "Organization: Google LLC",
-    "versionInfo" : "8.6.8-dev"
+    "versionInfo" : "8.6.10-dev"
   }, {
     "SPDXID" : "SPDXRef-gnrtd21",
     "checksums" : [ {
-      "algorithm" : "SHA1",
-      "checksumValue" : "00962acc39c59270f5ac7308d58d567d82258aac"
-    }, {
-      "algorithm" : "SHA256",
-      "checksumValue" : "11bcf9d11dd46b15676f69fb19b40a242ab573aedeee0da67c10b771b5a51f98"
-    } ],
-    "copyrightText" : "NOASSERTION",
-    "downloadLocation" : "https://maven.google.com/com/android/tools/build/aapt2-proto/8.5.0-alpha04-11315950/aapt2-proto-8.5.0-alpha04-11315950.jar",
-    "externalRefs" : [ {
-      "referenceCategory" : "PACKAGE-MANAGER",
-      "referenceLocator" : "pkg:maven/com.android.tools.build/aapt2-proto@8.5.0-alpha04-11315950?repository_url=maven.google.com",
-      "referenceType" : "purl"
-    } ],
-    "filesAnalyzed" : false,
-    "licenseConcluded" : "NOASSERTION",
-    "licenseDeclared" : "Apache-2.0",
-    "licenseInfoFromFiles" : [ ],
-    "name" : "com.android.tools.build:aapt2-proto:8.5.0-alpha04-11315950",
-    "supplier" : "Person: The Android Open Source Project",
-    "versionInfo" : "8.5.0-alpha04-11315950"
-  }, {
-    "SPDXID" : "SPDXRef-gnrtd22",
-    "checksums" : [ {
       "algorithm" : "SHA256",
       "checksumValue" : "59d388ea6a2d2d76ae8efff7fd4d0c60c6f0f464c3d3ab9be8e5add092975708"
     }, {
@@ -554,6 +531,29 @@
     "supplier" : "Organization: Google",
     "versionInfo" : "3.22.3"
   }, {
+    "SPDXID" : "SPDXRef-gnrtd22",
+    "checksums" : [ {
+      "algorithm" : "SHA256",
+      "checksumValue" : "11bcf9d11dd46b15676f69fb19b40a242ab573aedeee0da67c10b771b5a51f98"
+    }, {
+      "algorithm" : "SHA1",
+      "checksumValue" : "00962acc39c59270f5ac7308d58d567d82258aac"
+    } ],
+    "copyrightText" : "NOASSERTION",
+    "downloadLocation" : "https://maven.google.com/com/android/tools/build/aapt2-proto/8.5.0-alpha04-11315950/aapt2-proto-8.5.0-alpha04-11315950.jar",
+    "externalRefs" : [ {
+      "referenceCategory" : "PACKAGE-MANAGER",
+      "referenceLocator" : "pkg:maven/com.android.tools.build/aapt2-proto@8.5.0-alpha04-11315950?repository_url=maven.google.com",
+      "referenceType" : "purl"
+    } ],
+    "filesAnalyzed" : false,
+    "licenseConcluded" : "NOASSERTION",
+    "licenseDeclared" : "Apache-2.0",
+    "licenseInfoFromFiles" : [ ],
+    "name" : "com.android.tools.build:aapt2-proto:8.5.0-alpha04-11315950",
+    "supplier" : "Person: The Android Open Source Project",
+    "versionInfo" : "8.5.0-alpha04-11315950"
+  }, {
     "SPDXID" : "SPDXRef-gnrtd23",
     "checksums" : [ {
       "algorithm" : "SHA256",
@@ -1513,19 +1513,19 @@
     "relationshipType" : "DEPENDS_ON",
     "relatedSpdxElement" : "SPDXRef-gnrtd17"
   }, {
+    "spdxElementId" : "SPDXRef-gnrtd19",
+    "relationshipType" : "DEPENDS_ON",
+    "relatedSpdxElement" : "SPDXRef-gnrtd21"
+  }, {
     "spdxElementId" : "SPDXRef-gnrtd20",
     "relationshipType" : "DEPENDS_ON",
     "relatedSpdxElement" : "SPDXRef-gnrtd34"
   }, {
     "spdxElementId" : "SPDXRef-gnrtd20",
     "relationshipType" : "DEPENDS_ON",
-    "relatedSpdxElement" : "SPDXRef-gnrtd21"
-  }, {
-    "spdxElementId" : "SPDXRef-gnrtd20",
-    "relationshipType" : "DEPENDS_ON",
     "relatedSpdxElement" : "SPDXRef-gnrtd23"
   }, {
-    "spdxElementId" : "SPDXRef-gnrtd21",
+    "spdxElementId" : "SPDXRef-gnrtd20",
     "relationshipType" : "DEPENDS_ON",
     "relatedSpdxElement" : "SPDXRef-gnrtd22"
   }, {